Update postgres flexserver api version to 2021-06-01

- set attribute cmk_enabled to deprecated and empty value - update documentation set `cmk_enabled` to deprecated - add test to check that `cmk_enabled` is empty - secure pointer dereferences
hashicorp · Jul 6, 2021 · 2bd9717 · 2bd9717
1 parent 81e12e2
commit 2bd9717
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 13 deletions.
diff --git a/azurerm/internal/services/postgres/postgresql_flexible_server_data_source.go b/azurerm/internal/services/postgres/postgresql_flexible_server_data_source.go
@@ -63,6 +63,12 @@ func dataSourcePostgresqlFlexibleServer() *pluginsdk.Resource {
 				Computed: true,
 			},
 
+			"cmk_enabled": {
+				Type:       pluginsdk.TypeString,
+				Computed:   true,
+				Deprecated: "This attribute has been removed from the API and will be removed in version 3.0 of the provider.",
+			},
+
 			"fqdn": {
 				Type:     pluginsdk.TypeString,
 				Computed: true,
@@ -101,16 +107,27 @@ func dataSourceArmPostgresqlFlexibleServerRead(d *pluginsdk.ResourceData, meta i
 	d.Set("name", id.Name)
 	d.Set("resource_group_name", id.ResourceGroup)
 	d.Set("location", location.NormalizeNilable(resp.Location))
+
+	// `cmk_enabled` has been removed from API since 2021-06-01
+	// and should be removed in version 3.0 of the provider.
+	d.Set("cmk_enabled", "")
+
 	if props := resp.ServerProperties; props != nil {
 		d.Set("administrator_login", props.AdministratorLogin)
-		d.Set("storage_mb", (*props.Storage.StorageSizeGB * 1024))
 		d.Set("version", props.Version)
 		d.Set("fqdn", props.FullyQualifiedDomainName)
-		d.Set("public_network_access_enabled", props.Network.PublicNetworkAccess == postgresqlflexibleservers.ServerPublicNetworkAccessStateEnabled)
-		d.Set("backup_retention_days", props.Backup.BackupRetentionDays)
 
-		if props.Network.DelegatedSubnetResourceID != nil {
-			d.Set("delegated_subnet_id", props.Network.DelegatedSubnetResourceID)
+		if storage := props.Storage; storage != nil && storage.StorageSizeGB != nil {
+			d.Set("storage_mb", (*props.Storage.StorageSizeGB * 1024))
+		}
+
+		if backup := props.Backup; backup != nil {
+			d.Set("backup_retention_days", props.Backup.BackupRetentionDays)
+		}
+
+		if network := props.Network; network != nil {
+			d.Set("delegated_subnet_id", network.DelegatedSubnetResourceID)
+			d.Set("public_network_access_enabled", network.PublicNetworkAccess == postgresqlflexibleservers.ServerPublicNetworkAccessStateEnabled)
 		}
 	}
 

diff --git a/azurerm/internal/services/postgres/postgresql_flexible_server_data_source_test.go b/azurerm/internal/services/postgres/postgresql_flexible_server_data_source_test.go
@@ -26,6 +26,7 @@ func TestAccDataSourcePostgresqlflexibleServer_basic(t *testing.T) {
 				check.That(data.ResourceName).Key("backup_retention_days").Exists(),
 				check.That(data.ResourceName).Key("fqdn").Exists(),
 				check.That(data.ResourceName).Key("public_network_access_enabled").Exists(),
+				check.That(data.ResourceName).Key("cmk_enabled").IsEmpty(),
 			),
 		},
 	})

diff --git a/azurerm/internal/services/postgres/postgresql_flexible_server_resource.go b/azurerm/internal/services/postgres/postgresql_flexible_server_resource.go
@@ -169,6 +169,12 @@ func resourcePostgresqlFlexibleServer() *pluginsdk.Resource {
 				ValidateFunc: validation.IntBetween(7, 35),
 			},
 
