From 49f197ac4fc4d91fe4749b8ce0db913d3c9067bf Mon Sep 17 00:00:00 2001
From: Ian Wahbe <ian@wahbe.com>
Date: Fri, 12 Apr 2024 16:32:08 +0200
Subject: [PATCH] Leave golangci-lint timeout for individual repos (#881)

This PR allows https://github.com/pulumi/pulumi-command/pull/396 to go
forward.

Followup PRs:
- https://github.com/pulumi/pulumi-kubernetes/pull/2946
- https://github.com/pulumi/pulumi-dockerbuild/pull/25
---
 .../providers/command/repo/.github/workflows/build.yml         | 2 +-
 .../command/repo/.github/workflows/run-acceptance-tests.yml    | 2 +-
 native-provider-ci/providers/dockerbuild/config.yaml           | 1 -
 .../providers/dockerbuild/repo/.github/workflows/build.yml     | 3 +--
 .../dockerbuild/repo/.github/workflows/command-dispatch.yml    | 1 -
 .../dockerbuild/repo/.github/workflows/prerelease.yml          | 1 -
 .../dockerbuild/repo/.github/workflows/pull-request.yml        | 1 -
 .../providers/dockerbuild/repo/.github/workflows/release.yml   | 1 -
 .../repo/.github/workflows/run-acceptance-tests.yml            | 3 +--
 .../repo/.github/workflows/weekly-pulumi-update.yml            | 1 -
 native-provider-ci/providers/kubernetes/config.yaml            | 1 -
 .../providers/kubernetes/repo/.github/workflows/build.yml      | 3 +--
 .../kubernetes/repo/.github/workflows/command-dispatch.yml     | 1 -
 .../providers/kubernetes/repo/.github/workflows/prerelease.yml | 1 -
 .../kubernetes/repo/.github/workflows/pull-request.yml         | 1 -
 .../providers/kubernetes/repo/.github/workflows/release.yml    | 1 -
 .../kubernetes/repo/.github/workflows/run-acceptance-tests.yml | 3 +--
 .../kubernetes/repo/.github/workflows/weekly-pulumi-update.yml | 1 -
 native-provider-ci/src/steps.ts                                | 2 +-
 19 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/native-provider-ci/providers/command/repo/.github/workflows/build.yml b/native-provider-ci/providers/command/repo/.github/workflows/build.yml
index 855da6f7a7..a0bad63407 100644
--- a/native-provider-ci/providers/command/repo/.github/workflows/build.yml
+++ b/native-provider-ci/providers/command/repo/.github/workflows/build.yml
@@ -504,7 +504,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/native-provider-ci/providers/command/repo/.github/workflows/run-acceptance-tests.yml b/native-provider-ci/providers/command/repo/.github/workflows/run-acceptance-tests.yml
index dd97ac3ef2..59a0cb2cf4 100644
--- a/native-provider-ci/providers/command/repo/.github/workflows/run-acceptance-tests.yml
+++ b/native-provider-ci/providers/command/repo/.github/workflows/run-acceptance-tests.yml
@@ -354,7 +354,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/native-provider-ci/providers/dockerbuild/config.yaml b/native-provider-ci/providers/dockerbuild/config.yaml
index 1d77518bf0..6ab255ab9f 100644
--- a/native-provider-ci/providers/dockerbuild/config.yaml
+++ b/native-provider-ci/providers/dockerbuild/config.yaml
@@ -12,7 +12,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/native-provider-ci/providers/dockerbuild/repo/.github/workflows/build.yml b/native-provider-ci/providers/dockerbuild/repo/.github/workflows/build.yml
index 174ee522ab..6122a14ce8 100644
--- a/native-provider-ci/providers/dockerbuild/repo/.github/workflows/build.yml
+++ b/native-provider-ci/providers/dockerbuild/repo/.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/native-provider-ci/providers/dockerbuild/repo/.github/workflows/command-dispatch.yml b/native-provider-ci/providers/dockerbuild/repo/.github/workflows/command-dispatch.yml
index 439bb3b4e5..1413afa82b 100644
--- a/native-provider-ci/providers/dockerbuild/repo/.github/workflows/command-dispatch.yml
+++ b/native-provider-ci/providers/dockerbuild/repo/.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/native-provider-ci/providers/dockerbuild/repo/.github/workflows/prerelease.yml b/native-provider-ci/providers/dockerbuild/repo/.github/workflows/prerelease.yml
index b215e17ada..478b4d8642 100644
--- a/native-provider-ci/providers/dockerbuild/repo/.github/workflows/prerelease.yml
+++ b/native-provider-ci/providers/dockerbuild/repo/.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/native-provider-ci/providers/dockerbuild/repo/.github/workflows/pull-request.yml b/native-provider-ci/providers/dockerbuild/repo/.github/workflows/pull-request.yml
index ec76637811..2a37ceb779 100644
--- a/native-provider-ci/providers/dockerbuild/repo/.github/workflows/pull-request.yml
+++ b/native-provider-ci/providers/dockerbuild/repo/.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/native-provider-ci/providers/dockerbuild/repo/.github/workflows/release.yml b/native-provider-ci/providers/dockerbuild/repo/.github/workflows/release.yml
index de62b7eae4..dea237361c 100644
--- a/native-provider-ci/providers/dockerbuild/repo/.github/workflows/release.yml
+++ b/native-provider-ci/providers/dockerbuild/repo/.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/native-provider-ci/providers/dockerbuild/repo/.github/workflows/run-acceptance-tests.yml b/native-provider-ci/providers/dockerbuild/repo/.github/workflows/run-acceptance-tests.yml
index 36ce9f1466..23fcdd78b1 100644
--- a/native-provider-ci/providers/dockerbuild/repo/.github/workflows/run-acceptance-tests.yml
+++ b/native-provider-ci/providers/dockerbuild/repo/.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/native-provider-ci/providers/dockerbuild/repo/.github/workflows/weekly-pulumi-update.yml b/native-provider-ci/providers/dockerbuild/repo/.github/workflows/weekly-pulumi-update.yml
index 38c006d387..5dc3086550 100644
--- a/native-provider-ci/providers/dockerbuild/repo/.github/workflows/weekly-pulumi-update.yml
+++ b/native-provider-ci/providers/dockerbuild/repo/.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
diff --git a/native-provider-ci/providers/kubernetes/config.yaml b/native-provider-ci/providers/kubernetes/config.yaml
index eb4864a062..d909ae8405 100644
--- a/native-provider-ci/providers/kubernetes/config.yaml
+++ b/native-provider-ci/providers/kubernetes/config.yaml
@@ -7,7 +7,6 @@ env:
   AWS_REGION: us-west-2
   PULUMI_TEST_OWNER: moolumi
   GOLANGCI_LINT_VERSION: v1.55.2
-  GOLANGCI_LINT_TIMEOUT: 10m
   GOOGLE_CI_SERVICE_ACCOUNT_EMAIL:  pulumi-ci@pulumi-k8s-provider.iam.gserviceaccount.com
   GOOGLE_CI_WORKLOAD_IDENTITY_POOL: pulumi-ci
   GOOGLE_CI_WORKLOAD_IDENTITY_PROVIDER: pulumi-ci
diff --git a/native-provider-ci/providers/kubernetes/repo/.github/workflows/build.yml b/native-provider-ci/providers/kubernetes/repo/.github/workflows/build.yml
index 081e99f8c8..cbed73a7f0 100644
--- a/native-provider-ci/providers/kubernetes/repo/.github/workflows/build.yml
+++ b/native-provider-ci/providers/kubernetes/repo/.github/workflows/build.yml
@@ -42,7 +42,6 @@ env:
   AWS_REGION: us-west-2
   PULUMI_TEST_OWNER: moolumi
   GOLANGCI_LINT_VERSION: v1.55.2
-  GOLANGCI_LINT_TIMEOUT: 10m
   GOOGLE_CI_SERVICE_ACCOUNT_EMAIL: pulumi-ci@pulumi-k8s-provider.iam.gserviceaccount.com
   GOOGLE_CI_WORKLOAD_IDENTITY_POOL: pulumi-ci
   GOOGLE_CI_WORKLOAD_IDENTITY_PROVIDER: pulumi-ci
@@ -580,7 +579,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/native-provider-ci/providers/kubernetes/repo/.github/workflows/command-dispatch.yml b/native-provider-ci/providers/kubernetes/repo/.github/workflows/command-dispatch.yml
index aa3ef0b092..b01ed1b863 100644
--- a/native-provider-ci/providers/kubernetes/repo/.github/workflows/command-dispatch.yml
+++ b/native-provider-ci/providers/kubernetes/repo/.github/workflows/command-dispatch.yml
@@ -34,7 +34,6 @@ env:
   AWS_REGION: us-west-2
   PULUMI_TEST_OWNER: moolumi
   GOLANGCI_LINT_VERSION: v1.55.2
-  GOLANGCI_LINT_TIMEOUT: 10m
   GOOGLE_CI_SERVICE_ACCOUNT_EMAIL: pulumi-ci@pulumi-k8s-provider.iam.gserviceaccount.com
   GOOGLE_CI_WORKLOAD_IDENTITY_POOL: pulumi-ci
   GOOGLE_CI_WORKLOAD_IDENTITY_PROVIDER: pulumi-ci
diff --git a/native-provider-ci/providers/kubernetes/repo/.github/workflows/prerelease.yml b/native-provider-ci/providers/kubernetes/repo/.github/workflows/prerelease.yml
index 05660cf4c7..8dcad56ed3 100644
--- a/native-provider-ci/providers/kubernetes/repo/.github/workflows/prerelease.yml
+++ b/native-provider-ci/providers/kubernetes/repo/.github/workflows/prerelease.yml
@@ -33,7 +33,6 @@ env:
   AWS_REGION: us-west-2
   PULUMI_TEST_OWNER: moolumi
   GOLANGCI_LINT_VERSION: v1.55.2
-  GOLANGCI_LINT_TIMEOUT: 10m
   GOOGLE_CI_SERVICE_ACCOUNT_EMAIL: pulumi-ci@pulumi-k8s-provider.iam.gserviceaccount.com
   GOOGLE_CI_WORKLOAD_IDENTITY_POOL: pulumi-ci
   GOOGLE_CI_WORKLOAD_IDENTITY_PROVIDER: pulumi-ci
diff --git a/native-provider-ci/providers/kubernetes/repo/.github/workflows/pull-request.yml b/native-provider-ci/providers/kubernetes/repo/.github/workflows/pull-request.yml
index 763ceb3453..e589379360 100644
--- a/native-provider-ci/providers/kubernetes/repo/.github/workflows/pull-request.yml
+++ b/native-provider-ci/providers/kubernetes/repo/.github/workflows/pull-request.yml
@@ -31,7 +31,6 @@ env:
   AWS_REGION: us-west-2
   PULUMI_TEST_OWNER: moolumi
   GOLANGCI_LINT_VERSION: v1.55.2
-  GOLANGCI_LINT_TIMEOUT: 10m
   GOOGLE_CI_SERVICE_ACCOUNT_EMAIL: pulumi-ci@pulumi-k8s-provider.iam.gserviceaccount.com
   GOOGLE_CI_WORKLOAD_IDENTITY_POOL: pulumi-ci
   GOOGLE_CI_WORKLOAD_IDENTITY_PROVIDER: pulumi-ci
diff --git a/native-provider-ci/providers/kubernetes/repo/.github/workflows/release.yml b/native-provider-ci/providers/kubernetes/repo/.github/workflows/release.yml
index 6af544f4f2..5a55e86e39 100644
--- a/native-provider-ci/providers/kubernetes/repo/.github/workflows/release.yml
+++ b/native-provider-ci/providers/kubernetes/repo/.github/workflows/release.yml
@@ -34,7 +34,6 @@ env:
   AWS_REGION: us-west-2
   PULUMI_TEST_OWNER: moolumi
   GOLANGCI_LINT_VERSION: v1.55.2
-  GOLANGCI_LINT_TIMEOUT: 10m
   GOOGLE_CI_SERVICE_ACCOUNT_EMAIL: pulumi-ci@pulumi-k8s-provider.iam.gserviceaccount.com
   GOOGLE_CI_WORKLOAD_IDENTITY_POOL: pulumi-ci
   GOOGLE_CI_WORKLOAD_IDENTITY_PROVIDER: pulumi-ci
diff --git a/native-provider-ci/providers/kubernetes/repo/.github/workflows/run-acceptance-tests.yml b/native-provider-ci/providers/kubernetes/repo/.github/workflows/run-acceptance-tests.yml
index 410f47c64c..0f06e18e58 100644
--- a/native-provider-ci/providers/kubernetes/repo/.github/workflows/run-acceptance-tests.yml
+++ b/native-provider-ci/providers/kubernetes/repo/.github/workflows/run-acceptance-tests.yml
@@ -41,7 +41,6 @@ env:
   AWS_REGION: us-west-2
   PULUMI_TEST_OWNER: moolumi
   GOLANGCI_LINT_VERSION: v1.55.2
-  GOLANGCI_LINT_TIMEOUT: 10m
   GOOGLE_CI_SERVICE_ACCOUNT_EMAIL: pulumi-ci@pulumi-k8s-provider.iam.gserviceaccount.com
   GOOGLE_CI_WORKLOAD_IDENTITY_POOL: pulumi-ci
   GOOGLE_CI_WORKLOAD_IDENTITY_PROVIDER: pulumi-ci
@@ -428,7 +427,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/native-provider-ci/providers/kubernetes/repo/.github/workflows/weekly-pulumi-update.yml b/native-provider-ci/providers/kubernetes/repo/.github/workflows/weekly-pulumi-update.yml
index 3cd94db6e0..f025fa33ac 100644
--- a/native-provider-ci/providers/kubernetes/repo/.github/workflows/weekly-pulumi-update.yml
+++ b/native-provider-ci/providers/kubernetes/repo/.github/workflows/weekly-pulumi-update.yml
@@ -33,7 +33,6 @@ env:
   AWS_REGION: us-west-2
   PULUMI_TEST_OWNER: moolumi
   GOLANGCI_LINT_VERSION: v1.55.2
-  GOLANGCI_LINT_TIMEOUT: 10m
   GOOGLE_CI_SERVICE_ACCOUNT_EMAIL: pulumi-ci@pulumi-k8s-provider.iam.gserviceaccount.com
   GOOGLE_CI_WORKLOAD_IDENTITY_POOL: pulumi-ci
   GOOGLE_CI_WORKLOAD_IDENTITY_PROVIDER: pulumi-ci
diff --git a/native-provider-ci/src/steps.ts b/native-provider-ci/src/steps.ts
index 5fa9bee17e..45af7b2d33 100644
--- a/native-provider-ci/src/steps.ts
+++ b/native-provider-ci/src/steps.ts
@@ -884,7 +884,7 @@ export function GolangciLint(): Step {
     uses: action.goLint,
     with: {
       version: "${{ env.GOLANGCI_LINT_VERSION }}",
-      args: "-c ../.golangci.yml --timeout ${{ env.GOLANGCI_LINT_TIMEOUT }}",
+      args: "-c ../.golangci.yml",
       "working-directory": "provider",
     },
   };