diff --git a/.github/workflows/check-upstream-upgrade.yml b/.github/workflows/check-upstream-upgrade.yml index 352bc4d..34c4eb8 100644 --- a/.github/workflows/check-upstream-upgrade.yml +++ b/.github/workflows/check-upstream-upgrade.yml @@ -11,9 +11,9 @@ jobs: - name: Install Go uses: actions/setup-go@v5 with: + go-version: "1.21.x" cache-dependency-path: | - sdk/go.sum - go-version: 1.21.x + sdk/go.sum - name: Checkout Repo uses: actions/checkout@v4 - name: Install upgrade-provider diff --git a/.github/workflows/command-dispatch.yml b/.github/workflows/command-dispatch.yml index e395b0d..ce45ce8 100644 --- a/.github/workflows/command-dispatch.yml +++ b/.github/workflows/command-dispatch.yml @@ -1,17 +1,9 @@ # WARNING: This file is autogenerated - changes will be overwritten if not made via https://github.com/pulumi/ci-mgmt env: - PROVIDER: http - DOTNETVERSION: | - 6.0.x - 3.1.301 GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - GOVERSION: 1.21.x - GRADLEVERSION: "7.6" HTTP_TOKEN: ${{ secrets.HTTP_TOKEN }} - JAVAVERSION: "11" NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} - NODEVERSION: 20.x NPM_TOKEN: ${{ secrets.NPM_TOKEN }} NUGET_PUBLISH_KEY: ${{ secrets.NUGET_PUBLISH_KEY }} PUBLISH_REPO_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} @@ -22,13 +14,11 @@ env: PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget PYPI_PASSWORD: ${{ secrets.PYPI_API_TOKEN }} PYPI_USERNAME: __token__ - PYTHONVERSION: 3.11.8 SIGNING_KEY: ${{ secrets.JAVA_SIGNING_KEY }} SIGNING_KEY_ID: ${{ secrets.JAVA_SIGNING_KEY_ID }} SIGNING_PASSWORD: ${{ secrets.JAVA_SIGNING_PASSWORD }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} TF_APPEND_USER_AGENT: pulumi - TRAVIS_OS_NAME: linux jobs: command-dispatch-for-testing: name: command-dispatch-for-testing diff --git a/.github/workflows/license.yml b/.github/workflows/license.yml index 364e94a..23cd6e3 100644 --- a/.github/workflows/license.yml +++ b/.github/workflows/license.yml @@ -8,16 +8,9 @@ on: env: - DOTNETVERSION: | - 6.0.x - 3.1.301 GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - GOVERSION: 1.21.x - GRADLEVERSION: "7.6" HTTP_TOKEN: ${{ secrets.HTTP_TOKEN }} - JAVAVERSION: "11" NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} - NODEVERSION: 20.x NPM_TOKEN: ${{ secrets.NPM_TOKEN }} NUGET_PUBLISH_KEY: ${{ secrets.NUGET_PUBLISH_KEY }} PUBLISH_REPO_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} @@ -28,13 +21,11 @@ env: PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget PYPI_PASSWORD: ${{ secrets.PYPI_API_TOKEN }} PYPI_USERNAME: __token__ - PYTHONVERSION: 3.11.8 SIGNING_KEY: ${{ secrets.JAVA_SIGNING_KEY }} SIGNING_KEY_ID: ${{ secrets.JAVA_SIGNING_KEY_ID }} SIGNING_PASSWORD: ${{ secrets.JAVA_SIGNING_PASSWORD }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} TF_APPEND_USER_AGENT: pulumi - TRAVIS_OS_NAME: linux jobs: license_check: @@ -50,7 +41,7 @@ jobs: with: cache-dependency-path: | sdk/go.sum - go-version: 1.21.x + go-version: "1.21.x" - run: make upstream - uses: pulumi/license-check-action@main with: diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index cd15f68..b39cf4b 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -7,16 +7,9 @@ on: inputs: {} env: - DOTNETVERSION: | - 6.0.x - 3.1.301 GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - GOVERSION: 1.21.x - GRADLEVERSION: "7.6" HTTP_TOKEN: ${{ secrets.HTTP_TOKEN }} - JAVAVERSION: "11" NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} - NODEVERSION: 20.x NPM_TOKEN: ${{ secrets.NPM_TOKEN }} NUGET_PUBLISH_KEY: ${{ secrets.NUGET_PUBLISH_KEY }} PUBLISH_REPO_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} @@ -27,13 +20,11 @@ env: PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget PYPI_PASSWORD: ${{ secrets.PYPI_API_TOKEN }} PYPI_USERNAME: __token__ - PYTHONVERSION: 3.11.8 SIGNING_KEY: ${{ secrets.JAVA_SIGNING_KEY }} SIGNING_KEY_ID: ${{ secrets.JAVA_SIGNING_KEY_ID }} SIGNING_PASSWORD: ${{ secrets.JAVA_SIGNING_PASSWORD }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} TF_APPEND_USER_AGENT: pulumi - TRAVIS_OS_NAME: linux jobs: lint: diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2ac694e..95f63f4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,17 +1,9 @@ # WARNING: This file is autogenerated - changes will be overwritten if not made via https://github.com/pulumi/ci-mgmt env: - PROVIDER: http - DOTNETVERSION: | - 6.0.x - 3.1.301 GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - GOVERSION: 1.21.x - GRADLEVERSION: "7.6" HTTP_TOKEN: ${{ secrets.HTTP_TOKEN }} - JAVAVERSION: "11" NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} - NODEVERSION: 20.x NPM_TOKEN: ${{ secrets.NPM_TOKEN }} NUGET_PUBLISH_KEY: ${{ secrets.NUGET_PUBLISH_KEY }} PUBLISH_REPO_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} @@ -22,13 +14,11 @@ env: PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget PYPI_PASSWORD: ${{ secrets.PYPI_API_TOKEN }} PYPI_USERNAME: __token__ - PYTHONVERSION: 3.11.8 SIGNING_KEY: ${{ secrets.JAVA_SIGNING_KEY }} SIGNING_KEY_ID: ${{ secrets.JAVA_SIGNING_KEY_ID }} SIGNING_PASSWORD: ${{ secrets.JAVA_SIGNING_PASSWORD }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} TF_APPEND_USER_AGENT: pulumi - TRAVIS_OS_NAME: linux jobs: build_sdk: name: build_sdk @@ -43,9 +33,9 @@ jobs: - name: Install Go uses: actions/setup-go@v5 with: + go-version: "1.21.x" cache-dependency-path: | - sdk/go.sum - go-version: 1.21.x + sdk/go.sum - name: Cache examples generation uses: actions/cache@v4 with: @@ -60,41 +50,41 @@ jobs: - name: Install Pulumi CLI uses: pulumi/actions@v5 with: - pulumi-version: ^3 + pulumi-version: "^3" - name: Setup Node uses: actions/setup-node@v4 with: - node-version: ${{ env.NODEVERSION }} + node-version: "20.x" registry-url: https://registry.npmjs.org - name: Setup DotNet uses: actions/setup-dotnet@v4 with: - dotnet-version: ${{ env.DOTNETVERSION }} + dotnet-version: "6.0.x" - name: Setup Python uses: actions/setup-python@v5 with: - python-version: ${{ env.PYTHONVERSION }} + python-version: "3.11.8" - name: Setup Java uses: actions/setup-java@v4 with: cache: gradle distribution: temurin - java-version: ${{ env.JAVAVERSION }} + java-version: "11" - name: Setup Gradle uses: gradle/gradle-build-action@v3 with: - gradle-version: ${{ env.GRADLEVERSION }} + gradle-version: "7.6" - name: Download provider + tfgen binaries uses: actions/download-artifact@v4 with: - name: ${{ env.PROVIDER }}-provider.tar.gz + name: http-provider.tar.gz path: ${{ github.workspace }}/bin - name: Untar provider binaries run: >- tar -zxf ${{ github.workspace }}/bin/provider.tar.gz -C ${{ github.workspace}}/bin - find ${{ github.workspace }} -name "pulumi-*-${{ env.PROVIDER }}" -print -exec chmod +x {} \; + find ${{ github.workspace }} -name "pulumi-*-http" -print -exec chmod +x {} \; - name: Install plugins run: make install_plugins - name: Update path @@ -159,9 +149,9 @@ jobs: - name: Install Go uses: actions/setup-go@v5 with: + go-version: "1.21.x" cache-dependency-path: | - sdk/go.sum - go-version: 1.21.x + sdk/go.sum - name: Install pulumictl uses: jaxxstorm/action-install-gh-release@v1.11.0 with: @@ -170,7 +160,7 @@ jobs: - name: Install Pulumi CLI uses: pulumi/actions@v5 with: - pulumi-version: ^3 + pulumi-version: "^3" - if: github.event_name == 'pull_request' name: Install Schema Tools uses: jaxxstorm/action-install-gh-release@v1.11.0 @@ -217,7 +207,7 @@ jobs: - name: Install Go uses: actions/setup-go@v5 with: - go-version: 1.21.x + go-version: "1.21.x" cache-dependency-path: | provider/*.sum upstream/*.sum @@ -229,7 +219,7 @@ jobs: - name: Install Pulumi CLI uses: pulumi/actions@v5 with: - pulumi-version: ^3 + pulumi-version: "^3" - if: github.event_name == 'pull_request' name: Install Schema Tools uses: jaxxstorm/action-install-gh-release@v1.11.0 @@ -251,7 +241,7 @@ jobs: EOF=$(dd if=/dev/urandom bs=15 count=1 status=none | base64) { echo "SCHEMA_CHANGES<<$EOF"; - schema-tools compare -p ${{ env.PROVIDER }} -o ${{ github.event.repository.default_branch }} -n --local-path=provider/cmd/pulumi-resource-${{ env.PROVIDER }}/schema.json; + schema-tools compare -p http -o ${{ github.event.repository.default_branch }} -n --local-path=provider/cmd/pulumi-resource-http/schema.json; echo "$EOF"; } >> "$GITHUB_ENV" - if: github.event_name == 'pull_request' && github.actor != 'dependabot[bot]' @@ -268,12 +258,12 @@ jobs: - name: Tar provider binaries run: tar -zcf ${{ github.workspace }}/bin/provider.tar.gz -C ${{ - github.workspace }}/bin/ pulumi-resource-${{ env.PROVIDER }} - pulumi-tfgen-${{ env.PROVIDER }} + github.workspace }}/bin/ pulumi-resource-http + pulumi-tfgen-http - name: Upload artifacts uses: actions/upload-artifact@v4 with: - name: ${{ env.PROVIDER }}-provider.tar.gz + name: http-provider.tar.gz path: ${{ github.workspace }}/bin/provider.tar.gz retention-days: 30 - if: failure() && github.event_name == 'push' @@ -304,9 +294,9 @@ jobs: - name: Install Go uses: actions/setup-go@v5 with: + go-version: "1.21.x" cache-dependency-path: | - sdk/go.sum - go-version: 1.21.x + sdk/go.sum - name: Install pulumictl uses: jaxxstorm/action-install-gh-release@v1.11.0 with: @@ -315,7 +305,7 @@ jobs: - name: Install Pulumi CLI uses: pulumi/actions@v5 with: - pulumi-version: ^3 + pulumi-version: "^3" - name: Configure AWS Credentials uses: aws-actions/configure-aws-credentials@v4 with: @@ -324,7 +314,7 @@ jobs: aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} role-duration-seconds: 7200 role-external-id: upload-pulumi-release - role-session-name: ${{ env.PROVIDER }}@githubActions + role-session-name: http@githubActions role-to-assume: ${{ secrets.AWS_UPLOAD_ROLE_ARN }} - id: version uses: pulumi/provider-version-action@v1 @@ -401,9 +391,9 @@ jobs: - name: Install Go uses: actions/setup-go@v5 with: + go-version: "1.21.x" cache-dependency-path: | - sdk/go.sum - go-version: 1.21.x + sdk/go.sum - name: Install pulumictl uses: jaxxstorm/action-install-gh-release@v1.11.0 with: @@ -412,41 +402,41 @@ jobs: - name: Install Pulumi CLI uses: pulumi/actions@v5 with: - pulumi-version: ^3 + pulumi-version: "^3" - name: Setup Node uses: actions/setup-node@v4 with: - node-version: ${{ env.NODEVERSION }} + node-version: "20.x" registry-url: https://registry.npmjs.org - name: Setup DotNet uses: actions/setup-dotnet@v4 with: - dotnet-version: ${{ env.DOTNETVERSION }} + dotnet-version: "6.0.x" - name: Setup Python uses: actions/setup-python@v5 with: - python-version: ${{ env.PYTHONVERSION }} + python-version: "3.11.8" - name: Setup Java uses: actions/setup-java@v4 with: cache: gradle distribution: temurin - java-version: ${{ env.JAVAVERSION }} + java-version: "11" - name: Setup Gradle uses: gradle/gradle-build-action@v3 with: - gradle-version: ${{ env.GRADLEVERSION }} + gradle-version: "7.6" - name: Download provider + tfgen binaries uses: actions/download-artifact@v4 with: - name: ${{ env.PROVIDER }}-provider.tar.gz + name: http-provider.tar.gz path: ${{ github.workspace }}/bin - name: Untar provider binaries run: >- tar -zxf ${{ github.workspace }}/bin/provider.tar.gz -C ${{ github.workspace}}/bin - find ${{ github.workspace }} -name "pulumi-*-${{ env.PROVIDER }}" -print -exec chmod +x {} \; + find ${{ github.workspace }} -name "pulumi-*-http" -print -exec chmod +x {} \; - run: dotnet nuget add source ${{ github.workspace }}/nuget - name: Download SDK uses: actions/download-artifact@v4 diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml index 4a13c19..bc1634c 100644 --- a/.github/workflows/prerelease.yml +++ b/.github/workflows/prerelease.yml @@ -1,18 +1,10 @@ # WARNING: This file is autogenerated - changes will be overwritten if not made via https://github.com/pulumi/ci-mgmt env: - PROVIDER: http IS_PRERELEASE: true - DOTNETVERSION: | - 6.0.x - 3.1.301 GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - GOVERSION: 1.21.x - GRADLEVERSION: "7.6" HTTP_TOKEN: ${{ secrets.HTTP_TOKEN }} - JAVAVERSION: "11" NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} - NODEVERSION: 20.x NPM_TOKEN: ${{ secrets.NPM_TOKEN }} NUGET_PUBLISH_KEY: ${{ secrets.NUGET_PUBLISH_KEY }} PUBLISH_REPO_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} @@ -23,13 +15,11 @@ env: PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget PYPI_PASSWORD: ${{ secrets.PYPI_API_TOKEN }} PYPI_USERNAME: __token__ - PYTHONVERSION: 3.11.8 SIGNING_KEY: ${{ secrets.JAVA_SIGNING_KEY }} SIGNING_KEY_ID: ${{ secrets.JAVA_SIGNING_KEY_ID }} SIGNING_PASSWORD: ${{ secrets.JAVA_SIGNING_PASSWORD }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} TF_APPEND_USER_AGENT: pulumi - TRAVIS_OS_NAME: linux jobs: build_sdk: name: build_sdk @@ -44,9 +34,9 @@ jobs: - name: Install Go uses: actions/setup-go@v5 with: + go-version: "1.21.x" cache-dependency-path: | - sdk/go.sum - go-version: 1.21.x + sdk/go.sum - name: Cache examples generation uses: actions/cache@v4 with: @@ -61,41 +51,41 @@ jobs: - name: Install Pulumi CLI uses: pulumi/actions@v5 with: - pulumi-version: ^3 + pulumi-version: "^3" - name: Setup Node uses: actions/setup-node@v4 with: - node-version: ${{ env.NODEVERSION }} + node-version: "20.x" registry-url: https://registry.npmjs.org - name: Setup DotNet uses: actions/setup-dotnet@v4 with: - dotnet-version: ${{ env.DOTNETVERSION }} + dotnet-version: "6.0.x" - name: Setup Python uses: actions/setup-python@v5 with: - python-version: ${{ env.PYTHONVERSION }} + python-version: "3.11.8" - name: Setup Java uses: actions/setup-java@v4 with: cache: gradle distribution: temurin - java-version: ${{ env.JAVAVERSION }} + java-version: "11" - name: Setup Gradle uses: gradle/gradle-build-action@v3 with: - gradle-version: ${{ env.GRADLEVERSION }} + gradle-version: "7.6" - name: Download provider + tfgen binaries uses: actions/download-artifact@v4 with: - name: ${{ env.PROVIDER }}-provider.tar.gz + name: http-provider.tar.gz path: ${{ github.workspace }}/bin - name: Untar provider binaries run: >- tar -zxf ${{ github.workspace }}/bin/provider.tar.gz -C ${{ github.workspace}}/bin - find ${{ github.workspace }} -name "pulumi-*-${{ env.PROVIDER }}" -print -exec chmod +x {} \; + find ${{ github.workspace }} -name "pulumi-*-http" -print -exec chmod +x {} \; - name: Install plugins run: make install_plugins - name: Update path @@ -164,7 +154,7 @@ jobs: - name: Install Go uses: actions/setup-go@v5 with: - go-version: 1.21.x + go-version: "1.21.x" cache-dependency-path: | provider/*.sum upstream/*.sum @@ -176,7 +166,7 @@ jobs: - name: Install Pulumi CLI uses: pulumi/actions@v5 with: - pulumi-version: ^3 + pulumi-version: "^3" - if: github.event_name == 'pull_request' name: Install Schema Tools uses: jaxxstorm/action-install-gh-release@v1.11.0 @@ -198,7 +188,7 @@ jobs: EOF=$(dd if=/dev/urandom bs=15 count=1 status=none | base64) { echo "SCHEMA_CHANGES<<$EOF"; - schema-tools compare -p ${{ env.PROVIDER }} -o ${{ github.event.repository.default_branch }} -n --local-path=provider/cmd/pulumi-resource-${{ env.PROVIDER }}/schema.json; + schema-tools compare -p http -o ${{ github.event.repository.default_branch }} -n --local-path=provider/cmd/pulumi-resource-http/schema.json; echo "$EOF"; } >> "$GITHUB_ENV" - if: github.event_name == 'pull_request' && github.actor != 'dependabot[bot]' @@ -215,12 +205,12 @@ jobs: - name: Tar provider binaries run: tar -zcf ${{ github.workspace }}/bin/provider.tar.gz -C ${{ - github.workspace }}/bin/ pulumi-resource-${{ env.PROVIDER }} - pulumi-tfgen-${{ env.PROVIDER }} + github.workspace }}/bin/ pulumi-resource-http + pulumi-tfgen-http - name: Upload artifacts uses: actions/upload-artifact@v4 with: - name: ${{ env.PROVIDER }}-provider.tar.gz + name: http-provider.tar.gz path: ${{ github.workspace }}/bin/provider.tar.gz retention-days: 30 - if: failure() && github.event_name == 'push' @@ -251,9 +241,9 @@ jobs: - name: Install Go uses: actions/setup-go@v5 with: + go-version: "1.21.x" cache-dependency-path: | - sdk/go.sum - go-version: 1.21.x + sdk/go.sum - name: Install pulumictl uses: jaxxstorm/action-install-gh-release@v1.11.0 with: @@ -262,7 +252,7 @@ jobs: - name: Install Pulumi CLI uses: pulumi/actions@v5 with: - pulumi-version: ^3 + pulumi-version: "^3" - name: Configure AWS Credentials uses: aws-actions/configure-aws-credentials@v4 with: @@ -271,7 +261,7 @@ jobs: aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} role-duration-seconds: 7200 role-external-id: upload-pulumi-release - role-session-name: ${{ env.PROVIDER }}@githubActions + role-session-name: http@githubActions role-to-assume: ${{ secrets.AWS_UPLOAD_ROLE_ARN }} - id: version uses: pulumi/provider-version-action@v1 @@ -366,9 +356,9 @@ jobs: - name: Install Go uses: actions/setup-go@v5 with: + go-version: "1.21.x" cache-dependency-path: | - sdk/go.sum - go-version: 1.21.x + sdk/go.sum - name: Install pulumictl uses: jaxxstorm/action-install-gh-release@v1.11.0 with: @@ -377,41 +367,41 @@ jobs: - name: Install Pulumi CLI uses: pulumi/actions@v5 with: - pulumi-version: ^3 + pulumi-version: "^3" - name: Setup Node uses: actions/setup-node@v4 with: - node-version: ${{ env.NODEVERSION }} + node-version: "20.x" registry-url: https://registry.npmjs.org - name: Setup DotNet uses: actions/setup-dotnet@v4 with: - dotnet-version: ${{ env.DOTNETVERSION }} + dotnet-version: "6.0.x" - name: Setup Python uses: actions/setup-python@v5 with: - python-version: ${{ env.PYTHONVERSION }} + python-version: "3.11.8" - name: Setup Java uses: actions/setup-java@v4 with: cache: gradle distribution: temurin - java-version: ${{ env.JAVAVERSION }} + java-version: "11" - name: Setup Gradle uses: gradle/gradle-build-action@v3 with: - gradle-version: ${{ env.GRADLEVERSION }} + gradle-version: "7.6" - name: Download provider + tfgen binaries uses: actions/download-artifact@v4 with: - name: ${{ env.PROVIDER }}-provider.tar.gz + name: http-provider.tar.gz path: ${{ github.workspace }}/bin - name: Untar provider binaries run: >- tar -zxf ${{ github.workspace }}/bin/provider.tar.gz -C ${{ github.workspace}}/bin - find ${{ github.workspace }} -name "pulumi-*-${{ env.PROVIDER }}" -print -exec chmod +x {} \; + find ${{ github.workspace }} -name "pulumi-*-http" -print -exec chmod +x {} \; - run: dotnet nuget add source ${{ github.workspace }}/nuget - name: Download SDK uses: actions/download-artifact@v4 diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 86097b3..cf13195 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -1,17 +1,9 @@ # WARNING: This file is autogenerated - changes will be overwritten if not made via https://github.com/pulumi/ci-mgmt env: - PROVIDER: http - DOTNETVERSION: | - 6.0.x - 3.1.301 GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - GOVERSION: 1.21.x - GRADLEVERSION: "7.6" HTTP_TOKEN: ${{ secrets.HTTP_TOKEN }} - JAVAVERSION: "11" NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} - NODEVERSION: 20.x NPM_TOKEN: ${{ secrets.NPM_TOKEN }} NUGET_PUBLISH_KEY: ${{ secrets.NUGET_PUBLISH_KEY }} PUBLISH_REPO_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} @@ -22,13 +14,11 @@ env: PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget PYPI_PASSWORD: ${{ secrets.PYPI_API_TOKEN }} PYPI_USERNAME: __token__ - PYTHONVERSION: 3.11.8 SIGNING_KEY: ${{ secrets.JAVA_SIGNING_KEY }} SIGNING_KEY_ID: ${{ secrets.JAVA_SIGNING_KEY_ID }} SIGNING_PASSWORD: ${{ secrets.JAVA_SIGNING_PASSWORD }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} TF_APPEND_USER_AGENT: pulumi - TRAVIS_OS_NAME: linux jobs: comment-on-pr: if: github.event.pull_request.head.repo.full_name != github.repository diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a9e9903..1b7996d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,17 +1,9 @@ # WARNING: This file is autogenerated - changes will be overwritten if not made via https://github.com/pulumi/ci-mgmt env: - PROVIDER: http - DOTNETVERSION: | - 6.0.x - 3.1.301 GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - GOVERSION: 1.21.x - GRADLEVERSION: "7.6" HTTP_TOKEN: ${{ secrets.HTTP_TOKEN }} - JAVAVERSION: "11" NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} - NODEVERSION: 20.x NPM_TOKEN: ${{ secrets.NPM_TOKEN }} NUGET_PUBLISH_KEY: ${{ secrets.NUGET_PUBLISH_KEY }} PUBLISH_REPO_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} @@ -22,13 +14,11 @@ env: PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget PYPI_PASSWORD: ${{ secrets.PYPI_API_TOKEN }} PYPI_USERNAME: __token__ - PYTHONVERSION: 3.11.8 SIGNING_KEY: ${{ secrets.JAVA_SIGNING_KEY }} SIGNING_KEY_ID: ${{ secrets.JAVA_SIGNING_KEY_ID }} SIGNING_PASSWORD: ${{ secrets.JAVA_SIGNING_PASSWORD }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} TF_APPEND_USER_AGENT: pulumi - TRAVIS_OS_NAME: linux jobs: build_sdk: name: build_sdk @@ -43,9 +33,9 @@ jobs: - name: Install Go uses: actions/setup-go@v5 with: + go-version: "1.21.x" cache-dependency-path: | - sdk/go.sum - go-version: 1.21.x + sdk/go.sum - name: Cache examples generation uses: actions/cache@v4 with: @@ -60,41 +50,41 @@ jobs: - name: Install Pulumi CLI uses: pulumi/actions@v5 with: - pulumi-version: ^3 + pulumi-version: "^3" - name: Setup Node uses: actions/setup-node@v4 with: - node-version: ${{ env.NODEVERSION }} + node-version: "20.x" registry-url: https://registry.npmjs.org - name: Setup DotNet uses: actions/setup-dotnet@v4 with: - dotnet-version: ${{ env.DOTNETVERSION }} + dotnet-version: "6.0.x" - name: Setup Python uses: actions/setup-python@v5 with: - python-version: ${{ env.PYTHONVERSION }} + python-version: "3.11.8" - name: Setup Java uses: actions/setup-java@v4 with: cache: gradle distribution: temurin - java-version: ${{ env.JAVAVERSION }} + java-version: "11" - name: Setup Gradle uses: gradle/gradle-build-action@v3 with: - gradle-version: ${{ env.GRADLEVERSION }} + gradle-version: "7.6" - name: Download provider + tfgen binaries uses: actions/download-artifact@v4 with: - name: ${{ env.PROVIDER }}-provider.tar.gz + name: http-provider.tar.gz path: ${{ github.workspace }}/bin - name: Untar provider binaries run: >- tar -zxf ${{ github.workspace }}/bin/provider.tar.gz -C ${{ github.workspace}}/bin - find ${{ github.workspace }} -name "pulumi-*-${{ env.PROVIDER }}" -print -exec chmod +x {} \; + find ${{ github.workspace }} -name "pulumi-*-http" -print -exec chmod +x {} \; - name: Install plugins run: make install_plugins - name: Update path @@ -163,7 +153,7 @@ jobs: - name: Install Go uses: actions/setup-go@v5 with: - go-version: 1.21.x + go-version: "1.21.x" cache-dependency-path: | provider/*.sum upstream/*.sum @@ -175,7 +165,7 @@ jobs: - name: Install Pulumi CLI uses: pulumi/actions@v5 with: - pulumi-version: ^3 + pulumi-version: "^3" - if: github.event_name == 'pull_request' name: Install Schema Tools uses: jaxxstorm/action-install-gh-release@v1.11.0 @@ -197,7 +187,7 @@ jobs: EOF=$(dd if=/dev/urandom bs=15 count=1 status=none | base64) { echo "SCHEMA_CHANGES<<$EOF"; - schema-tools compare -p ${{ env.PROVIDER }} -o ${{ github.event.repository.default_branch }} -n --local-path=provider/cmd/pulumi-resource-${{ env.PROVIDER }}/schema.json; + schema-tools compare -p http -o ${{ github.event.repository.default_branch }} -n --local-path=provider/cmd/pulumi-resource-http/schema.json; echo "$EOF"; } >> "$GITHUB_ENV" - if: github.event_name == 'pull_request' && github.actor != 'dependabot[bot]' @@ -214,12 +204,12 @@ jobs: - name: Tar provider binaries run: tar -zcf ${{ github.workspace }}/bin/provider.tar.gz -C ${{ - github.workspace }}/bin/ pulumi-resource-${{ env.PROVIDER }} - pulumi-tfgen-${{ env.PROVIDER }} + github.workspace }}/bin/ pulumi-resource-http + pulumi-tfgen-http - name: Upload artifacts uses: actions/upload-artifact@v4 with: - name: ${{ env.PROVIDER }}-provider.tar.gz + name: http-provider.tar.gz path: ${{ github.workspace }}/bin/provider.tar.gz retention-days: 30 - if: failure() && github.event_name == 'push' @@ -250,9 +240,9 @@ jobs: - name: Install Go uses: actions/setup-go@v5 with: + go-version: "1.21.x" cache-dependency-path: | - sdk/go.sum - go-version: 1.21.x + sdk/go.sum - name: Install pulumictl uses: jaxxstorm/action-install-gh-release@v1.11.0 with: @@ -261,7 +251,7 @@ jobs: - name: Install Pulumi CLI uses: pulumi/actions@v5 with: - pulumi-version: ^3 + pulumi-version: "^3" - name: Configure AWS Credentials uses: aws-actions/configure-aws-credentials@v4 with: @@ -270,7 +260,7 @@ jobs: aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} role-duration-seconds: 7200 role-external-id: upload-pulumi-release - role-session-name: ${{ env.PROVIDER }}@githubActions + role-session-name: http@githubActions role-to-assume: ${{ secrets.AWS_UPLOAD_ROLE_ARN }} - id: version uses: pulumi/provider-version-action@v1 @@ -382,9 +372,9 @@ jobs: - name: Install Go uses: actions/setup-go@v5 with: + go-version: "1.21.x" cache-dependency-path: | - sdk/go.sum - go-version: 1.21.x + sdk/go.sum - name: Install pulumictl uses: jaxxstorm/action-install-gh-release@v1.11.0 with: @@ -393,41 +383,41 @@ jobs: - name: Install Pulumi CLI uses: pulumi/actions@v5 with: - pulumi-version: ^3 + pulumi-version: "^3" - name: Setup Node uses: actions/setup-node@v4 with: - node-version: ${{ env.NODEVERSION }} + node-version: "20.x" registry-url: https://registry.npmjs.org - name: Setup DotNet uses: actions/setup-dotnet@v4 with: - dotnet-version: ${{ env.DOTNETVERSION }} + dotnet-version: "6.0.x" - name: Setup Python uses: actions/setup-python@v5 with: - python-version: ${{ env.PYTHONVERSION }} + python-version: "3.11.8" - name: Setup Java uses: actions/setup-java@v4 with: cache: gradle distribution: temurin - java-version: ${{ env.JAVAVERSION }} + java-version: "11" - name: Setup Gradle uses: gradle/gradle-build-action@v3 with: - gradle-version: ${{ env.GRADLEVERSION }} + gradle-version: "7.6" - name: Download provider + tfgen binaries uses: actions/download-artifact@v4 with: - name: ${{ env.PROVIDER }}-provider.tar.gz + name: http-provider.tar.gz path: ${{ github.workspace }}/bin - name: Untar provider binaries run: >- tar -zxf ${{ github.workspace }}/bin/provider.tar.gz -C ${{ github.workspace}}/bin - find ${{ github.workspace }} -name "pulumi-*-${{ env.PROVIDER }}" -print -exec chmod +x {} \; + find ${{ github.workspace }} -name "pulumi-*-http" -print -exec chmod +x {} \; - run: dotnet nuget add source ${{ github.workspace }}/nuget - name: Download SDK uses: actions/download-artifact@v4 diff --git a/.github/workflows/resync-build.yml b/.github/workflows/resync-build.yml index 4ff778c..e7c500a 100644 --- a/.github/workflows/resync-build.yml +++ b/.github/workflows/resync-build.yml @@ -1,19 +1,11 @@ # WARNING: This file is autogenerated - changes will be overwritten if not made via https://github.com/pulumi/ci-mgmt env: - PROVIDER: http PULUMI_EXTRA_MAPPING_ERROR: true PULUMI_MISSING_MAPPING_ERROR: true - DOTNETVERSION: | - 6.0.x - 3.1.301 GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - GOVERSION: 1.21.x - GRADLEVERSION: "7.6" HTTP_TOKEN: ${{ secrets.HTTP_TOKEN }} - JAVAVERSION: "11" NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} - NODEVERSION: 20.x NPM_TOKEN: ${{ secrets.NPM_TOKEN }} NUGET_PUBLISH_KEY: ${{ secrets.NUGET_PUBLISH_KEY }} PUBLISH_REPO_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} @@ -24,13 +16,11 @@ env: PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget PYPI_PASSWORD: ${{ secrets.PYPI_API_TOKEN }} PYPI_USERNAME: __token__ - PYTHONVERSION: 3.11.8 SIGNING_KEY: ${{ secrets.JAVA_SIGNING_KEY }} SIGNING_KEY_ID: ${{ secrets.JAVA_SIGNING_KEY_ID }} SIGNING_PASSWORD: ${{ secrets.JAVA_SIGNING_PASSWORD }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} TF_APPEND_USER_AGENT: pulumi - TRAVIS_OS_NAME: linux jobs: resync_build: name: resync-build @@ -49,9 +39,9 @@ jobs: - name: Install Go uses: actions/setup-go@v5 with: + go-version: "1.21.x" cache-dependency-path: | - sdk/go.sum - go-version: 1.21.x + sdk/go.sum - name: Install pulumictl uses: jaxxstorm/action-install-gh-release@v1.11.0 with: @@ -60,20 +50,20 @@ jobs: - name: Install Pulumi CLI uses: pulumi/actions@v5 with: - pulumi-version: ^3 + pulumi-version: "^3" - name: Setup DotNet uses: actions/setup-dotnet@v4 with: - dotnet-version: ${{ env.DOTNETVERSION }} + dotnet-version: "6.0.x" - name: Setup Node uses: actions/setup-node@v4 with: - node-version: ${{ env.NODEVERSION }} + node-version: "20.x" registry-url: https://registry.npmjs.org - name: Setup Python uses: actions/setup-python@v5 with: - python-version: ${{ env.PYTHONVERSION }} + python-version: "3.11.8" - name: Sync with ci-mgmt run: cp -r "ci-mgmt/provider-ci/providers/$PROVIDER/repo/." . - name: Remove ci-mgmt directory @@ -104,11 +94,11 @@ jobs: body: This pull request was generated automatically by the resync-build workflow in this repository. branch: pulumi-bot/resync-${{ github.run_id}} - commit-message: Resync build for pulumi-${{ env.PROVIDER }} + commit-message: Resync build for pulumi-http committer: pulumi-bot labels: impact/no-changelog-required team-reviewers: platform-integrations - title: Fix up build for pulumi-${{ env.PROVIDER }} + title: Fix up build for pulumi-http token: ${{ secrets.PULUMI_BOT_TOKEN }} name: Resync build on: diff --git a/.github/workflows/run-acceptance-tests.yml b/.github/workflows/run-acceptance-tests.yml index a330394..e601a8f 100644 --- a/.github/workflows/run-acceptance-tests.yml +++ b/.github/workflows/run-acceptance-tests.yml @@ -1,18 +1,10 @@ # WARNING: This file is autogenerated - changes will be overwritten if not made via https://github.com/pulumi/ci-mgmt env: - PROVIDER: http PR_COMMIT_SHA: ${{ github.event.client_payload.pull_request.head.sha }} - DOTNETVERSION: | - 6.0.x - 3.1.301 GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - GOVERSION: 1.21.x - GRADLEVERSION: "7.6" HTTP_TOKEN: ${{ secrets.HTTP_TOKEN }} - JAVAVERSION: "11" NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} - NODEVERSION: 20.x NPM_TOKEN: ${{ secrets.NPM_TOKEN }} NUGET_PUBLISH_KEY: ${{ secrets.NUGET_PUBLISH_KEY }} PUBLISH_REPO_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} @@ -23,13 +15,11 @@ env: PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget PYPI_PASSWORD: ${{ secrets.PYPI_API_TOKEN }} PYPI_USERNAME: __token__ - PYTHONVERSION: 3.11.8 SIGNING_KEY: ${{ secrets.JAVA_SIGNING_KEY }} SIGNING_KEY_ID: ${{ secrets.JAVA_SIGNING_KEY_ID }} SIGNING_PASSWORD: ${{ secrets.JAVA_SIGNING_PASSWORD }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} TF_APPEND_USER_AGENT: pulumi - TRAVIS_OS_NAME: linux # This should cancel any previous runs of the same workflow on the same branch which are still running. concurrency: @@ -53,9 +43,9 @@ jobs: - name: Install Go uses: actions/setup-go@v5 with: + go-version: "1.21.x" cache-dependency-path: | - sdk/go.sum - go-version: 1.21.x + sdk/go.sum - name: Cache examples generation uses: actions/cache@v4 with: @@ -70,41 +60,41 @@ jobs: - name: Install Pulumi CLI uses: pulumi/actions@v5 with: - pulumi-version: ^3 + pulumi-version: "^3" - name: Setup Node uses: actions/setup-node@v4 with: - node-version: ${{ env.NODEVERSION }} + node-version: "20.x" registry-url: https://registry.npmjs.org - name: Setup DotNet uses: actions/setup-dotnet@v4 with: - dotnet-version: ${{ env.DOTNETVERSION }} + dotnet-version: "6.0.x" - name: Setup Python uses: actions/setup-python@v5 with: - python-version: ${{ env.PYTHONVERSION }} + python-version: "3.11.8" - name: Setup Java uses: actions/setup-java@v4 with: cache: gradle distribution: temurin - java-version: ${{ env.JAVAVERSION }} + java-version: "11" - name: Setup Gradle uses: gradle/gradle-build-action@v3 with: - gradle-version: ${{ env.GRADLEVERSION }} + gradle-version: "7.6" - name: Download provider + tfgen binaries uses: actions/download-artifact@v4 with: - name: ${{ env.PROVIDER }}-provider.tar.gz + name: http-provider.tar.gz path: ${{ github.workspace }}/bin - name: Untar provider binaries run: >- tar -zxf ${{ github.workspace }}/bin/provider.tar.gz -C ${{ github.workspace}}/bin - find ${{ github.workspace }} -name "pulumi-*-${{ env.PROVIDER }}" -print -exec chmod +x {} \; + find ${{ github.workspace }} -name "pulumi-*-http" -print -exec chmod +x {} \; - name: Install plugins run: make install_plugins - name: Update path @@ -188,7 +178,7 @@ jobs: - name: Install Go uses: actions/setup-go@v5 with: - go-version: 1.21.x + go-version: "1.21.x" cache-dependency-path: | provider/*.sum upstream/*.sum @@ -200,7 +190,7 @@ jobs: - name: Install Pulumi CLI uses: pulumi/actions@v5 with: - pulumi-version: ^3 + pulumi-version: "^3" - if: github.event_name == 'pull_request' name: Install Schema Tools uses: jaxxstorm/action-install-gh-release@v1.11.0 @@ -222,7 +212,7 @@ jobs: EOF=$(dd if=/dev/urandom bs=15 count=1 status=none | base64) { echo "SCHEMA_CHANGES<<$EOF"; - schema-tools compare -p ${{ env.PROVIDER }} -o ${{ github.event.repository.default_branch }} -n --local-path=provider/cmd/pulumi-resource-${{ env.PROVIDER }}/schema.json; + schema-tools compare -p http -o ${{ github.event.repository.default_branch }} -n --local-path=provider/cmd/pulumi-resource-http/schema.json; echo "$EOF"; } >> "$GITHUB_ENV" - if: github.event_name == 'pull_request' && github.actor != 'dependabot[bot]' @@ -239,12 +229,12 @@ jobs: - name: Tar provider binaries run: tar -zcf ${{ github.workspace }}/bin/provider.tar.gz -C ${{ - github.workspace }}/bin/ pulumi-resource-${{ env.PROVIDER }} - pulumi-tfgen-${{ env.PROVIDER }} + github.workspace }}/bin/ pulumi-resource-http + pulumi-tfgen-http - name: Upload artifacts uses: actions/upload-artifact@v4 with: - name: ${{ env.PROVIDER }}-provider.tar.gz + name: http-provider.tar.gz path: ${{ github.workspace }}/bin/provider.tar.gz retention-days: 30 - if: failure() && github.event_name == 'push' @@ -334,9 +324,9 @@ jobs: - name: Install Go uses: actions/setup-go@v5 with: + go-version: "1.21.x" cache-dependency-path: | - sdk/go.sum - go-version: 1.21.x + sdk/go.sum - name: Install pulumictl uses: jaxxstorm/action-install-gh-release@v1.11.0 with: @@ -345,41 +335,41 @@ jobs: - name: Install Pulumi CLI uses: pulumi/actions@v5 with: - pulumi-version: ^3 + pulumi-version: "^3" - name: Setup Node uses: actions/setup-node@v4 with: - node-version: ${{ env.NODEVERSION }} + node-version: "20.x" registry-url: https://registry.npmjs.org - name: Setup DotNet uses: actions/setup-dotnet@v4 with: - dotnet-version: ${{ env.DOTNETVERSION }} + dotnet-version: "6.0.x" - name: Setup Python uses: actions/setup-python@v5 with: - python-version: ${{ env.PYTHONVERSION }} + python-version: "3.11.8" - name: Setup Java uses: actions/setup-java@v4 with: cache: gradle distribution: temurin - java-version: ${{ env.JAVAVERSION }} + java-version: "11" - name: Setup Gradle uses: gradle/gradle-build-action@v3 with: - gradle-version: ${{ env.GRADLEVERSION }} + gradle-version: "7.6" - name: Download provider + tfgen binaries uses: actions/download-artifact@v4 with: - name: ${{ env.PROVIDER }}-provider.tar.gz + name: http-provider.tar.gz path: ${{ github.workspace }}/bin - name: Untar provider binaries run: >- tar -zxf ${{ github.workspace }}/bin/provider.tar.gz -C ${{ github.workspace}}/bin - find ${{ github.workspace }} -name "pulumi-*-${{ env.PROVIDER }}" -print -exec chmod +x {} \; + find ${{ github.workspace }} -name "pulumi-*-http" -print -exec chmod +x {} \; - run: dotnet nuget add source ${{ github.workspace }}/nuget - name: Download SDK uses: actions/download-artifact@v4 diff --git a/Makefile b/Makefile index 2d022fc..2b33088 100644 --- a/Makefile +++ b/Makefile @@ -11,6 +11,7 @@ JAVA_GEN := pulumi-java-gen TESTPARALLELISM := 10 WORKING_DIR := $(shell pwd) PULUMI_CONVERT := 1 +PULUMI_MISSING_DOCS_ERROR := true # Override during CI using `make [TARGET] PROVIDER_VERSION=""` or by setting a PROVIDER_VERSION environment variable # Local & branch builds will just used this fixed default version unless specified @@ -146,6 +147,7 @@ tfgen_no_deps: export PATH := $(WORKING_DIR)/.pulumi/bin:$(PATH) tfgen_no_deps: export PULUMI_CONVERT := $(PULUMI_CONVERT) tfgen_no_deps: export PULUMI_CONVERT_EXAMPLES_CACHE_DIR := $(WORKING_DIR)/.pulumi/examples-cache tfgen_no_deps: export PULUMI_DISABLE_AUTOMATIC_PLUGIN_ACQUISITION := $(PULUMI_CONVERT) +tfgen_no_deps: export PULUMI_MISSING_DOCS_ERROR := $(PULUMI_MISSING_DOCS_ERROR) tfgen_no_deps: tfgen_build_only $(WORKING_DIR)/bin/$(TFGEN) schema --out provider/cmd/$(PROVIDER) (cd provider && VERSION=$(VERSION_GENERIC) go generate cmd/$(PROVIDER)/main.go)