Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add aws_appconfig_deployment #20172

Merged
merged 12 commits into from
Jul 22, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .changelog/20172.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:new-resource
aws_appconfig_deployment
```
11 changes: 11 additions & 0 deletions aws/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -695,6 +695,17 @@ func (c *Config) Client() (interface{}, error) {
}
})

// StartDeployment operations can return a ConflictException
// if ongoing deployments are in-progress, thus we handle them
// here for the service client.
client.appconfigconn.Handlers.Retry.PushBack(func(r *request.Request) {
if r.Operation.Name == "StartDeployment" {
if tfawserr.ErrCodeEquals(r.Error, appconfig.ErrCodeConflictException) {
r.Retryable = aws.Bool(true)
}
}
})

client.appsyncconn.Handlers.Retry.PushBack(func(r *request.Request) {
if r.Operation.Name == "CreateGraphqlApi" {
if isAWSErr(r.Error, appsync.ErrCodeConcurrentModificationException, "a GraphQL API creation is already in progress") {
Expand Down
29 changes: 29 additions & 0 deletions aws/internal/service/appconfig/waiter/status.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
package waiter

import (
"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/service/appconfig"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
)

func DeploymentStatus(conn *appconfig.AppConfig, appID, envID string, deployNum int64) resource.StateRefreshFunc {
return func() (interface{}, string, error) {
input := &appconfig.GetDeploymentInput{
ApplicationId: aws.String(appID),
DeploymentNumber: aws.Int64(deployNum),
EnvironmentId: aws.String(envID),
}

output, err := conn.GetDeployment(input)

if err != nil {
return nil, "", err
}

if output == nil {
return nil, "", nil
}

return output, aws.StringValue(output.State), nil
}
}
23 changes: 23 additions & 0 deletions aws/internal/service/appconfig/waiter/waiter.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
package waiter

import (
"time"

"github.com/aws/aws-sdk-go/service/appconfig"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
)

const DeploymentCreatedTimeout = 20 * time.Minute

func DeploymentCreated(conn *appconfig.AppConfig, appID, envID string, deployNum int64) error {
stateConf := &resource.StateChangeConf{
Pending: []string{appconfig.DeploymentStateBaking, appconfig.DeploymentStateRollingBack, appconfig.DeploymentStateValidating, appconfig.DeploymentStateDeploying},
Target: []string{appconfig.DeploymentStateComplete},
Refresh: DeploymentStatus(conn, appID, envID, deployNum),
Timeout: DeploymentCreatedTimeout,
}

_, err := stateConf.WaitForState()

return err
}
1 change: 1 addition & 0 deletions aws/provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -508,6 +508,7 @@ func Provider() *schema.Provider {
"aws_appautoscaling_scheduled_action": resourceAwsAppautoscalingScheduledAction(),
"aws_appconfig_application": resourceAwsAppconfigApplication(),
"aws_appconfig_configuration_profile": resourceAwsAppconfigConfigurationProfile(),
"aws_appconfig_deployment": resourceAwsAppconfigDeployment(),
"aws_appconfig_deployment_strategy": resourceAwsAppconfigDeploymentStrategy(),
"aws_appconfig_environment": resourceAwsAppconfigEnvironment(),
"aws_appconfig_hosted_configuration_version": resourceAwsAppconfigHostedConfigurationVersion(),
Expand Down
222 changes: 222 additions & 0 deletions aws/resource_aws_appconfig_deployment.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,222 @@
package aws

import (
"fmt"
"log"
"regexp"
"strconv"
"strings"

"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/arn"
"github.com/aws/aws-sdk-go/service/appconfig"
"github.com/hashicorp/aws-sdk-go-base/tfawserr"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
"github.com/terraform-providers/terraform-provider-aws/aws/internal/keyvaluetags"
"github.com/terraform-providers/terraform-provider-aws/aws/internal/service/appconfig/waiter"
)

func resourceAwsAppconfigDeployment() *schema.Resource {
return &schema.Resource{
Create: resourceAwsAppconfigDeploymentCreate,
Read: resourceAwsAppconfigDeploymentRead,
Update: resourceAwsAppconfigDeploymentUpdate,
Delete: resourceAwsAppconfigDeploymentDelete,
Importer: &schema.ResourceImporter{
State: schema.ImportStatePassthrough,
},

Schema: map[string]*schema.Schema{
"application_id": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
ValidateFunc: validation.StringMatch(regexp.MustCompile(`[a-z0-9]{4,7}`), ""),
},
"arn": {
Type: schema.TypeString,
Computed: true,
},
"configuration_profile_id": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
ValidateFunc: validation.StringMatch(regexp.MustCompile(`[a-z0-9]{4,7}`), ""),
},
"configuration_version": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
ValidateFunc: validation.StringLenBetween(1, 1024),
},
"deployment_number": {
Type: schema.TypeInt,
Computed: true,
},
"deployment_strategy_id": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
ValidateFunc: validation.StringMatch(regexp.MustCompile(`[a-z0-9]{4,7}`), ""),
},
"description": {
Type: schema.TypeString,
Optional: true,
ForceNew: true,
ValidateFunc: validation.StringLenBetween(0, 1024),
},
"environment_id": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
ValidateFunc: validation.StringMatch(regexp.MustCompile(`[a-z0-9]{4,7}`), ""),
},
"tags": tagsSchema(),
"tags_all": tagsSchemaComputed(),
},
CustomizeDiff: SetTagsDiff,
}
}

func resourceAwsAppconfigDeploymentCreate(d *schema.ResourceData, meta interface{}) error {
conn := meta.(*AWSClient).appconfigconn
defaultTagsConfig := meta.(*AWSClient).DefaultTagsConfig
tags := defaultTagsConfig.MergeTags(keyvaluetags.New(d.Get("tags").(map[string]interface{})))

input := &appconfig.StartDeploymentInput{
ApplicationId: aws.String(d.Get("application_id").(string)),
EnvironmentId: aws.String(d.Get("environment_id").(string)),
ConfigurationProfileId: aws.String(d.Get("configuration_profile_id").(string)),
ConfigurationVersion: aws.String(d.Get("configuration_version").(string)),
DeploymentStrategyId: aws.String(d.Get("deployment_strategy_id").(string)),
Description: aws.String(d.Get("description").(string)),
Tags: tags.IgnoreAws().AppconfigTags(),
}

output, err := conn.StartDeployment(input)

if err != nil {
return fmt.Errorf("error starting AppConfig Deployment: %w", err)
}

if output == nil {
return fmt.Errorf("error starting AppConfig Deployment: empty response")
}

appID := aws.StringValue(output.ApplicationId)
envID := aws.StringValue(output.EnvironmentId)
deployNum := aws.Int64Value(output.DeploymentNumber)

d.SetId(fmt.Sprintf("%s/%s/%d", appID, envID, deployNum))

if err := waiter.DeploymentCreated(conn, appID, envID, deployNum); err != nil {
return fmt.Errorf("error waiting for AppConfig Deployment (%s) creation: %w", d.Id(), err)
}

return resourceAwsAppconfigDeploymentRead(d, meta)
}

func resourceAwsAppconfigDeploymentRead(d *schema.ResourceData, meta interface{}) error {
conn := meta.(*AWSClient).appconfigconn
defaultTagsConfig := meta.(*AWSClient).DefaultTagsConfig
ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig

appID, envID, deploymentNum, err := resourceAwsAppconfigDeploymentParseID(d.Id())

if err != nil {
return err
}

input := &appconfig.GetDeploymentInput{
ApplicationId: aws.String(appID),
DeploymentNumber: aws.Int64(int64(deploymentNum)),
EnvironmentId: aws.String(envID),
}

output, err := conn.GetDeployment(input)

if !d.IsNewResource() && tfawserr.ErrCodeEquals(err, appconfig.ErrCodeResourceNotFoundException) {
log.Printf("[WARN] Appconfig Deployment (%s) not found, removing from state", d.Id())
d.SetId("")
return nil
}

if err != nil {
return fmt.Errorf("error getting AppConfig Deployment (%s): %w", d.Id(), err)
}

if output == nil {
return fmt.Errorf("error getting AppConfig Deployment (%s): empty response", d.Id())
}

arn := arn.ARN{
AccountID: meta.(*AWSClient).accountid,
Partition: meta.(*AWSClient).partition,
Region: meta.(*AWSClient).region,
Resource: fmt.Sprintf("application/%s/environment/%s/deployment/%d", aws.StringValue(output.ApplicationId), aws.StringValue(output.EnvironmentId), aws.Int64Value(output.DeploymentNumber)),
Service: "appconfig",
}.String()

d.Set("application_id", output.ApplicationId)
d.Set("arn", arn)
d.Set("configuration_profile_id", output.ConfigurationProfileId)
d.Set("configuration_version", output.ConfigurationVersion)
d.Set("deployment_number", output.DeploymentNumber)
d.Set("deployment_strategy_id", output.DeploymentStrategyId)
d.Set("description", output.Description)
d.Set("environment_id", output.EnvironmentId)

tags, err := keyvaluetags.AppconfigListTags(conn, arn)

if err != nil {
return fmt.Errorf("error listing tags for AppConfig Deployment (%s): %w", d.Id(), err)
}

tags = tags.IgnoreAws().IgnoreConfig(ignoreTagsConfig)

//lintignore:AWSR002
if err := d.Set("tags", tags.RemoveDefaultConfig(defaultTagsConfig).Map()); err != nil {
return fmt.Errorf("error setting tags: %w", err)
}

if err := d.Set("tags_all", tags.Map()); err != nil {
return fmt.Errorf("error setting tags_all: %w", err)
}

return nil
}

func resourceAwsAppconfigDeploymentUpdate(d *schema.ResourceData, meta interface{}) error {
conn := meta.(*AWSClient).appconfigconn

if d.HasChange("tags_all") {
o, n := d.GetChange("tags_all")

if err := keyvaluetags.AppconfigUpdateTags(conn, d.Get("arn").(string), o, n); err != nil {
return fmt.Errorf("error updating AppConfig Deployment (%s) tags: %w", d.Get("arn").(string), err)
}
}

return resourceAwsAppconfigDeploymentRead(d, meta)
}

func resourceAwsAppconfigDeploymentDelete(_ *schema.ResourceData, _ interface{}) error {
log.Printf("[WARN] Cannot destroy AppConfig Deployment. Terraform will remove this resource from the state file, however this resource remains.")
return nil
}

func resourceAwsAppconfigDeploymentParseID(id string) (string, string, int, error) {
parts := strings.Split(id, "/")

if len(parts) != 3 || parts[0] == "" || parts[1] == "" || parts[2] == "" {
return "", "", 0, fmt.Errorf("unexpected format of ID (%q), expected ApplicationID:EnvironmentID:DeploymentNumber", id)
}

num, err := strconv.Atoi(parts[2])
if err != nil {
return "", "", 0, fmt.Errorf("error parsing AppConfig Deployment resource ID deployment_number: %w", err)
}

return parts[0], parts[1], num, nil
}
Loading