azurerm_storage_account/azurerm_storage_account_blob_properties/azurerm_storage_account_queue_properties/azurerm_storage_account_share_properties/azurerm_storage_account_static_website_properties - split data plane into separate resources

internal/services/storage/registration.go

@@ -34,6 +34,7 @@ func (r Registration) SupportedDataSources() map[string]*pluginsdk.Resource {
 		"azurerm_storage_account_blob_container_sas": dataSourceStorageAccountBlobContainerSharedAccessSignature(),
 		"azurerm_storage_account_sas":                dataSourceStorageAccountSharedAccessSignature(),
 		"azurerm_storage_account":                    dataSourceStorageAccount(),
+		"azurerm_storage_account_queue_properties":   dataSourceStorageAccountQueueProperties(),
 		"azurerm_storage_blob":                       dataSourceStorageBlob(),
 		"azurerm_storage_container":                  dataSourceStorageContainer(),
 		"azurerm_storage_encryption_scope":           dataSourceStorageEncryptionScope(),

internal/services/storage/storage_account_customer_managed_key_resource.go

@@ -175,7 +175,7 @@ func resourceStorageAccountCustomerManagedKeyCreateUpdate(d *pluginsdk.ResourceD
 			}
 		}
 		if !softDeleteEnabled || !purgeProtectionEnabled {
-			return fmt.Errorf("Key Vault %q (Resource Group %q) must be configured for both Purge Protection and Soft Delete", keyVaultID.VaultName, keyVaultID.ResourceGroupName)
+			return fmt.Errorf("key vault %q (Resource Group %q) must be configured for both Purge Protection and Soft Delete", keyVaultID.VaultName, keyVaultID.ResourceGroupName)
 		}
 
 		keyVaultBaseURL, err := keyVaultsClient.BaseUriForKeyVault(ctx, *keyVaultID)
@@ -196,7 +196,7 @@ func resourceStorageAccountCustomerManagedKeyCreateUpdate(d *pluginsdk.ResourceD
 			keyVersion = ""
 			keyVaultURI = keyId.BaseUri()
 		} else {
-			return fmt.Errorf("Failed to parse '%s' as HSM key ID", managedHSMKeyId)
+			return fmt.Errorf("failed to parse '%s' as HSM key ID", managedHSMKeyId)
 		}
 	}
 

internal/services/storage/storage_account_data_source.go

@@ -173,46 +173,6 @@ func dataSourceStorageAccount() *pluginsdk.Resource {
 				Computed: true,
 			},
 
