Merge pull request #147 from hashicorp/main

[pull] main from hashicorp:main

.copywrite.hcl

@@ -0,0 +1,16 @@
+schema_version = 1
+
+project {
+  license        = "MPL-2.0"
+  copyright_year = 2023
+
+  header_ignore = [
+    ".ci/**",
+    ".github/**",
+    ".teamcity/**",
+    ".release/**",
+    "vendor/**",
+    "internal/**/**_gen.go", # Pandora generated files
+    ".goreleaser.yml",
+  ]
+}

.github/labeler-issue-triage.yml

@@ -331,7 +331,7 @@ service/stream-analytics:
   - '### (|New or )Affected Resource\(s\)\/Data Source\(s\)((.|\n)*)azurerm_stream_analytics_((.|\n)*)###'
 
 service/subscription:
-  - '### (|New or )Affected Resource\(s\)\/Data Source\(s\)((.|\n)*)azurerm_(extended_locations|subscription\W+|subscriptions)((.|\n)*)###'
+  - '### (|New or )Affected Resource\(s\)\/Data Source\(s\)((.|\n)*)azurerm_(extended_locations|location|subscription\W+|subscriptions)((.|\n)*)###'
 
 service/synapse:
   - '### (|New or )Affected Resource\(s\)\/Data Source\(s\)((.|\n)*)azurerm_synapse_((.|\n)*)###'

.github/workflows/teamcity-test.yaml

@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-      - uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3.13.0
+      - uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
         with:
           distribution: zulu
           java-version: 17

.teamcity/components/settings.kt

@@ -4,7 +4,7 @@
  */
 
 // specifies the default hour (UTC) at which tests should be triggered, if enabled
-var defaultStartHour = 0
+var defaultStartHour = 23
 
 // specifies the default level of parallelism per-service-package
 var defaultParallelism = 20
