From fd9735d956b7742c3edd26abf348f87a4f6c11e4 Mon Sep 17 00:00:00 2001 From: Pulumi Bot <30351955+pulumi-bot@users.noreply.github.com> Date: Mon, 8 Apr 2024 22:03:52 -0700 Subject: [PATCH 1/3] Update GitHub Actions workflows. (#24) This PR was automatically generated by the update-native-provider-workflows workflow in the pulumi/ci-mgmt repo, from commit e8b9d89f27ba4e3a59389258853fbfd225f08c5a. --- .github/workflows/build.yml | 2 ++ .github/workflows/command-dispatch.yml | 1 + .github/workflows/prerelease.yml | 3 +++ .github/workflows/pull-request.yml | 1 + .github/workflows/release.yml | 3 +++ .github/workflows/run-acceptance-tests.yml | 2 ++ .github/workflows/weekly-pulumi-update.yml | 1 + 7 files changed, 13 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e175817..174ee52 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -99,6 +99,8 @@ jobs: schema-tools compare -p ${{ env.PROVIDER }} -o ${{ github.event.repository.default_branch }} -n --local-path=provider/cmd/pulumi-resource-${{ env.PROVIDER }}/schema.json >> $GITHUB_ENV echo 'EOF' >> $GITHUB_ENV + env: + GITHUB_TOKEN: ${{ secrets.PULUMI_BOT_TOKEN }} - if: github.event_name == 'pull_request' name: Comment on PR with Details of Schema Check uses: thollander/actions-comment-pull-request@v2 diff --git a/.github/workflows/command-dispatch.yml b/.github/workflows/command-dispatch.yml index 1413afa..439bb3b 100644 --- a/.github/workflows/command-dispatch.yml +++ b/.github/workflows/command-dispatch.yml @@ -39,6 +39,7 @@ env: ARM_CLIENT_SECRET: ${{ secrets.ARM_CLIENT_SECRET }} AZURE_LOCATION: westus DIGITALOCEAN_TOKEN: ${{ secrets.DIGITALOCEAN_TOKEN }} + GOLANGCI_LINT_TIMEOUT: 10m GOOGLE_CI_SERVICE_ACCOUNT_EMAIL: pulumi-ci@pulumi-ci-gcp-provider.iam.gserviceaccount.com GOOGLE_CI_WORKLOAD_IDENTITY_POOL: pulumi-ci GOOGLE_CI_WORKLOAD_IDENTITY_PROVIDER: pulumi-ci diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml index 136e517..b215e17 100644 --- a/.github/workflows/prerelease.yml +++ b/.github/workflows/prerelease.yml @@ -38,6 +38,7 @@ env: ARM_CLIENT_SECRET: ${{ secrets.ARM_CLIENT_SECRET }} AZURE_LOCATION: westus DIGITALOCEAN_TOKEN: ${{ secrets.DIGITALOCEAN_TOKEN }} + GOLANGCI_LINT_TIMEOUT: 10m GOOGLE_CI_SERVICE_ACCOUNT_EMAIL: pulumi-ci@pulumi-ci-gcp-provider.iam.gserviceaccount.com GOOGLE_CI_WORKLOAD_IDENTITY_POOL: pulumi-ci GOOGLE_CI_WORKLOAD_IDENTITY_PROVIDER: pulumi-ci @@ -90,6 +91,8 @@ jobs: schema-tools compare -p ${{ env.PROVIDER }} -o ${{ github.event.repository.default_branch }} -n --local-path=provider/cmd/pulumi-resource-${{ env.PROVIDER }}/schema.json >> $GITHUB_ENV echo 'EOF' >> $GITHUB_ENV + env: + GITHUB_TOKEN: ${{ secrets.PULUMI_BOT_TOKEN }} - if: github.event_name == 'pull_request' name: Comment on PR with Details of Schema Check uses: thollander/actions-comment-pull-request@v2 diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 2a37ceb..ec76637 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -36,6 +36,7 @@ env: ARM_CLIENT_SECRET: ${{ secrets.ARM_CLIENT_SECRET }} AZURE_LOCATION: westus DIGITALOCEAN_TOKEN: ${{ secrets.DIGITALOCEAN_TOKEN }} + GOLANGCI_LINT_TIMEOUT: 10m GOOGLE_CI_SERVICE_ACCOUNT_EMAIL: pulumi-ci@pulumi-ci-gcp-provider.iam.gserviceaccount.com GOOGLE_CI_WORKLOAD_IDENTITY_POOL: pulumi-ci GOOGLE_CI_WORKLOAD_IDENTITY_PROVIDER: pulumi-ci diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index de11aee..de62b7e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -39,6 +39,7 @@ env: ARM_CLIENT_SECRET: ${{ secrets.ARM_CLIENT_SECRET }} AZURE_LOCATION: westus DIGITALOCEAN_TOKEN: ${{ secrets.DIGITALOCEAN_TOKEN }} + GOLANGCI_LINT_TIMEOUT: 10m GOOGLE_CI_SERVICE_ACCOUNT_EMAIL: pulumi-ci@pulumi-ci-gcp-provider.iam.gserviceaccount.com GOOGLE_CI_WORKLOAD_IDENTITY_POOL: pulumi-ci GOOGLE_CI_WORKLOAD_IDENTITY_PROVIDER: pulumi-ci @@ -90,6 +91,8 @@ jobs: schema-tools compare -p ${{ env.PROVIDER }} -o ${{ github.event.repository.default_branch }} -n --local-path=provider/cmd/pulumi-resource-${{ env.PROVIDER }}/schema.json >> $GITHUB_ENV echo 'EOF' >> $GITHUB_ENV + env: + GITHUB_TOKEN: ${{ secrets.PULUMI_BOT_TOKEN }} - if: github.event_name == 'pull_request' name: Comment on PR with Details of Schema Check uses: thollander/actions-comment-pull-request@v2 diff --git a/.github/workflows/run-acceptance-tests.yml b/.github/workflows/run-acceptance-tests.yml index 8229968..36ce9f1 100644 --- a/.github/workflows/run-acceptance-tests.yml +++ b/.github/workflows/run-acceptance-tests.yml @@ -116,6 +116,8 @@ jobs: schema-tools compare -p ${{ env.PROVIDER }} -o ${{ github.event.repository.default_branch }} -n --local-path=provider/cmd/pulumi-resource-${{ env.PROVIDER }}/schema.json >> $GITHUB_ENV echo 'EOF' >> $GITHUB_ENV + env: + GITHUB_TOKEN: ${{ secrets.PULUMI_BOT_TOKEN }} - if: github.event_name == 'pull_request' name: Comment on PR with Details of Schema Check uses: thollander/actions-comment-pull-request@v2 diff --git a/.github/workflows/weekly-pulumi-update.yml b/.github/workflows/weekly-pulumi-update.yml index 5dc3086..38c006d 100644 --- a/.github/workflows/weekly-pulumi-update.yml +++ b/.github/workflows/weekly-pulumi-update.yml @@ -38,6 +38,7 @@ env: ARM_CLIENT_SECRET: ${{ secrets.ARM_CLIENT_SECRET }} AZURE_LOCATION: westus DIGITALOCEAN_TOKEN: ${{ secrets.DIGITALOCEAN_TOKEN }} + GOLANGCI_LINT_TIMEOUT: 10m GOOGLE_CI_SERVICE_ACCOUNT_EMAIL: pulumi-ci@pulumi-ci-gcp-provider.iam.gserviceaccount.com GOOGLE_CI_WORKLOAD_IDENTITY_POOL: pulumi-ci GOOGLE_CI_WORKLOAD_IDENTITY_PROVIDER: pulumi-ci From ffc60ed74e3264587c6d26e6822f6aabe854f9bd Mon Sep 17 00:00:00 2001 From: Pulumi Bot <30351955+pulumi-bot@users.noreply.github.com> Date: Fri, 12 Apr 2024 22:03:59 -0700 Subject: [PATCH 2/3] Update GitHub Actions workflows. (#26) This PR was automatically generated by the update-native-provider-workflows workflow in the pulumi/ci-mgmt repo, from commit b5479f3402f3a2a65eb1cdf36af6f704e59b29d4. --- .github/workflows/build.yml | 3 +-- .github/workflows/command-dispatch.yml | 1 - .github/workflows/prerelease.yml | 1 - .github/workflows/pull-request.yml | 1 - .github/workflows/release.yml | 1 - .github/workflows/run-acceptance-tests.yml | 3 +-- .github/workflows/weekly-pulumi-update.yml | 1 - 7 files changed, 2 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 174ee52..6122a14 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -47,7 +47,6 @@ env: ARM_CLIENT_SECRET: ${{ secrets.ARM_CLIENT_SECRET }} AZURE_LOCATION: westus DIGITALOCEAN_TOKEN: ${{ secrets.DIGITALOCEAN_TOKEN }} - GOLANGCI_LINT_TIMEOUT: 10m GOOGLE_CI_SERVICE_ACCOUNT_EMAIL: pulumi-ci@pulumi-ci-gcp-provider.iam.gserviceaccount.com GOOGLE_CI_WORKLOAD_IDENTITY_POOL: pulumi-ci GOOGLE_CI_WORKLOAD_IDENTITY_PROVIDER: pulumi-ci @@ -567,7 +566,7 @@ jobs: uses: golangci/golangci-lint-action@v4 with: version: ${{ env.GOLANGCI_LINT_VERSION }} - args: -c ../.golangci.yml --timeout ${{ env.GOLANGCI_LINT_TIMEOUT }} + args: -c ../.golangci.yml working-directory: provider name: lint if: github.event_name == 'repository_dispatch' || diff --git a/.github/workflows/command-dispatch.yml b/.github/workflows/command-dispatch.yml index 439bb3b..1413afa 100644 --- a/.github/workflows/command-dispatch.yml +++ b/.github/workflows/command-dispatch.yml @@ -39,7 +39,6 @@ env: ARM_CLIENT_SECRET: ${{ secrets.ARM_CLIENT_SECRET }} AZURE_LOCATION: westus DIGITALOCEAN_TOKEN: ${{ secrets.DIGITALOCEAN_TOKEN }} - GOLANGCI_LINT_TIMEOUT: 10m GOOGLE_CI_SERVICE_ACCOUNT_EMAIL: pulumi-ci@pulumi-ci-gcp-provider.iam.gserviceaccount.com GOOGLE_CI_WORKLOAD_IDENTITY_POOL: pulumi-ci GOOGLE_CI_WORKLOAD_IDENTITY_PROVIDER: pulumi-ci diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml index b215e17..478b4d8 100644 --- a/.github/workflows/prerelease.yml +++ b/.github/workflows/prerelease.yml @@ -38,7 +38,6 @@ env: ARM_CLIENT_SECRET: ${{ secrets.ARM_CLIENT_SECRET }} AZURE_LOCATION: westus DIGITALOCEAN_TOKEN: ${{ secrets.DIGITALOCEAN_TOKEN }} - GOLANGCI_LINT_TIMEOUT: 10m GOOGLE_CI_SERVICE_ACCOUNT_EMAIL: pulumi-ci@pulumi-ci-gcp-provider.iam.gserviceaccount.com GOOGLE_CI_WORKLOAD_IDENTITY_POOL: pulumi-ci GOOGLE_CI_WORKLOAD_IDENTITY_PROVIDER: pulumi-ci diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index ec76637..2a37ceb 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -36,7 +36,6 @@ env: ARM_CLIENT_SECRET: ${{ secrets.ARM_CLIENT_SECRET }} AZURE_LOCATION: westus DIGITALOCEAN_TOKEN: ${{ secrets.DIGITALOCEAN_TOKEN }} - GOLANGCI_LINT_TIMEOUT: 10m GOOGLE_CI_SERVICE_ACCOUNT_EMAIL: pulumi-ci@pulumi-ci-gcp-provider.iam.gserviceaccount.com GOOGLE_CI_WORKLOAD_IDENTITY_POOL: pulumi-ci GOOGLE_CI_WORKLOAD_IDENTITY_PROVIDER: pulumi-ci diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index de62b7e..dea2373 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -39,7 +39,6 @@ env: ARM_CLIENT_SECRET: ${{ secrets.ARM_CLIENT_SECRET }} AZURE_LOCATION: westus DIGITALOCEAN_TOKEN: ${{ secrets.DIGITALOCEAN_TOKEN }} - GOLANGCI_LINT_TIMEOUT: 10m GOOGLE_CI_SERVICE_ACCOUNT_EMAIL: pulumi-ci@pulumi-ci-gcp-provider.iam.gserviceaccount.com GOOGLE_CI_WORKLOAD_IDENTITY_POOL: pulumi-ci GOOGLE_CI_WORKLOAD_IDENTITY_PROVIDER: pulumi-ci diff --git a/.github/workflows/run-acceptance-tests.yml b/.github/workflows/run-acceptance-tests.yml index 36ce9f1..23fcdd7 100644 --- a/.github/workflows/run-acceptance-tests.yml +++ b/.github/workflows/run-acceptance-tests.yml @@ -45,7 +45,6 @@ env: ARM_CLIENT_SECRET: ${{ secrets.ARM_CLIENT_SECRET }} AZURE_LOCATION: westus DIGITALOCEAN_TOKEN: ${{ secrets.DIGITALOCEAN_TOKEN }} - GOLANGCI_LINT_TIMEOUT: 10m GOOGLE_CI_SERVICE_ACCOUNT_EMAIL: pulumi-ci@pulumi-ci-gcp-provider.iam.gserviceaccount.com GOOGLE_CI_WORKLOAD_IDENTITY_POOL: pulumi-ci GOOGLE_CI_WORKLOAD_IDENTITY_PROVIDER: pulumi-ci @@ -417,7 +416,7 @@ jobs: uses: golangci/golangci-lint-action@v4 with: version: ${{ env.GOLANGCI_LINT_VERSION }} - args: -c ../.golangci.yml --timeout ${{ env.GOLANGCI_LINT_TIMEOUT }} + 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 38c006d..5dc3086 100644 --- a/.github/workflows/weekly-pulumi-update.yml +++ b/.github/workflows/weekly-pulumi-update.yml @@ -38,7 +38,6 @@ env: ARM_CLIENT_SECRET: ${{ secrets.ARM_CLIENT_SECRET }} AZURE_LOCATION: westus DIGITALOCEAN_TOKEN: ${{ secrets.DIGITALOCEAN_TOKEN }} - GOLANGCI_LINT_TIMEOUT: 10m GOOGLE_CI_SERVICE_ACCOUNT_EMAIL: pulumi-ci@pulumi-ci-gcp-provider.iam.gserviceaccount.com GOOGLE_CI_WORKLOAD_IDENTITY_POOL: pulumi-ci GOOGLE_CI_WORKLOAD_IDENTITY_PROVIDER: pulumi-ci From 680b464bfc826a85b9978585d818309e3a0058c3 Mon Sep 17 00:00:00 2001 From: Ian Wahbe Date: Sat, 13 Apr 2024 22:20:38 +0200 Subject: [PATCH 3/3] Set golangci-lint timeout to 10m (#25) Should be merged with https://github.com/pulumi/ci-mgmt/pull/881. --- .golangci.yml | 3 +++ Makefile | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.golangci.yml b/.golangci.yml index 6801b2b..689c351 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -1,3 +1,6 @@ +run: + timeout: 10m + linters: enable-all: false enable: diff --git a/Makefile b/Makefile index a007d8e..b9ae67b 100644 --- a/Makefile +++ b/Makefile @@ -114,7 +114,7 @@ only_build:: build .PHONY: lint lint: - golangci-lint run --fix -c .golangci.yml --timeout 10m + golangci-lint run --fix -c .golangci.yml install:: install_nodejs_sdk install_dotnet_sdk cp $(WORKING_DIR)/bin/${PROVIDER} ${GOPATH}/bin