-			"primary_queue_endpoint": {
-				Type:     pluginsdk.TypeString,
-				Computed: true,
-			},
-
-			"primary_queue_host": {
-				Type:     pluginsdk.TypeString,
-				Computed: true,
-			},
-
-			"primary_queue_microsoft_endpoint": {
-				Type:     pluginsdk.TypeString,
-				Computed: true,
-			},
-
-			"primary_queue_microsoft_host": {
-				Type:     pluginsdk.TypeString,
-				Computed: true,
-			},
-
-			"secondary_queue_endpoint": {
-				Type:     pluginsdk.TypeString,
-				Computed: true,
-			},
-
-			"secondary_queue_host": {
-				Type:     pluginsdk.TypeString,
-				Computed: true,
-			},
-
-			"secondary_queue_microsoft_endpoint": {
-				Type:     pluginsdk.TypeString,
-				Computed: true,
-			},
-
-			"secondary_queue_microsoft_host": {
-				Type:     pluginsdk.TypeString,
-				Computed: true,
-			},
-
 			"primary_table_endpoint": {
 				Type:     pluginsdk.TypeString,
 				Computed: true,
@@ -539,9 +499,60 @@ func dataSourceStorageAccount() *pluginsdk.Resource {
 	}
 
 	if !features.FourPointOhBeta() {
+		// TODO 4.0: change this from enable_* to *_enabled
 		resource.Schema["enable_https_traffic_only"] = &pluginsdk.Schema{
-			Type:     pluginsdk.TypeBool,
-			Computed: true,
+			Type:          pluginsdk.TypeBool,
+			Computed:      true,
+			Deprecated:    "the `enable_https_traffic_only` field has been deprecated in favour of `https_traffic_only_enabled` in v4.0 of the provider.",
+			ConflictsWith: []string{"https_traffic_only_enabled"},
+		}
+
+		resource.Schema["primary_queue_endpoint"] = &pluginsdk.Schema{
+			Type:       pluginsdk.TypeString,
+			Computed:   true,
+			Deprecated: "`primary_queue_endpoint` will be moved to the `azurerm_storage_account_queue_properties` data source in v4.0 of the provider.",
+		}
+
+		resource.Schema["primary_queue_host"] = &pluginsdk.Schema{
+			Type:       pluginsdk.TypeString,
+			Computed:   true,
+			Deprecated: "`primary_queue_host` will be moved to the `azurerm_storage_account_queue_properties` data source in v4.0 of the provider.",
+		}
+
+		resource.Schema["primary_queue_microsoft_endpoint"] = &pluginsdk.Schema{
+			Type:       pluginsdk.TypeString,
+			Computed:   true,
+			Deprecated: "`primary_queue_microsoft_endpoint` will be moved to the `azurerm_storage_account_queue_properties` data source in v4.0 of the provider.",
+		}
+
+		resource.Schema["primary_queue_microsoft_host"] = &pluginsdk.Schema{
+			Type:       pluginsdk.TypeString,
+			Computed:   true,
+			Deprecated: "`primary_queue_microsoft_host` will be moved to the `azurerm_storage_account_queue_properties` data source in v4.0 of the provider.",
+		}
+
+		resource.Schema["secondary_queue_endpoint"] = &pluginsdk.Schema{
+			Type:       pluginsdk.TypeString,
+			Computed:   true,
+			Deprecated: "`secondary_queue_endpoint` will be moved to the `azurerm_storage_account_queue_properties` data source in v4.0 of the provider.",
+		}
+
+		resource.Schema["secondary_queue_host"] = &pluginsdk.Schema{
+			Type:       pluginsdk.TypeString,
+			Computed:   true,
+			Deprecated: "`secondary_queue_host` will be moved to the `azurerm_storage_account_queue_properties` data source in v4.0 of the provider.",
+		}
+
+		resource.Schema["secondary_queue_microsoft_endpoint"] = &pluginsdk.Schema{
+			Type:       pluginsdk.TypeString,
+			Computed:   true,
+			Deprecated: "`secondary_queue_microsoft_endpoint` will be moved to the `azurerm_storage_account_queue_properties` data source in v4.0 of the provider.",
+		}
+
+		resource.Schema["secondary_queue_microsoft_host"] = &pluginsdk.Schema{
+			Type:       pluginsdk.TypeString,
+			Computed:   true,
+			Deprecated: "`secondary_queue_microsoft_host` will be moved to the `azurerm_storage_account_queue_properties` data source in v4.0 of the provider.",
 		}
 	}
 
@@ -611,6 +622,11 @@ func dataSourceStorageAccountRead(d *pluginsdk.ResourceData, meta interface{}) e
 			if err := d.Set("custom_domain", flattenAccountCustomDomain(props.CustomDomain)); err != nil {
 				return fmt.Errorf("setting `custom_domain`: %+v", err)
 			}
+
+			if !features.FourPointOhBeta() {
+				d.Set("enable_https_traffic_only", pointer.From(props.SupportsHTTPSTrafficOnly))
+			}
+
 			d.Set("https_traffic_only_enabled", pointer.From(props.SupportsHTTPSTrafficOnly))
 			d.Set("is_hns_enabled", pointer.From(props.IsHnsEnabled))
 			d.Set("nfsv3_enabled", pointer.From(props.IsNfsV3Enabled))
@@ -670,15 +686,26 @@ func dataSourceStorageAccountRead(d *pluginsdk.ResourceData, meta interface{}) e
 		routingPreference = model.Properties.RoutingPreference
 		secondaryEndpoints = model.Properties.SecondaryEndpoints
 	}
