diff --git a/.ci-mgmt.yaml b/.ci-mgmt.yaml index 8a0b8a60ae..a3c54e1e06 100644 --- a/.ci-mgmt.yaml +++ b/.ci-mgmt.yaml @@ -6,16 +6,14 @@ gcp: true # need GCP credentials to test in GKE pulumiVersionFile: .pulumi.version major-version: 4 parallel: 3 -toolVersions: - go: 1.24.x esc: - enabled: true + enabled: true envOverride: - PULUMI_API: https://api.pulumi-staging.io - AWS_REGION: us-west-2 - PULUMI_TEST_OWNER: moolumi - GOLANGCI_LINT_VERSION: v1.64.8 - GOOGLE_CI_SERVICE_ACCOUNT_EMAIL: pulumi-ci@pulumi-k8s-provider.iam.gserviceaccount.com - GOOGLE_CI_WORKLOAD_IDENTITY_POOL: pulumi-ci - GOOGLE_CI_WORKLOAD_IDENTITY_PROVIDER: pulumi-ci - GOOGLE_PROJECT_NUMBER: 637339343727 + PULUMI_API: https://api.pulumi-staging.io + AWS_REGION: us-west-2 + PULUMI_TEST_OWNER: moolumi + GOLANGCI_LINT_VERSION: v1.64.8 + GOOGLE_CI_SERVICE_ACCOUNT_EMAIL: pulumi-ci@pulumi-k8s-provider.iam.gserviceaccount.com + GOOGLE_CI_WORKLOAD_IDENTITY_POOL: pulumi-ci + GOOGLE_CI_WORKLOAD_IDENTITY_PROVIDER: pulumi-ci + GOOGLE_PROJECT_NUMBER: 637339343727 diff --git a/.config/mise.lock b/.config/mise.lock new file mode 100644 index 0000000000..4871501937 --- /dev/null +++ b/.config/mise.lock @@ -0,0 +1,87 @@ +[[tools.dotnet]] +version = "8.0.414" +backend = "asdf:dotnet" + +[[tools."github:pulumi/pulumictl"]] +version = "0.0.50" +backend = "github:pulumi/pulumictl" + +[tools."github:pulumi/pulumictl".platforms.linux-x64] +checksum = "sha256:a988418240d3a985bdcb9753b7c65ba4b06608deb359dc2942cb8c9374abc164" +name = "pulumictl-v0.0.50-linux-amd64.tar.gz" +size = 27744219 +url = "https://github.com/pulumi/pulumictl/releases/download/v0.0.50/pulumictl-v0.0.50-linux-amd64.tar.gz" +url_api = "https://api.github.com/repos/pulumi/pulumictl/releases/assets/278054496" + +[[tools."github:pulumi/schema-tools"]] +version = "0.6.0" +backend = "github:pulumi/schema-tools" + +[tools."github:pulumi/schema-tools".platforms.linux-x64] +checksum = "blake3:82dfe616fee18b4258f6e3d2dc3c4e9f14afd43a0a4cc33eff2d2a04088d6ca3" +name = "schema-tools-v0.6.0-linux-amd64.tar.gz" +size = 14282746 +url = "https://github.com/pulumi/schema-tools/releases/download/v0.6.0/schema-tools-v0.6.0-linux-amd64.tar.gz" +url_api = "https://api.github.com/repos/pulumi/schema-tools/releases/assets/118725905" + +[[tools.go]] +version = "1.24.9" +backend = "core:go" + +[tools.go.platforms.linux-x64] +checksum = "sha256:5b7899591c2dd6e9da1809fde4a2fad842c45d3f6b9deb235ba82216e31e34a6" +size = 78693175 +url = "https://dl.google.com/go/go1.24.9.linux-amd64.tar.gz" + +[[tools.golangci-lint]] +version = "1.64.8" +backend = "aqua:golangci/golangci-lint" + +[tools.golangci-lint.platforms.linux-x64] +checksum = "sha256:b6270687afb143d019f387c791cd2a6f1cb383be9b3124d241ca11bd3ce2e54e" +size = 12364828 +url = "https://github.com/golangci/golangci-lint/releases/download/v1.64.8/golangci-lint-1.64.8-linux-amd64.tar.gz" + +[[tools.gradle]] +version = "7.6.6" +backend = "aqua:gradle/gradle" + +[tools.gradle.platforms.linux-x64] +checksum = "sha256:673d9776f303bc7048fc3329d232d6ebf1051b07893bd9d11616fad9a8673be0" +size = 128439774 +url = "https://github.com/gradle/gradle-distributions/releases/download/v7.6.6/gradle-7.6.6-bin.zip" + +[[tools.java]] +version = "corretto-11.0.29.7.1" +backend = "core:java" + +[tools.java.platforms.linux-x64] +checksum = "sha256:279c6d3124f8b0251b16297b16687fe8b3946410b05ed27de1259b5e5cea02ba" +size = 195379320 +url = "https://corretto.aws/downloads/resources/11.0.29.7.1/amazon-corretto-11.0.29.7.1-linux-x64.tar.gz" + +[[tools.node]] +version = "20.19.5" +backend = "core:node" + +[tools.node.platforms.linux-x64] +checksum = "sha256:4eba5fbe1fb10753bc06e42f001a91c5cec16798b7764a3e9257adc59af47fe1" +size = 47041607 +url = "https://nodejs.org/dist/v20.19.5/node-v20.19.5-linux-x64.tar.gz" + +[[tools."npm:yarn"]] +version = "1.22.22" +backend = "npm:yarn" + +[[tools.pulumi]] +version = "3.204.0" +backend = "aqua:pulumi/pulumi" + +[tools.pulumi.platforms.linux-x64] +checksum = "sha256:1716a79dae3514e83f4dd95c20d2a22bd1157535a2f6c55a4c6fbf70ca51a03c" +size = 94478287 +url = "https://github.com/pulumi/pulumi/releases/download/v3.204.0/pulumi-v3.204.0-linux-x64.tar.gz" + +[[tools.python]] +version = "3.11.8" +backend = "core:python" diff --git a/.config/mise.test.toml b/.config/mise.test.toml new file mode 100644 index 0000000000..3ab74020ab --- /dev/null +++ b/.config/mise.test.toml @@ -0,0 +1,11 @@ +# WARNING: This file is autogenerated - changes will be overwritten when regenerated by https://github.com/pulumi/ci-mgmt + +# Overrides for test workflows + +[env] +# Acceptance (specifically providertest) tests require that PULUMI_HOME be the default +PULUMI_HOME = "{{ env.HOME }}/.pulumi" + +[tools] +# always use pulumi latest for tests +pulumi = "latest" diff --git a/.config/mise.toml b/.config/mise.toml new file mode 100644 index 0000000000..f52e9c42f6 --- /dev/null +++ b/.config/mise.toml @@ -0,0 +1,29 @@ +# WARNING: This file is autogenerated - changes will be overwritten when regenerated by https://github.com/pulumi/ci-mgmt +# You can create your own root-level mise.toml file to override/augment this. See https://mise.jdx.dev/configuration.html + +[env] +_.source = "{{config_root}}/scripts/get-versions.sh" +PULUMI_HOME = "{{config_root}}/.pulumi" + +[tools] + +# Runtimes +# TODO: we may not need 'get_env' once https://github.com/jdx/mise/discussions/6339 is fixed +go = "{{ get_env(name='GO_VERSION_MISE', default='latest') }}" +node = '20.19.5' +python = '3.11.8' +dotnet = '8.0.414' +# Corretto version used as Java SE/OpenJDK version no longer offered +java = 'corretto-11' + +# Executable tools +pulumi = "{{ get_env(name='PULUMI_VERSION_MISE', default='latest') }}" +"github:pulumi/pulumictl" = 'latest' +"github:pulumi/schema-tools" = "latest" +gradle = '7.6' +golangci-lint = "1.64.8" # See note about about overrides if you need to customize this. +"npm:yarn" = "1.22.22" + +[settings] +experimental = true # Required for Go binaries (e.g. pulumictl). +lockfile = true diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ec110d3435..73fbb70da9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,9 +16,7 @@ on: workflow_dispatch: {} env: PROVIDER: kubernetes - PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget TRAVIS_OS_NAME: linux - PULUMI_GO_DEP_ROOT: ${{ github.workspace }}/.. GOVERSION: "1.24.x" NODEVERSION: "20.x" PYTHONVERSION: "3.11.8" @@ -71,7 +69,7 @@ jobs: with: repo: pulumi/pulumictl - name: Install Pulumi CLI - uses: pulumi/actions@d7ceb0215da5a14ec84f50b703365ddf0194a9c8 # v6.6.0 + uses: pulumi/actions@cc7494be991dba0978f7ffafaf995b0449a0998e # v6.5.0 with: pulumi-version-file: .pulumi.version - if: github.event_name == 'pull_request' @@ -126,6 +124,7 @@ jobs: sdk/go/**/pulumiUtilities.go sdk/nodejs/package.json sdk/python/pyproject.toml + sdk/java/build.gradle - name: Commit SDK changes for Renovate if: failure() && steps.worktreeClean.outcome == 'failure' && contains(github.actor, 'renovate') && github.event_name == @@ -248,11 +247,11 @@ jobs: with: repo: pulumi/pulumictl - name: Install Pulumi CLI - uses: pulumi/actions@d7ceb0215da5a14ec84f50b703365ddf0194a9c8 # v6.6.0 + uses: pulumi/actions@cc7494be991dba0978f7ffafaf995b0449a0998e # v6.5.0 with: pulumi-version-file: .pulumi.version - name: Setup Node - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0 + uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0 with: node-version: ${{ env.NODEVERSION }} registry-url: https://registry.npmjs.org @@ -271,7 +270,7 @@ jobs: distribution: temurin cache: gradle - name: Setup Gradle - uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3 + uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0 with: gradle-version: "7.6" - name: Download provider @@ -298,6 +297,7 @@ jobs: sdk/go/**/pulumiUtilities.go sdk/nodejs/package.json sdk/python/pyproject.toml + sdk/java/build.gradle - name: Commit SDK changes for Renovate if: failure() && steps.worktreeClean.outcome == 'failure' && contains(github.actor, 'renovate') && github.event_name == @@ -449,11 +449,11 @@ jobs: with: repo: pulumi/pulumictl - name: Install Pulumi CLI - uses: pulumi/actions@d7ceb0215da5a14ec84f50b703365ddf0194a9c8 # v6.6.0 + uses: pulumi/actions@cc7494be991dba0978f7ffafaf995b0449a0998e # v6.5.0 with: pulumi-version-file: .pulumi.version - name: Setup Node - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0 + uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0 with: node-version: ${{ env.NODEVERSION }} registry-url: https://registry.npmjs.org @@ -472,7 +472,7 @@ jobs: distribution: temurin cache: gradle - name: Setup Gradle - uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3 + uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0 with: gradle-version: "7.6" - name: Download provider @@ -523,7 +523,7 @@ jobs: requested-token-type: urn:pulumi:token-type:access_token:organization export-environment-variables: false - name: Export AWS Credentials - uses: pulumi/esc-action@6cf9520e68354d86f81c455e8d43eabd58f5c9f5 # v1.5.0 + uses: pulumi/esc-action@efb0bc8946938f0dfbfa00e829196ec95f0d0ea7 # v1.4.0 env: PULUMI_ACCESS_TOKEN: ${{ steps.generate_pulumi_token.outputs.pulumi-access-token }} with: @@ -622,11 +622,11 @@ jobs: with: repo: pulumi/pulumictl - name: Install Pulumi CLI - uses: pulumi/actions@d7ceb0215da5a14ec84f50b703365ddf0194a9c8 # v6.6.0 + uses: pulumi/actions@cc7494be991dba0978f7ffafaf995b0449a0998e # v6.5.0 with: pulumi-version-file: .pulumi.version - name: Configure AWS Credentials - uses: aws-actions/configure-aws-credentials@a03048d87541d1d9fcf2ecf528a4a65ba9bd7838 # v5.0.0 + uses: aws-actions/configure-aws-credentials@00943011d9042930efac3dcd3a170e4273319bc8 # v5.1.0 with: aws-access-key-id: ${{ steps.esc-secrets.outputs.AWS_ACCESS_KEY_ID }} aws-region: us-east-2 @@ -701,9 +701,9 @@ jobs: with: repo: pulumi/pulumictl - name: Install Pulumi CLI - uses: pulumi/actions@d7ceb0215da5a14ec84f50b703365ddf0194a9c8 # v6.6.0 + uses: pulumi/actions@cc7494be991dba0978f7ffafaf995b0449a0998e # v6.5.0 - name: Setup Node - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0 + uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0 with: node-version: ${{ env.NODEVERSION }} registry-url: https://registry.npmjs.org @@ -784,7 +784,6 @@ jobs: uses: golangci/golangci-lint-action@55c2c1448f86e01eaae002a5a3a9624417608d84 # v6.5.2 with: version: ${{ env.GOLANGCI_LINT_VERSION }} - args: -c ../.golangci.yml working-directory: provider name: lint if: github.event_name == 'repository_dispatch' || @@ -808,11 +807,11 @@ jobs: go-version: ${{ env.GOVERSION }} cache-dependency-path: "**/*.sum" - name: Install Pulumi CLI - uses: pulumi/actions@d7ceb0215da5a14ec84f50b703365ddf0194a9c8 # v6.6.0 + uses: pulumi/actions@cc7494be991dba0978f7ffafaf995b0449a0998e # v6.5.0 with: pulumi-version-file: .pulumi.version - name: Setup Node - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0 + uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0 with: node-version: ${{ env.NODEVERSION }} registry-url: https://registry.npmjs.org @@ -882,11 +881,11 @@ jobs: go-version: ${{ env.GOVERSION }} cache-dependency-path: "**/*.sum" - name: Install Pulumi CLI - uses: pulumi/actions@d7ceb0215da5a14ec84f50b703365ddf0194a9c8 # v6.6.0 + uses: pulumi/actions@cc7494be991dba0978f7ffafaf995b0449a0998e # v6.5.0 with: pulumi-version-file: .pulumi.version - name: Setup Node - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0 + uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0 with: node-version: ${{ env.NODEVERSION }} registry-url: https://registry.npmjs.org diff --git a/.github/workflows/comment-on-stale-issues.yml b/.github/workflows/comment-on-stale-issues.yml index 79be47c19d..e3ec80ee5c 100644 --- a/.github/workflows/comment-on-stale-issues.yml +++ b/.github/workflows/comment-on-stale-issues.yml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest name: Stale issue job steps: - - uses: aws-actions/stale-issue-cleanup@5650b49bcd757a078f6ca06c373d7807b773f9bc #v7.1.0 + - uses: aws-actions/stale-issue-cleanup@5650b49bcd757a078f6ca06c373d7807b773f9bc # v7.1.0 with: issue-types: issues # only look at issues (ignore pull-requests) diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml index c81cc9601c..46d5d19831 100644 --- a/.github/workflows/prerelease.yml +++ b/.github/workflows/prerelease.yml @@ -7,9 +7,7 @@ on: - v*.*.*-** env: PROVIDER: kubernetes - PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget TRAVIS_OS_NAME: linux - PULUMI_GO_DEP_ROOT: ${{ github.workspace }}/.. GOVERSION: "1.24.x" NODEVERSION: "20.x" PYTHONVERSION: "3.11.8" @@ -60,7 +58,7 @@ jobs: with: repo: pulumi/pulumictl - name: Install Pulumi CLI - uses: pulumi/actions@d7ceb0215da5a14ec84f50b703365ddf0194a9c8 # v6.6.0 + uses: pulumi/actions@cc7494be991dba0978f7ffafaf995b0449a0998e # v6.5.0 with: pulumi-version-file: .pulumi.version - if: github.event_name == 'pull_request' @@ -115,6 +113,7 @@ jobs: sdk/go/**/pulumiUtilities.go sdk/nodejs/package.json sdk/python/pyproject.toml + sdk/java/build.gradle - name: Commit SDK changes for Renovate if: failure() && steps.worktreeClean.outcome == 'failure' && contains(github.actor, 'renovate') && github.event_name == @@ -237,11 +236,11 @@ jobs: with: repo: pulumi/pulumictl - name: Install Pulumi CLI - uses: pulumi/actions@d7ceb0215da5a14ec84f50b703365ddf0194a9c8 # v6.6.0 + uses: pulumi/actions@cc7494be991dba0978f7ffafaf995b0449a0998e # v6.5.0 with: pulumi-version-file: .pulumi.version - name: Setup Node - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0 + uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0 with: node-version: ${{ env.NODEVERSION }} registry-url: https://registry.npmjs.org @@ -260,7 +259,7 @@ jobs: distribution: temurin cache: gradle - name: Setup Gradle - uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3 + uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0 with: gradle-version: "7.6" - name: Download provider @@ -287,6 +286,7 @@ jobs: sdk/go/**/pulumiUtilities.go sdk/nodejs/package.json sdk/python/pyproject.toml + sdk/java/build.gradle - name: Commit ${{ matrix.language }} SDK changes for Renovate if: failure() && steps.worktreeClean.outcome == 'failure' && contains(github.actor, 'renovate') && github.event_name == @@ -402,11 +402,11 @@ jobs: with: repo: pulumi/pulumictl - name: Install Pulumi CLI - uses: pulumi/actions@d7ceb0215da5a14ec84f50b703365ddf0194a9c8 # v6.6.0 + uses: pulumi/actions@cc7494be991dba0978f7ffafaf995b0449a0998e # v6.5.0 with: pulumi-version-file: .pulumi.version - name: Setup Node - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0 + uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0 with: node-version: ${{ env.NODEVERSION }} registry-url: https://registry.npmjs.org @@ -425,7 +425,7 @@ jobs: distribution: temurin cache: gradle - name: Setup Gradle - uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3 + uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0 with: gradle-version: "7.6" - name: Download provider @@ -476,7 +476,7 @@ jobs: requested-token-type: urn:pulumi:token-type:access_token:organization export-environment-variables: false - name: Export AWS Credentials - uses: pulumi/esc-action@6cf9520e68354d86f81c455e8d43eabd58f5c9f5 # v1.5.0 + uses: pulumi/esc-action@efb0bc8946938f0dfbfa00e829196ec95f0d0ea7 # v1.4.0 env: PULUMI_ACCESS_TOKEN: ${{ steps.generate_pulumi_token.outputs.pulumi-access-token }} with: @@ -575,11 +575,11 @@ jobs: with: repo: pulumi/pulumictl - name: Install Pulumi CLI - uses: pulumi/actions@d7ceb0215da5a14ec84f50b703365ddf0194a9c8 # v6.6.0 + uses: pulumi/actions@cc7494be991dba0978f7ffafaf995b0449a0998e # v6.5.0 with: pulumi-version-file: .pulumi.version - name: Configure AWS Credentials - uses: aws-actions/configure-aws-credentials@a03048d87541d1d9fcf2ecf528a4a65ba9bd7838 # v5.0.0 + uses: aws-actions/configure-aws-credentials@00943011d9042930efac3dcd3a170e4273319bc8 # v5.1.0 with: aws-access-key-id: ${{ steps.esc-secrets.outputs.AWS_ACCESS_KEY_ID }} aws-region: us-east-2 @@ -654,9 +654,9 @@ jobs: with: repo: pulumi/pulumictl - name: Install Pulumi CLI - uses: pulumi/actions@d7ceb0215da5a14ec84f50b703365ddf0194a9c8 # v6.6.0 + uses: pulumi/actions@cc7494be991dba0978f7ffafaf995b0449a0998e # v6.5.0 - name: Setup Node - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0 + uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0 with: node-version: ${{ env.NODEVERSION }} registry-url: https://registry.npmjs.org @@ -750,7 +750,7 @@ jobs: with: repo: pulumi/pulumictl - name: Install Pulumi CLI - uses: pulumi/actions@d7ceb0215da5a14ec84f50b703365ddf0194a9c8 # v6.6.0 + uses: pulumi/actions@cc7494be991dba0978f7ffafaf995b0449a0998e # v6.5.0 - name: Setup Java uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0 with: @@ -758,7 +758,7 @@ jobs: distribution: temurin cache: gradle - name: Setup Gradle - uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3 + uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0 with: gradle-version: "7.6" - name: Download java SDK @@ -770,7 +770,7 @@ jobs: run: tar -zxf ${{github.workspace}}/sdk/java.tar.gz -C ${{github.workspace}}/sdk/java - name: Setup Gradle - uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3 + uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0 with: gradle-version: "7.6" - name: Publish Java SDK @@ -838,11 +838,11 @@ jobs: go-version: ${{ env.GOVERSION }} cache-dependency-path: "**/*.sum" - name: Install Pulumi CLI - uses: pulumi/actions@d7ceb0215da5a14ec84f50b703365ddf0194a9c8 # v6.6.0 + uses: pulumi/actions@cc7494be991dba0978f7ffafaf995b0449a0998e # v6.5.0 with: pulumi-version-file: .pulumi.version - name: Setup Node - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0 + uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0 with: node-version: ${{ env.NODEVERSION }} registry-url: https://registry.npmjs.org @@ -912,11 +912,11 @@ jobs: go-version: ${{ env.GOVERSION }} cache-dependency-path: "**/*.sum" - name: Install Pulumi CLI - uses: pulumi/actions@d7ceb0215da5a14ec84f50b703365ddf0194a9c8 # v6.6.0 + uses: pulumi/actions@cc7494be991dba0978f7ffafaf995b0449a0998e # v6.5.0 with: pulumi-version-file: .pulumi.version - name: Setup Node - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0 + uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0 with: node-version: ${{ env.NODEVERSION }} registry-url: https://registry.npmjs.org diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6ccc520fa9..60de152d94 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -8,9 +8,7 @@ on: - "!v*.*.*-**" env: PROVIDER: kubernetes - PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget TRAVIS_OS_NAME: linux - PULUMI_GO_DEP_ROOT: ${{ github.workspace }}/.. GOVERSION: "1.24.x" NODEVERSION: "20.x" PYTHONVERSION: "3.11.8" @@ -63,7 +61,7 @@ jobs: with: repo: pulumi/pulumictl - name: Install Pulumi CLI - uses: pulumi/actions@d7ceb0215da5a14ec84f50b703365ddf0194a9c8 # v6.6.0 + uses: pulumi/actions@cc7494be991dba0978f7ffafaf995b0449a0998e # v6.5.0 with: pulumi-version-file: .pulumi.version - if: github.event_name == 'pull_request' @@ -118,6 +116,7 @@ jobs: sdk/go/**/pulumiUtilities.go sdk/nodejs/package.json sdk/python/pyproject.toml + sdk/java/build.gradle - name: Commit SDK changes for Renovate if: failure() && steps.worktreeClean.outcome == 'failure' && contains(github.actor, 'renovate') && github.event_name == @@ -240,11 +239,11 @@ jobs: with: repo: pulumi/pulumictl - name: Install Pulumi CLI - uses: pulumi/actions@d7ceb0215da5a14ec84f50b703365ddf0194a9c8 # v6.6.0 + uses: pulumi/actions@cc7494be991dba0978f7ffafaf995b0449a0998e # v6.5.0 with: pulumi-version-file: .pulumi.version - name: Setup Node - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0 + uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0 with: node-version: ${{ env.NODEVERSION }} registry-url: https://registry.npmjs.org @@ -263,7 +262,7 @@ jobs: distribution: temurin cache: gradle - name: Setup Gradle - uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3 + uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0 with: gradle-version: "7.6" - name: Download provider @@ -290,6 +289,7 @@ jobs: sdk/go/**/pulumiUtilities.go sdk/nodejs/package.json sdk/python/pyproject.toml + sdk/java/build.gradle - name: Commit SDK changes for Renovate if: failure() && steps.worktreeClean.outcome == 'failure' && contains(github.actor, 'renovate') && github.event_name == @@ -405,11 +405,11 @@ jobs: with: repo: pulumi/pulumictl - name: Install Pulumi CLI - uses: pulumi/actions@d7ceb0215da5a14ec84f50b703365ddf0194a9c8 # v6.6.0 + uses: pulumi/actions@cc7494be991dba0978f7ffafaf995b0449a0998e # v6.5.0 with: pulumi-version-file: .pulumi.version - name: Setup Node - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0 + uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0 with: node-version: ${{ env.NODEVERSION }} registry-url: https://registry.npmjs.org @@ -428,7 +428,7 @@ jobs: distribution: temurin cache: gradle - name: Setup Gradle - uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3 + uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0 with: gradle-version: "7.6" - name: Download provider @@ -479,7 +479,7 @@ jobs: requested-token-type: urn:pulumi:token-type:access_token:organization export-environment-variables: false - name: Export AWS Credentials - uses: pulumi/esc-action@6cf9520e68354d86f81c455e8d43eabd58f5c9f5 # v1.5.0 + uses: pulumi/esc-action@efb0bc8946938f0dfbfa00e829196ec95f0d0ea7 # v1.4.0 env: PULUMI_ACCESS_TOKEN: ${{ steps.generate_pulumi_token.outputs.pulumi-access-token }} with: @@ -578,11 +578,11 @@ jobs: with: repo: pulumi/pulumictl - name: Install Pulumi CLI - uses: pulumi/actions@d7ceb0215da5a14ec84f50b703365ddf0194a9c8 # v6.6.0 + uses: pulumi/actions@cc7494be991dba0978f7ffafaf995b0449a0998e # v6.5.0 with: pulumi-version-file: .pulumi.version - name: Configure AWS Credentials - uses: aws-actions/configure-aws-credentials@a03048d87541d1d9fcf2ecf528a4a65ba9bd7838 # v5.0.0 + uses: aws-actions/configure-aws-credentials@00943011d9042930efac3dcd3a170e4273319bc8 # v5.1.0 with: aws-access-key-id: ${{ steps.esc-secrets.outputs.AWS_ACCESS_KEY_ID }} aws-region: us-east-2 @@ -657,9 +657,9 @@ jobs: with: repo: pulumi/pulumictl - name: Install Pulumi CLI - uses: pulumi/actions@d7ceb0215da5a14ec84f50b703365ddf0194a9c8 # v6.6.0 + uses: pulumi/actions@cc7494be991dba0978f7ffafaf995b0449a0998e # v6.5.0 - name: Setup Node - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0 + uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0 with: node-version: ${{ env.NODEVERSION }} registry-url: https://registry.npmjs.org @@ -753,7 +753,7 @@ jobs: with: repo: pulumi/pulumictl - name: Install Pulumi CLI - uses: pulumi/actions@d7ceb0215da5a14ec84f50b703365ddf0194a9c8 # v6.6.0 + uses: pulumi/actions@cc7494be991dba0978f7ffafaf995b0449a0998e # v6.5.0 - name: Setup Java uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0 with: @@ -761,7 +761,7 @@ jobs: distribution: temurin cache: gradle - name: Setup Gradle - uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3 + uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0 with: gradle-version: "7.6" - name: Download java SDK @@ -773,7 +773,7 @@ jobs: run: tar -zxf ${{github.workspace}}/sdk/java.tar.gz -C ${{github.workspace}}/sdk/java - name: Setup Gradle - uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3 + uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0 with: gradle-version: "7.6" - name: Publish Java SDK @@ -871,11 +871,11 @@ jobs: go-version: ${{ env.GOVERSION }} cache-dependency-path: "**/*.sum" - name: Install Pulumi CLI - uses: pulumi/actions@d7ceb0215da5a14ec84f50b703365ddf0194a9c8 # v6.6.0 + uses: pulumi/actions@cc7494be991dba0978f7ffafaf995b0449a0998e # v6.5.0 with: pulumi-version-file: .pulumi.version - name: Setup Node - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0 + uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0 with: node-version: ${{ env.NODEVERSION }} registry-url: https://registry.npmjs.org @@ -945,11 +945,11 @@ jobs: go-version: ${{ env.GOVERSION }} cache-dependency-path: "**/*.sum" - name: Install Pulumi CLI - uses: pulumi/actions@d7ceb0215da5a14ec84f50b703365ddf0194a9c8 # v6.6.0 + uses: pulumi/actions@cc7494be991dba0978f7ffafaf995b0449a0998e # v6.5.0 with: pulumi-version-file: .pulumi.version - name: Setup Node - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0 + uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0 with: node-version: ${{ env.NODEVERSION }} registry-url: https://registry.npmjs.org diff --git a/.github/workflows/release_command.yml b/.github/workflows/release_command.yml index f70c3ac4ff..443b8cb99c 100644 --- a/.github/workflows/release_command.yml +++ b/.github/workflows/release_command.yml @@ -37,7 +37,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - if: failure() name: Notify failure - uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4.0.0 + uses: peter-evans/create-or-update-comment@e8674b075228eee787fea43ef493e45ece1004c9 # v5.0.0 with: token: ${{ secrets.GITHUB_TOKEN }} repository: ${{ github.event.client_payload.github.payload.repository.full_name }} @@ -46,7 +46,7 @@ jobs: "release command failed: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" - if: success() name: Notify success - uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4.0.0 + uses: peter-evans/create-or-update-comment@e8674b075228eee787fea43ef493e45ece1004c9 # v5.0.0 with: token: ${{ secrets.GITHUB_TOKEN }} repository: ${{ github.event.client_payload.github.payload.repository.full_name }} diff --git a/.github/workflows/run-acceptance-tests.yml b/.github/workflows/run-acceptance-tests.yml index c65e03b136..5c090eb1db 100644 --- a/.github/workflows/run-acceptance-tests.yml +++ b/.github/workflows/run-acceptance-tests.yml @@ -11,9 +11,7 @@ on: workflow_dispatch: {} env: PROVIDER: kubernetes - PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget TRAVIS_OS_NAME: linux - PULUMI_GO_DEP_ROOT: ${{ github.workspace }}/.. GOVERSION: "1.24.x" NODEVERSION: "20.x" PYTHONVERSION: "3.11.8" @@ -46,7 +44,7 @@ jobs: "run-url=https://github.com/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID" >> "$GITHUB_OUTPUT" - name: Update with Result - uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4.0.0 + uses: peter-evans/create-or-update-comment@e8674b075228eee787fea43ef493e45ece1004c9 # v5.0.0 with: token: ${{ secrets.GITHUB_TOKEN }} repository: ${{ github.event.client_payload.github.payload.repository.full_name }} @@ -91,7 +89,7 @@ jobs: with: repo: pulumi/pulumictl - name: Install Pulumi CLI - uses: pulumi/actions@d7ceb0215da5a14ec84f50b703365ddf0194a9c8 # v6.6.0 + uses: pulumi/actions@cc7494be991dba0978f7ffafaf995b0449a0998e # v6.5.0 with: pulumi-version-file: .pulumi.version - if: github.event_name == 'pull_request' @@ -146,6 +144,7 @@ jobs: sdk/go/**/pulumiUtilities.go sdk/nodejs/package.json sdk/python/pyproject.toml + sdk/java/build.gradle - name: Commit SDK changes for Renovate if: failure() && steps.worktreeClean.outcome == 'failure' && contains(github.actor, 'renovate') && github.event_name == @@ -272,11 +271,11 @@ jobs: with: repo: pulumi/pulumictl - name: Install Pulumi CLI - uses: pulumi/actions@d7ceb0215da5a14ec84f50b703365ddf0194a9c8 # v6.6.0 + uses: pulumi/actions@cc7494be991dba0978f7ffafaf995b0449a0998e # v6.5.0 with: pulumi-version-file: .pulumi.version - name: Setup Node - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0 + uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0 with: node-version: ${{ env.NODEVERSION }} registry-url: https://registry.npmjs.org @@ -295,7 +294,7 @@ jobs: distribution: temurin cache: gradle - name: Setup Gradle - uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3 + uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0 with: gradle-version: "7.6" - name: Download provider @@ -322,6 +321,7 @@ jobs: sdk/go/**/pulumiUtilities.go sdk/nodejs/package.json sdk/python/pyproject.toml + sdk/java/build.gradle - name: Commit SDK changes for Renovate if: failure() && steps.worktreeClean.outcome == 'failure' && contains(github.actor, 'renovate') && github.event_name == @@ -440,11 +440,11 @@ jobs: with: repo: pulumi/pulumictl - name: Install Pulumi CLI - uses: pulumi/actions@d7ceb0215da5a14ec84f50b703365ddf0194a9c8 # v6.6.0 + uses: pulumi/actions@cc7494be991dba0978f7ffafaf995b0449a0998e # v6.5.0 with: pulumi-version-file: .pulumi.version - name: Setup Node - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0 + uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0 with: node-version: ${{ env.NODEVERSION }} registry-url: https://registry.npmjs.org @@ -463,7 +463,7 @@ jobs: distribution: temurin cache: gradle - name: Setup Gradle - uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3 + uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0 with: gradle-version: "7.6" - name: Download provider @@ -507,7 +507,7 @@ jobs: requested-token-type: urn:pulumi:token-type:access_token:organization export-environment-variables: false - name: Export AWS Credentials - uses: pulumi/esc-action@6cf9520e68354d86f81c455e8d43eabd58f5c9f5 # v1.5.0 + uses: pulumi/esc-action@efb0bc8946938f0dfbfa00e829196ec95f0d0ea7 # v1.4.0 env: PULUMI_ACCESS_TOKEN: ${{ steps.generate_pulumi_token.outputs.pulumi-access-token }} with: @@ -623,7 +623,6 @@ jobs: uses: golangci/golangci-lint-action@55c2c1448f86e01eaae002a5a3a9624417608d84 # v6.5.2 with: version: ${{ env.GOLANGCI_LINT_VERSION }} - args: -c ../.golangci.yml working-directory: provider name: lint if: github.event_name == 'repository_dispatch' || diff --git a/.github/workflows/weekly-pulumi-update.yml b/.github/workflows/weekly-pulumi-update.yml index 878091c712..2493e3fc03 100644 --- a/.github/workflows/weekly-pulumi-update.yml +++ b/.github/workflows/weekly-pulumi-update.yml @@ -8,9 +8,7 @@ on: env: GITHUB_TOKEN: ${{ secrets.PULUMI_BOT_TOKEN }} PROVIDER: kubernetes - PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget TRAVIS_OS_NAME: linux - PULUMI_GO_DEP_ROOT: ${{ github.workspace }}/.. GOVERSION: "1.24.x" NODEVERSION: "20.x" PYTHONVERSION: "3.11.8" @@ -53,7 +51,7 @@ jobs: with: repo: pulumi/pulumictl - name: Install Pulumi CLI - uses: pulumi/actions@d7ceb0215da5a14ec84f50b703365ddf0194a9c8 # v6.6.0 + uses: pulumi/actions@cc7494be991dba0978f7ffafaf995b0449a0998e # v6.5.0 with: pulumi-version-file: .pulumi.version - name: Setup DotNet @@ -61,7 +59,7 @@ jobs: with: dotnet-version: ${{ env.DOTNETVERSION }} - name: Setup Node - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0 + uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0 with: node-version: ${{ env.NODEVERSION }} registry-url: https://registry.npmjs.org @@ -76,7 +74,7 @@ jobs: distribution: temurin cache: gradle - name: Setup Gradle - uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a # v4.4.3 + uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0 with: gradle-version: "7.6" - name: Update Pulumi/Pulumi diff --git a/mise.toml b/mise.toml deleted file mode 100644 index 57433b07fd..0000000000 --- a/mise.toml +++ /dev/null @@ -1,19 +0,0 @@ -# WARNING: This file is autogenerated - changes will be overwritten when regenerated by https://github.com/pulumi/ci-mgmt - -[tools] - -# Runtimes -go = '1.24' -node = '20' -python = '3.11.8' -dotnet = '8.0' -# Corretto version used as Java SE/OpenJDK version no longer offered -java = 'corretto-11' - -# Executable tools -pulumi = 'latest' -"go:github.com/pulumi/pulumictl/cmd/pulumictl" = 'latest' -gradle = '7.6' - -[settings] -experimental = true # Required for Go binaries (e.g. pulumictl). diff --git a/scripts/get-versions.sh b/scripts/get-versions.sh new file mode 100755 index 0000000000..bc92573bfe --- /dev/null +++ b/scripts/get-versions.sh @@ -0,0 +1,55 @@ +#!/usr/bin/env bash +set -euo pipefail + +# This script can be simplified to use go when https://github.com/jdx/mise/discussions/6374 is fixed +# e.g. go list -m -f '{{.GoVersion}}' + +module_path="github.com/pulumi/pulumi/pkg/v3" +go_mod_path="provider" +gomod="go.mod" + +if [[ "$go_mod_path" != "" && "$go_mod_path" != "." ]]; then + gomod="$go_mod_path/$gomod" +fi + +if [[ ! -f "$gomod" ]]; then + echo "missing $gomod" >&2 + exit 1 +fi + +raw_version=$(awk -v module="$module_path" ' + $1 == module || $2 == module { + for (i = 1; i <= NF; i++) { + if ($i ~ /^v[0-9]/) { + sub(/^v/, "", $i) + print $i + exit + } + } + } +' "$gomod") + +if [[ -z "${raw_version:-}" ]]; then + echo "failed to determine Pulumi version from $gomod" >&2 + exit 1 +fi + +echo "PULUMI_VERSION_MISE=$raw_version" +export PULUMI_VERSION_MISE=$raw_version + +# Prefer the toolchain directive if present, otherwise fall back to the `go` version line +go_toolchain=$(awk '/^toolchain[[:space:]]+go[0-9]/{ print $2; exit }' "$gomod") + +if [[ -n "${go_toolchain:-}" ]]; then + go_version=${go_toolchain#go} +else + go_version=$(awk '/^go[[:space:]]+[0-9]/{ print $2; exit }' "$gomod") +fi + +if [[ -z "${go_version:-}" ]]; then + echo "failed to determine Go version from $gomod" >&2 + exit 1 +fi + +echo "GO_VERSION_MISE=$go_version" +export GO_VERSION_MISE=$go_version