Dropping pulumi/provider-version-action from the workflows.

pulumiverse · Jan 21, 2025 · cf80be0 · cf80be0
1 parent 2cf4bb7
commit cf80be0
Show file tree

Hide file tree

Showing 8 changed files with 182 additions and 237 deletions.
diff --git a/.github/workflows/build_provider.yml b/.github/workflows/build_provider.yml
@@ -4,18 +4,12 @@ name: "Build Provider"
 
 on:
   workflow_call:
-    inputs:
-      version:
-        required: true
-        type: string
-        description: Version of the provider to build
 
 jobs:
   build_provider:
     name: Build ${{ matrix.platform.os }}-${{ matrix.platform.arch }}
     runs-on: ubuntu-latest
     env:
-      PROVIDER_VERSION: ${{ inputs.version }}
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     strategy:
       fail-fast: true

diff --git a/.github/workflows/build_sdk.yml b/.github/workflows/build_sdk.yml
@@ -4,10 +4,6 @@ name: "Build SDK"
 
 on:
   workflow_call:
-    inputs:
-      version:
-        required: true
-        type: string
 
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -26,7 +22,6 @@ env:
   SIGNING_KEY_ID: ${{ secrets.JAVA_SIGNING_KEY_ID }}
   SIGNING_PASSWORD: ${{ secrets.JAVA_SIGNING_PASSWORD }}
   TF_APPEND_USER_AGENT: pulumi
-  PROVIDER_VERSION: ${{ inputs.version }}
 
 jobs:
   build_sdk:
@@ -38,10 +33,10 @@ jobs:
       fail-fast: ${{ ! contains(github.actor, 'renovate') }}
       matrix:
         language:
-        - dotnet
-        - go
-        - nodejs
-        - python
+          - dotnet
+          - go
+          - nodejs
+          - python
     steps:
       - name: Checkout Repo
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -30,16 +30,12 @@ jobs:
     uses: ./.github/workflows/build_provider.yml
     needs: prerequisites
     secrets: inherit
-    with:
-      version: ${{ needs.prerequisites.outputs.version }}
 
   build_sdk:
     name: build_sdk
     needs: prerequisites
     uses: ./.github/workflows/build_sdk.yml
     secrets: inherit
-    with:
-      version: ${{ needs.prerequisites.outputs.version }}
 
   generate_coverage_data:
     continue-on-error: true
@@ -49,38 +45,38 @@ jobs:
     needs: prerequisites
     runs-on: ubuntu-latest
     steps:
-    - name: Free Disk Space (Ubuntu)
-      uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be # v1.3.1
-      with:
-        tool-cache: false
-        swap-storage: false
-    - name: Checkout Repo
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      with:
-        persist-credentials: false
-    - name: Configure AWS Credentials
-      uses: aws-actions/configure-aws-credentials@e3dd6a429d7300a6a4c196c26e071d42e0343502 # v4.0.2
-      with:
-        aws-access-key-id: ${{ secrets.AWS_CORP_S3_UPLOAD_ACCESS_KEY_ID }}
-        aws-region: us-west-2
-        aws-secret-access-key: ${{ secrets.AWS_CORP_S3_UPLOAD_SECRET_ACCESS_KEY }}
-    - name: Setup tools
-      uses: ./.github/actions/setup-tools
-      with:
-        tools: pulumictl, pulumicli, go, schema-tools
-    - name: Echo Coverage Output Dir
-      run: 'echo "Coverage output directory: ${{ env.COVERAGE_OUTPUT_DIR }}"'
-    - name: Generate Coverage Data
-      run: PULUMI_MISSING_DOCS_ERROR=true make tfgen
-    - name: Summarize Provider Coverage Results
-      run: cat ${{ env.COVERAGE_OUTPUT_DIR }}/shortSummary.txt
-    - name: Upload coverage data to S3
-      run: >-
-        summaryName="${PROVIDER}_summary_$(date +"%Y-%m-%d_%H-%M-%S").json"
+      - name: Free Disk Space (Ubuntu)
+        uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be # v1.3.1
+        with:
+          tool-cache: false
+          swap-storage: false
+      - name: Checkout Repo
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          persist-credentials: false
+      - name: Configure AWS Credentials
+        uses: aws-actions/configure-aws-credentials@e3dd6a429d7300a6a4c196c26e071d42e0343502 # v4.0.2
+        with:
+          aws-access-key-id: ${{ secrets.AWS_CORP_S3_UPLOAD_ACCESS_KEY_ID }}
+          aws-region: us-west-2
+          aws-secret-access-key: ${{ secrets.AWS_CORP_S3_UPLOAD_SECRET_ACCESS_KEY }}
+      - name: Setup tools
+        uses: ./.github/actions/setup-tools
+        with:
+          tools: pulumictl, pulumicli, go, schema-tools
+      - name: Echo Coverage Output Dir
+        run: 'echo "Coverage output directory: ${{ env.COVERAGE_OUTPUT_DIR }}"'
+      - name: Generate Coverage Data
+        run: PULUMI_MISSING_DOCS_ERROR=true make tfgen
+      - name: Summarize Provider Coverage Results
+        run: cat ${{ env.COVERAGE_OUTPUT_DIR }}/shortSummary.txt
+      - name: Upload coverage data to S3
+        run: >-
+          summaryName="${PROVIDER}_summary_$(date +"%Y-%m-%d_%H-%M-%S").json"
 
