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.

Sign up for GitHub

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

resource/aws_amplify_branch: fix forces replacement #34141

Merged
merged 6 commits into from
Oct 30, 2023
Merged

resource/aws_amplify_branch: fix forces replacement #34141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3de1393
resource/aws_amplify_branch: fix forces replacement
Oct 27, 2023
1bb77fd
add: CHANGELOG
Oct 27, 2023
856aede
fix: update enable_performance_mode
Oct 27, 2023
247d318
Tweak CHANGELOG entry.
ewbankkit Oct 30, 2023
75a92b6
r/aws_amplify_branch: Cosmetics.
ewbankkit Oct 30, 2023
2c61b47
Tweak 'testAccBranch_OptionalArguments'.
ewbankkit Oct 30, 2023
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/34141.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
resource/aws_amplify_branch: Remove [ForceNew](https://developer.hashicorp.com/terraform/plugin/sdkv2/schemas/schema-behaviors#forcenew) from `enable_performance_mode`
```
36 changes: 5 additions & 31 deletions internal/service/amplify/branch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ func ResourceBranch() *schema.Resource {
ReadWithoutTimeout: resourceBranchRead,
UpdateWithoutTimeout: resourceBranchUpdate,
DeleteWithoutTimeout: resourceBranchDelete,

Importer: &schema.ResourceImporter{
StateContext: schema.ImportStatePassthroughContext,
},
Expand All @@ -43,24 +44,20 @@ func ResourceBranch() *schema.Resource {
Required: true,
ForceNew: true,
},

"arn": {
Type: schema.TypeString,
Computed: true,
},

"associated_resources": {
Type: schema.TypeList,
Computed: true,
Elem: &schema.Schema{Type: schema.TypeString},
},

"backend_environment_arn": {
Type: schema.TypeString,
Optional: true,
ValidateFunc: verify.ValidARN,
},

"basic_auth_credentials": {
Type: schema.TypeString,
Optional: true,
Expand All @@ -75,88 +72,72 @@ func ResourceBranch() *schema.Resource {
return true
},
},

"branch_name": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
ValidateFunc: validation.StringMatch(regexache.MustCompile(`^[0-9A-Za-z/_.-]{1,255}$`), "should be not be more than 255 letters, numbers, and the symbols /_.-"),
},

"custom_domains": {
Type: schema.TypeList,
Computed: true,
Elem: &schema.Schema{Type: schema.TypeString},
},

"description": {
Type: schema.TypeString,
Optional: true,
ValidateFunc: validation.StringLenBetween(1, 1000),
},

"destination_branch": {
Type: schema.TypeString,
Computed: true,
},

"display_name": {
Type: schema.TypeString,
Optional: true,
Computed: true,
ValidateFunc: validation.StringMatch(regexache.MustCompile(`^[0-9a-z-]{1,255}$`), "should be not be more than 255 lowercase alphanumeric or hyphen characters"),
},

"enable_auto_build": {
Type: schema.TypeBool,
Optional: true,
Default: true,
},

"enable_basic_auth": {
Type: schema.TypeBool,
Optional: true,
},

"enable_notification": {
Type: schema.TypeBool,
Optional: true,
},

"enable_performance_mode": {
Type: schema.TypeBool,
Optional: true,
ForceNew: true,
ewbankkit marked this conversation as resolved.
Show resolved Hide resolved
},

"enable_pull_request_preview": {
Type: schema.TypeBool,
Optional: true,
},

"environment_variables": {
Type: schema.TypeMap,
Optional: true,
Elem: &schema.Schema{Type: schema.TypeString},
},

"framework": {
Type: schema.TypeString,
Optional: true,
ValidateFunc: validation.StringLenBetween(1, 255),
},

"pull_request_environment_name": {
Type: schema.TypeString,
Optional: true,
ValidateFunc: validation.StringLenBetween(1, 20),
},

"source_branch": {
Type: schema.TypeString,
Computed: true,
},

"stage": {
Type: schema.TypeString,
Optional: true,
Expand All @@ -170,7 +151,6 @@ func ResourceBranch() *schema.Resource {
return old == new
},
},

"ttl": {
Type: schema.TypeString,
Optional: true,
Expand All @@ -183,7 +163,6 @@ func ResourceBranch() *schema.Resource {
return old == new
},
},

names.AttrTags: tftags.TagsSchema(),
names.AttrTagsAll: tftags.TagsSchemaComputed(),
},
Expand All @@ -197,7 +176,6 @@ func resourceBranchCreate(ctx context.Context, d *schema.ResourceData, meta inte
appID := d.Get("app_id").(string)
branchName := d.Get("branch_name").(string)
id := BranchCreateResourceID(appID, branchName)

input := &amplify.CreateBranchInput{
AppId: aws.String(appID),
BranchName: aws.String(branchName),
Expand Down Expand Up @@ -257,7 +235,6 @@ func resourceBranchCreate(ctx context.Context, d *schema.ResourceData, meta inte
input.Ttl = aws.String(v.(string))
}

log.Printf("[DEBUG] Creating Amplify Branch: %s", input)
_, err := conn.CreateBranchWithContext(ctx, input)

if err != nil {
Expand All @@ -274,9 +251,8 @@ func resourceBranchRead(ctx context.Context, d *schema.ResourceData, meta interf
conn := meta.(*conns.AWSClient).AmplifyConn(ctx)

appID, branchName, err := BranchParseResourceID(d.Id())

if err != nil {
return sdkdiag.AppendErrorf(diags, "parsing Amplify Branch ID: %s", err)
return sdkdiag.AppendFromErr(diags, err)
}

branch, err := FindBranchByAppIDAndBranchName(ctx, conn, appID, branchName)
Expand Down Expand Up @@ -324,9 +300,8 @@ func resourceBranchUpdate(ctx context.Context, d *schema.ResourceData, meta inte

if d.HasChangesExcept("tags", "tags_all") {
appID, branchName, err := BranchParseResourceID(d.Id())

if err != nil {
return sdkdiag.AppendErrorf(diags, "parsing Amplify Branch ID: %s", err)
return sdkdiag.AppendFromErr(diags, err)
}

input := &amplify.UpdateBranchInput{
Expand Down Expand Up @@ -363,7 +338,7 @@ func resourceBranchUpdate(ctx context.Context, d *schema.ResourceData, meta inte
}

if d.HasChange("enable_performance_mode") {
input.EnablePullRequestPreview = aws.Bool(d.Get("enable_performance_mode").(bool))
input.EnablePerformanceMode = aws.Bool(d.Get("enable_performance_mode").(bool))
}

if d.HasChange("enable_pull_request_preview") {
Expand Down Expand Up @@ -409,9 +384,8 @@ func resourceBranchDelete(ctx context.Context, d *schema.ResourceData, meta inte
conn := meta.(*conns.AWSClient).AmplifyConn(ctx)

appID, branchName, err := BranchParseResourceID(d.Id())

if err != nil {
return sdkdiag.AppendErrorf(diags, "parsing Amplify Branch ID: %s", err)
return sdkdiag.AppendFromErr(diags, err)
}

log.Printf("[DEBUG] Deleting Amplify Branch: %s", d.Id())
Expand Down
4 changes: 2 additions & 2 deletions internal/service/amplify/branch_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ func testAccBranch_OptionalArguments(t *testing.T) {
resource.TestCheckResourceAttr(resourceName, "display_name", "testdisplayname2"),
resource.TestCheckResourceAttr(resourceName, "enable_auto_build", "true"),
resource.TestCheckResourceAttr(resourceName, "enable_notification", "false"),
resource.TestCheckResourceAttr(resourceName, "enable_performance_mode", "true"),
resource.TestCheckResourceAttr(resourceName, "enable_performance_mode", "false"),
resource.TestCheckResourceAttr(resourceName, "enable_pull_request_preview", "true"),
resource.TestCheckResourceAttr(resourceName, "framework", "Angular"),
resource.TestCheckResourceAttr(resourceName, "pull_request_environment_name", "testpr2"),
Expand Down Expand Up @@ -512,7 +512,7 @@ resource "aws_amplify_branch" "test" {
display_name = "testdisplayname2"
enable_auto_build = true
enable_notification = false
enable_performance_mode = true
enable_performance_mode = false
enable_pull_request_preview = true
framework = "Angular"
pull_request_environment_name = "testpr2"
Expand Down