+
 	endpoints := flattenAccountEndpoints(primaryEndpoints, secondaryEndpoints, routingPreference)
 	if err := endpoints.set(d); err != nil {
 		return err
 	}
 
+	// Only set the Queue Endpoints in v3.x since in v4.0 these properties will be
+	// moved to the 'azurerm_storage_account_queue_properties' data source...
+	if !features.FourPointOhBeta() {
+		queueEndpoints := flattenAccountQueueEndpoints(primaryEndpoints, secondaryEndpoints, routingPreference)
+		if err := queueEndpoints.set(d); err != nil {
+			return err
+		}
+	}
+
 	storageAccountKeys := make([]storageaccounts.StorageAccountKey, 0)
 	if keys.Model != nil && keys.Model.Keys != nil {
 		storageAccountKeys = *keys.Model.Keys
 	}
+
 	keysAndConnectionStrings := flattenAccountAccessKeysAndConnectionStrings(id.StorageAccountName, *storageDomainSuffix, storageAccountKeys, endpoints)
 	if err := keysAndConnectionStrings.set(d); err != nil {
 		return err

internal/services/storage/storage_account_helpers_endpoints_credentials.go

@@ -52,15 +52,6 @@ type accountEndpoints struct {
 	secondaryFileMicrosoftEndpoint string
 	secondaryFileMicrosoftHostName string
 
-	primaryQueueEndpoint            string
-	primaryQueueHostName            string
-	primaryQueueMicrosoftEndpoint   string
-	primaryQueueMicrosoftHostName   string
-	secondaryQueueEndpoint          string
-	secondaryQueueHostName          string
-	secondaryQueueMicrosoftEndpoint string
-	secondaryQueueMicrosoftHostName string
-
 	primaryTableEndpoint            string
 	primaryTableHostName            string
 	primaryTableMicrosoftEndpoint   string
@@ -84,6 +75,17 @@ type accountEndpoints struct {
 	secondaryWebMicrosoftHostName string
 }
 
+type accountQueueEndpoints struct {
+	primaryQueueEndpoint            string
+	primaryQueueHostName            string
+	primaryQueueMicrosoftEndpoint   string
+	primaryQueueMicrosoftHostName   string
+	secondaryQueueEndpoint          string
+	secondaryQueueHostName          string
+	secondaryQueueMicrosoftEndpoint string
+	secondaryQueueMicrosoftHostName string
+}
+
 func (a accountEndpoints) set(d *pluginsdk.ResourceData) error {
 	d.Set("primary_blob_endpoint", a.primaryBlobEndpoint)
 	d.Set("primary_blob_host", a.primaryBlobHostName)
@@ -124,15 +126,6 @@ func (a accountEndpoints) set(d *pluginsdk.ResourceData) error {
 	d.Set("secondary_file_microsoft_endpoint", a.secondaryFileMicrosoftEndpoint)
 	d.Set("secondary_file_microsoft_host", a.secondaryFileMicrosoftHostName)
 
-	d.Set("primary_queue_endpoint", a.primaryQueueEndpoint)
-	d.Set("primary_queue_host", a.primaryQueueHostName)
-	d.Set("primary_queue_microsoft_endpoint", a.primaryQueueMicrosoftEndpoint)
-	d.Set("primary_queue_microsoft_host", a.primaryQueueMicrosoftHostName)
-	d.Set("secondary_queue_endpoint", a.secondaryQueueEndpoint)
-	d.Set("secondary_queue_host", a.secondaryQueueHostName)
-	d.Set("secondary_queue_microsoft_endpoint", a.secondaryQueueMicrosoftEndpoint)
-	d.Set("secondary_queue_microsoft_host", a.secondaryQueueMicrosoftHostName)
-
 	d.Set("primary_table_endpoint", a.primaryTableEndpoint)
 	d.Set("primary_table_host", a.primaryTableHostName)
 	d.Set("primary_table_microsoft_endpoint", a.primaryTableMicrosoftEndpoint)
@@ -158,14 +151,26 @@ func (a accountEndpoints) set(d *pluginsdk.ResourceData) error {
 	return nil
 }
 
+func (a accountQueueEndpoints) set(d *pluginsdk.ResourceData) error {
+	d.Set("primary_queue_endpoint", a.primaryQueueEndpoint)
+	d.Set("primary_queue_host", a.primaryQueueHostName)
+	d.Set("primary_queue_microsoft_endpoint", a.primaryQueueMicrosoftEndpoint)
+	d.Set("primary_queue_microsoft_host", a.primaryQueueMicrosoftHostName)
+	d.Set("secondary_queue_endpoint", a.secondaryQueueEndpoint)
+	d.Set("secondary_queue_host", a.secondaryQueueHostName)
+	d.Set("secondary_queue_microsoft_endpoint", a.secondaryQueueMicrosoftEndpoint)
+	d.Set("secondary_queue_microsoft_host", a.secondaryQueueMicrosoftHostName)
+
+	return nil
+}
+
 func flattenAccountEndpoints(primaryEndpoints, secondaryEndpoints *storageaccounts.Endpoints, routingPreference *storageaccounts.RoutingPreference) accountEndpoints {
 	output := accountEndpoints{}
 
 	if primaryEndpoints != nil {
 		output.primaryBlobEndpoint, output.primaryBlobHostName = flattenAccountEndpointAndHost(primaryEndpoints.Blob)
 		output.primaryDfsEndpoint, output.primaryDfsHostName = flattenAccountEndpointAndHost(primaryEndpoints.Dfs)
 		output.primaryFileEndpoint, output.primaryFileHostName = flattenAccountEndpointAndHost(primaryEndpoints.File)
-		output.primaryQueueEndpoint, output.primaryQueueHostName = flattenAccountEndpointAndHost(primaryEndpoints.Queue)
 		output.primaryTableEndpoint, output.primaryTableHostName = flattenAccountEndpointAndHost(primaryEndpoints.Table)
 		output.primaryWebEndpoint, output.primaryWebHostName = flattenAccountEndpointAndHost(primaryEndpoints.Web)
 
@@ -181,7 +186,6 @@ func flattenAccountEndpoints(primaryEndpoints, secondaryEndpoints *storageaccoun
 				output.primaryBlobMicrosoftEndpoint, output.primaryBlobMicrosoftHostName = flattenAccountEndpointAndHost(primaryEndpoints.MicrosoftEndpoints.Blob)
 				output.primaryDfsMicrosoftEndpoint, output.primaryDfsMicrosoftHostName = flattenAccountEndpointAndHost(primaryEndpoints.MicrosoftEndpoints.Dfs)
 				output.primaryFileMicrosoftEndpoint, output.primaryFileMicrosoftHostName = flattenAccountEndpointAndHost(primaryEndpoints.MicrosoftEndpoints.File)
-				output.primaryQueueMicrosoftEndpoint, output.primaryQueueMicrosoftHostName = flattenAccountEndpointAndHost(primaryEndpoints.MicrosoftEndpoints.Queue)
 				output.primaryTableMicrosoftEndpoint, output.primaryTableMicrosoftHostName = flattenAccountEndpointAndHost(primaryEndpoints.MicrosoftEndpoints.Table)
 				output.primaryWebMicrosoftEndpoint, output.primaryWebMicrosoftHostName = flattenAccountEndpointAndHost(primaryEndpoints.MicrosoftEndpoints.Web)
 			}
@@ -192,7 +196,6 @@ func flattenAccountEndpoints(primaryEndpoints, secondaryEndpoints *storageaccoun
 		output.secondaryBlobEndpoint, output.secondaryBlobHostName = flattenAccountEndpointAndHost(secondaryEndpoints.Blob)
 		output.secondaryDfsEndpoint, output.secondaryDfsHostName = flattenAccountEndpointAndHost(secondaryEndpoints.Dfs)
 		output.secondaryFileEndpoint, output.secondaryFileHostName = flattenAccountEndpointAndHost(secondaryEndpoints.File)
-		output.secondaryQueueEndpoint, output.secondaryQueueHostName = flattenAccountEndpointAndHost(secondaryEndpoints.Queue)
 		output.secondaryTableEndpoint, output.secondaryTableHostName = flattenAccountEndpointAndHost(secondaryEndpoints.Table)
 		output.secondaryWebEndpoint, output.secondaryWebHostName = flattenAccountEndpointAndHost(secondaryEndpoints.Web)
 
@@ -208,7 +211,6 @@ func flattenAccountEndpoints(primaryEndpoints, secondaryEndpoints *storageaccoun
 				output.secondaryBlobMicrosoftEndpoint, output.secondaryBlobMicrosoftHostName = flattenAccountEndpointAndHost(secondaryEndpoints.MicrosoftEndpoints.Blob)
 				output.secondaryDfsMicrosoftEndpoint, output.secondaryDfsMicrosoftHostName = flattenAccountEndpointAndHost(secondaryEndpoints.MicrosoftEndpoints.Dfs)
 				output.secondaryFileMicrosoftEndpoint, output.secondaryFileMicrosoftHostName = flattenAccountEndpointAndHost(secondaryEndpoints.MicrosoftEndpoints.File)
-				output.secondaryQueueMicrosoftEndpoint, output.secondaryQueueMicrosoftHostName = flattenAccountEndpointAndHost(secondaryEndpoints.MicrosoftEndpoints.Queue)
 				output.secondaryTableMicrosoftEndpoint, output.secondaryTableMicrosoftHostName = flattenAccountEndpointAndHost(secondaryEndpoints.MicrosoftEndpoints.Table)
 				output.secondaryWebMicrosoftEndpoint, output.secondaryWebMicrosoftHostName = flattenAccountEndpointAndHost(secondaryEndpoints.MicrosoftEndpoints.Web)
 			}
@@ -218,6 +220,32 @@ func flattenAccountEndpoints(primaryEndpoints, secondaryEndpoints *storageaccoun
 	return output
 }
 
+func flattenAccountQueueEndpoints(primaryEndpoints, secondaryEndpoints *storageaccounts.Endpoints, routingPreference *storageaccounts.RoutingPreference) accountQueueEndpoints {
+	output := accountQueueEndpoints{}
+
+	if primaryEndpoints != nil {
+		output.primaryQueueEndpoint, output.primaryQueueHostName = flattenAccountEndpointAndHost(primaryEndpoints.Queue)
+
+		if routingPreference != nil {
+			if primaryEndpoints.MicrosoftEndpoints != nil && pointer.From(routingPreference.PublishMicrosoftEndpoints) {
+				output.primaryQueueMicrosoftEndpoint, output.primaryQueueMicrosoftHostName = flattenAccountEndpointAndHost(primaryEndpoints.MicrosoftEndpoints.Queue)
+			}
+		}
+	}
+
+	if secondaryEndpoints != nil {
+		output.secondaryQueueEndpoint, output.secondaryQueueHostName = flattenAccountEndpointAndHost(secondaryEndpoints.Queue)
+
+		if routingPreference != nil {
+			if secondaryEndpoints.MicrosoftEndpoints != nil && pointer.From(routingPreference.PublishMicrosoftEndpoints) {
+				output.secondaryQueueMicrosoftEndpoint, output.secondaryQueueMicrosoftHostName = flattenAccountEndpointAndHost(secondaryEndpoints.MicrosoftEndpoints.Queue)
+			}
+		}
+	}
+
+	return output
+}
+
 func flattenAccountEndpointAndHost(input *string) (string, string) {
 	endpoint := ""
 	host := ""