Skip to content

Commit 270774f

Browse files
Upgrade terraform-provider-azurerm to v3.114.0 (#2309)
This PR was generated via `$ upgrade-provider pulumi/pulumi-azure --kind=all --target-bridge-version=latest`. After patches applied cleanly, it didn't build due to duplicate imports and did - `upstream.sh checkout` - edit - commit - `upstream.sh rebase -i` - `upstream.sh check_in` --- - Upgrading terraform-provider-azurerm from 3.113.0 to 3.114.0. Fixes #2308 --------- Co-authored-by: Daniel Bradley <[email protected]>
1 parent 9be0288 commit 270774f

File tree

1,373 files changed

+18839
-2102
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,373 files changed

+18839
-2102
lines changed

.ci-mgmt.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ parallel: 1
44
timeout: 90
55
generate-nightly-test-workflow: true
66
providerVersion: github.com/hashicorp/terraform-provider-azurerm/version.ProviderVersion
7+
freeDiskSpaceBeforeTest: true
78
env:
89
ARM_CLIENT_ID: ${{ secrets.ARM_CLIENT_ID }}
910
ARM_ENVIRONMENT: "public"

.github/workflows/master.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,12 @@ jobs:
138138
env:
139139
PROVIDER_VERSION: ${{ needs.prerequisites.outputs.version }}
140140
steps:
141+
# Run as first step so we don't delete things that have just been installed
142+
- name: Free Disk Space (Ubuntu)
143+
uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be
144+
with:
145+
tool-cache: false
146+
swap-storage: false
141147
- name: Checkout Repo
142148
uses: actions/checkout@v4
143149
- name: Setup tools

.github/workflows/nightly-test.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,12 @@ jobs:
6060
env:
6161
PROVIDER_VERSION: ${{ needs.prerequisites.outputs.version }}
6262
steps:
63+
# Run as first step so we don't delete things that have just been installed
64+
- name: Free Disk Space (Ubuntu)
65+
uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be
66+
with:
67+
tool-cache: false
68+
swap-storage: false
6369
- name: Checkout Repo
6470
uses: actions/checkout@v4
6571
- name: Setup tools

.github/workflows/prerelease.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,12 @@ jobs:
8383
env:
8484
PROVIDER_VERSION: ${{ needs.prerequisites.outputs.version }}
8585
steps:
86+
# Run as first step so we don't delete things that have just been installed
87+
- name: Free Disk Space (Ubuntu)
88+
uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be
89+
with:
90+
tool-cache: false
91+
swap-storage: false
8692
- name: Checkout Repo
8793
uses: actions/checkout@v4
8894
- name: Setup tools

.github/workflows/release.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,12 @@ jobs:
8282
env:
8383
PROVIDER_VERSION: ${{ needs.prerequisites.outputs.version }}
8484
steps:
85+
# Run as first step so we don't delete things that have just been installed
86+
- name: Free Disk Space (Ubuntu)
87+
uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be
88+
with:
89+
tool-cache: false
90+
swap-storage: false
8591
- name: Checkout Repo
8692
uses: actions/checkout@v4
8793
- name: Setup tools

.github/workflows/run-acceptance-tests.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,12 @@ jobs:
116116
env:
117117
PROVIDER_VERSION: ${{ needs.prerequisites.outputs.version }}
118118
steps:
119+
# Run as first step so we don't delete things that have just been installed
120+
- name: Free Disk Space (Ubuntu)
121+
uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be
122+
with:
123+
tool-cache: false
124+
swap-storage: false
119125
- name: Checkout Repo
120126
uses: actions/checkout@v4
121127
with:

.pulumi-java-gen.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.12.0
1+
0.13.0

patches/0001-Set-user-agent-in-client-options.patch

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,14 @@ Subject: [PATCH] Set user agent in client options
66
Use Pulumi-specific user agent which includes the current provider version number.
77

88
diff --git a/internal/common/client_options.go b/internal/common/client_options.go
9-
index a6c84174b9..d27416056d 100644
9+
index 2495f52a4e..d27416056d 100644
1010
--- a/internal/common/client_options.go
1111
+++ b/internal/common/client_options.go
12-
@@ -13,7 +13,6 @@ import (
13-
"github.com/hashicorp/go-azure-sdk/sdk/auth"
14-
"github.com/hashicorp/go-azure-sdk/sdk/client"
15-
"github.com/hashicorp/go-azure-sdk/sdk/environments"
16-
- "github.com/hashicorp/terraform-plugin-sdk/v2/meta"
17-
"github.com/hashicorp/terraform-provider-azurerm/internal/features"
18-
"github.com/hashicorp/terraform-provider-azurerm/version"
19-
)
20-
@@ -96,12 +95,8 @@ func (o ClientOptions) ConfigureClient(c *autorest.Client, authorizer autorest.A
12+
@@ -95,12 +95,8 @@ func (o ClientOptions) ConfigureClient(c *autorest.Client, authorizer autorest.A
2113
}
2214

2315
func userAgent(userAgent, tfVersion, partnerID string, disableTerraformPartnerID bool) string {
24-
- tfUserAgent := fmt.Sprintf("HashiCorp Terraform/%s (+https://www.terraform.io) Terraform Plugin SDK/%s", tfVersion, meta.SDKVersionString())
16+
- tfUserAgent := fmt.Sprintf("HashiCorp Terraform/%s (+https://www.terraform.io)", tfVersion)
2517
-
2618
- providerUserAgent := fmt.Sprintf("%s terraform-provider-azurerm/%s", tfUserAgent, version.ProviderVersion)
2719
- if features.FourPointOhBeta() {
@@ -32,7 +24,7 @@ index a6c84174b9..d27416056d 100644
3224
userAgent = strings.TrimSpace(fmt.Sprintf("%s %s", userAgent, providerUserAgent))
3325

3426
// append the CloudShell version to the user agent if it exists
35-
@@ -110,11 +105,11 @@ func userAgent(userAgent, tfVersion, partnerID string, disableTerraformPartnerID
27+
@@ -109,11 +105,11 @@ func userAgent(userAgent, tfVersion, partnerID string, disableTerraformPartnerID
3628
}
3729

3830
// only one pid can be interpreted currently

patches/0007-Make-storage-account-resource_group_name-optional-in.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ Subject: [PATCH] Make storage account resource_group_name optional in data
77
Look up resource_group_name by using `storageClient.FindAccount` as storage account names should be unique, and resolve back to the resource group it belongs to.
88

99
diff --git a/internal/services/storage/storage_account_data_source.go b/internal/services/storage/storage_account_data_source.go
10-
index 482972243e..f49dc817f7 100644
10+
index d9a1156241..b91b3cdc71 100644
1111
--- a/internal/services/storage/storage_account_data_source.go
1212
+++ b/internal/services/storage/storage_account_data_source.go
13-
@@ -38,7 +38,8 @@ func dataSourceStorageAccount() *pluginsdk.Resource {
13+
@@ -39,7 +39,8 @@ func dataSourceStorageAccount() *pluginsdk.Resource {
1414
ValidateFunc: validate.StorageAccountName,
1515
},
1616

@@ -20,7 +20,7 @@ index 482972243e..f49dc817f7 100644
2020

2121
"location": commonschema.LocationComputed(),
2222

23-
@@ -541,10 +542,27 @@ func dataSourceStorageAccount() *pluginsdk.Resource {
23+
@@ -550,10 +551,27 @@ func dataSourceStorageAccount() *pluginsdk.Resource {
2424

2525
func dataSourceStorageAccountRead(d *pluginsdk.ResourceData, meta interface{}) error {
2626
client := meta.(*clients.Client).Storage.ResourceManager.StorageAccounts

0 commit comments

Comments
 (0)