Resolving merge after review

.github/labeler-pull-request-triage.yml

@@ -1,6 +1,287 @@
+# NOTE: this file is generated via 'make generate'
 dependencies:
   - go.mod
   - go.sum
   - vendor/**/*
 documentation:
   - website/**/*
+tooling:
+  - internal/tools/**/*
+service/aadb2c:
+  - internal/services/aadb2c/**/*
+
+service/advisor:
+  - internal/services/advisor/**/*
+
+service/analysis:
+  - internal/services/analysisservices/**/*
+
+service/api-management:
+  - internal/services/apimanagement/**/*
+
+service/app-configuration:
+  - internal/services/appconfiguration/**/*
+
+service/app-service:
+  - internal/services/appservice/**/*
+
+service/application-insights:
+  - internal/services/applicationinsights/**/*
+
+service/attestation:
+  - internal/services/attestation/**/*
+
+service/authorization:
+  - internal/services/authorization/**/*
+  - internal/services/msi/**/*
+
+service/automation:
+  - internal/services/automation/**/*
+
+service/azure-stack-hci:
+  - internal/services/azurestackhci/**/*
+
+service/batch:
+  - internal/services/batch/**/*
+
+service/billing:
+  - internal/services/billing/**/*
+
+service/blueprints:
+  - internal/services/blueprints/**/*
+
+service/bots:
+  - internal/services/bot/**/*
+
+service/cdn:
+  - internal/services/cdn/**/*
+
+service/cognitive-services:
+  - internal/services/cognitive/**/*
+
+service/communication:
+  - internal/services/communication/**/*
+
+service/consumption:
+  - internal/services/consumption/**/*
+
+service/cosmosdb:
+  - internal/services/cosmos/**/*
+
+service/cost-management:
+  - internal/services/costmanagement/**/*
+
+service/custom-resource-provider:
+  - internal/services/customproviders/**/*
+
+service/data-factory:
+  - internal/services/datafactory/**/*
+
+service/data-lake:
+  - internal/services/datalake/**/*
+
+service/data-protection:
+  - internal/services/dataprotection/**/*
+
+service/data-share:
+  - internal/services/datashare/**/*
+
+service/database-migration:
+  - internal/services/databasemigration/**/*
+
+service/databox-edge:
+  - internal/services/databoxedge/**/*
+
+service/databricks:
+  - internal/services/databricks/**/*
+
+service/devtestlabs:
+  - internal/services/devtestlabs/**/*
+
+service/digital-twins:
+  - internal/services/digitaltwins/**/*
+
+service/disks:
+  - internal/services/disks/**/*
+
+service/dns:
+  - internal/services/dns/**/*
+  - internal/services/privatedns/**/*
+
+service/domain-services:
+  - internal/services/domainservices/**/*
+
+service/elastic:
+  - internal/services/elastic/**/*
+
+service/event-grid:
+  - internal/services/eventgrid/**/*
+
+service/event-hubs:
+  - internal/services/eventhub/**/*
+
+service/firewall:
+  - internal/services/firewall/**/*
+
+service/frontdoor:
+  - internal/services/frontdoor/**/*
+
+service/hdinsight:
+  - internal/services/hdinsight/**/*
+
+service/healthcare:
+  - internal/services/healthcare/**/*
+
+service/hpc-cache:
+  - internal/services/hpccache/**/*
+
+service/hsm:
+  - internal/services/hsm/**/*
+
+service/iot-central:
+  - internal/services/iotcentral/**/*
+
+service/iot-hub:
+  - internal/services/iothub/**/*
+
+service/iot-time-series:
+  - internal/services/iottimeseriesinsights/**/*
+
+service/key-vault:
+  - internal/services/keyvault/**/*
+
+service/kusto:
+  - internal/services/kusto/**/*
+
+service/lighthouse:
+  - internal/services/lighthouse/**/*
+
+service/load-balancers:
+  - internal/services/loadbalancer/**/*
+
+service/load-test:
+  - internal/services/loadtest/**/*
+
+service/log-analytics:
+  - internal/services/loganalytics/**/*
+
+service/logic:
+  - internal/services/logic/**/*
+
+service/logz:
+  - internal/services/logz/**/*
+
+service/machine-learning:
+  - internal/services/machinelearning/**/*
+
+service/maintenance:
+  - internal/services/maintenance/**/*
+
+service/managed-apps:
+  - internal/services/managedapplications/**/*
+
+service/management-groups:
+  - internal/services/managementgroup/**/*
+
+service/maps:
+  - internal/services/maps/**/*
+
+service/maria-db:
+  - internal/services/mariadb/**/*
+
+service/media:
+  - internal/services/media/**/*
+
+service/mixed-reality:
+  - internal/services/mixedreality/**/*
+
+service/monitor:
+  - internal/services/monitor/**/*
+
+service/mssql:
+  - internal/services/mssql/**/*
+
+service/mysql:
+  - internal/services/mysql/**/*
+
+service/netapp:
+  - internal/services/netapp/**/*
+
+service/notifications:
+  - internal/services/notificationhub/**/*
+
+service/policy:
+  - internal/services/policy/**/*
+
+service/portal:
+  - internal/services/portal/**/*
+
+service/postgresql:
+  - internal/services/postgres/**/*
+
+service/power-bi:
+  - internal/services/powerbi/**/*
+
+service/purview:
+  - internal/services/purview/**/*
+
+service/recovery-services:
+  - internal/services/recoveryservices/**/*
+
+service/redis:
+  - internal/services/redis/**/*
+  - internal/services/redisenterprise/**/*
+
+service/relay:
+  - internal/services/relay/**/*
+
+service/search:
+  - internal/services/search/**/*
+
+service/security-center:
+  - internal/services/securitycenter/**/*
+
+service/sentinel:
+  - internal/services/sentinel/**/*
+
+service/service-bus:
+  - internal/services/servicebus/**/*
+
+service/service-fabric:
+  - internal/services/servicefabric/**/*
+
+service/service-fabric-managed-cluster:
+  - internal/services/servicefabricmanaged/**/*
+
+service/signalr:
+  - internal/services/signalr/**/*
+
+service/spring:
+  - internal/services/springcloud/**/*
+
+service/sql:
+  - internal/services/sql/**/*
+
+service/storage:
+  - internal/services/storage/**/*
+
+service/stream-analytics:
+  - internal/services/streamanalytics/**/*
+
+service/subscription:
+  - internal/services/subscription/**/*
+
+service/synapse:
+  - internal/services/synapse/**/*
+
+service/traffic-manager:
+  - internal/services/trafficmanager/**/*
+
+service/video-analyzer:
+  - internal/services/videoanalyzer/**/*
+
+service/virtual-desktops:
+  - internal/services/desktopvirtualization/**/*
+
+service/vmware:
+  - internal/services/vmware/**/*

