Properly handle renaming of CodeCommit repository

Resolve #32161
hashicorp · Oct 13, 2023 · a568ac6 · a568ac6
1 parent 4a19834
commit a568ac6
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 3 deletions.
diff --git a/internal/service/codecommit/repository.go b/internal/service/codecommit/repository.go
@@ -38,7 +38,6 @@ func ResourceRepository() *schema.Resource {
 			"repository_name": {
 				Type:         schema.TypeString,
 				Required:     true,
-				ForceNew:     true,
 				ValidateFunc: validation.StringLenBetween(0, 100),
 			},
 
@@ -146,6 +145,12 @@ func resourceRepositoryRead(ctx context.Context, d *schema.ResourceData, meta in
 func resourceRepositoryUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
 	var diags diag.Diagnostics
 	conn := meta.(*conns.AWSClient).CodeCommitConn(ctx)
+
+	if d.HasChange("repository_name") {
+		if err := resourceUpdateRepositoryName(ctx, conn, d); err != nil {
+			return sdkdiag.AppendErrorf(diags, "updating CodeCommit Repository (%s) name: %s", d.Id(), err)
+		}
+	}
 
 	if d.HasChange("default_branch") {
 		if err := resourceUpdateDefaultBranch(ctx, conn, d); err != nil {
@@ -177,6 +182,20 @@ func resourceRepositoryDelete(ctx context.Context, d *schema.ResourceData, meta
 	return diags
 }
 
+func resourceUpdateRepositoryName(ctx context.Context, conn *codecommit.CodeCommit, d *schema.ResourceData) error {
+	branchInput := &codecommit.UpdateRepositoryNameInput{
+		OldName: aws.String(d.Id()),
+		NewName: aws.String(d.Get("repository_name").(string)),
+	}
+
+	_, err := conn.UpdateRepositoryNameWithContext(ctx, branchInput)
+	if err != nil {
+		return fmt.Errorf("Updating Repository Name for CodeCommit Repository: %s", err.Error())
+	}
+
+	return nil
+}
+
 func resourceUpdateDescription(ctx context.Context, conn *codecommit.CodeCommit, d *schema.ResourceData) error {
 	branchInput := &codecommit.UpdateRepositoryDescriptionInput{
 		RepositoryName:        aws.String(d.Id()),

diff --git a/internal/service/codecommit/repository_test.go b/internal/service/codecommit/repository_test.go
@@ -74,7 +74,9 @@ func TestAccCodeCommitRepository_withChanges(t *testing.T) {
 					testAccCheckRepositoryExists(ctx, "aws_codecommit_repository.test"),
 					resource.TestCheckResourceAttr(
 						"aws_codecommit_repository.test", "description", "This is a test description - with changes"),
-				),
+					resource.TestCheckResourceAttr(
+						"aws_codecommit_repository.test", "repository_name", "renamed_test_repository"),
+					),
 			},
 		},
 	})
@@ -262,7 +264,7 @@ resource "aws_codecommit_repository" "test" {
 func testAccRepositoryConfig_changes(rInt int) string {
 	return fmt.Sprintf(`
 resource "aws_codecommit_repository" "test" {
-  repository_name = "test_repository_%d"
+  repository_name = "renamed_test_repository_%d"
   description     = "This is a test description - with changes"
 }
 `, rInt)