diff --git a/.github/workflows/check-upstream-upgrade.yml b/.github/workflows/check-upstream-upgrade.yml index 352bc4d9a..34c4eb8f0 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 2916f569a..1865e6adb 100644 --- a/.github/workflows/command-dispatch.yml +++ b/.github/workflows/command-dispatch.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: datadog DATADOG_API_KEY: ${{ secrets.DATADOG_API_KEY }} DATADOG_APP_KEY: ${{ secrets.DATADOG_APP_KEY }} - DOTNETVERSION: | - 6.0.x - 3.1.301 GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - GOVERSION: 1.21.x - GRADLEVERSION: "7.6" - 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: command-dispatch-for-testing: name: command-dispatch-for-testing diff --git a/.github/workflows/license.yml b/.github/workflows/license.yml index 35f51a859..7c7b284b6 100644 --- a/.github/workflows/license.yml +++ b/.github/workflows/license.yml @@ -10,15 +10,8 @@ on: env: DATADOG_API_KEY: ${{ secrets.DATADOG_API_KEY }} DATADOG_APP_KEY: ${{ secrets.DATADOG_APP_KEY }} - DOTNETVERSION: | - 6.0.x - 3.1.301 GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - GOVERSION: 1.21.x - GRADLEVERSION: "7.6" - 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 }} @@ -29,13 +22,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: @@ -51,7 +42,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 17c9d0f03..ca9ead9e5 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -9,15 +9,8 @@ on: env: DATADOG_API_KEY: ${{ secrets.DATADOG_API_KEY }} DATADOG_APP_KEY: ${{ secrets.DATADOG_APP_KEY }} - DOTNETVERSION: | - 6.0.x - 3.1.301 GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - GOVERSION: 1.21.x - GRADLEVERSION: "7.6" - 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: lint: diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 9571f1c43..183722ff0 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.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: datadog DATADOG_API_KEY: ${{ secrets.DATADOG_API_KEY }} DATADOG_APP_KEY: ${{ secrets.DATADOG_APP_KEY }} - DOTNETVERSION: | - 6.0.x - 3.1.301 GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - GOVERSION: 1.21.x - GRADLEVERSION: "7.6" - 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: datadog-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-*-datadog" -print -exec chmod +x {} \; - name: Install plugins run: make install_plugins - name: Update path @@ -160,9 +150,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: @@ -171,7 +161,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 @@ -214,7 +204,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 @@ -226,7 +216,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 @@ -248,7 +238,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 datadog -o ${{ github.event.repository.default_branch }} -n --local-path=provider/cmd/pulumi-resource-datadog/schema.json; echo "$EOF"; } >> "$GITHUB_ENV" - if: github.event_name == 'pull_request' && github.actor != 'dependabot[bot]' @@ -265,12 +255,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-datadog + pulumi-tfgen-datadog - name: Upload artifacts uses: actions/upload-artifact@v4 with: - name: ${{ env.PROVIDER }}-provider.tar.gz + name: datadog-provider.tar.gz path: ${{ github.workspace }}/bin/provider.tar.gz retention-days: 30 - if: failure() && github.event_name == 'push' @@ -301,9 +291,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: @@ -312,7 +302,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: @@ -321,7 +311,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: datadog@githubActions role-to-assume: ${{ secrets.AWS_UPLOAD_ROLE_ARN }} - id: version uses: pulumi/provider-version-action@v1 @@ -398,9 +388,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: @@ -409,41 +399,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: datadog-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-*-datadog" -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 bed991a59..42d4ba4f4 100644 --- a/.github/workflows/prerelease.yml +++ b/.github/workflows/prerelease.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: datadog IS_PRERELEASE: true DATADOG_API_KEY: ${{ secrets.DATADOG_API_KEY }} DATADOG_APP_KEY: ${{ secrets.DATADOG_APP_KEY }} - DOTNETVERSION: | - 6.0.x - 3.1.301 GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - GOVERSION: 1.21.x - GRADLEVERSION: "7.6" - 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: build_sdk: name: build_sdk @@ -45,9 +35,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: @@ -62,41 +52,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: datadog-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-*-datadog" -print -exec chmod +x {} \; - name: Install plugins run: make install_plugins - name: Update path @@ -161,7 +151,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 @@ -173,7 +163,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 @@ -195,7 +185,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 datadog -o ${{ github.event.repository.default_branch }} -n --local-path=provider/cmd/pulumi-resource-datadog/schema.json; echo "$EOF"; } >> "$GITHUB_ENV" - if: github.event_name == 'pull_request' && github.actor != 'dependabot[bot]' @@ -212,12 +202,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-datadog + pulumi-tfgen-datadog - name: Upload artifacts uses: actions/upload-artifact@v4 with: - name: ${{ env.PROVIDER }}-provider.tar.gz + name: datadog-provider.tar.gz path: ${{ github.workspace }}/bin/provider.tar.gz retention-days: 30 - if: failure() && github.event_name == 'push' @@ -248,9 +238,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: @@ -259,7 +249,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: @@ -268,7 +258,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: datadog@githubActions role-to-assume: ${{ secrets.AWS_UPLOAD_ROLE_ARN }} - id: version uses: pulumi/provider-version-action@v1 @@ -363,9 +353,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: @@ -374,41 +364,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: datadog-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-*-datadog" -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 d790e2633..96b5d7666 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.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: datadog DATADOG_API_KEY: ${{ secrets.DATADOG_API_KEY }} DATADOG_APP_KEY: ${{ secrets.DATADOG_APP_KEY }} - DOTNETVERSION: | - 6.0.x - 3.1.301 GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - GOVERSION: 1.21.x - GRADLEVERSION: "7.6" - 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: 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 c81ade747..5a32c1aef 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.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: datadog DATADOG_API_KEY: ${{ secrets.DATADOG_API_KEY }} DATADOG_APP_KEY: ${{ secrets.DATADOG_APP_KEY }} - DOTNETVERSION: | - 6.0.x - 3.1.301 GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - GOVERSION: 1.21.x - GRADLEVERSION: "7.6" - 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: datadog-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-*-datadog" -print -exec chmod +x {} \; - name: Install plugins run: make install_plugins - name: Update path @@ -149,7 +139,7 @@ jobs: - env: GITHUB_TOKEN: ${{ secrets.PULUMI_BOT_TOKEN }} name: Dispatch Event - run: pulumictl create docs-build pulumi-${{ env.PROVIDER }} + run: pulumictl create docs-build pulumi-datadog "${GITHUB_REF#refs/tags/}" license_check: name: License Check @@ -175,7 +165,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 @@ -187,7 +177,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 @@ -209,7 +199,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 datadog -o ${{ github.event.repository.default_branch }} -n --local-path=provider/cmd/pulumi-resource-datadog/schema.json; echo "$EOF"; } >> "$GITHUB_ENV" - if: github.event_name == 'pull_request' && github.actor != 'dependabot[bot]' @@ -226,12 +216,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-datadog + pulumi-tfgen-datadog - name: Upload artifacts uses: actions/upload-artifact@v4 with: - name: ${{ env.PROVIDER }}-provider.tar.gz + name: datadog-provider.tar.gz path: ${{ github.workspace }}/bin/provider.tar.gz retention-days: 30 - if: failure() && github.event_name == 'push' @@ -262,9 +252,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: @@ -273,7 +263,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: @@ -282,7 +272,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: datadog@githubActions role-to-assume: ${{ secrets.AWS_UPLOAD_ROLE_ARN }} - id: version uses: pulumi/provider-version-action@v1 @@ -394,9 +384,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: @@ -405,41 +395,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: datadog-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-*-datadog" -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 c0a3c5dfb..9e3e916b3 100644 --- a/.github/workflows/resync-build.yml +++ b/.github/workflows/resync-build.yml @@ -1,20 +1,12 @@ # WARNING: This file is autogenerated - changes will be overwritten if not made via https://github.com/pulumi/ci-mgmt env: - PROVIDER: datadog PULUMI_EXTRA_MAPPING_ERROR: true PULUMI_MISSING_MAPPING_ERROR: true DATADOG_API_KEY: ${{ secrets.DATADOG_API_KEY }} DATADOG_APP_KEY: ${{ secrets.DATADOG_APP_KEY }} - DOTNETVERSION: | - 6.0.x - 3.1.301 GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - GOVERSION: 1.21.x - GRADLEVERSION: "7.6" - 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 }} @@ -25,13 +17,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 @@ -50,9 +40,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: @@ -61,20 +51,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 @@ -105,11 +95,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-datadog 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-datadog 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 d5712ebe3..753902441 100644 --- a/.github/workflows/run-acceptance-tests.yml +++ b/.github/workflows/run-acceptance-tests.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: datadog PR_COMMIT_SHA: ${{ github.event.client_payload.pull_request.head.sha }} DATADOG_API_KEY: ${{ secrets.DATADOG_API_KEY }} DATADOG_APP_KEY: ${{ secrets.DATADOG_APP_KEY }} - DOTNETVERSION: | - 6.0.x - 3.1.301 GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - GOVERSION: 1.21.x - GRADLEVERSION: "7.6" - 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 # This should cancel any previous runs of the same workflow on the same branch which are still running. concurrency: @@ -54,9 +44,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: @@ -71,41 +61,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: datadog-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-*-datadog" -print -exec chmod +x {} \; - name: Install plugins run: make install_plugins - name: Update path @@ -183,7 +173,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 @@ -195,7 +185,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: 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 datadog -o ${{ github.event.repository.default_branch }} -n --local-path=provider/cmd/pulumi-resource-datadog/schema.json; echo "$EOF"; } >> "$GITHUB_ENV" - if: github.event_name == 'pull_request' && github.actor != 'dependabot[bot]' @@ -234,12 +224,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-datadog + pulumi-tfgen-datadog - name: Upload artifacts uses: actions/upload-artifact@v4 with: - name: ${{ env.PROVIDER }}-provider.tar.gz + name: datadog-provider.tar.gz path: ${{ github.workspace }}/bin/provider.tar.gz retention-days: 30 - if: failure() && github.event_name == 'push' @@ -328,9 +318,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: @@ -339,41 +329,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: datadog-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-*-datadog" -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 e623f64fb..9656d8e58 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)