Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade terraform-provider-azurerm to v4.14.0 #2806

Merged
merged 2 commits into from
Dec 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ index 957314cfe5..9a5f9adac7 100644
~> **NOTE:** Source Control Tokens are configured at the subscription level, not on each App Service - as such this can only be configured Subscription-wide

diff --git a/website/docs/r/function_app.html.markdown b/website/docs/r/function_app.html.markdown
index e52e87003b..d4c341247a 100644
index f3d01cdd15..ee0131e664 100644
--- a/website/docs/r/function_app.html.markdown
+++ b/website/docs/r/function_app.html.markdown
@@ -11,7 +11,7 @@ description: |-
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ index 3c4cde6ea2..433b20b500 100644
},

diff --git a/internal/services/compute/windows_virtual_machine_resource.go b/internal/services/compute/windows_virtual_machine_resource.go
index 0226497579..94cf07503c 100644
index ff56d4122e..99e677060b 100644
--- a/internal/services/compute/windows_virtual_machine_resource.go
+++ b/internal/services/compute/windows_virtual_machine_resource.go
@@ -386,7 +386,6 @@ func resourceWindowsVirtualMachine() *pluginsdk.Resource {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Subject: [PATCH] Remove function_app_schema use_dotnet_isolated_runtime


diff --git a/internal/services/appservice/helpers/function_app_schema.go b/internal/services/appservice/helpers/function_app_schema.go
index d0380954e9..fb9daddb26 100644
index d427fb0398..85361052e4 100644
--- a/internal/services/appservice/helpers/function_app_schema.go
+++ b/internal/services/appservice/helpers/function_app_schema.go
@@ -1085,10 +1085,11 @@ func linuxFunctionAppStackSchema() *pluginsdk.Schema {
Expand Down
8 changes: 4 additions & 4 deletions patches/0013-Update-documentation.patch
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ index f997403600..b10ea52bc4 100644
* `bearer_token_sending_methods` - (Optional) How to send token to the server. A list of zero or more methods. Valid values are `authorizationHeader` and `query`.

diff --git a/website/docs/r/api_management_api_diagnostic.html.markdown b/website/docs/r/api_management_api_diagnostic.html.markdown
index e4924a5439..ea46c447fa 100644
index 5c171b3703..9c893da103 100644
--- a/website/docs/r/api_management_api_diagnostic.html.markdown
+++ b/website/docs/r/api_management_api_diagnostic.html.markdown
@@ -34,7 +34,7 @@ resource "azurerm_api_management" "example" {
Expand Down Expand Up @@ -1465,7 +1465,7 @@ index 6b06ca628f..a2e544d3ef 100644

```hcl
diff --git a/website/docs/r/function_app.html.markdown b/website/docs/r/function_app.html.markdown
index d4c341247a..1af082b738 100644
index ee0131e664..3a3c5fdbec 100644
--- a/website/docs/r/function_app.html.markdown
+++ b/website/docs/r/function_app.html.markdown
@@ -237,7 +237,7 @@ The following arguments are supported:
Expand Down Expand Up @@ -1999,7 +1999,7 @@ index 8cd3a53f29..7349e0e1e2 100644
--> **NOTE:** This ID is unique to Terraform and doesn't directly match to any other resource. To compose this ID, you can take the ID Logic App Workflow and append `/triggers/{name of the trigger}`.
+-> **NOTE:** This ID is unique to this provider and doesn't directly match to any other resource. To compose this ID, you can take the ID Logic App Workflow and append `/triggers/{name of the trigger}`.
diff --git a/website/docs/r/managed_disk.html.markdown b/website/docs/r/managed_disk.html.markdown
index 5581db562f..59d329aa24 100644
index 762ffaf535..87ae15cdb8 100644
--- a/website/docs/r/managed_disk.html.markdown
+++ b/website/docs/r/managed_disk.html.markdown
@@ -82,7 +82,14 @@ The following arguments are supported:
Expand Down Expand Up @@ -2051,7 +2051,7 @@ index 6ce94c3f96..96a0bc66c1 100644
--> **NOTE:** This is a Terraform specific Resource ID which uses the format `{resourceId}|{diagnosticSettingName}`
+-> **NOTE:** This is an ID specific to this resource provider which uses the format `{resourceId}|{diagnosticSettingName}`
diff --git a/website/docs/r/mssql_server.html.markdown b/website/docs/r/mssql_server.html.markdown
index 90b738703a..e3a0c821ce 100644
index 1fcfad3a05..ce6ab37003 100644
--- a/website/docs/r/mssql_server.html.markdown
+++ b/website/docs/r/mssql_server.html.markdown
@@ -11,9 +11,6 @@ description: |-
Expand Down
16 changes: 16 additions & 0 deletions provider/cmd/pulumi-resource-azure/bridge-metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -3664,6 +3664,10 @@
"current": "azure:cognitive/accountCustomerManagedKey:AccountCustomerManagedKey",
"majorVersion": 6
},
"azurerm_cognitive_account_rai_blocklist": {
"current": "azure:cognitive/accountRaiBlocklist:AccountRaiBlocklist",
"majorVersion": 6
},
"azurerm_cognitive_deployment": {
"current": "azure:cognitive/deployment:Deployment",
"majorVersion": 6,
Expand Down Expand Up @@ -7688,6 +7692,18 @@
}
}
},
"azurerm_fabric_capacity": {
"current": "azure:fabric/capacity:Capacity",
"majorVersion": 6,
"fields": {
"administration_members": {
"maxItemsOne": false
},
"sku": {
"maxItemsOne": true
}
}
},
"azurerm_federated_identity_credential": {
"current": "azure:armmsi/federatedIdentityCredential:FederatedIdentityCredential",
"majorVersion": 6,
Expand Down
273 changes: 241 additions & 32 deletions provider/cmd/pulumi-resource-azure/schema.json

Large diffs are not rendered by default.

5 changes: 2 additions & 3 deletions provider/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ toolchain go1.22.7

require (
github.com/Azure/go-autorest/autorest/azure/cli v0.4.6
github.com/hashicorp/go-azure-sdk/sdk v0.20241128.1112539
github.com/hashicorp/go-azure-sdk/sdk v0.20241206.1180327
github.com/hashicorp/terraform-plugin-sdk/v2 v2.35.0
github.com/hashicorp/terraform-provider-azurerm v1.44.1-0.20220923005104-eaa801c358ff
github.com/pulumi/providertest v0.1.3
Expand Down Expand Up @@ -121,7 +121,7 @@ require (
github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-azure-helpers v0.71.0 // indirect
github.com/hashicorp/go-azure-sdk/resource-manager v0.20241128.1112539 // indirect
github.com/hashicorp/go-azure-sdk/resource-manager v0.20241206.1180327 // indirect
github.com/hashicorp/go-checkpoint v0.5.0 // indirect
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320 // indirect
Expand Down Expand Up @@ -225,7 +225,6 @@ require (
github.com/teekennedy/goldmark-markdown v0.3.0 // indirect
github.com/texttheater/golang-levenshtein v1.0.1 // indirect
github.com/tombuildsstuff/giovanni v0.27.0 // indirect
github.com/tombuildsstuff/kermit v0.20240122.1123108 // indirect
github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect
github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
github.com/ulikunitz/xz v0.5.11 // indirect
Expand Down
10 changes: 4 additions & 6 deletions provider/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1629,10 +1629,10 @@ github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY
github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
github.com/hashicorp/go-azure-helpers v0.71.0 h1:ra3aIRzg01g6MLKQ+yABcb6WJtrqRUDDgyuPLmyZ9lY=
github.com/hashicorp/go-azure-helpers v0.71.0/go.mod h1:BmbF4JDYXK5sEmFeU5hcn8Br21uElcqLfdQxjatwQKw=
github.com/hashicorp/go-azure-sdk/resource-manager v0.20241128.1112539 h1:rHh2P5qcPObzpfAFafIjle3CowejFAHTfBJAHDkuSGk=
github.com/hashicorp/go-azure-sdk/resource-manager v0.20241128.1112539/go.mod h1:oQAUu+aCHPCM0CDfsQTBnEkfUZ+sLhEW8Ssip9AeCLc=
github.com/hashicorp/go-azure-sdk/sdk v0.20241128.1112539 h1:6Ps2V/DBwBxWEjSx01fM+PqG+uIavHWvxmM2vb1N2Ok=
github.com/hashicorp/go-azure-sdk/sdk v0.20241128.1112539/go.mod h1:oI5R0fTbBx3K/sJBK5R/OlEy8ozdQjvctxVU9v3EDkc=
github.com/hashicorp/go-azure-sdk/resource-manager v0.20241206.1180327 h1:6b8IGRB1RpeFUtUym6bf+GJgyWuQpZq+fa/dBpHgPIE=
github.com/hashicorp/go-azure-sdk/resource-manager v0.20241206.1180327/go.mod h1:Y2T5KK4QAV+/tGfcwp5BzPRQs5/cbIXT/igtHqYZ09U=
github.com/hashicorp/go-azure-sdk/sdk v0.20241206.1180327 h1:c7Y0wwTOdna2dndVW1nalZ/DZX1wDQCSj2JNgiLycKw=
github.com/hashicorp/go-azure-sdk/sdk v0.20241206.1180327/go.mod h1:oI5R0fTbBx3K/sJBK5R/OlEy8ozdQjvctxVU9v3EDkc=
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=
Expand Down Expand Up @@ -2090,8 +2090,6 @@ github.com/tidwall/sjson v1.2.5 h1:kLy8mja+1c9jlljvWTlSazM7cKDRfJuR/bOJhcY5NcY=
github.com/tidwall/sjson v1.2.5/go.mod h1:Fvgq9kS/6ociJEDnK0Fk1cpYF4FIW6ZF7LAe+6jwd28=
github.com/tombuildsstuff/giovanni v0.27.0 h1:3CDNjauK78FIhvvCp0SAHlvNcPTcofR6zQXvxwhk4zY=
github.com/tombuildsstuff/giovanni v0.27.0/go.mod h1:SviBdlwdVn2HyArdRABBqMUODBJ2adQHi+RFEVaO05I=
github.com/tombuildsstuff/kermit v0.20240122.1123108 h1:icQaxsv/ANv/KC4Sr0V1trrWA/XIL+3QAVBDpiSTgj8=
github.com/tombuildsstuff/kermit v0.20240122.1123108/go.mod h1:T3YBVFhRV4qA7SbnRaNE6eapIMpKDA9rG/V7Ocsjlno=
github.com/uber/jaeger-client-go v2.30.0+incompatible h1:D6wyKGCecFaSRUpo8lCVbaOOb6ThwMmTEbhRwtKR97o=
github.com/uber/jaeger-client-go v2.30.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk=
github.com/uber/jaeger-lib v2.4.1+incompatible h1:td4jdvLcExb4cBISKIpHuGoVXh+dVKhn2Um6rjCsSsg=
Expand Down
1 change: 1 addition & 0 deletions provider/resources.go
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,7 @@ var moduleMap = map[string]string{
"dynatrace": azureDynatrace,
"elastic_cloud": azureElasticCloud,
"elastic_san": "ElasticSan",
"fabric": "Fabric",
"fluid_relay": azureFluidRelay,
"frontdoor": azureFrontdoor,
"function": azureAppService,
Expand Down
2 changes: 1 addition & 1 deletion sdk/dotnet/ApiManagement/ApiDiagnostic.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion sdk/dotnet/ApiManagement/ApiRelease.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion sdk/dotnet/AppService/Inputs/FunctionAppSiteConfigArgs.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading