Skip to content

Commit

Permalink
Upgrade terraform-provider-azurerm to v3.114.0 (#2309)
Browse files Browse the repository at this point in the history
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 <daniel@pulumi.com>
  • Loading branch information
thomas11 and danielrbradley authored Aug 5, 2024
1 parent 9be0288 commit 270774f
Show file tree
Hide file tree
Showing 1,373 changed files with 18,839 additions and 2,102 deletions.
1 change: 1 addition & 0 deletions .ci-mgmt.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ parallel: 1
timeout: 90
generate-nightly-test-workflow: true
providerVersion: github.com/hashicorp/terraform-provider-azurerm/version.ProviderVersion
freeDiskSpaceBeforeTest: true
env:
ARM_CLIENT_ID: ${{ secrets.ARM_CLIENT_ID }}
ARM_ENVIRONMENT: "public"
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,12 @@ jobs:
env:
PROVIDER_VERSION: ${{ needs.prerequisites.outputs.version }}
steps:
# Run as first step so we don't delete things that have just been installed
- name: Free Disk Space (Ubuntu)
uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be
with:
tool-cache: false
swap-storage: false
- name: Checkout Repo
uses: actions/checkout@v4
- name: Setup tools
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/nightly-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,12 @@ jobs:
env:
PROVIDER_VERSION: ${{ needs.prerequisites.outputs.version }}
steps:
# Run as first step so we don't delete things that have just been installed
- name: Free Disk Space (Ubuntu)
uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be
with:
tool-cache: false
swap-storage: false
- name: Checkout Repo
uses: actions/checkout@v4
- name: Setup tools
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/prerelease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,12 @@ jobs:
env:
PROVIDER_VERSION: ${{ needs.prerequisites.outputs.version }}
steps:
# Run as first step so we don't delete things that have just been installed
- name: Free Disk Space (Ubuntu)
uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be
with:
tool-cache: false
swap-storage: false
- name: Checkout Repo
uses: actions/checkout@v4
- name: Setup tools
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,12 @@ jobs:
env:
PROVIDER_VERSION: ${{ needs.prerequisites.outputs.version }}
steps:
# Run as first step so we don't delete things that have just been installed
- name: Free Disk Space (Ubuntu)
uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be
with:
tool-cache: false
swap-storage: false
- name: Checkout Repo
uses: actions/checkout@v4
- name: Setup tools
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/run-acceptance-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,12 @@ jobs:
env:
PROVIDER_VERSION: ${{ needs.prerequisites.outputs.version }}
steps:
# Run as first step so we don't delete things that have just been installed
- name: Free Disk Space (Ubuntu)
uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be
with:
tool-cache: false
swap-storage: false
- name: Checkout Repo
uses: actions/checkout@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion .pulumi-java-gen.version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.12.0
0.13.0
16 changes: 4 additions & 12 deletions patches/0001-Set-user-agent-in-client-options.patch
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,14 @@ Subject: [PATCH] Set user agent in client options
Use Pulumi-specific user agent which includes the current provider version number.

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

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

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

// only one pid can be interpreted currently
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ Subject: [PATCH] Make storage account resource_group_name optional in data
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.

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

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

"location": commonschema.LocationComputed(),

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

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

0 comments on commit 270774f

Please sign in to comment.