chore: further deferred unlock fixes and implementations

burythehammer · burythehammer · commit 472b35da7a63 · 2025-10-23T11:46:41.000+01:00
diff --git a/provider/pro/resource_rediscloud_pro_database.go b/provider/pro/resource_rediscloud_pro_database.go
@@ -469,6 +469,8 @@ func resourceRedisCloudProDatabaseCreate(ctx context.Context, d *schema.Resource
 
 	// Some attributes on a database are not accessible by the subscription creation API.
 	// Run the subscription update function to apply any additional changes to the databases, such as password, enableDefaultUser and so on.
+	// Unlock before calling Update since Update also needs to acquire the same subscription mutex.
+	utils.SubscriptionMutex.Unlock(subId)
 	return resourceRedisCloudProDatabaseUpdate(ctx, d, meta)
 }
 
diff --git a/provider/resource_rediscloud_active_active_database.go b/provider/resource_rediscloud_active_active_database.go
@@ -361,6 +361,7 @@ func resourceRedisCloudActiveActiveDatabaseCreate(ctx context.Context, d *schema
 
 	subId := d.Get("subscription_id").(int)
 	utils.SubscriptionMutex.Lock(subId)
+	defer utils.SubscriptionMutex.Unlock(subId)
 
 	name := d.Get("name").(string)
 	supportOSSClusterAPI := d.Get("support_oss_cluster_api").(bool)
@@ -395,7 +396,6 @@ func resourceRedisCloudActiveActiveDatabaseCreate(ctx context.Context, d *schema
 	// Get regions from /subscriptions/{subscriptionId}/regions, this will use the Regions API
 	regions, err := api.Client.Regions.List(ctx, subId)
 	if err != nil {
-		utils.SubscriptionMutex.Unlock(subId)
 		return diag.FromErr(err)
 	}
 
@@ -460,13 +460,11 @@ func resourceRedisCloudActiveActiveDatabaseCreate(ctx context.Context, d *schema
 	// Confirm Subscription Active status before creating database
 	err = utils.WaitForSubscriptionToBeActive(ctx, subId, api)
 	if err != nil {
-		utils.SubscriptionMutex.Unlock(subId)
 		return diag.FromErr(err)
 	}
 
 	dbId, err := api.Client.Database.ActiveActiveCreate(ctx, subId, createDatabase)
 	if err != nil {
-		utils.SubscriptionMutex.Unlock(subId)
 		return diag.FromErr(err)
 	}
 
@@ -475,17 +473,16 @@ func resourceRedisCloudActiveActiveDatabaseCreate(ctx context.Context, d *schema
 	// Confirm Database Active status
 	err = utils.WaitForDatabaseToBeActive(ctx, subId, dbId, api)
 	if err != nil {
-		utils.SubscriptionMutex.Unlock(subId)
 		return diag.FromErr(err)
 	}
 
 	if err := utils.WaitForSubscriptionToBeActive(ctx, subId, api); err != nil {
-		utils.SubscriptionMutex.Unlock(subId)
 		return diag.FromErr(err)
 	}
 
 	// Some attributes on a database are not accessible by the subscription creation API.
 	// Run the subscription update function to apply any additional changes to the databases, such as password and so on.
+	// Unlock before calling Update since Update also needs to acquire the same subscription mutex.
 	utils.SubscriptionMutex.Unlock(subId)
 	return resourceRedisCloudActiveActiveDatabaseUpdate(ctx, d, meta)
 }
diff --git a/provider/resource_rediscloud_active_active_private_service_connect.go b/provider/resource_rediscloud_active_active_private_service_connect.go
@@ -64,12 +64,12 @@ func resourceRedisCloudActiveActivePrivateServiceConnectCreate(ctx context.Conte
 		return diag.FromErr(err)
 	}
 	utils.SubscriptionMutex.Lock(subscriptionId)
+	defer utils.SubscriptionMutex.Unlock(subscriptionId)
 
 	regionId := d.Get("region_id").(int)
 
 	pscServiceId, err := api.Client.PrivateServiceConnect.CreateActiveActiveService(ctx, subscriptionId, regionId)
 	if err != nil {
-		utils.SubscriptionMutex.Unlock(subscriptionId)
 		return diag.FromErr(err)
 	}
 
@@ -79,17 +79,14 @@ func resourceRedisCloudActiveActivePrivateServiceConnectCreate(ctx context.Conte
 		return refreshPrivateServiceConnectServiceActiveActiveStatus(ctx, subscriptionId, regionId, api)
 	})
 	if err != nil {
-		utils.SubscriptionMutex.Unlock(subscriptionId)
 		return diag.FromErr(err)
 	}
 
 	err = utils.WaitForSubscriptionToBeActive(ctx, subscriptionId, api)
 	if err != nil {
-		utils.SubscriptionMutex.Unlock(subscriptionId)
 		return diag.FromErr(err)
 	}
 
-	utils.SubscriptionMutex.Unlock(subscriptionId)
 	return resourceRedisCloudActiveActivePrivateServiceConnectRead(ctx, d, meta)
 }
 
diff --git a/provider/resource_rediscloud_essentials_database.go b/provider/resource_rediscloud_essentials_database.go
@@ -442,6 +442,8 @@ func resourceRedisCloudEssentialsDatabaseCreate(ctx context.Context, d *schema.R
 	// Some attributes on a database are not accessible by the subscription creation API.
 	// Run the subscription update function to apply any additional changes to the databases (enableDefaultUser)
 	// Others are omitted here _because_ the update will take care of them, such as tags
+	// Unlock before calling Update since Update also needs to acquire the same subscription mutex.
+	utils.SubscriptionMutex.Unlock(subId)
 	return resourceRedisCloudEssentialsDatabaseUpdate(ctx, d, meta)
 }
 
diff --git a/provider/resource_rediscloud_private_service_connect.go b/provider/resource_rediscloud_private_service_connect.go
@@ -59,10 +59,10 @@ func resourceRedisCloudPrivateServiceConnectCreate(ctx context.Context, d *schem
 		return diag.FromErr(err)
 	}
 	utils.SubscriptionMutex.Lock(subscriptionId)
+	defer utils.SubscriptionMutex.Unlock(subscriptionId)
 
 	pscServiceId, err := api.Client.PrivateServiceConnect.CreateService(ctx, subscriptionId)
 	if err != nil {
-		utils.SubscriptionMutex.Unlock(subscriptionId)
 		return diag.FromErr(err)
 	}
 
@@ -72,17 +72,14 @@ func resourceRedisCloudPrivateServiceConnectCreate(ctx context.Context, d *schem
 		return refreshPrivateServiceConnectServiceStatus(ctx, subscriptionId, api)
 	})
 	if err != nil {
-		utils.SubscriptionMutex.Unlock(subscriptionId)
 		return diag.FromErr(err)
 	}
 
 	err = utils.WaitForSubscriptionToBeActive(ctx, subscriptionId, api)
 	if err != nil {
-		utils.SubscriptionMutex.Unlock(subscriptionId)
 		return diag.FromErr(err)
 	}
 
