feat(mongodb): refacto update snapshot and instance

Author: jremy42

internal/services/mongodb/instance.go

@@ -51,9 +51,10 @@ func ResourceInstance() *schema.Resource {
 				},
 			},
 			"node_number": {
-				Type:        schema.TypeInt,
-				Required:    true,
-				Description: "Number of nodes in the instance",
+				Type:         schema.TypeInt,
+				Required:     true,
+				ValidateFunc: validation.IntAtLeast(1),
+				Description:  "Number of nodes in the instance",
 			},
 			"node_type": {
 				Type:             schema.TypeString,
@@ -324,22 +325,29 @@ func ResourceInstanceUpdate(ctx context.Context, d *schema.ResourceData, m inter
 		}
 	}
 
+	////////////////////
+	// Update instance
+	////////////////////
+
+	shouldUpdateInstance := false
 	req := &mongodb.UpdateInstanceRequest{
 		Region:     region,
 		InstanceID: ID,
 	}
 
 	if d.HasChange("name") {
 		req.Name = types.ExpandStringPtr(d.Get("name"))
+		shouldUpdateInstance = true
 	}
 
 	if d.HasChange("tags") {
 		if tags := types.ExpandUpdatedStringsPtr(d.Get("tags")); tags != nil {
 			req.Tags = tags
+			shouldUpdateInstance = true
 		}
 	}
 
-	if req.Name != nil || req.Tags != nil {
+	if shouldUpdateInstance {
 		_, err = mongodbAPI.UpdateInstance(req, scw.WithContext(ctx))
 		if err != nil {
 			return diag.FromErr(err)
@@ -350,6 +358,7 @@ func ResourceInstanceUpdate(ctx context.Context, d *schema.ResourceData, m inter
 	// Update user
 	////////////////////
 
+	shouldUpdateUser := false
 	updateUserRequest := mongodb.UpdateUserRequest{
 		Name:       d.Get("user_name").(string),
 		Region:     region,
@@ -359,9 +368,10 @@ func ResourceInstanceUpdate(ctx context.Context, d *schema.ResourceData, m inter
 	if d.HasChange("password") {
 		password := d.Get("password").(string)
 		updateUserRequest.Password = &password
+		shouldUpdateUser = true
 	}
 
-	if updateUserRequest.Password != nil {
+	if shouldUpdateUser {
 		_, err = mongodbAPI.UpdateUser(&updateUserRequest, scw.WithContext(ctx))
 		if err != nil {
 			return diag.FromErr(err)

internal/services/mongodb/snapshot.go

@@ -32,28 +32,22 @@ func ResourceSnapshot() *schema.Resource {
 		},
 		SchemaVersion: 0,
 		Schema: map[string]*schema.Schema{
-			"id": {
+			"name": {
 				Type:        schema.TypeString,
+				Optional:    true,
 				Computed:    true,
-				Description: "Unique identifier of the snapshot",
+				Description: "Name of the snapshot",
 			},
 			"instance_id": {
 				Type:        schema.TypeString,
 				Required:    true,
 				Description: "The ID of the instance from which the snapshot was created",
 			},
-			"name": {
-				Type:        schema.TypeString,
-				Optional:    true,
-				Computed:    true,
-				Description: "Name of the snapshot",
-			},
 			"instance_name": {
 				Type:        schema.TypeString,
 				Computed:    true,
 				Description: "Name of the instance from which the snapshot was created",
 			},
-
 			"size": {
 				Type:        schema.TypeInt,
 				Computed:    true,
@@ -134,7 +128,6 @@ func ResourceSnapshotRead(ctx context.Context, d *schema.ResourceData, m interfa
 	if err != nil {
 		return diag.FromErr(err)
 	}
-	_ = d.Set("id", snapshot.ID)
 	_ = d.Set("instance_id", zonal.NewIDString(zone, snapshot.InstanceID))
 	_ = d.Set("name", snapshot.Name)
 	_ = d.Set("instance_name", snapshot.InstanceName)
@@ -164,19 +157,26 @@ func ResourceSnapshotUpdate(ctx context.Context, d *schema.ResourceData, m inter
 		Region:     region,
 	}
 
+	hasChanged := false
+
 	if d.HasChange("name") {
 		newName := types.ExpandOrGenerateString(d.Get("name"), "snapshot")
 		updateReq.Name = &newName
+		hasChanged = true
 	}
 
 	if d.HasChange("expires_at") {
 		updateReq.ExpiresAt = types.ExpandTimePtr(d.Get("expires_at"))
+		hasChanged = true
 	}
 
-	_, err = mongodbAPI.UpdateSnapshot(updateReq)
-	if err != nil {
-		return diag.FromErr(err)
+	if hasChanged {
+		_, err = mongodbAPI.UpdateSnapshot(updateReq)
+		if err != nil {
+			return diag.FromErr(err)
+		}
 	}
+
 	instanceID := locality.ExpandID(d.Get("instance_id").(string))
 
 	_, err = waitForSnapshot(ctx, mongodbAPI, region, instanceID, snapshotID, d.Timeout(schema.TimeoutUpdate))