.gitignore

@@ -24,6 +24,7 @@ website/node_modules
 .idea
 *.iml
 *.test
+.python-version
 .terraform.tfstate.lock.info
 .terraform.lock.hcl
 

.teamcity/components/build_azure.kt

@@ -25,5 +25,5 @@ fun ParametrizedWithType.ConfigureAzureSpecificTestParameters(environment: Strin
     hiddenVariable("env.ARM_TEST_LOCATION", locationsForEnv.primary, "The Primary region which should be used for testing")
     hiddenVariable("env.ARM_TEST_LOCATION_ALT", locationsForEnv.secondary, "The Primary region which should be used for testing")
     hiddenVariable("env.ARM_TEST_LOCATION_ALT2", locationsForEnv.ternary, "The Primary region which should be used for testing")
-    hiddenVariable("env.ARM_THREEPOINTZERO_BETA_RESOURCES", "true", "Opt into the use of 3.0 beta resources")
+    hiddenVariable("env.ARM_THREEPOINTZERO_BETA", "true", "Opt into the use of 3.0 beta resources")
 }

.teamcity/components/generated/services.kt

@@ -51,6 +51,7 @@ var services = mapOf(
         "iothub" to "IoT Hub",
         "keyvault" to "KeyVault",
         "kusto" to "Kusto",
+        "legacy" to "Legacy",
         "lighthouse" to "Lighthouse",
         "loadbalancer" to "Load Balancer",
         "loadtest" to "Load Test",

.teamcity/components/settings.kt

@@ -5,7 +5,7 @@ var defaultStartHour = 0
 var defaultParallelism = 20
 
 // specifies the default version of Terraform Core which should be used for testing
-var defaultTerraformCoreVersion = "1.0.3"
+var defaultTerraformCoreVersion = "1.1.5"
 
 // This represents a cron view of days of the week, Monday - Friday.
 const val defaultDaysOfWeek = "2,3,4,5,6"
@@ -14,8 +14,7 @@ const val defaultDaysOfWeek = "2,3,4,5,6"
 const val defaultDaysOfMonth = "*"
 
 var locations = mapOf(
-        "public" to LocationConfiguration("westeurope", "eastus2", "francecentral", false),
-        "germany" to LocationConfiguration("germanynortheast", "germanycentral", "", false)
+        "public" to LocationConfiguration("westeurope", "eastus2", "francecentral", false)
 )
 
 // specifies the list of Azure Environments where tests should be run nightly
@@ -40,6 +39,9 @@ var serviceTestConfigurationOverrides = mapOf(
         // Data Lake has a low quota
         "datalake" to testConfiguration(parallelism = 2),
 
+        // Elastic can't provision many in parallel
+        "elastic" to testConfiguration(parallelism = 1),
+
         // "hdinsight" is super expensive
         "hdinsight" to testConfiguration(daysOfWeek = "2,4,6"),
 

CHANGELOG-v2.md

@@ -3726,7 +3726,7 @@ BUG FIXES:
 
 NOTES:
 
-* **Major Version:** Version 2.0 of the Azure Provider is a major version - some deprecated fields/resources have been removed - please [refer to the 2.0 upgrade guide for more information](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/guides/2.0-upgrade-guide).
+* **Major Version:** Version 2.0 of the Azure Provider is a major version - some deprecated fields/resources have been removed - please [refer to the 2.0 upgrade guide for more information](https://registry.terraform.io/providers/hashicorp/azurerm/2.97.0/docs/guides/2.0-upgrade-guide).
 * **Provider Block:** The Azure Provider now requires that a `features` block is specified within the Provider block, which can be used to alter the behaviour of certain resources - [more information on the `features` block can be found in the documentation](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs#features).
 * **Terraform 0.10/0.11:** Version 2.0 of the Azure Provider no longer supports Terraform 0.10 or 0.11 - you must upgrade to Terraform 0.12 to use version 2.0 of the Azure Provider.