-        s3FullURI="s3://${{ secrets.S3_COVERAGE_BUCKET_NAME }}/summaries/${summaryName}"
+          s3FullURI="s3://${{ secrets.S3_COVERAGE_BUCKET_NAME }}/summaries/${summaryName}"
 
-        aws s3 cp "${{ env.COVERAGE_OUTPUT_DIR }}/summary.json" "${s3FullURI}" --acl bucket-owner-full-control
+          aws s3 cp "${{ env.COVERAGE_OUTPUT_DIR }}/summary.json" "${s3FullURI}" --acl bucket-owner-full-control
   lint:
     name: lint
     uses: ./.github/workflows/lint.yml
@@ -102,7 +98,6 @@ jobs:
     uses: ./.github/workflows/publish.yml
     secrets: inherit
     with:
-      version: ${{ needs.prerequisites.outputs.version }}
       isPrerelease: true
       skipGoSdk: true
       skipJavaSdk: true
@@ -112,18 +107,18 @@ jobs:
     needs: publish
     runs-on: ubuntu-latest
     steps:
-    - name: check if this commit needs release
-      if: ${{ env.RELEASE_BOT_ENDPOINT != '' }}
-      uses: pulumi/action-release-by-pr-label@main
-      with:
-        command: "release-if-needed"
-        repo: ${{ github.repository }}
-        commit: ${{ github.sha }}
-        slack_channel: ${{ secrets.RELEASE_OPS_SLACK_CHANNEL }}
-      env:
-        RELEASE_BOT_ENDPOINT: ${{ secrets.RELEASE_BOT_ENDPOINT }}
-        RELEASE_BOT_KEY: ${{ secrets.RELEASE_BOT_KEY }}
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: check if this commit needs release
+        if: ${{ env.RELEASE_BOT_ENDPOINT != '' }}
+        uses: pulumi/action-release-by-pr-label@main
+        with:
+          command: "release-if-needed"
+          repo: ${{ github.repository }}
+          commit: ${{ github.sha }}
+          slack_channel: ${{ secrets.RELEASE_OPS_SLACK_CHANNEL }}
+        env:
+          RELEASE_BOT_ENDPOINT: ${{ secrets.RELEASE_BOT_ENDPOINT }}
+          RELEASE_BOT_KEY: ${{ secrets.RELEASE_BOT_KEY }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
   test:
     uses: ./.github/workflows/test.yml
@@ -135,18 +130,16 @@ jobs:
       contents: read
       id-token: write
     secrets: inherit
-    with:
-      version: ${{ needs.prerequisites.outputs.version }}
 
 name: main
 on:
   workflow_dispatch: {}
   push:
     branches:
-    - main
+      - main
     paths-ignore:
-    - "**.md"
+      - "**.md"
     tags-ignore:
-    - v*
-    - sdk/*
-    - "**"
+      - v*
+      - sdk/*
+      - "**"
diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml
@@ -31,16 +31,12 @@ jobs:
     uses: ./.github/workflows/build_provider.yml
     needs: prerequisites
     secrets: inherit
-    with:
-      version: ${{ needs.prerequisites.outputs.version }}
 
   build_sdk:
     name: build_sdk
     needs: prerequisites
     uses: ./.github/workflows/build_sdk.yml
     secrets: inherit
-    with:
-      version: ${{ needs.prerequisites.outputs.version }}
 
   lint:
     name: lint
@@ -63,7 +59,6 @@ jobs:
     uses: ./.github/workflows/publish.yml
     secrets: inherit
     with:
-      version: ${{ needs.prerequisites.outputs.version }}
       isPrerelease: true
 
   test:
@@ -76,11 +71,9 @@ jobs:
       contents: read
       id-token: write
     secrets: inherit
-    with:
-      version: ${{ needs.prerequisites.outputs.version }}
 
 name: prerelease
 on:
   push:
     tags:
-    - v*.*.*-**
+      - v*.*.*-**
diff --git a/.github/workflows/prerequisites.yml b/.github/workflows/prerequisites.yml
@@ -14,10 +14,6 @@ on:
       default_branch:
         type: string
         required: true
-    outputs:
-      version:
-        description: "Provider version being built"
-        value: ${{ jobs.prerequisites.outputs.version }}
 
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -41,70 +37,64 @@ jobs:
   prerequisites:
     name: prerequisites
     runs-on: ubuntu-latest
-    outputs:
-      version: ${{ steps.provider-version.outputs.version }}
     steps:
-    - name: Checkout Repo
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      with:
-        persist-credentials: false
-    - uses: pulumi/provider-version-action@0391d47b9b0d865d33dd0a295b1fcf9f7021dd4c # v1.5.3
-      id: provider-version
-      with:
-        set-env: 'PROVIDER_VERSION'
-    - name: Cache examples generation
-      uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4
-      with:
-        path: |
-          .pulumi/examples-cache
-        key: ${{ runner.os }}-${{ hashFiles('provider/go.sum') }}
-    - name: Setup tools
-      uses: ./.github/actions/setup-tools
-      with:
-        tools: go, pulumictl, pulumicli, schema-tools
-    - name: Prepare local workspace before restoring previously built files
-      run: make prepare_local_workspace
-    - name: Generate schema
-      run: make schema
-    - name: Build provider binary
-      run: make provider
-    - name: Unit-test provider code
-      run: make test_provider
-    - name: Upload coverage reports to Codecov
-      uses: codecov/codecov-action@1e68e06f1dbfde0e4cefc87efeba9e4643565303 # v5.1.2
-      env:
-        CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
-    - if: inputs.is_pr
-      name: Check Schema is Valid
-      run: |
-        EOF=$(dd if=/dev/urandom bs=15 count=1 status=none | base64)
-        {
-          echo "SCHEMA_CHANGES<<$EOF";
-          schema-tools compare -r github://api.github.com/pulumiverse -p configcat -o "${{ inputs.default_branch }}" -n --local-path=provider/cmd/pulumi-resource-configcat/schema.json;
-          echo "$EOF";
-        } >> "$GITHUB_ENV"
-    - if: inputs.is_pr && inputs.is_automated == false && github.actor != 'dependabot[bot]'
-      name: Comment on PR with Details of Schema Check
-      uses: thollander/actions-comment-pull-request@24bffb9b452ba05a4f3f77933840a6a841d1b32b # v3.0.1
-      with:
-        github-token: ${{ secrets.GITHUB_TOKEN }}
-        comment-tag: schemaCheck
-        message: >+
-          ${{ env.SCHEMA_CHANGES }}
+      - name: Checkout Repo
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          persist-credentials: false
+      - name: Cache examples generation
+        uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4
+        with:
+          path: |
+            .pulumi/examples-cache
+          key: ${{ runner.os }}-${{ hashFiles('provider/go.sum') }}
+      - name: Setup tools
+        uses: ./.github/actions/setup-tools
+        with:
+          tools: go, pulumictl, pulumicli, schema-tools
+      - name: Prepare local workspace before restoring previously built files
+        run: make prepare_local_workspace
+      - name: Generate schema
+        run: make schema
+      - name: Build provider binary
+        run: make provider
+      - name: Unit-test provider code
+        run: make test_provider
+      - name: Upload coverage reports to Codecov
+        uses: codecov/codecov-action@1e68e06f1dbfde0e4cefc87efeba9e4643565303 # v5.1.2
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+      - if: inputs.is_pr
+        name: Check Schema is Valid
+        run: |
+          EOF=$(dd if=/dev/urandom bs=15 count=1 status=none | base64)
+          {
+            echo "SCHEMA_CHANGES<<$EOF";
+            schema-tools compare -r github://api.github.com/pulumiverse -p configcat -o "${{ inputs.default_branch }}" -n --local-path=provider/cmd/pulumi-resource-configcat/schema.json;
+            echo "$EOF";
+          } >> "$GITHUB_ENV"
+      - if: inputs.is_pr && inputs.is_automated == false && github.actor != 'dependabot[bot]'
+        name: Comment on PR with Details of Schema Check
+        uses: thollander/actions-comment-pull-request@24bffb9b452ba05a4f3f77933840a6a841d1b32b # v3.0.1
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          comment-tag: schemaCheck
+          message: >+
+            ${{ env.SCHEMA_CHANGES }}
 
 
-          Maintainer note: consult the [runbook](https://github.com/pulumi/platform-providers-team/blob/main/playbooks/tf-provider-updating.md) for dealing with any breaking changes.
+            Maintainer note: consult the [runbook](https://github.com/pulumi/platform-providers-team/blob/main/playbooks/tf-provider-updating.md) for dealing with any breaking changes.
 
-    - name: Upload codegen binary for configcat
-      uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
-      with:
-        name: pulumi-tfgen-configcat
-        path: ${{ github.workspace }}/bin/pulumi-tfgen-configcat
-        retention-days: 30
+      - name: Upload codegen binary for configcat
+        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
+        with:
+          name: pulumi-tfgen-configcat
+          path: ${{ github.workspace }}/bin/pulumi-tfgen-configcat
+          retention-days: 30
 
-    - name: Upload schema-embed.json
-      uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
-      with:
-        name: schema-embed.json
-        path: provider/cmd/pulumi-resource-configcat/schema-embed.json
-        retention-days: 30
+      - name: Upload schema-embed.json
+        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
+        with:
+          name: schema-embed.json
+          path: provider/cmd/pulumi-resource-configcat/schema-embed.json
+          retention-days: 30