Merge pull request #20288 from hashicorp/b-appconfig-deployment

r/appconfig_deployment: remove waiter since deployment time is configurable
hashicorp · Aug 17, 2021 · 1039380 · 1039380
2 parents 7953a87 + f34e114
commit 1039380
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 57 deletions.
diff --git a/.changelog/20288.txt b/.changelog/20288.txt
@@ -0,0 +1,7 @@
+```release-note:bug
+aws/resource_aws_appconfig_deployment: Remove internal waiter after start of deployment
+```
+
+```release-note:enhancement
+aws/resource_aws_appconfig_deployment: Add `state` attribute
+```
diff --git a/aws/internal/service/appconfig/waiter/status.go b/aws/internal/service/appconfig/waiter/status.go
diff --git a/aws/internal/service/appconfig/waiter/waiter.go b/aws/internal/service/appconfig/waiter/waiter.go
diff --git a/aws/resource_aws_appconfig_deployment.go b/aws/resource_aws_appconfig_deployment.go
@@ -14,7 +14,6 @@ import (
 	"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 {
@@ -72,6 +71,10 @@ func resourceAwsAppconfigDeployment() *schema.Resource {
 				ForceNew:     true,
 				ValidateFunc: validation.StringMatch(regexp.MustCompile(`[a-z0-9]{4,7}`), ""),
 			},
+			"state": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"tags":     tagsSchema(),
 			"tags_all": tagsSchemaComputed(),
 		},
@@ -110,10 +113,6 @@ func resourceAwsAppconfigDeploymentCreate(d *schema.ResourceData, meta interface
 
 	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)
 }
 
@@ -166,6 +165,7 @@ func resourceAwsAppconfigDeploymentRead(d *schema.ResourceData, meta interface{}
 	d.Set("deployment_strategy_id", output.DeploymentStrategyId)
 	d.Set("description", output.Description)
 	d.Set("environment_id", output.EnvironmentId)
+	d.Set("state", output.State)
 
 	tags, err := keyvaluetags.AppconfigListTags(conn, arn)
 

diff --git a/aws/resource_aws_appconfig_deployment_test.go b/aws/resource_aws_appconfig_deployment_test.go
@@ -41,6 +41,7 @@ func TestAccAWSAppConfigDeployment_basic(t *testing.T) {
 					resource.TestCheckResourceAttrPair(resourceName, "deployment_strategy_id", depStrategyResourceName, "id"),
 					resource.TestCheckResourceAttr(resourceName, "description", rName),
 					resource.TestCheckResourceAttrPair(resourceName, "environment_id", envResourceName, "environment_id"),
+					resource.TestCheckResourceAttrSet(resourceName, "state"),
 					resource.TestCheckResourceAttr(resourceName, "tags.%", "0"),
 				),
 			},

diff --git a/website/docs/r/appconfig_deployment.html.markdown b/website/docs/r/appconfig_deployment.html.markdown
@@ -46,6 +46,7 @@ In addition to all arguments above, the following attributes are exported:
 * `id` - The AppConfig application ID, environment ID, and deployment number separated by a slash (`/`).
 * `arn` - The Amazon Resource Name (ARN) of the AppConfig Deployment.
 * `deployment_number` - The deployment number.
+* `state` - The state of the deployment.
 * `tags_all` - A map of tags assigned to the resource, including those inherited from the provider [`default_tags` configuration block](/docs/providers/aws/index.html#default_tags-configuration-block).
 
 ## Import