fix name check on read

hashicorp · Apr 14, 2021 · 72d4a8a · 72d4a8a
1 parent 16bf681
commit 72d4a8a
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 8 deletions.
diff --git a/aws/resource_aws_codedeploy_app.go b/aws/resource_aws_codedeploy_app.go
@@ -64,7 +64,6 @@ func resourceAwsCodeDeployApp() *schema.Resource {
 			"name": {
 				Type:         schema.TypeString,
 				Required:     true,
-				ForceNew:     true,
 				ValidateFunc: validation.StringLenBetween(1, 100),
 			},
 
@@ -120,8 +119,9 @@ func resourceAwsCodeDeployAppRead(d *schema.ResourceData, meta interface{}) erro
 	ignoreTagsConfig := meta.(*AWSClient).IgnoreTagsConfig
 
 	application := resourceAwsCodeDeployAppParseId(d.Id())
-	if application != d.Get("name").(string) {
-	    application = d.Get("name").(string)
+	name := d.Get("name").(string)
+	if name != "" && application != name {
+		application = name
 	}
 	log.Printf("[DEBUG] Reading CodeDeploy application %s", application)
 	resp, err := conn.GetApplication(&codedeploy.GetApplicationInput{
@@ -141,10 +141,10 @@ func resourceAwsCodeDeployAppRead(d *schema.ResourceData, meta interface{}) erro
 	app := resp.Application
 	appName := aws.StringValue(app.ApplicationName)
 
-     if !strings.Contains(d.Id(), appName) {
-         d.SetId(fmt.Sprintf("%s:%s", aws.StringValue(app.ApplicationId), appName))
-     }
-     
+	if !strings.Contains(d.Id(), appName) {
+		d.SetId(fmt.Sprintf("%s:%s", aws.StringValue(app.ApplicationId), appName))
+	}
+
 	appArn := arn.ARN{
 		Partition: meta.(*AWSClient).partition,
 		Service:   "codedeploy",
@@ -176,6 +176,19 @@ func resourceAwsCodeDeployAppRead(d *schema.ResourceData, meta interface{}) erro
 func resourceAwsCodeDeployUpdate(d *schema.ResourceData, meta interface{}) error {
 	conn := meta.(*AWSClient).codedeployconn
 
+	if d.HasChange("name") {
+		o, n := d.GetChange("name")
+
+		_, err := conn.UpdateApplication(&codedeploy.UpdateApplicationInput{
+			ApplicationName:    aws.String(o.(string)),
+			NewApplicationName: aws.String(n.(string)),
+		})
+
+		if err != nil {
+			return fmt.Errorf("error updating CodeDeploy Application (%s) name: %w", d.Id(), err)
+		}
+	}
+
 	if d.HasChange("tags") {
 		o, n := d.GetChange("tags")
 

diff --git a/aws/resource_aws_codedeploy_app_test.go b/aws/resource_aws_codedeploy_app_test.go
@@ -211,7 +211,6 @@ func TestAccAWSCodeDeployApp_name(t *testing.T) {
 				Config: testAccAWSCodeDeployAppConfigName(rName2),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckAWSCodeDeployAppExists(resourceName, &application2),
-					testAccCheckAWSCodeDeployAppRecreated(&application1, &application2),
 					resource.TestCheckResourceAttr(resourceName, "name", rName2),
 				),
 			},