+			"cmk_enabled": {
+				Type:       pluginsdk.TypeString,
+				Computed:   true,
+				Deprecated: "This attribute has been removed from the API and will be removed in version 3.0 of the provider.",
+			},
+
 			"fqdn": {
 				Type:     pluginsdk.TypeString,
 				Computed: true,
@@ -330,26 +336,27 @@ func resourcePostgresqlFlexibleServerRead(d *pluginsdk.ResourceData, meta interf
 	d.Set("name", id.Name)
 	d.Set("resource_group_name", id.ResourceGroup)
 	d.Set("location", location.NormalizeNilable(resp.Location))
+
+	// `cmk_enabled` has been removed from API since 2021-06-01
+	// and should be removed in version 3.0 of the provider.
+	d.Set("cmk_enabled", "")
+
 	if props := resp.ServerProperties; props != nil {
 		d.Set("administrator_login", props.AdministratorLogin)
 		d.Set("zone", props.AvailabilityZone)
 		d.Set("version", props.Version)
 		d.Set("fqdn", props.FullyQualifiedDomainName)
-		d.Set("public_network_access_enabled", props.Network.PublicNetworkAccess == postgresqlflexibleservers.ServerPublicNetworkAccessStateEnabled)
-
-		if props.SourceServerResourceID != nil {
-			d.Set("source_server_id", props.SourceServerResourceID)
-		}
 
-		if props.Network.DelegatedSubnetResourceID != nil {
-			d.Set("delegated_subnet_id", props.Network.DelegatedSubnetResourceID)
+		if network := props.Network; network != nil {
+			d.Set("public_network_access_enabled", network.PublicNetworkAccess == postgresqlflexibleservers.ServerPublicNetworkAccessStateEnabled)
+			d.Set("delegated_subnet_id", network.DelegatedSubnetResourceID)
 		}
 
 		if err := d.Set("maintenance_window", flattenArmServerMaintenanceWindow(props.MaintenanceWindow)); err != nil {
 			return fmt.Errorf("setting `maintenance_window`: %+v", err)
 		}
 
-		if storage := props.Storage; storage != nil {
+		if storage := props.Storage; storage != nil && storage.StorageSizeGB != nil {
 			d.Set("storage_mb", (*storage.StorageSizeGB * 1024))
 		}
 

diff --git a/azurerm/internal/services/postgres/postgresql_flexible_server_resource_test.go b/azurerm/internal/services/postgres/postgresql_flexible_server_resource_test.go
@@ -26,6 +26,7 @@ func TestAccPostgresqlflexibleServer_basic(t *testing.T) {
 			Check: acceptance.ComposeTestCheckFunc(
 				check.That(data.ResourceName).ExistsInAzure(r),
 				check.That(data.ResourceName).Key("zone").Exists(),
+				check.That(data.ResourceName).Key("cmk_enabled").IsEmpty(),
 				check.That(data.ResourceName).Key("fqdn").Exists(),
 				check.That(data.ResourceName).Key("public_network_access_enabled").Exists(),
 			),

diff --git a/website/docs/d/postgresql_flexible_server.html.markdown b/website/docs/d/postgresql_flexible_server.html.markdown
@@ -43,6 +43,10 @@ In addition to the Arguments listed above - the following Attributes are exporte
 
 * `backup_retention_days` -  The backup retention days for the PostgreSQL Flexible Server.
 
+* `cmk_enabled` - The status showing whether the data encryption is enabled with a customer-managed key.
+
+~> **Note:** Attribute `cmk_enabled` has been deprecated and will be removed in version 3.0 of the provider.
+
 * `delegated_subnet_id` - The ID of the virtual network subnet to create the PostgreSQL Flexible Server.
 
 * `fqdn` - The FQDN of the PostgreSQL Flexible Server.

diff --git a/website/docs/r/postgresql_flexible_server.html.markdown b/website/docs/r/postgresql_flexible_server.html.markdown
@@ -113,6 +113,10 @@ In addition to the Arguments listed above - the following Attributes are exporte
 
 * `id` - The ID of the PostgreSQL Flexible Server.
 
+* `cmk_enabled` - The status showing whether the data encryption is enabled with a customer-managed key.
+
+~> **Note:** Attribute `cmk_enabled` has been deprecated and will be removed in version 3.0 of the provider.
+
 * `fqdn` - The FQDN of the PostgreSQL Flexible Server.
 
 * `public_network_access_enabled` - Is public network access enabled?