fix: defer unlock crashes

Author: burythehammer

provider/pro/resource_rediscloud_pro_database.go

@@ -363,7 +363,6 @@ func resourceRedisCloudProDatabaseCreate(ctx context.Context, d *schema.Resource
 
 	subId := *utils.GetInt(d, "subscription_id")
 	utils.SubscriptionMutex.Lock(subId)
-	defer utils.SubscriptionMutex.Unlock(subId)
 
 	createModules := make([]*databases.Module, 0)
 	modules := d.Get("modules").(*schema.Set)
@@ -449,21 +448,25 @@ func resourceRedisCloudProDatabaseCreate(ctx context.Context, d *schema.Resource
 
 	// Confirm sub is ready to accept a db request
 	if err := utils.WaitForSubscriptionToBeActive(ctx, subId, api); err != nil {
+		utils.SubscriptionMutex.Unlock(subId)
 		return diag.FromErr(err)
 	}
 
 	dbId, err := api.Client.Database.Create(ctx, subId, createDatabase)
 	if err != nil {
+		utils.SubscriptionMutex.Unlock(subId)
 		return diag.FromErr(err)
 	}
 
 	d.SetId(utils.BuildResourceId(subId, dbId))
 
 	// Confirm db + sub active status
 	if err := utils.WaitForDatabaseToBeActive(ctx, subId, dbId, api); 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)
 	}
 

provider/resource_rediscloud_active_active_database.go

@@ -361,7 +361,6 @@ 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)
@@ -396,6 +395,7 @@ 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,11 +460,13 @@ 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)
 	}
 
@@ -473,10 +475,12 @@ 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)
 	}
 

provider/resource_rediscloud_essentials_database.go

@@ -305,7 +305,6 @@ func resourceRedisCloudEssentialsDatabaseCreate(ctx context.Context, d *schema.R
 	subId := d.Get("subscription_id").(int)
 
 	utils.SubscriptionMutex.Lock(subId)
-	defer utils.SubscriptionMutex.Unlock(subId)
 
 	createDatabaseRequest := fixedDatabases.CreateFixedDatabase{
 		Name:               redis.String(d.Get("name").(string)),
@@ -427,6 +426,7 @@ func resourceRedisCloudEssentialsDatabaseCreate(ctx context.Context, d *schema.R
 	databaseId, err := api.Client.FixedDatabases.Create(ctx, subId, createDatabaseRequest)
 	if err != nil {
 		log.Printf("[ERROR] FixedDatabases.Create failed for subscription %d: %v", subId, err)
+		utils.SubscriptionMutex.Unlock(subId)
 		return diag.FromErr(err)
 	}
 	log.Printf("[DEBUG] FixedDatabases.Create succeeded for subscription %d, database ID: %d", subId, databaseId)
@@ -436,6 +436,7 @@ func resourceRedisCloudEssentialsDatabaseCreate(ctx context.Context, d *schema.R
 	// Confirm Subscription Active status
 	err = waitForEssentialsDatabaseToBeActive(ctx, subId, databaseId, api)
 	if err != nil {
+		utils.SubscriptionMutex.Unlock(subId)
 		return diag.FromErr(err)
 	}