refactor: cleaning up how fields are fetched

Author: burythehammer

provider/resource_rediscloud_pro_database.go

@@ -3,6 +3,7 @@ package provider
 import (
 	"context"
 	"fmt"
+	"github.com/RedisLabs/terraform-provider-rediscloud/provider/utils"
 	"regexp"
 	"strconv"
 	"strings"
@@ -351,23 +352,9 @@ func resourceRedisCloudProDatabase() *schema.Resource {
 func resourceRedisCloudProDatabaseCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
 	api := meta.(*apiClient)
 
-	subId := d.Get("subscription_id").(int)
-
+	subId := *utils.GetInt(d, "subscription_id")
 	subscriptionMutex.Lock(subId)
 
-	name := d.Get("name").(string)
-	protocol := d.Get("protocol").(string)
-	supportOSSClusterAPI := d.Get("support_oss_cluster_api").(bool)
-	respVersion := d.Get("resp_version").(string)
-	dataPersistence := d.Get("data_persistence").(string)
-	dataEviction := d.Get("data_eviction").(string)
-	password := d.Get("password").(string)
-	replication := d.Get("replication").(bool)
-	throughputMeasurementBy := d.Get("throughput_measurement_by").(string)
-	throughputMeasurementValue := d.Get("throughput_measurement_value").(int)
-	averageItemSizeInBytes := d.Get("average_item_size_in_bytes").(int)
-	queryPerformanceFactor := d.Get("query_performance_factor").(string)
-
 	createModules := make([]*databases.Module, 0)
 	modules := d.Get("modules").(*schema.Set)
 	for _, module := range modules.List() {
@@ -399,35 +386,37 @@ func resourceRedisCloudProDatabaseCreate(ctx context.Context, d *schema.Resource
 	}
 
 	createDatabase := databases.CreateDatabase{
-		Name:                 redis.String(name),
-		Protocol:             redis.String(protocol),
-		SupportOSSClusterAPI: redis.Bool(supportOSSClusterAPI),
-		DataPersistence:      redis.String(dataPersistence),
-		DataEvictionPolicy:   redis.String(dataEviction),
-		Replication:          redis.Bool(replication),
+		Name:                 utils.GetString(d, "name"),
+		Protocol:             utils.GetString(d, "protocol"),
+		SupportOSSClusterAPI: utils.GetBool(d, "support_oss_cluster_api"),
+		DataPersistence:      utils.GetString(d, "data_persistence"),
+		DataEvictionPolicy:   utils.GetString(d, "data_eviction"),
+		Replication:          utils.GetBool(d, "replication"),
 		ThroughputMeasurement: &databases.CreateThroughputMeasurement{
-			By:    redis.String(throughputMeasurementBy),
-			Value: redis.Int(throughputMeasurementValue),
+			By:    utils.GetString(d, "throughput_measurement_by"),
+			Value: utils.GetInt(d, "throughput_measurement_value"),
 		},
 		Modules:      createModules,
 		Alerts:       createAlerts,
 		RemoteBackup: buildBackupPlan(d.Get("remote_backup").([]interface{}), d.Get("periodic_backup_path")),
 	}
 
-	if queryPerformanceFactor != "" {
-		createDatabase.QueryPerformanceFactor = redis.String(queryPerformanceFactor)
+	if v, ok := d.GetOk("query_performance_factor"); ok {
+		createDatabase.QueryPerformanceFactor = redis.String(v.(string))
 	}
 
 	if v, ok := d.GetOk("redis_version"); ok {
 		createDatabase.RedisVersion = redis.String(v.(string))
 	}
 
-	if password != "" {
-		createDatabase.Password = redis.String(password)
+	if v, ok := d.GetOk("password"); ok {
+		createDatabase.Password = redis.String(v.(string))
 	}
 
-	if averageItemSizeInBytes > 0 {
-		createDatabase.AverageItemSizeInBytes = &averageItemSizeInBytes
+	if v, ok := d.GetOk("average_item_size_in_bytes"); ok {
+		if size, valid := v.(int); valid && size > 0 {
+			createDatabase.AverageItemSizeInBytes = redis.Int(size)
+		}
 	}
 
 	if v, ok := d.GetOk("dataset_size_in_gb"); ok {
@@ -442,8 +431,10 @@ func resourceRedisCloudProDatabaseCreate(ctx context.Context, d *schema.Resource
 		createDatabase.PortNumber = redis.Int(v.(int))
 	}
 
-	if respVersion != "" {
-		createDatabase.RespVersion = redis.String(respVersion)
+	if v, ok := d.GetOk("resp_version"); ok {
+		if s, valid := v.(string); valid && s != "" {
+			createDatabase.RespVersion = redis.String(s)
+		}
 	}
 
 	// Confirm sub is ready to accept a db request