-	utils.SubscriptionMutex.Unlock(subscriptionId)
 	return resourceRedisCloudPrivateServiceConnectRead(ctx, d, meta)
 }
 

Original file line number	Diff line number	Diff line change
`@@ -469,6 +469,8 @@ func resourceRedisCloudProDatabaseCreate(ctx context.Context, d *schema.Resource`
`469`	`469`
`470`	`470`	`// Some attributes on a database are not accessible by the subscription creation API.`
`471`	`471`	`// Run the subscription update function to apply any additional changes to the databases, such as password, enableDefaultUser and so on.`
	`472`	`+ // Unlock before calling Update since Update also needs to acquire the same subscription mutex.`
	`473`	`+ utils.SubscriptionMutex.Unlock(subId)`
`472`	`474`	`return resourceRedisCloudProDatabaseUpdate(ctx, d, meta)`
`473`	`475`	`}`
`474`	`476`
Original file line number	Diff line number	Diff line change
`@@ -64,12 +64,12 @@ func resourceRedisCloudActiveActivePrivateServiceConnectCreate(ctx context.Conte`
`64`	`64`	`return diag.FromErr(err)`
`65`	`65`	`}`
`66`	`66`	`utils.SubscriptionMutex.Lock(subscriptionId)`
	`67`	`+ defer utils.SubscriptionMutex.Unlock(subscriptionId)`
