Merge branch 'main' into pandora-signalr-regen

.github/workflows/link-milestone.yaml

@@ -0,0 +1,29 @@
+---
+name: Link Milestone
+on:
+  pull_request:
+    branches: [main]
+    types: ['closed']
+
+jobs:
+  link-milestone:
+    if: github.event.pull_request.merged == true
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: true
+    permissions:
+      contents: read
+      pull-requests: write
+      issues: write
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-go@v2
+        with:
+          go-version: '1.16.7'
+      - run: |
+          go install github.com/stephybun/link-milestone@latest
+          link-milestone
+        env:
+          PR_NUMBER: ${{ github.event.number }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_REPO: ${{ github.repository }}

CHANGELOG.md

@@ -1,19 +1,36 @@
-## 2.85.0 (Unreleased)
+## 2.85.0 (November 12, 2021)
 
 FEATURES:
 
+* **New Data Source:** `azurerm_batch_application` ([#14043](https://github.com/hashicorp/terraform-provider-azurerm/issues/14043))
+* **New Resource:** `azurerm_monitor_private_link_scope` ([#14098](https://github.com/hashicorp/terraform-provider-azurerm/issues/14098))
+* **New Resource:** `azurerm_mysql_flexible_server_firewall_rule` ([#14136](https://github.com/hashicorp/terraform-provider-azurerm/issues/14136))
+* **New Resource:** `azurerm_synapse_workspace_aad_admin` ([#13600](https://github.com/hashicorp/terraform-provider-azurerm/issues/13600))
+
 IMPROVEMENTS:
 
-* dependencies: upgrading to `v0.17.0` of `github.com/hashicorp/go-azure-helpers` [GH-14060]
-* dependencies: upgrading to `v2.8.0` of `github.com/hashicorp/terraform-plugin-sdk` [GH-14060]
-* `azurerm_application_insights` - support for the `internet_ingestion_enabled` and `internet_query_enabled` properties [GH-14035]
-* `azurerm_security_center_subscription_pricing` - `resource_type` can now be set to `OpenSourceRelationalDatabases` [GH-14103]
+* dependencies: upgrading to `v0.17.1` of `github.com/hashicorp/go-azure-helpers` ([#14141](https://github.com/hashicorp/terraform-provider-azurerm/issues/14141))
+* dependencies: upgrading to `v2.8.0` of `github.com/hashicorp/terraform-plugin-sdk` ([#14060](https://github.com/hashicorp/terraform-provider-azurerm/issues/14060))
+* `azurerm_application_insights` - support for the `internet_ingestion_enabled` and `internet_query_enabled` properties ([#14035](https://github.com/hashicorp/terraform-provider-azurerm/issues/14035))
+* `azurerm_backup_protected_vm` - support for the `exclude_disk_luns` and `include_disk_luns` properties ([#14097](https://github.com/hashicorp/terraform-provider-azurerm/issues/14097))
+* `azurerm_managed_disk_resource` - support for the `disk_iops_read_only` and `disk_mbps_read_only` properties ([#14025](https://github.com/hashicorp/terraform-provider-azurerm/issues/14025))
+* `azurerm_security_center_subscription_pricing` - `resource_type` can now be set to `OpenSourceRelationalDatabases` ([#14103](https://github.com/hashicorp/terraform-provider-azurerm/issues/14103))
+* `azurerm_storage_encryption_scope` - allow versionless `key_vault_key_id` ([#14085](https://github.com/hashicorp/terraform-provider-azurerm/issues/14085))
+* `azurerm_sql_managed_instance` - support for the `identity` block ([#14052](https://github.com/hashicorp/terraform-provider-azurerm/issues/14052))
+* `azurerm_virtual_network_gateway` - enable configuration of an active-active zone redundant gateway with P2S ([#14124](https://github.com/hashicorp/terraform-provider-azurerm/issues/14124))
 
 BUG FIXES:
 
-* `azurerm_api_management_certificate` - set `subject` property from correct field [GH-14026]
-* `azurerm_app_service_virtual_network_swift_connection` - fixing a panic when checking for an existing resource during creation [GH-14070]
-* `azurerm_storage_blob` - ensuring that `cache_control` is sent during updates [GH-14100]
+* Data Source: `azurerm_redis_cache` - parsing the `subnet_id` response value case-insensitively ([#14108](https://github.com/hashicorp/terraform-provider-azurerm/issues/14108))
+* Data Source: `azurerm_redis_cache` - ensuring that `shard_count` always has a value set ([#14108](https://github.com/hashicorp/terraform-provider-azurerm/issues/14108))
+* Data Source: `azurerm_consumption_budget_resource_group` - add missing `threshold_type` property in the schema ([#14125](https://github.com/hashicorp/terraform-provider-azurerm/issues/14125))
+* Data Source: `azurerm_consumption_budget_subscription` - add missing `threshold_type` property in the schema ([#14125](https://github.com/hashicorp/terraform-provider-azurerm/issues/14125))
+* `azurerm_api_management_certificate` - set `subject` property from correct field ([#14026](https://github.com/hashicorp/terraform-provider-azurerm/issues/14026))
+* `azurerm_app_service_virtual_network_swift_connection` - fixing a panic when checking for an existing resource during creation ([#14070](https://github.com/hashicorp/terraform-provider-azurerm/issues/14070))
+* `azurerm_frontdoor_resource` - route engines are no longer removed on update ([#14093](https://github.com/hashicorp/terraform-provider-azurerm/issues/14093))
+* `azurerm_redis_cache` - parsing the `subnet_id` response value case-insensitively ([#14108](https://github.com/hashicorp/terraform-provider-azurerm/issues/14108))
+* `azurerm_redis_cache` - ensuring that `shard_count` always has a value set ([#14108](https://github.com/hashicorp/terraform-provider-azurerm/issues/14108))
+* `azurerm_storage_blob` - ensuring that `cache_control` is sent during updates ([#14100](https://github.com/hashicorp/terraform-provider-azurerm/issues/14100))
 
 ## 2.84.0 (November 05, 2021)
 

go.mod

@@ -19,7 +19,7 @@ require (
 	github.com/google/go-cmp v0.5.6
 	github.com/google/uuid v1.1.2
 	github.com/hashicorp/errwrap v1.1.0 // indirect
-	github.com/hashicorp/go-azure-helpers v0.17.0
+	github.com/hashicorp/go-azure-helpers v0.17.1
 	github.com/hashicorp/go-getter v1.5.4
 	github.com/hashicorp/go-hclog v0.16.1 // indirect
 	github.com/hashicorp/go-multierror v1.1.1

go.sum

@@ -249,8 +249,8 @@ 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.17.0 h1:HQF6kVNzofmwOhbRK/h/RWEVl/zu6kjB6mjoIxFL0A0=
-github.com/hashicorp/go-azure-helpers v0.17.0/go.mod h1:L4ny2lW2muOESZR1XjbM59c3Pq+7SA9Yt1Nry5UfKZc=
+github.com/hashicorp/go-azure-helpers v0.17.1 h1:qkvhSgyPzK3UwWQDocGLFmZ9iRjTj1Dv4CzeyhwfoIs=
+github.com/hashicorp/go-azure-helpers v0.17.1/go.mod h1:L4ny2lW2muOESZR1XjbM59c3Pq+7SA9Yt1Nry5UfKZc=
 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/acceptance/testcase.go

@@ -132,7 +132,7 @@ func (td TestData) providers() map[string]func() (*schema.Provider, error) {
 func (td TestData) externalProviders() map[string]resource.ExternalProvider {
 	return map[string]resource.ExternalProvider{
 		"azuread": {
-			VersionConstraint: "=1.5.1",
+			VersionConstraint: "=2.8.0",
 			Source:            "registry.terraform.io/hashicorp/azuread",
 		},
 	}

internal/services/apimanagement/api_management_identity_provider_aadb2c_resource_test.go

@@ -129,22 +129,25 @@ resource "azurerm_api_management" "test" {
 }
 
 resource "azuread_application" "test" {
-  name                       = "acctestAM-%[5]d"
-  oauth2_allow_implicit_flow = true
-  reply_urls                 = [azurerm_api_management.test.developer_portal_url]
+  display_name = "acctestAM-%[5]d"
+  web {
+    redirect_uris = [azurerm_api_management.test.developer_portal_url]
+
+    implicit_grant {
+      access_token_issuance_enabled = true
+    }
+  }
 }
 
 resource "azuread_application_password" "test" {
   application_object_id = azuread_application.test.object_id
-  end_date_relative     = "36h"
-  value                 = "P@55w0rD!%[7]s"
 }
 
 resource "azurerm_api_management_identity_provider_aadb2c" "test" {
   resource_group_name    = azurerm_resource_group.test.name
   api_management_name    = azurerm_api_management.test.name
   client_id              = azuread_application.test.application_id
-  client_secret          = "P@55w0rD!%[7]s"
+  client_secret          = azuread_application_password.test.value
   allowed_tenant         = "%[4]s.onmicrosoft.com"
   signin_tenant          = "%[4]s.onmicrosoft.com"
   authority              = "%[4]s.b2clogin.com"
@@ -155,7 +158,7 @@ resource "azurerm_api_management_identity_provider_aadb2c" "test" {
 
   depends_on = [azuread_application_password.test]
 }
-`, b2cConfig["tenant_id"], b2cConfig["client_id"], b2cConfig["client_secret"], b2cConfig["tenant_slug"], data.RandomInteger, data.Locations.Primary, data.RandomString)
+`, b2cConfig["tenant_id"], b2cConfig["client_id"], b2cConfig["client_secret"], b2cConfig["tenant_slug"], data.RandomInteger, data.Locations.Primary)
 }
 
 func (r ApiManagementIdentityProviderAADB2CResource) requiresImport(data acceptance.TestData, b2cConfig map[string]string) string {

internal/services/appconfiguration/app_configuration_resource.go

@@ -274,8 +274,8 @@ func resourceAppConfigurationRead(d *pluginsdk.ResourceData, meta interface{}) e
 		return fmt.Errorf("retrieving access keys for %s: %+v", *id, err)
 	}
 
-	d.Set("name", id.Name)
-	d.Set("resource_group_name", id.ResourceGroup)
+	d.Set("name", id.ConfigStoreName)
+	d.Set("resource_group_name", id.ResourceGroupName)
 
 	if model := resp.Model; model != nil {
 		d.Set("location", location.Normalize(model.Location))

internal/services/appconfiguration/app_configuration_resource_test.go

@@ -167,7 +167,7 @@ func (t AppConfigurationResource) Exists(ctx context.Context, clients *clients.C
 
 	resp, err := clients.AppConfiguration.ConfigurationStoresClient.Get(ctx, *id)
 	if err != nil {
-		return nil, fmt.Errorf("retrieving App Configuration %q (resource group: %q): %+v", id.Name, id.ResourceGroup, err)
+		return nil, fmt.Errorf("retrieving %s: %+v", *id, err)
 	}
 
 	return utils.Bool(resp.Model != nil), nil

internal/services/appconfiguration/sdk/2020-06-01/configurationstores/constants.go

@@ -1,12 +1,37 @@
 package configurationstores
 
+import "strings"
+
 type ActionsRequired string
 
 const (
 	ActionsRequiredNone     ActionsRequired = "None"
 	ActionsRequiredRecreate ActionsRequired = "Recreate"
 )
 
+func PossibleValuesForActionsRequired() []string {
+	return []string{
+		"None",
+		"Recreate",
+	}
+}
+
+func parseActionsRequired(input string) (*ActionsRequired, error) {
+	vals := map[string]ActionsRequired{
+		"none":     "None",
+		"recreate": "Recreate",
+	}
+	if v, ok := vals[strings.ToLower(input)]; ok {
+		return &v, nil
+	}
+
+	// it could be a new value - best effort convert this
+	v := input
+
+	out := ActionsRequired(v)
+	return &out, nil
+}
+
 type ConnectionStatus string
 
 const (
@@ -16,6 +41,33 @@ const (
 	ConnectionStatusRejected     ConnectionStatus = "Rejected"
 )
 
+func PossibleValuesForConnectionStatus() []string {
+	return []string{
+		"Approved",
+		"Disconnected",
+		"Pending",
+		"Rejected",
+	}
+}
+
+func parseConnectionStatus(input string) (*ConnectionStatus, error) {
+	vals := map[string]ConnectionStatus{
+		"approved":     "Approved",
+		"disconnected": "Disconnected",
+		"pending":      "Pending",
+		"rejected":     "Rejected",
+	}
+	if v, ok := vals[strings.ToLower(input)]; ok {
+		return &v, nil
+	}
+
+	// it could be a new value - best effort convert this
+	v := input
+
+	out := ConnectionStatus(v)
+	return &out, nil
+}
+
 type ProvisioningState string
 
 const (
@@ -27,9 +79,63 @@ const (
 	ProvisioningStateUpdating  ProvisioningState = "Updating"
 )
 
+func PossibleValuesForProvisioningState() []string {
+	return []string{
+		"Canceled",
+		"Creating",
+		"Deleting",
+		"Failed",
+		"Succeeded",
+		"Updating",
+	}
+}
+
+func parseProvisioningState(input string) (*ProvisioningState, error) {
+	vals := map[string]ProvisioningState{
+		"canceled":  "Canceled",
+		"creating":  "Creating",
+		"deleting":  "Deleting",
+		"failed":    "Failed",
+		"succeeded": "Succeeded",
+		"updating":  "Updating",
+	}
+	if v, ok := vals[strings.ToLower(input)]; ok {
+		return &v, nil
+	}
+
+	// it could be a new value - best effort convert this
+	v := input
+
+	out := ProvisioningState(v)
+	return &out, nil
+}
+
 type PublicNetworkAccess string
 
 const (
 	PublicNetworkAccessDisabled PublicNetworkAccess = "Disabled"
 	PublicNetworkAccessEnabled  PublicNetworkAccess = "Enabled"
 )
+
+func PossibleValuesForPublicNetworkAccess() []string {
+	return []string{
+		"Disabled",
+		"Enabled",
+	}
+}
+
+func parsePublicNetworkAccess(input string) (*PublicNetworkAccess, error) {
+	vals := map[string]PublicNetworkAccess{
+		"disabled": "Disabled",
+		"enabled":  "Enabled",
+	}
+	if v, ok := vals[strings.ToLower(input)]; ok {
+		return &v, nil
+	}
+
+	// it could be a new value - best effort convert this
+	v := input
+
+	out := PublicNetworkAccess(v)
+	return &out, nil
+}