Skip to content

B account region enable #41678

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

Merged
merged 6 commits into from
Mar 6, 2025
Merged

B account region enable #41678

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
29f6388
Add helper function for status check
nam054 Mar 5, 2025
383c1d8
Add disabling status
nam054 Mar 5, 2025
8bea33f
Invert the helper function
nam054 Mar 6, 2025
3b68f9f
Add changelog
nam054 Mar 6, 2025
4394430
Review changes
nam054 Mar 6, 2025
92268bb
Remove period in changelog
nam054 Mar 6, 2025
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
7 changes: 7 additions & 0 deletions .changelog/41678.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
```release-note:enhancement
resource/aws_account_region: Prevent errors when the region is an ENABLING or DISABLING state during creation
```

```release-note:enhancement
resource/aws_account_region: Allow adoption of regions in an ENABLED or DISABLED state without an explicit import operation
```
32 changes: 22 additions & 10 deletions internal/service/account/region.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,11 @@ func resourceRegionUpdate(ctx context.Context, d *schema.ResourceData, meta inte
timeout = d.Timeout(schema.TimeoutUpdate)
}

status, err := findRegionOptStatus(ctx, conn, accountID, region)
if err != nil {
return sdkdiag.AppendErrorf(diags, "reading Account Region status: %s", err)
}

if v := d.Get(names.AttrEnabled).(bool); v {
input := account.EnableRegionInput{
RegionName: aws.String(region),
Expand All @@ -99,10 +104,11 @@ func resourceRegionUpdate(ctx context.Context, d *schema.ResourceData, meta inte
input.AccountId = aws.String(accountID)
}

_, err := conn.EnableRegion(ctx, &input)

if err != nil {
return sdkdiag.AppendErrorf(diags, "enabling Account Region (%s): %s", id, err)
if requiresStatusChange(status.RegionOptStatus, true) {
_, err := conn.EnableRegion(ctx, &input)
if err != nil {
return sdkdiag.AppendErrorf(diags, "enabling Account Region (%s): %s", id, err)
}
}

if _, err := waitRegionEnabled(ctx, conn, accountID, region, timeout); err != nil {
Expand All @@ -116,10 +122,11 @@ func resourceRegionUpdate(ctx context.Context, d *schema.ResourceData, meta inte
input.AccountId = aws.String(accountID)
}

_, err := conn.DisableRegion(ctx, &input)

if err != nil {
return sdkdiag.AppendErrorf(diags, "enabling Account Region (%s): %s", id, err)
if requiresStatusChange(status.RegionOptStatus, false) {
_, err := conn.DisableRegion(ctx, &input)
if err != nil {
return sdkdiag.AppendErrorf(diags, "disabling Account Region (%s): %s", id, err)
}
}

if _, err := waitRegionDisabled(ctx, conn, accountID, region, timeout); err != nil {
Expand Down Expand Up @@ -208,7 +215,6 @@ func waitRegionEnabled(ctx context.Context, conn *account.Client, accountID, reg
Target: enum.Slice(types.RegionOptStatusEnabled),
Refresh: statusRegionOptStatus(ctx, conn, accountID, region),
Timeout: timeout,
Delay: 1 * time.Minute,
PollInterval: 30 * time.Second,
}

Expand All @@ -227,7 +233,6 @@ func waitRegionDisabled(ctx context.Context, conn *account.Client, accountID, re
Target: enum.Slice(types.RegionOptStatusDisabled),
Refresh: statusRegionOptStatus(ctx, conn, accountID, region),
Timeout: timeout,
Delay: 1 * time.Minute,
PollInterval: 30 * time.Second,
}

Expand All @@ -239,3 +244,10 @@ func waitRegionDisabled(ctx context.Context, conn *account.Client, accountID, re

return nil, err
}

func requiresStatusChange(status types.RegionOptStatus, enable bool) bool {
if enable {
return status != types.RegionOptStatusEnabled && status != types.RegionOptStatusEnabling
}
return status != types.RegionOptStatusDisabled && status != types.RegionOptStatusDisabling
}
Loading