Skip to content

Commit

Permalink
Upgrade terraform-provider-azurerm to v3.68.0 (#1325)
Browse files Browse the repository at this point in the history 
* make tfgen

* make build_sdks
  • Loading branch information
@iwahbe
iwahbe authored Aug 7, 2023
1 parent 80c97d9 commit b2bebb9
Show file tree
Hide file tree
Showing 213 changed files with 17,208 additions and 1,114 deletions.
4 changes: 2 additions & 2 deletions patches/0001-Client-options.patch
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 74447506fa19a63d85ef4cbdb42641031d8a2a62 Mon Sep 17 00:00:00 2001
From 86dffa760caf22f51898d62cea9e1d2438866da4 Mon Sep 17 00:00:00 2001
From: aq17 <[email protected]>
Date: Thu, 25 May 2023 10:33:38 -0700
Subject: [PATCH 1/8] Client-options
Expand Down Expand Up @@ -50,5 +50,5 @@ index 6eba6eeaed..56ccbd5f87 100644

if partnerID != "" {
--
2.39.1
2.41.0

4 changes: 2 additions & 2 deletions patches/0002-Shared-features.patch
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 315b2dd527bb89a53e5e90f5774d29fdf839fa74 Mon Sep 17 00:00:00 2001
From 0745908fec984437e0cf7852d4d1de665f67e173 Mon Sep 17 00:00:00 2001
From: aq17 <[email protected]>
Date: Thu, 25 May 2023 10:33:38 -0700
Subject: [PATCH 2/8] Shared-features
Expand Down Expand Up @@ -36,5 +36,5 @@ index bdb0cbfe3a..c4122bf0bc 100644
MinItems: 1,
Elem: &pluginsdk.Resource{
--
2.39.1
2.41.0

4 changes: 2 additions & 2 deletions patches/0003-Add-new-resources.patch
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 5a1ba490b3dc3e36d69ddba9d2b2eb9bf8d16fa6 Mon Sep 17 00:00:00 2001
From 69441c2f48c60a0c92ff03e91415f04a1753f0ae Mon Sep 17 00:00:00 2001
From: aq17 <[email protected]>
Date: Thu, 25 May 2023 10:33:38 -0700
Subject: [PATCH 3/8] Add-new-resources
Expand Down Expand Up @@ -4842,5 +4842,5 @@ index 0000000000..ad87350b81
+ }
+}
--
2.39.1
2.41.0

4 changes: 2 additions & 2 deletions patches/0004-fixup-Shared-features.patch
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From d577dead6e6fe220efbff57fa68b935aa77f5fab Mon Sep 17 00:00:00 2001
From f5f613cf921bc36573302a63fd723ac22be690de Mon Sep 17 00:00:00 2001
From: aq17 <[email protected]>
Date: Thu, 25 May 2023 10:33:38 -0700
Subject: [PATCH 4/8] fixup-Shared-features
Expand All @@ -22,5 +22,5 @@ index 926f57f880..815f6e3006 100644
+ return strings.EqualFold(old, new)
+}
--
2.39.1
2.41.0

