Skip to content

fix: importing active-active regions failing due to incorrect ID #319

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 1 commit into from
Jan 19, 2023
Merged

fix: importing active-active regions failing due to incorrect ID #319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions internal/provider/resource_rediscloud_active_active_region.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ func resourceRedisCloudActiveActiveRegionUpdate(ctx context.Context, d *schema.R
api := meta.(*apiClient)
var diags diag.Diagnostics

subId, err := strconv.Atoi(d.Get("subscription_id").(string))
subId, err := strconv.Atoi(d.Id())
if err != nil {
return diag.FromErr(err)
}
Expand Down Expand Up @@ -379,7 +379,7 @@ func resourceRedisCloudActiveActiveRegionRead(ctx context.Context, d *schema.Res

var diags diag.Diagnostics

subId, err := strconv.Atoi(d.Get("subscription_id").(string))
subId, err := strconv.Atoi(d.Id())
regions, err := api.client.Regions.List(ctx, subId)
if err != nil {
if _, ok := err.(*subscriptions.NotFound); ok {
Expand Down
10 changes: 8 additions & 2 deletions internal/provider/resource_rediscloud_active_active_region_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ func TestAccResourceRedisCloudActiveActiveRegion_CRUDI(t *testing.T) {
CheckDestroy: testAccCheckActiveActiveSubscriptionDestroy,
Steps: []resource.TestStep{
{
Config: fmt.Sprintf(testAccResourceRedisCloudCrateActiveActiveRegion, subName, dbName, dbPass),
Config: fmt.Sprintf(testAccResourceRedisCloudCreateActiveActiveRegion, subName, dbName, dbPass),
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttr(resourceName, "region.#", "3"),
resource.TestCheckResourceAttr(resourceName, "region.2.region", "eu-west-2"),
Expand Down Expand Up @@ -104,6 +104,12 @@ func TestAccResourceRedisCloudActiveActiveRegion_CRUDI(t *testing.T) {
resource.TestCheckResourceAttr(resourceName, "region.1.networking_deployment_cidr", "10.1.0.0/24"),
),
},
{
ResourceName: resourceName,
ImportState: true,
ImportStateVerify: true,
ImportStateVerifyIgnore: []string{"delete_regions"},
},
},
})
}
Expand Down Expand Up @@ -156,7 +162,7 @@ resource "rediscloud_active_active_subscription_database" "example" {
`

// TF config for provisioning a new region.
const testAccResourceRedisCloudCrateActiveActiveRegion = testAARegionsBoilerplate + `
const testAccResourceRedisCloudCreateActiveActiveRegion = testAARegionsBoilerplate + `

resource "rediscloud_active_active_subscription_regions" "example" {
subscription_id = rediscloud_active_active_subscription.example.id
Expand Down