@@ -71,7 +71,7 @@ var serviceTestConfigurationOverrides = mapOf(
         "customproviders" to testConfiguration(locationOverride = LocationConfiguration("eastus", "westus2", "westeurope", true)),
 
         // Dashboard is only available in certain locations
-        "dashboard" to testConfiguration(locationOverride = LocationConfiguration("westeurope", "westus2", "eastus2", false)),
+        "dashboard" to testConfiguration(locationOverride = LocationConfiguration("eastus", "westus2", "eastus2", false)),
 
         // Datadog is available only in WestUS2 region
         "datadog" to testConfiguration(locationOverride = LocationConfiguration("westus2", "westus2", "centraluseuap", false)),

CHANGELOG.md

@@ -1,3 +1,97 @@
+## 3.85.0 (Unreleased)
+
+FEATURES:
+
+* New Data Source: `azurerm_locations` [GH-23324]
+
+ENHANCEMENTS:
+
+* provider: support for authenticating using Azure Kubernetes Service Workload Identity [GH-23965]
+* dependencies: updating to `v0.65.0` of `github.com/hashicorp/go-azure-helpers` [GH-24222]
+* dependencies: updating to `v0.20231213.1160254` of `github.com/hashicorp/go-azure-sdk` [GH-24222]
+* dependencies: update `security/automation` to use `hashicorp/go-azure-sdk` [GH-24156]
+* Data Source: `azurerm_cognitive_account` - export the `identity` block [GH-24214]
+* Data Source: `azurerm_monitor_workspace` - add support for the `default_data_collection_endpoint_id` and `default_data_collection_rule_id` properties [GH-24153]
+* Data Source: `azurerm_shared_image_gallery` - add support for property `image_names` [GH-24176]
+* `azurerm_dns_txt_record` - allow up to 4096 characters for the property `record.value` [GH-24169]
+* `azurerm_container_app` - add `workload_profile_name` property [GH-24219]
+* `azurerm_linux_web_app` - make `client_secret_setting_name` optional and conflicts with `client_secret_certificate_thumbprint` [GH-21834]
+* `azurerm_linux_web_app_slot` - make `client_secret_setting_name` optional and conflicts with `client_secret_certificate_thumbprint` [GH-21834]
+* `azurerm_linux_web_app` - fix a bug in `app_settings` where settings could be lost [GH-24221]
+* `azurerm_linux_web_app_slot` - fix a bug in `app_settings` where settings could be lost [GH-24221]
+* `azurerm_log_analytics_workspace` - add support for the `immediate_data_purge_on_30_days_enabled` property [GH-24015]
+* `azurerm_machine_learning_datastore_blobstorage` - this resource skips validation when being created [GH-24078]
+* `azurerm_machine_learning_datastore_datalake_gen2` - this resource skips validation when being created [GH-24078]
+* `azurerm_machine_learning_datastore_fileshare` - this resource skips validation when being created [GH-24078]
+* `azurerm_monitor_workspace` - add support for the `default_data_collection_endpoint_id` and `default_data_collection_rule_id` properties [GH-24153]
+* `azurerm_redis_cache` - add support for the `storage_account_subscription_id` property [GH-24101]
+* `azurerm_storage_blob` - add support for the `source_content` type `Page` [GH-24177]
+* `azurerm_windows_web_app` - make `client_secret_setting_name` optional and conflicts with `client_secret_certificate_thumbprint` [GH-21834]
+* `azurerm_windows_web_app_slot` - make `client_secret_setting_name` optional and conflicts with `client_secret_certificate_thumbprint` [GH-21834]
+* `azurerm_windows_web_app` - fix a bug in `app_settings` where settings could be lost [GH-24221]
+* `azurerm_windows_web_app_slot` - fix a bug in `app_settings` where settings could be lost [GH-24221]
+* `azurerm_cognitive_account` - add `ContentSafety` to the `kind` property validation [GH-24205]
+
+BUG FIXES:
+
+* Data Source: `azurerm_role_definition` - fix bug where `role_definition_id` and `scope` were being incorrectly set [GH-24211]
+* `azurerm_batch_account` - fix bug where `UserAssigned, SystemAssigned` could be passed to the resource even though it isn't supported [GH-24204]
+* `azurerm_batch_pool` - fix bug where `settings_json` and `protected_settings` were not being unmarshaled [GH-24075]
+* `azurerm_bot_service_azure_bot` - fix bug where `public_network_access_enabled` was being set as the value for `LuisKey` [GH-24164]
+* `azurerm_linux_web_app_slot` - error when `service_plan_id` is identical to the parent `service_plan_id` [GH-23403]
+* `azurerm_management_group_template_deployment` - fixing a bug where `template_spec_version_id` couldn't be updated [GH-24072]
+* `azurerm_pim_active_role_assignment` - fix an importing issue by filtering available role assignments based on the provided `scope` [GH-24077]
+* `azurerm_pim_eligible_role_assignment` - fix an importing issue by filtering available role assignments based on the provided `scope` [GH-24077]
+* `azurerm_resource_group_template_deployment` - fixing a bug where `template_spec_version_id` couldn't be updated [GH-24072]
+* `azurerm_security_center_setting` - fix the casing for the `setting_name` `Sentinel` [GH-24210]
+* `azurerm_storage_share_file` - prevent panic when the file specified by `source` is empty [GH-24179]
+* `azurerm_subscription_template_deployment` - fixing a bug where `template_spec_version_id` couldn't be updated [GH-24072]
+* `azurerm_tenant_template_deployment` - fixing a bug where `template_spec_version_id` couldn't be updated [GH-24072]
+* `azurerm_virtual_machine` - prevent a panic by nil checking the first element of `additional_capabilities` [GH-24159]
+* `azurerm_windows_web_app_slot` - error when `service_plan_id` is identical to the parent `service_plan_id` [GH-23403]
+
+## 3.84.0 (December 07, 2023)
+
+FEATURES:
+
+* **New Data Source:** `azurerm_storage_containers` ([#24061](https://github.com/hashicorp/terraform-provider-azurerm/issues/24061))
+* **New Resource:** `azurerm_elastic_san` ([#23619](https://github.com/hashicorp/terraform-provider-azurerm/issues/23619))
+* **New Resource:** `azurerm_key_vault_managed_hardware_security_module_role_assignment` ([#22332](https://github.com/hashicorp/terraform-provider-azurerm/issues/22332))
+* **New Resource:** `azurerm_key_vault_managed_hardware_security_module_role_definition` ([#22332](https://github.com/hashicorp/terraform-provider-azurerm/issues/22332))
+
+ENHANCEMENTS:
+
+* dependencies: updating mssql elasticpools from `v5.0` to `2023-05-01-preview`
+* dependencies: updating to `v0.20231207.1122031` of `github.com/hashicorp/go-azure-sdk` ([#24149](https://github.com/hashicorp/terraform-provider-azurerm/issues/24149))
+* Data Source: `azurerm_storage_account` - export the primary and secondary internet and microsoft hostnames for blobs, dfs, files, queues, tables and web ([#23517](https://github.com/hashicorp/terraform-provider-azurerm/issues/23517))
+* Data Source: `azurerm_cosmosdb_account` - export the `connection_strings`, `primary_sql_connection_string`, `secondary_sql_connection_string`, `primary_readonly_sql_connection_string`, `secondary_readonly_sql_connection_string`, `primary_mongodb_connection_string`, `secondary_mongodb_connection_string`, `primary_readonly_mongodb_connection_string`, and `secondary_readonly_mongodb_connection_string` attributes ([#24129](https://github.com/hashicorp/terraform-provider-azurerm/issues/24129))
+* `azurerm_bot_service_azure_bot` - support for the `public_network_access_enabled` property ([#24125](https://github.com/hashicorp/terraform-provider-azurerm/issues/24125))
+* `azurerm_container_app_environment` - support for the `workload_profile` property ([#23478](https://github.com/hashicorp/terraform-provider-azurerm/issues/23478))
+* `azurerm_cosmosdb_cassandra_datacenter` - support for the `seed_node_ip_addresses` property ([#24076](https://github.com/hashicorp/terraform-provider-azurerm/issues/24076))
+* `azurerm_firewall` - support for the `dns_proxy_enabled` property ([#20519](https://github.com/hashicorp/terraform-provider-azurerm/issues/20519))
+* `azurerm_kubernetes_cluster` - support for the  `support_plan` property and the `sku_tier` `Premium` ([#23970](https://github.com/hashicorp/terraform-provider-azurerm/issues/23970))
+* `azurerm_mssql_database` - support for `enclave_type` field ([#24054](https://github.com/hashicorp/terraform-provider-azurerm/issues/24054))
+* `azurerm_mssql_elasticpool` - support for `enclave_type` field ([#24054](https://github.com/hashicorp/terraform-provider-azurerm/issues/24054))
+* `azurerm_mssql_managed_instance` - support for more `vcores`: `6`, `10`, `12`, `20`, `48`, `56`, `96`, `128` ([#24085](https://github.com/hashicorp/terraform-provider-azurerm/issues/24085))
+* `azurerm_redis_linked_server` - support for the property `geo_replicated_primary_host_name` ([#23984](https://github.com/hashicorp/terraform-provider-azurerm/issues/23984))
+* `azurerm_storage_account` - expose the primary and secondary internet and microsoft hostnames for blobs, dfs, files, queues, tables and web ([#23517](https://github.com/hashicorp/terraform-provider-azurerm/issues/23517))
+* `azurerm_synapse_role_assignment` - support for the `principal_type` property ([#24089](https://github.com/hashicorp/terraform-provider-azurerm/issues/24089))
+* `azurerm_spring_cloud_build_deployment` - support for the `application_performance_monitoring_ids` property ([#23969](https://github.com/hashicorp/terraform-provider-azurerm/issues/23969))
+* `azurerm_virtual_network_gateway` - support for the `bgp_route_translation_for_nat_enabled`, `dns_forwarding_enabled`, `ip_sec_replay_protection_enabled`, `remote_vnet_traffic_enabled`, `virtual_wan_traffic_enabled`, `radius_server`, `virtual_network_gateway_client_connection`, `policy_group`, and `ipsec_policy` property ([#23220](https://github.com/hashicorp/terraform-provider-azurerm/issues/23220))
+
+BUG FIXES:
+
+* `azurerm_application_insights_api_key` - prevent a bug where multiple keys couldn't be created for an Application Insights instance ([#23463](https://github.com/hashicorp/terraform-provider-azurerm/issues/23463))
+* `azurerm_container_registry` - the `network_rule_set.virtual_network` property has been deprecated ([#24140](https://github.com/hashicorp/terraform-provider-azurerm/issues/24140))
+* `azurerm_hdinsight_hadoop_cluster` - set `roles.edge_node.install_script_action.parameters` into state by retrieving the value provided in the user config since this property isn't returned by the API ([#23971](https://github.com/hashicorp/terraform-provider-azurerm/issues/23971))
+* `azurerm_kubernetes_cluster` - prevent a bug where maintenance window start date was always recalculated and sent to the API ([#23985](https://github.com/hashicorp/terraform-provider-azurerm/issues/23985))
+* `azurerm_mssql_database` - will no longer send all long retention values in payload unless set ([#24124](https://github.com/hashicorp/terraform-provider-azurerm/issues/24124))
+* `azurerm_mssql_managed_database` - will no longer send all long retention values in payload unless set ([#24124](https://github.com/hashicorp/terraform-provider-azurerm/issues/24124))
+* `azurerm_mssql_server_microsoft_support_auditing_policy` - only include storage endpoint in payload if set ([#24122](https://github.com/hashicorp/terraform-provider-azurerm/issues/24122))
+* `azurerm_mobile_network_packet_core_control_plane` - prevent a panic if the HTTP Response is nil ([#24083](https://github.com/hashicorp/terraform-provider-azurerm/issues/24083))
+* `azurerm_storage_account` - revert plan time name validation `(#23799)` ([#24142](https://github.com/hashicorp/terraform-provider-azurerm/issues/24142))
+* `azurerm_web_application_firewall_policy` - split create and update function to fix lifecycle - ignore changes ([#23412](https://github.com/hashicorp/terraform-provider-azurerm/issues/23412))
+
 ## 3.83.0 (November 30, 2023)
 
 UPGRADE NOTES
@@ -128,6 +222,8 @@ BUG FIXES:
 * Data Source: `azurerm_data_protection_backup_vault` - removing `import` support, since Data Sources don't support being imported ([#23820](https://github.com/hashicorp/terraform-provider-azurerm/issues/23820))
 * Data Source: `azurerm_kusto_database` - removing `import` support, since Data Sources don't support being imported ([#23820](https://github.com/hashicorp/terraform-provider-azurerm/issues/23820))
 * Data Source: `azurerm_virtual_hub_route_table` - removing `import` support, since Data Sources don't support being imported ([#23820](https://github.com/hashicorp/terraform-provider-azurerm/issues/23820))
+* `azurerm_windows_web_app` - prevent a panic with the `auto_heal.actions` property ([#23836](https://github.com/hashicorp/terraform-provider-azurerm/issues/23836))
+* `azurerm_windows_web_app` - prevent a panic with the `auto_heal.triggers` property ([#23812](https://github.com/hashicorp/terraform-provider-azurerm/issues/23812))
 
 ## 3.79.0 (November 02, 2023)
 

go.mod

@@ -16,8 +16,8 @@ require (
 	github.com/golang-jwt/jwt/v4 v4.5.0
 	github.com/google/go-cmp v0.5.9
 	github.com/google/uuid v1.3.1
-	github.com/hashicorp/go-azure-helpers v0.64.0
-	github.com/hashicorp/go-azure-sdk v0.20231129.1103252
+	github.com/hashicorp/go-azure-helpers v0.65.0
+	github.com/hashicorp/go-azure-sdk v0.20231213.1160254
 	github.com/hashicorp/go-hclog v1.5.0
 	github.com/hashicorp/go-multierror v1.1.1
 	github.com/hashicorp/go-uuid v1.0.3

go.sum

@@ -111,10 +111,10 @@ github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brv
 github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
 github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/hashicorp/go-azure-helpers v0.12.0/go.mod h1:Zc3v4DNeX6PDdy7NljlYpnrdac1++qNW0I4U+ofGwpg=
-github.com/hashicorp/go-azure-helpers v0.64.0 h1:JNTt0F7tbApmpmF9hzNq2TN1lduOiXJFkMFoAPVctK8=
-github.com/hashicorp/go-azure-helpers v0.64.0/go.mod h1:ELmZ65vzHJNTk6ml4jsPD+xq2gZb7t78D35s+XN02Kk=
-github.com/hashicorp/go-azure-sdk v0.20231129.1103252 h1:H5SzxFYj++yIwN4o3WeEz0qMDFDOGeQt+H/j0yyhhz8=
-github.com/hashicorp/go-azure-sdk v0.20231129.1103252/go.mod h1:MfF4SCtGLaSP7OeJk+Y3xd4MQL5tFbz31c+ERP1S9D0=
+github.com/hashicorp/go-azure-helpers v0.65.0 h1:aOZV7HcxvqAlnaWJ/Fhfu321dXLs++TyBIVelWOb/8w=
+github.com/hashicorp/go-azure-helpers v0.65.0/go.mod h1:ELmZ65vzHJNTk6ml4jsPD+xq2gZb7t78D35s+XN02Kk=
+github.com/hashicorp/go-azure-sdk v0.20231213.1160254 h1:e7wZ3lvtnM6hSgIAIEm0jdKx68k3rke417aNFQq+C6I=
+github.com/hashicorp/go-azure-sdk v0.20231213.1160254/go.mod h1:69DSA+VMovHYJyQkRuUP3BCgwlEFrKvzeIHKi9m5xzY=
 github.com/hashicorp/go-checkpoint v0.5.0 h1:MFYpPZCnQqQTE18jFwSII6eUQrD/oxMFp3mlgcqk5mU=
 github.com/hashicorp/go-checkpoint v0.5.0/go.mod h1:7nfLNL10NsxqO4iWuW6tWW0HjZuDrwkBuEQsVcpCOgg=
 github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=

internal/clients/client.go

@@ -594,7 +594,11 @@ func (client *Client) Build(ctx context.Context, o *common.ClientOptions) error
 		return fmt.Errorf("building Storage for StorageMover: %+v", err)
 	}
 	client.StreamAnalytics = streamAnalytics.NewClient(o)
-	client.Subscription = subscription.NewClient(o)
+
+	if client.Subscription, err = subscription.NewClient(o); err != nil {
+		return fmt.Errorf("building clients for Subscription: %+v", err)
+	}
+
 	client.Synapse = synapse.NewClient(o)
 	if client.TrafficManager, err = trafficManager.NewClient(o); err != nil {
 		return fmt.Errorf("building clients for Traffic Manager: %+v", err)