Merge branch 'master' into v7-resolve-conflicts

Author: corymhall

.github/workflows/main-post-build.yml

@@ -64,6 +64,8 @@ jobs:
           COVERAGE_OUTPUT_DIR: ${{ runner.temp }}/cov
       - name: Summarize Provider Coverage Results
         run: cat ${{ env.COVERAGE_OUTPUT_DIR }}/shortSummary.txt
+        env:
+          COVERAGE_OUTPUT_DIR: ${{ runner.temp }}/cov
       - name: Upload coverage data to S3
         run: >-
           summaryName="${PROVIDER}_summary_$(date +"%Y-%m-%d_%H-%M-%S").json"

.github/workflows/upgrade-java.yml

@@ -0,0 +1,68 @@
+# WARNING: This file is autogenerated - changes will be overwritten when regenerated by https://github.com/pulumi/ci-mgmt
+
+name: Upgrade Java
+on:
+  workflow_dispatch:
+    inputs:
+      version:
+        description: |
+          The version of pulumi/pulumi-java to upgrade to, without the 'v' prefix
+        required: true
+        type: string
+      upgradeProviderVersion:
+        description: |
+          Version of upgrade-provider to use. This must be a valid git reference in the pulumi/upgrade-provider repo. Defaults to "main"
+
+          See https://go.dev/ref/mod#versions for valid versions. E.g. "v0.1.0", "main", "da25dec".
+        default: main
+        type: string
+
+permissions:
+  contents: write
+  issues: write
+  pull-requests: write
+
+env:
+
+  # upgrade-provider calls into gh CLI tool to open PRs that uses GH_TOKEN env var, which is not obivous.
+  # setting this correctly makes sure the PR has the correct owner and permissions work as expected.
+  GH_TOKEN: ${{ secrets.PULUMI_PROVIDER_AUTOMATION_TOKEN || secrets.PULUMI_BOT_TOKEN || secrets.GITHUB_TOKEN }}
+
+  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+jobs:
+  upgrade_java:
+    name: upgrade-java
+    runs-on: ubuntu-latest
+    steps:
+
+      - name: Checkout Repo
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          # Persist credentials so upgrade-provider can push a new branch.
+          persist-credentials: true
+
+      - name: Setup tools
+        uses: ./.github/actions/setup-tools
+        with:
+          tools: pulumictl, pulumicli, go
+
+      - name: Install upgrade-provider
+        run: go install github.com/pulumi/upgrade-provider@${{ inputs.upgradeProviderVersion || 'main' }}
+        shell: bash
+
+      - name: "Set up git identity"
+        run: |
+          git config --global user.name '[email protected]'
+          git config --global user.email '[email protected]'
+        shell: bash
+
+      - name: Upgrade Java
+        shell: bash
+        id: upgrade_provider
+        env:
+          V: ${{inputs.version}}
+          REPO: ${{github.repository}}
+          GH_TOKEN: ${{env.GH_TOKEN}}
+        run: |
+          upgrade-provider "$REPO" --kind=java --java-version="$V"

.pulumi-java-gen.version

@@ -1 +1 @@
-1.13.0
+1.16.0

provider/go.mod

@@ -32,7 +32,7 @@ replace github.com/hashicorp/terraform-plugin-log => github.com/gdavison/terrafo
 replace (
 	github.com/hashicorp/terraform-plugin-sdk/v2 => github.com/pulumi/terraform-plugin-sdk/v2 v2.0.0-20250530111747-935112552988
 	github.com/hashicorp/terraform-provider-aws => ../upstream
-	github.com/hashicorp/vault => github.com/hashicorp/vault v1.19.3
+	github.com/hashicorp/vault => github.com/hashicorp/vault v1.20.0
 )
 
 require (