azurerm_cosmosdb_postgresql_cluster: fix naming convention and wron…

…g nil handling
hashicorp · Mar 15, 2024 · 011d413 · 011d413
1 parent 1533adc
commit 011d413
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/internal/services/cosmos/cosmosdb_postgresql_cluster_resource.go b/internal/services/cosmos/cosmosdb_postgresql_cluster_resource.go
@@ -36,7 +36,7 @@ type CosmosDbPostgreSQLClusterModel struct {
 	SourceLocation                   string              `tfschema:"source_location"`
 	SourceResourceId                 string              `tfschema:"source_resource_id"`
 	MaintenanceWindow                []MaintenanceWindow `tfschema:"maintenance_window"`
-	ServerNames                      []ServerNameItem    `tfschema:"server_names"`
+	ServerNames                      []ServerNameItem    `tfschema:"servers"`
 	NodeCount                        int64               `tfschema:"node_count"`
 	NodePublicIPAccessEnabled        bool                `tfschema:"node_public_ip_access_enabled"`
 	NodeServerEdition                string              `tfschema:"node_server_edition"`
@@ -310,7 +310,7 @@ func (r CosmosDbPostgreSQLClusterResource) Attributes() map[string]*pluginsdk.Sc
 			Type:     pluginsdk.TypeString,
 			Computed: true,
 		},
-		"server_names": {
+		"servers": {
 			Type:     pluginsdk.TypeList,
 			Computed: true,
 			Elem: &pluginsdk.Resource{
@@ -580,7 +580,7 @@ func (r CosmosDbPostgreSQLClusterResource) Read() sdk.ResourceFunc {
 				state.CoordinatorServerEdition = pointer.From(props.CoordinatorServerEdition)
 				state.CoordinatorStorageQuotaInMb = pointer.From(props.CoordinatorStorageQuotaInMb)
 				state.CoordinatorVCoreCount = pointer.From(props.CoordinatorVCores)
-				state.ServerNames = formatServerNames(props.ServerNames)
+				state.ServerNames = flattenServerNames(props.ServerNames)
 				state.HaEnabled = pointer.From(props.EnableHa)
 				state.NodeCount = pointer.From(props.NodeCount)
 				state.NodePublicIPAccessEnabled = pointer.From(props.NodeEnablePublicIPAccess)
@@ -660,12 +660,13 @@ func flattenMaintenanceWindow(input *clusters.MaintenanceWindow) []MaintenanceWi
 	}
 }
 
-func formatServerNames(input *[]clusters.ServerNameItem) []ServerNameItem {
+func flattenServerNames(input *[]clusters.ServerNameItem) []ServerNameItem {
+	var output []ServerNameItem
+
 	if input == nil {
-		return nil
+		return output
 	}
 
-	var output []ServerNameItem
 	for _, v := range *input {
 		output = append(output, ServerNameItem{
 			FullyQualifiedDomainName: *v.FullyQualifiedDomainName,

diff --git a/internal/services/cosmos/cosmosdb_postgresql_cluster_resource_test.go b/internal/services/cosmos/cosmosdb_postgresql_cluster_resource_test.go
@@ -29,8 +29,8 @@ func TestAccCosmosDbPostgreSQLCluster_basic(t *testing.T) {
 			Config: r.basic(data),
 			Check: acceptance.ComposeTestCheckFunc(
 				check.That(data.ResourceName).ExistsInAzure(r),
-				check.That(data.ResourceName).Key("server_names.0.fqdn").IsNotEmpty(),
-				check.That(data.ResourceName).Key("server_names.0.name").IsNotEmpty(),
+				check.That(data.ResourceName).Key("servers.0.fqdn").IsNotEmpty(),
+				check.That(data.ResourceName).Key("servers.0.name").IsNotEmpty(),
 			),
 		},
 		data.ImportStep("administrator_login_password"),

diff --git a/website/docs/r/cosmosdb_postgresql_cluster.html.markdown b/website/docs/r/cosmosdb_postgresql_cluster.html.markdown
@@ -99,7 +99,7 @@ In addition to the Arguments listed above - the following Attributes are exporte
 
 * `earliest_restore_time` - The earliest restore point time (ISO8601 format) for the Azure Cosmos DB for PostgreSQL Cluster.
 
-* `server_names` - The name of the servers and its fully qualified domain name
+* `servers` - The name of the servers and its fully qualified domain name
 
 ## Timeouts