Add separate function to get resize opts for datastore resize

selectel · Sep 23, 2024 · 68fc5f2 · 68fc5f2
1 parent 871724e
commit 68fc5f2
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/selectel/dbaas.go b/selectel/dbaas.go
@@ -320,7 +320,7 @@ func updateDatastoreBackups(ctx context.Context, d *schema.ResourceData, client
 	return nil
 }
 
-func resizeDatastore(ctx context.Context, d *schema.ResourceData, client *dbaas.API) error {
+func getResizeOpts(ctx context.Context, d *schema.ResourceData, client *dbaas.API) (error, dbaas.DatastoreResizeOpts) {
 	var resizeOpts dbaas.DatastoreResizeOpts
 	nodeCount := d.Get("node_count").(int)
 	resizeOpts.NodeCount = nodeCount
@@ -333,21 +333,30 @@ func resizeDatastore(ctx context.Context, d *schema.ResourceData, client *dbaas.
 		flavorSet := flavorRaw.(*schema.Set)
 		flavor, err := resourceDBaaSDatastoreV1FlavorFromSet(flavorSet)
 		if err != nil {
-			return errParseDatastoreV1Resize(err)
+			return errParseDatastoreV1Resize(err), resizeOpts
 		}
 		resizeOpts.Flavor = flavor
 	}
 
 	typeID := d.Get("type_id").(string)
 	datastoreType, err := client.DatastoreType(ctx, typeID)
 	if err != nil {
-		return errors.New("Couldnt get datastore type with id" + typeID)
+		return errors.New("Couldnt get datastore type with id" + typeID), resizeOpts
 	}
 
 	if datastoreType.Engine == "redis" {
 		resizeOpts.Flavor = nil
 	}
 
+	return nil, resizeOpts
+}
+
+func resizeDatastore(ctx context.Context, d *schema.ResourceData, client *dbaas.API) error {
+	err, resizeOpts := getResizeOpts(ctx, d, client)
+	if err != nil {
+		return errUpdatingObject(objectDatastore, d.Id(), err)
+	}
+
 	log.Print(msgUpdate(objectDatastore, d.Id(), resizeOpts))
 	_, err = client.ResizeDatastore(ctx, d.Id(), resizeOpts)
 	if err != nil {