`67`	`68`
`68`	`69`	`regionId := d.Get("region_id").(int)`
`69`	`70`
`70`	`71`	`pscServiceId, err := api.Client.PrivateServiceConnect.CreateActiveActiveService(ctx, subscriptionId, regionId)`
`71`	`72`	`if err != nil {`
`72`		`- utils.SubscriptionMutex.Unlock(subscriptionId)`
`73`	`73`	`return diag.FromErr(err)`
`74`	`74`	`}`
`75`	`75`
`@@ -79,17 +79,14 @@ func resourceRedisCloudActiveActivePrivateServiceConnectCreate(ctx context.Conte`
`79`	`79`	`return refreshPrivateServiceConnectServiceActiveActiveStatus(ctx, subscriptionId, regionId, api)`
`80`	`80`	`})`
`81`	`81`	`if err != nil {`
`82`		`- utils.SubscriptionMutex.Unlock(subscriptionId)`
`83`	`82`	`return diag.FromErr(err)`
`84`	`83`	`}`
`85`	`84`
`86`	`85`	`err = utils.WaitForSubscriptionToBeActive(ctx, subscriptionId, api)`
`87`	`86`	`if err != nil {`
`88`		`- utils.SubscriptionMutex.Unlock(subscriptionId)`
`89`	`87`	`return diag.FromErr(err)`
`90`	`88`	`}`
`91`	`89`
`92`		`- utils.SubscriptionMutex.Unlock(subscriptionId)`
`93`	`90`	`return resourceRedisCloudActiveActivePrivateServiceConnectRead(ctx, d, meta)`
`94`	`91`	`}`
`95`	`92`
Original file line number	Diff line number	Diff line change
`@@ -442,6 +442,8 @@ func resourceRedisCloudEssentialsDatabaseCreate(ctx context.Context, d *schema.R`
`442`	`442`	`// Some attributes on a database are not accessible by the subscription creation API.`
`443`	`443`	`// Run the subscription update function to apply any additional changes to the databases (enableDefaultUser)`
`444`	`444`	`// Others are omitted here _because_ the update will take care of them, such as tags`
	`445`	`+ // Unlock before calling Update since Update also needs to acquire the same subscription mutex.`
	`446`	`+ utils.SubscriptionMutex.Unlock(subId)`
`445`	`447`	`return resourceRedisCloudEssentialsDatabaseUpdate(ctx, d, meta)`
`446`	`448`	`}`
`447`	`449`
Original file line number	Diff line number	Diff line change
`@@ -59,10 +59,10 @@ func resourceRedisCloudPrivateServiceConnectCreate(ctx context.Context, d *schem`
`59`	`59`	`return diag.FromErr(err)`
`60`	`60`	`}`
`61`	`61`	`utils.SubscriptionMutex.Lock(subscriptionId)`
	`62`	`+ defer utils.SubscriptionMutex.Unlock(subscriptionId)`
`62`	`63`
`63`	`64`	`pscServiceId, err := api.Client.PrivateServiceConnect.CreateService(ctx, subscriptionId)`
`64`	`65`	`if err != nil {`
`65`		`- utils.SubscriptionMutex.Unlock(subscriptionId)`
`66`	`66`	`return diag.FromErr(err)`
`67`	`67`	`}`
`68`	`68`
`@@ -72,17 +72,14 @@ func resourceRedisCloudPrivateServiceConnectCreate(ctx context.Context, d *schem`
`72`	`72`	`return refreshPrivateServiceConnectServiceStatus(ctx, subscriptionId, api)`
`73`	`73`	`})`
`74`	`74`	`if err != nil {`
`75`		`- utils.SubscriptionMutex.Unlock(subscriptionId)`
`76`	`75`	`return diag.FromErr(err)`
`77`	`76`	`}`
`78`	`77`
`79`	`78`	`err = utils.WaitForSubscriptionToBeActive(ctx, subscriptionId, api)`
`80`	`79`	`if err != nil {`
`81`		`- utils.SubscriptionMutex.Unlock(subscriptionId)`
`82`	`80`	`return diag.FromErr(err)`
`83`	`81`	`}`
`84`	`82`
`85`		`- utils.SubscriptionMutex.Unlock(subscriptionId)`
`86`	`83`	`return resourceRedisCloudPrivateServiceConnectRead(ctx, d, meta)`
`87`	`84`	`}`
`88`	`85`