52 changes: 26 additions & 26 deletions patches/0005-Modify-resources.patch
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 4a00274a37ca71cd78413d5e0b2f629d822b8d9a Mon Sep 17 00:00:00 2001
From 3ad036935d30dcf7e4110c33da435d5d1e0ea2df Mon Sep 17 00:00:00 2001
From: aq17 <[email protected]>
Date: Thu, 25 May 2023 10:33:38 -0700
Subject: [PATCH 5/8] Modify-resources
Expand Down Expand Up @@ -1351,7 +1351,7 @@ index 2766565528..b7af892e01 100644
},
"hours": {
diff --git a/internal/services/mssql/mssql_database_resource.go b/internal/services/mssql/mssql_database_resource.go
index 7eb503d1bb..88c3ea1100 100644
index 71201df465..f43ad74e76 100644
--- a/internal/services/mssql/mssql_database_resource.go
+++ b/internal/services/mssql/mssql_database_resource.go
@@ -6,6 +6,7 @@ package mssql
Expand All @@ -1362,7 +1362,7 @@ index 7eb503d1bb..88c3ea1100 100644
"log"
"strings"
"time"
@@ -1018,7 +1019,8 @@ func resourceMsSqlDatabaseSchema() map[string]*pluginsdk.Schema {
@@ -1017,7 +1018,8 @@ func resourceMsSqlDatabaseSchema() map[string]*pluginsdk.Schema {
"Sql_Injection",
"Sql_Injection_Vulnerability",
"Access_Anomaly",
Expand All @@ -1372,7 +1372,7 @@ index 7eb503d1bb..88c3ea1100 100644
},
},

@@ -1029,7 +1031,7 @@ func resourceMsSqlDatabaseSchema() map[string]*pluginsdk.Schema {
@@ -1028,7 +1030,7 @@ func resourceMsSqlDatabaseSchema() map[string]*pluginsdk.Schema {
ValidateFunc: validation.StringInSlice([]string{
"Disabled",
"Enabled",
Expand All @@ -1381,7 +1381,7 @@ index 7eb503d1bb..88c3ea1100 100644
},

"email_addresses": {
@@ -1055,7 +1057,7 @@ func resourceMsSqlDatabaseSchema() map[string]*pluginsdk.Schema {
@@ -1054,7 +1056,7 @@ func resourceMsSqlDatabaseSchema() map[string]*pluginsdk.Schema {
string(sql.SecurityAlertPolicyStateDisabled),
string(sql.SecurityAlertPolicyStateEnabled),
string(sql.SecurityAlertPolicyStateNew),
Expand Down Expand Up @@ -1457,7 +1457,7 @@ index d8d893c2da..75c103e7e5 100644

"storage_account_access_key": {
diff --git a/internal/services/mysql/mysql_server_resource.go b/internal/services/mysql/mysql_server_resource.go
index 75cf70a553..3cad4ce28d 100644
index c40494cc94..875a752374 100644
--- a/internal/services/mysql/mysql_server_resource.go
+++ b/internal/services/mysql/mysql_server_resource.go
@@ -6,6 +6,8 @@ package mysql
Expand All @@ -1469,10 +1469,10 @@ index 75cf70a553..3cad4ce28d 100644
"log"
"strconv"
"strings"
@@ -306,8 +308,9 @@ func resourceMySqlServer() *pluginsdk.Resource {
@@ -307,8 +309,9 @@ func resourceMySqlServer() *pluginsdk.Resource {
ValidateFunc: validation.StringInSlice([]string{
string(mysql.FiveFullStopSeven),
string(mysql.EightFullStopZero),
string(servers.ServerVersionFivePointSeven),
string(servers.ServerVersionEightPointZero),
- }, false),
- ForceNew: true,
+ }, features.CaseInsensitive()),
Expand All @@ -1482,7 +1482,7 @@ index 75cf70a553..3cad4ce28d 100644
},

diff --git a/internal/services/network/application_gateway_resource.go b/internal/services/network/application_gateway_resource.go
index 4fd1bacd9b..3cc8186a0b 100644
index 97a1cdb274..6d022c6b2e 100644
--- a/internal/services/network/application_gateway_resource.go
+++ b/internal/services/network/application_gateway_resource.go
@@ -7,6 +7,8 @@ import (
Expand All @@ -1494,7 +1494,7 @@ index 4fd1bacd9b..3cc8186a0b 100644
"log"
"strings"
"time"
@@ -211,7 +213,7 @@ func resourceApplicationGateway() *pluginsdk.Resource {
@@ -212,7 +214,7 @@ func resourceApplicationGateway() *pluginsdk.Resource {
ValidateFunc: validation.StringInSlice([]string{
string(network.ProtocolHTTP),
string(network.ProtocolHTTPS),
Expand All @@ -1503,7 +1503,7 @@ index 4fd1bacd9b..3cc8186a0b 100644
},

"cookie_based_affinity": {
@@ -220,7 +222,7 @@ func resourceApplicationGateway() *pluginsdk.Resource {
@@ -221,7 +223,7 @@ func resourceApplicationGateway() *pluginsdk.Resource {
ValidateFunc: validation.StringInSlice([]string{
string(network.ApplicationGatewayCookieBasedAffinityEnabled),
string(network.ApplicationGatewayCookieBasedAffinityDisabled),
Expand All @@ -1512,7 +1512,7 @@ index 4fd1bacd9b..3cc8186a0b 100644
},

"affinity_cookie_name": {
@@ -347,7 +349,7 @@ func resourceApplicationGateway() *pluginsdk.Resource {
@@ -348,7 +350,7 @@ func resourceApplicationGateway() *pluginsdk.Resource {
ValidateFunc: validation.StringInSlice([]string{
string(network.IPAllocationMethodDynamic),
string(network.IPAllocationMethodStatic),
Expand All @@ -1521,7 +1521,7 @@ index 4fd1bacd9b..3cc8186a0b 100644
},

"private_link_configuration_name": {
@@ -462,7 +464,7 @@ func resourceApplicationGateway() *pluginsdk.Resource {
@@ -463,7 +465,7 @@ func resourceApplicationGateway() *pluginsdk.Resource {
ValidateFunc: validation.StringInSlice([]string{
string(network.ProtocolHTTP),
string(network.ProtocolHTTPS),
Expand All @@ -1530,7 +1530,7 @@ index 4fd1bacd9b..3cc8186a0b 100644
},

"host_name": {
@@ -617,7 +619,8 @@ func resourceApplicationGateway() *pluginsdk.Resource {
@@ -618,7 +620,8 @@ func resourceApplicationGateway() *pluginsdk.Resource {
ValidateFunc: validation.StringInSlice([]string{
string(network.IPAllocationMethodDynamic),
string(network.IPAllocationMethodStatic),
Expand All @@ -1540,7 +1540,7 @@ index 4fd1bacd9b..3cc8186a0b 100644
},

"primary": {
@@ -825,7 +828,7 @@ func resourceApplicationGateway() *pluginsdk.Resource {
@@ -826,7 +829,7 @@ func resourceApplicationGateway() *pluginsdk.Resource {
string(network.ApplicationGatewaySkuNameWAFLarge),
string(network.ApplicationGatewaySkuNameWAFMedium),
string(network.ApplicationGatewaySkuNameWAFV2),
Expand All @@ -1549,7 +1549,7 @@ index 4fd1bacd9b..3cc8186a0b 100644
},

"tier": {
@@ -836,7 +839,7 @@ func resourceApplicationGateway() *pluginsdk.Resource {
@@ -837,7 +840,7 @@ func resourceApplicationGateway() *pluginsdk.Resource {
string(network.ApplicationGatewayTierStandardV2),
string(network.ApplicationGatewayTierWAF),
string(network.ApplicationGatewayTierWAFV2),
Expand All @@ -1558,7 +1558,7 @@ index 4fd1bacd9b..3cc8186a0b 100644
},

"capacity": {
@@ -937,7 +940,7 @@ func resourceApplicationGateway() *pluginsdk.Resource {
@@ -938,7 +941,7 @@ func resourceApplicationGateway() *pluginsdk.Resource {
ValidateFunc: validation.StringInSlice([]string{
string(network.ProtocolHTTP),
string(network.ProtocolHTTPS),
Expand All @@ -1567,7 +1567,7 @@ index 4fd1bacd9b..3cc8186a0b 100644
},

"path": {
@@ -1406,7 +1409,7 @@ func resourceApplicationGateway() *pluginsdk.Resource {
@@ -1407,7 +1410,7 @@ func resourceApplicationGateway() *pluginsdk.Resource {
ValidateFunc: validation.StringInSlice([]string{
string(network.ApplicationGatewayFirewallModeDetection),
string(network.ApplicationGatewayFirewallModePrevention),
Expand Down Expand Up @@ -1657,11 +1657,11 @@ index 668ca0a8d1..a5531c00ba 100644
},
},
diff --git a/internal/services/network/network_security_rule_resource.go b/internal/services/network/network_security_rule_resource.go
index 1ecf3430c2..ae19f4077e 100644
index 524468a0d8..78a286fbfd 100644
--- a/internal/services/network/network_security_rule_resource.go
+++ b/internal/services/network/network_security_rule_resource.go
@@ -14,7 +14,9 @@ import (
"github.com/hashicorp/go-azure-sdk/resource-manager/network/2022-09-01/securityrules"
"github.com/hashicorp/go-azure-sdk/resource-manager/network/2023-04-01/securityrules"
"github.com/hashicorp/terraform-provider-azurerm/helpers/tf"
"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
+ "github.com/hashicorp/terraform-provider-azurerm/internal/features"
Expand Down Expand Up @@ -1719,7 +1719,7 @@ index 1ecf3430c2..ae19f4077e 100644
},
}
diff --git a/internal/services/network/public_ip_prefix_resource.go b/internal/services/network/public_ip_prefix_resource.go
index 5833533ef8..25efa46806 100644
index f0f001ff61..d909b00794 100644
--- a/internal/services/network/public_ip_prefix_resource.go
+++ b/internal/services/network/public_ip_prefix_resource.go
@@ -5,6 +5,8 @@ package network
Expand Down Expand Up @@ -1796,7 +1796,7 @@ index fa1c7c8eb9..8b150ba955 100644

"sku_tier": {
diff --git a/internal/services/network/route_resource.go b/internal/services/network/route_resource.go
index f437708ac7..bcfe6318a3 100644
index f4a0909bd2..603b568b09 100644
--- a/internal/services/network/route_resource.go
+++ b/internal/services/network/route_resource.go
@@ -5,6 +5,8 @@ package network
Expand All @@ -1819,7 +1819,7 @@ index f437708ac7..bcfe6318a3 100644

"next_hop_in_ip_address": {
diff --git a/internal/services/network/route_table_resource.go b/internal/services/network/route_table_resource.go
index fcd9320b57..1f32f4ad60 100644
index c18857418f..45997207b9 100644
--- a/internal/services/network/route_table_resource.go
+++ b/internal/services/network/route_table_resource.go
@@ -5,6 +5,8 @@ package network
Expand Down Expand Up @@ -1959,7 +1959,7 @@ index 3856d6e759..dff2cd3a9d 100644
},
},
diff --git a/internal/services/network/virtual_network_resource_test.go b/internal/services/network/virtual_network_resource_test.go
index 6ced40cf07..74d9bcac62 100644
index f8d5af6645..ba3f7d1106 100644
--- a/internal/services/network/virtual_network_resource_test.go
+++ b/internal/services/network/virtual_network_resource_test.go
@@ -333,6 +333,52 @@ resource "azurerm_virtual_network" "test" {
Expand Down Expand Up @@ -2941,5 +2941,5 @@ index da8c25a5b0..fa2bfff38e 100644
}

--
2.39.1
2.41.0

4 changes: 2 additions & 2 deletions patches/0006-Add-privatedns-parse.patch
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From df7f75abae34147bed3cae8601f17958be5ae5fa Mon Sep 17 00:00:00 2001
From 248ca568a264a6fff255539431250592bf682b46 Mon Sep 17 00:00:00 2001
From: aq17 <[email protected]>
Date: Thu, 25 May 2023 10:33:39 -0700
Subject: [PATCH 6/8] Add-privatedns-parse
Expand Down Expand Up @@ -1956,5 +1956,5 @@ index 0000000000..1f45b56b1b
+ }
+}
--
2.39.1
2.41.0

10 changes: 5 additions & 5 deletions patches/0007-Update-documentation.patch
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 748d3c0d7965c6e4df90519dca61906f9ce74f60 Mon Sep 17 00:00:00 2001
From 4c09b9fcf5e7acf770e58897910810f52840417c Mon Sep 17 00:00:00 2001
From: aq17 <[email protected]>
Date: Thu, 25 May 2023 10:33:39 -0700
Subject: [PATCH 7/8] Update-documentation
Expand Down Expand Up @@ -1951,7 +1951,7 @@ index d97d53b42d..d04a166153 100644

```hcl
diff --git a/website/docs/r/kubernetes_cluster.html.markdown b/website/docs/r/kubernetes_cluster.html.markdown
index dae708263e..56bdec4541 100644
index f9cebfec3a..87b36c3b4a 100644
--- a/website/docs/r/kubernetes_cluster.html.markdown
+++ b/website/docs/r/kubernetes_cluster.html.markdown
@@ -10,15 +10,9 @@ description: |-
Expand Down Expand Up @@ -1987,7 +1987,7 @@ index dae708263e..56bdec4541 100644
-~> At this time there's a bug in the AKS API where Tags for a Node Pool are not stored in the correct case - you [may wish to use Terraform's `ignore_changes` functionality to ignore changes to the casing](https://www.terraform.io/language/meta-arguments/lifecycle#ignore_changess) until this is fixed in the AKS API.
+~> At this time there's a bug in the AKS API where Tags for a Node Pool are not stored in the correct case - you may wish to use `ignore_changes` functionality to ignore changes to the casing until this is fixed in the AKS API.

* `ultra_ssd_enabled` - (Optional) Used to specify whether the UltraSSD is enabled in the Default Node Pool. Defaults to `false`. See [the documentation](https://docs.microsoft.com/azure/aks/use-ultra-disks) for more information. Changing this forces a new resource to be created.
* `ultra_ssd_enabled` - (Optional) Used to specify whether the UltraSSD is enabled in the Default Node Pool. Defaults to `false`. See [the documentation](https://docs.microsoft.com/azure/aks/use-ultra-disks) for more information. `temporary_name_for_rotation` must be specified when attempting a change.

@@ -470,7 +464,7 @@ If `enable_auto_scaling` is set to `true`, then the following fields can also be

Expand Down Expand Up @@ -3164,7 +3164,7 @@ index 2f1b6e07da..fb1f7f91b7 100644
---

diff --git a/website/docs/r/virtual_network.html.markdown b/website/docs/r/virtual_network.html.markdown
index 876cf68385..623813b4e8 100644
index b81413d6cd..f478a20c63 100644
--- a/website/docs/r/virtual_network.html.markdown
+++ b/website/docs/r/virtual_network.html.markdown
@@ -11,10 +11,10 @@ description: |-
Expand Down Expand Up @@ -3264,5 +3264,5 @@ index e94d26bbb6..3b17a31535 100644

A `gallery_application` block supports the following:
--
2.39.1
2.41.0

4 changes: 2 additions & 2 deletions patches/0008-expose-provider.patch
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From dac2d5b5d06b83b9c29837a33935f93be1e3a89b Mon Sep 17 00:00:00 2001
From 8dd5cfbd098292e7a1aa5517faa23523de8a4633 Mon Sep 17 00:00:00 2001
From: aq17 <[email protected]>
Date: Thu, 25 May 2023 10:33:39 -0700
Subject: [PATCH 8/8] expose-provider
Expand All @@ -25,5 +25,5 @@ index 0000000000..cd6b26156c
+ return provider.AzureProvider()
+}
--
2.39.1
2.41.0

Loading

0 comments on commit b2bebb9

Please sign in to comment.