Fix review change requests

- Add base schemas for datastore and database resources
- Add required fields for each datastore type in corresponding schema
instead of deleting unused fields
- Use Sensitive: true for password fields

selectel/data_source_selectel_dbaas_configuration_parameter_v1.go

@@ -195,9 +195,9 @@ func filterConfigurationParametersByName(configurationParameters []dbaas.Configu
 	return filteredConfigurationParameters
 }
 
-func convertListParametersTypes(parameter []interface{}) []string {
-	parameterList := make([]string, len(parameter))
-	for i, value := range parameter {
+func convertListParametersTypes(parameters []interface{}) []string {
+	parameterList := make([]string, len(parameters))
+	for i, value := range parameters {
 		parameterList[i] = convertFieldToStringByType(value)
 	}
 

selectel/dbaas_base_schemas.go

@@ -0,0 +1,154 @@
+package selectel
+
+import "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+
+func resourceDBaaSDatastoreV1BaseSchema() map[string]*schema.Schema {
+	return map[string]*schema.Schema{
+		"name": {
+			Type:     schema.TypeString,
+			Required: true,
+		},
+		"project_id": {
+			Type:     schema.TypeString,
+			Required: true,
+			ForceNew: true,
+		},
+		"region": {
+			Type:     schema.TypeString,
+			Required: true,
+			ForceNew: true,
+		},
+		"subnet_id": {
+			Type:     schema.TypeString,
+			Required: true,
+			ForceNew: true,
+		},
+		"type_id": {
+			Type:     schema.TypeString,
+			Required: true,
+			ForceNew: true,
+		},
+		"flavor_id": {
+			Type:          schema.TypeString,
+			Optional:      true,
+			Computed:      true,
+			ForceNew:      false,
+			ConflictsWith: []string{"flavor"},
+		},
+		"node_count": {
+			Type:     schema.TypeInt,
+			Required: true,
+		},
+		"enabled": {
+			Type:     schema.TypeBool,
+			Computed: true,
+		},
+		"status": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+		"backup_retention_days": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "Number of days to retain backups.",
+		},
+		"connections": {
+			Type:     schema.TypeMap,
+			Computed: true,
+			Elem: &schema.Schema{
+				Type: schema.TypeString,
+			},
+		},
+		"flavor": {
+			Type:          schema.TypeSet,
+			Optional:      true,
+			Computed:      true,
+			ForceNew:      false,
+			ConflictsWith: []string{"flavor_id"},
+			Elem: &schema.Resource{
+				Schema: map[string]*schema.Schema{
+					"vcpus": {
+						Type:     schema.TypeInt,
+						Required: true,
+					},
+					"ram": {
+						Type:     schema.TypeInt,
+						Required: true,
+					},
+					"disk": {
+						Type:     schema.TypeInt,
+						Required: true,
+					},
+				},
+			},
+		},
+		"firewall": {
+			Type:     schema.TypeSet,
+			Optional: true,
+			Elem: &schema.Resource{
+				Schema: map[string]*schema.Schema{
+					"ips": {
+						Type:     schema.TypeList,
+						Required: true,
+						Elem: &schema.Schema{
+							Type: schema.TypeString,
+						},
+					},
+				},
+			},
+		},
+		"config": {
+			Type:     schema.TypeMap,
+			Optional: true,
+			Computed: true,
+			Elem: &schema.Schema{
+				Type: schema.TypeString,
+			},
+		},
+		"instances": {
+			Type:     schema.TypeList,
+			Computed: true,
+			Elem: &schema.Resource{
+				Schema: map[string]*schema.Schema{
+					"role": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+					"floating_ip": {
+						Type:     schema.TypeString,
+						Computed: true,
+					},
+				},
+			},
+		},
+	}
+}
+
+func resourceDBaaSDatabaseV1BaseSchema() map[string]*schema.Schema {
+	return map[string]*schema.Schema{
+		"name": {
+			Type:     schema.TypeString,
+			Required: true,
+			ForceNew: true,
+		},
+		"project_id": {
+			Type:     schema.TypeString,
+			Required: true,
+			ForceNew: true,
+		},
+		"region": {
+			Type:     schema.TypeString,
+			Required: true,
+			ForceNew: true,
+		},
+		"datastore_id": {
+			Type:     schema.TypeString,
+			Required: true,
+			ForceNew: true,
+		},
+		"status": {
+			Type:     schema.TypeString,
+			Computed: true,
+		},
+	}
+}