From 586eee22ad03b33063441a32747f21fa77a3ad49 Mon Sep 17 00:00:00 2001 From: Ringo De Smet Date: Fri, 4 Aug 2023 10:53:48 +0200 Subject: [PATCH 1/4] Updating build tool prereqs --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 04d94ae3ff..cd40b5b12b 100644 --- a/README.md +++ b/README.md @@ -27,6 +27,8 @@ The following tools are required for generating and deploying GitHub Actions wor - [Make](https://www.gnu.org/software/make/) - [npm](https://www.npmjs.com/) +- [golangci-lint](https://golangci-lint.run/) +- [shellcheck](https://github.com/koalaman/shellcheck) ## Building From da7e77740611e696d15f5b605fbd157c645bc6e0 Mon Sep 17 00:00:00 2001 From: Ringo De Smet Date: Fri, 4 Aug 2023 10:54:42 +0200 Subject: [PATCH 2/4] Remove duplicate providers build dependency --- provider-ci/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/provider-ci/Makefile b/provider-ci/Makefile index 90f2608191..86d05c1836 100644 --- a/provider-ci/Makefile +++ b/provider-ci/Makefile @@ -6,7 +6,7 @@ PROVIDER_REPOS := $(addsuffix /repo, $(PROVIDERS)) ACTIONLINT_VERSION := 1.6.24 ACTIONLINT := bin/actionlint-$(ACTIONLINT_VERSION) -all: ensure test format providers providers lint-providers +all: ensure test format providers lint-providers gen: clean providers From 6b39850014f48d5acb00ae43306b05abbcf536a4 Mon Sep 17 00:00:00 2001 From: Ringo De Smet Date: Fri, 4 Aug 2023 10:55:34 +0200 Subject: [PATCH 3/4] Quote name of `null` provider to fix a substitution error --- provider-ci/providers/null/config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/provider-ci/providers/null/config.yaml b/provider-ci/providers/null/config.yaml index 237f908111..f7c05822e8 100644 --- a/provider-ci/providers/null/config.yaml +++ b/provider-ci/providers/null/config.yaml @@ -1,4 +1,4 @@ -provider: null +provider: "null" major-version: 0 lint: false makeTemplate: bridged From 591efdedb199b0b14c5cee6354b3178ac0b538e0 Mon Sep 17 00:00:00 2001 From: Ringo De Smet Date: Fri, 4 Aug 2023 16:32:57 +0200 Subject: [PATCH 4/4] Regenerated workflow files for `null` provider --- .../null/repo/.github/workflows/command-dispatch.yml | 2 +- provider-ci/providers/null/repo/.github/workflows/main.yml | 2 +- provider-ci/providers/null/repo/.github/workflows/master.yml | 2 +- .../providers/null/repo/.github/workflows/prerelease.yml | 2 +- .../providers/null/repo/.github/workflows/pull-request.yml | 2 +- provider-ci/providers/null/repo/.github/workflows/release.yml | 2 +- .../providers/null/repo/.github/workflows/resync-build.yml | 2 +- .../null/repo/.github/workflows/run-acceptance-tests.yml | 2 +- provider-ci/providers/null/repo/.goreleaser.prerelease.yml | 4 ++-- provider-ci/providers/null/repo/.goreleaser.yml | 4 ++-- provider-ci/providers/null/repo/.upgrade-config.yml | 2 +- provider-ci/providers/null/repo/Makefile | 2 +- 12 files changed, 14 insertions(+), 14 deletions(-) diff --git a/provider-ci/providers/null/repo/.github/workflows/command-dispatch.yml b/provider-ci/providers/null/repo/.github/workflows/command-dispatch.yml index 190c903da9..c56c299618 100644 --- a/provider-ci/providers/null/repo/.github/workflows/command-dispatch.yml +++ b/provider-ci/providers/null/repo/.github/workflows/command-dispatch.yml @@ -1,7 +1,7 @@ # WARNING: This file is autogenerated - changes will be overwritten if not made via https://github.com/pulumi/ci-mgmt env: - PROVIDER: + PROVIDER: null DOTNETVERSION: | 6.0.x 3.1.301 diff --git a/provider-ci/providers/null/repo/.github/workflows/main.yml b/provider-ci/providers/null/repo/.github/workflows/main.yml index ed92160f55..7e8c17ba35 100644 --- a/provider-ci/providers/null/repo/.github/workflows/main.yml +++ b/provider-ci/providers/null/repo/.github/workflows/main.yml @@ -1,7 +1,7 @@ # WARNING: This file is autogenerated - changes will be overwritten if not made via https://github.com/pulumi/ci-mgmt env: - PROVIDER: + PROVIDER: null DOTNETVERSION: | 6.0.x 3.1.301 diff --git a/provider-ci/providers/null/repo/.github/workflows/master.yml b/provider-ci/providers/null/repo/.github/workflows/master.yml index 7f6e3999c9..6a230c2c6d 100644 --- a/provider-ci/providers/null/repo/.github/workflows/master.yml +++ b/provider-ci/providers/null/repo/.github/workflows/master.yml @@ -1,7 +1,7 @@ # WARNING: This file is autogenerated - changes will be overwritten if not made via https://github.com/pulumi/ci-mgmt env: - PROVIDER: + PROVIDER: null DOTNETVERSION: | 6.0.x 3.1.301 diff --git a/provider-ci/providers/null/repo/.github/workflows/prerelease.yml b/provider-ci/providers/null/repo/.github/workflows/prerelease.yml index 4f4047879d..8eb47c3d64 100644 --- a/provider-ci/providers/null/repo/.github/workflows/prerelease.yml +++ b/provider-ci/providers/null/repo/.github/workflows/prerelease.yml @@ -1,7 +1,7 @@ # WARNING: This file is autogenerated - changes will be overwritten if not made via https://github.com/pulumi/ci-mgmt env: - PROVIDER: + PROVIDER: null IS_PRERELEASE: true DOTNETVERSION: | 6.0.x diff --git a/provider-ci/providers/null/repo/.github/workflows/pull-request.yml b/provider-ci/providers/null/repo/.github/workflows/pull-request.yml index f73ab4df22..352c4c07b6 100644 --- a/provider-ci/providers/null/repo/.github/workflows/pull-request.yml +++ b/provider-ci/providers/null/repo/.github/workflows/pull-request.yml @@ -1,7 +1,7 @@ # WARNING: This file is autogenerated - changes will be overwritten if not made via https://github.com/pulumi/ci-mgmt env: - PROVIDER: + PROVIDER: null DOTNETVERSION: | 6.0.x 3.1.301 diff --git a/provider-ci/providers/null/repo/.github/workflows/release.yml b/provider-ci/providers/null/repo/.github/workflows/release.yml index c1c05b4fe4..247bb7351e 100644 --- a/provider-ci/providers/null/repo/.github/workflows/release.yml +++ b/provider-ci/providers/null/repo/.github/workflows/release.yml @@ -1,7 +1,7 @@ # WARNING: This file is autogenerated - changes will be overwritten if not made via https://github.com/pulumi/ci-mgmt env: - PROVIDER: + PROVIDER: null DOTNETVERSION: | 6.0.x 3.1.301 diff --git a/provider-ci/providers/null/repo/.github/workflows/resync-build.yml b/provider-ci/providers/null/repo/.github/workflows/resync-build.yml index c619f992e9..f546f6d665 100644 --- a/provider-ci/providers/null/repo/.github/workflows/resync-build.yml +++ b/provider-ci/providers/null/repo/.github/workflows/resync-build.yml @@ -1,7 +1,7 @@ # WARNING: This file is autogenerated - changes will be overwritten if not made via https://github.com/pulumi/ci-mgmt env: - PROVIDER: + PROVIDER: null PULUMI_EXTRA_MAPPING_ERROR: true PULUMI_MISSING_MAPPING_ERROR: true DOTNETVERSION: | diff --git a/provider-ci/providers/null/repo/.github/workflows/run-acceptance-tests.yml b/provider-ci/providers/null/repo/.github/workflows/run-acceptance-tests.yml index 3829f8ba5d..122e234234 100644 --- a/provider-ci/providers/null/repo/.github/workflows/run-acceptance-tests.yml +++ b/provider-ci/providers/null/repo/.github/workflows/run-acceptance-tests.yml @@ -1,7 +1,7 @@ # WARNING: This file is autogenerated - changes will be overwritten if not made via https://github.com/pulumi/ci-mgmt env: - PROVIDER: + PROVIDER: null PR_COMMIT_SHA: ${{ github.event.client_payload.pull_request.head.sha }} DOTNETVERSION: | 6.0.x diff --git a/provider-ci/providers/null/repo/.goreleaser.prerelease.yml b/provider-ci/providers/null/repo/.goreleaser.prerelease.yml index 9e79352a8d..45b2ba74ba 100644 --- a/provider-ci/providers/null/repo/.goreleaser.prerelease.yml +++ b/provider-ci/providers/null/repo/.goreleaser.prerelease.yml @@ -14,7 +14,7 @@ blobs: provider: s3 region: us-west-2 builds: -- binary: pulumi-resource- +- binary: pulumi-resource-null dir: provider env: - CGO_ENABLED=0 @@ -33,7 +33,7 @@ builds: ignore: [] ldflags: - -X github.com/pulumi/pulumi-null/provider/pkg/version.Version={{.Tag}} - main: ./cmd/pulumi-resource-/ + main: ./cmd/pulumi-resource-null/ changelog: skip: true release: diff --git a/provider-ci/providers/null/repo/.goreleaser.yml b/provider-ci/providers/null/repo/.goreleaser.yml index 80dcfd0989..c09feb0aea 100644 --- a/provider-ci/providers/null/repo/.goreleaser.yml +++ b/provider-ci/providers/null/repo/.goreleaser.yml @@ -14,7 +14,7 @@ blobs: provider: s3 region: us-west-2 builds: -- binary: pulumi-resource- +- binary: pulumi-resource-null dir: provider env: - CGO_ENABLED=0 @@ -33,7 +33,7 @@ builds: ignore: [] ldflags: - -X github.com/pulumi/pulumi-null/provider/pkg/version.Version={{.Tag}} - main: ./cmd/pulumi-resource-/ + main: ./cmd/pulumi-resource-null/ changelog: filters: exclude: diff --git a/provider-ci/providers/null/repo/.upgrade-config.yml b/provider-ci/providers/null/repo/.upgrade-config.yml index 7953ce65d6..4aa9642d52 100644 --- a/provider-ci/providers/null/repo/.upgrade-config.yml +++ b/provider-ci/providers/null/repo/.upgrade-config.yml @@ -1,7 +1,7 @@ # WARNING: This file is autogenerated - changes will be overwritten if not made via https://github.com/pulumi/ci-mgmt --- -upstream-provider-name: terraform-provider- +upstream-provider-name: terraform-provider-null pulumi-infer-version: true remove-plugins: true pr-reviewers: pulumi/Providers diff --git a/provider-ci/providers/null/repo/Makefile b/provider-ci/providers/null/repo/Makefile index 9a60394baa..5427572b87 100644 --- a/provider-ci/providers/null/repo/Makefile +++ b/provider-ci/providers/null/repo/Makefile @@ -1,6 +1,6 @@ # WARNING: This file is autogenerated - changes will be overwritten if not made via https://github.com/pulumi/ci-mgmt -PACK := +PACK := null ORG := pulumi PROJECT := github.com/$(ORG)/pulumi-$(PACK) PROVIDER_PATH := provider