Update GitHub Actions workflows. (#2174)

* [internal] Update GitHub Actions workflow files * Fix python readme Co-authored-by: Daniel Bradley <[email protected]>
pulumi · Oct 12, 2022 · 9c01b95 · 9c01b95
1 parent f079766
commit 9c01b95
Show file tree

Hide file tree

Showing 8 changed files with 79 additions and 74 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -528,9 +528,10 @@ jobs:
     - name: Install dependencies
       run: make install_${{ matrix.language}}_sdk
     - name: Install gotestfmt
-      uses: jaxxstorm/[email protected]
+      uses: GoTestTools/gotestfmt-action@v2
       with:
-        repo: haveyoudebuggedit/gotestfmt
+        token: ${{ secrets.GITHUB_TOKEN }}
+        version: v2.4.0
     - name: Run tests
       run: cd examples && go test -v -json -count=1 -cover -timeout 2h -tags=${{
         matrix.language }} -parallel 4 . 2>&1 | tee /tmp/gotest.log | gotestfmt

diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
@@ -528,9 +528,10 @@ jobs:
     - name: Install dependencies
       run: make install_${{ matrix.language}}_sdk
     - name: Install gotestfmt
-      uses: jaxxstorm/[email protected]
+      uses: GoTestTools/gotestfmt-action@v2
       with:
-        repo: haveyoudebuggedit/gotestfmt
+        token: ${{ secrets.GITHUB_TOKEN }}
+        version: v2.4.0
     - name: Run tests
       run: cd examples && go test -v -json -count=1 -cover -timeout 2h -tags=${{
         matrix.language }} -parallel 4 . 2>&1 | tee /tmp/gotest.log | gotestfmt

diff --git a/.github/workflows/nightly-test.yml b/.github/workflows/nightly-test.yml
@@ -277,9 +277,10 @@ jobs:
     - name: Install dependencies
       run: make install_${{ matrix.language}}_sdk
     - name: Install gotestfmt
-      uses: jaxxstorm/[email protected]
+      uses: GoTestTools/gotestfmt-action@v2
       with:
-        repo: haveyoudebuggedit/gotestfmt
+        token: ${{ secrets.GITHUB_TOKEN }}
+        version: v2.4.0
     - name: Run tests
       run: cd examples && go test -v -json -count=1 -cover -timeout 2h -tags=${{
         matrix.language }} -parallel 4 . 2>&1 | tee /tmp/gotest.log | gotestfmt

diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml
@@ -472,9 +472,10 @@ jobs:
     - name: Install dependencies
       run: make install_${{ matrix.language}}_sdk
     - name: Install gotestfmt
-      uses: jaxxstorm/[email protected]
+      uses: GoTestTools/gotestfmt-action@v2
       with:
-        repo: haveyoudebuggedit/gotestfmt
+        token: ${{ secrets.GITHUB_TOKEN }}
+        version: v2.4.0
     - name: Run tests
       run: cd examples && go test -v -json -count=1 -cover -timeout 2h -tags=${{
         matrix.language }} -parallel 4 . 2>&1 | tee /tmp/gotest.log | gotestfmt

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -499,9 +499,10 @@ jobs:
     - name: Install dependencies
       run: make install_${{ matrix.language}}_sdk
     - name: Install gotestfmt
-      uses: jaxxstorm/[email protected]
+      uses: GoTestTools/gotestfmt-action@v2
       with:
-        repo: haveyoudebuggedit/gotestfmt
+        token: ${{ secrets.GITHUB_TOKEN }}
+        version: v2.4.0
     - name: Run tests
       run: cd examples && go test -v -json -count=1 -cover -timeout 2h -tags=${{
         matrix.language }} -parallel 4 . 2>&1 | tee /tmp/gotest.log | gotestfmt

diff --git a/.github/workflows/run-acceptance-tests.yml b/.github/workflows/run-acceptance-tests.yml
@@ -316,9 +316,10 @@ jobs:
     - name: Install dependencies
       run: make install_${{ matrix.language}}_sdk
     - name: Install gotestfmt
-      uses: jaxxstorm/[email protected]
+      uses: GoTestTools/gotestfmt-action@v2
       with:
-        repo: haveyoudebuggedit/gotestfmt
+        token: ${{ secrets.GITHUB_TOKEN }}
+        version: v2.4.0
     - name: Run tests
       run: cd examples && go test -v -json -count=1 -cover -timeout 2h -tags=${{
         matrix.language }} -parallel 4 . 2>&1 | tee /tmp/gotest.log | gotestfmt

diff --git a/Makefile b/Makefile
@@ -13,24 +13,43 @@ JAVA_GEN_VERSION := v0.5.4
 TESTPARALLELISM := 10
 WORKING_DIR := $(shell pwd)
 
-development:: install_plugins provider build_sdks install_sdks
+development: install_plugins provider build_sdks install_sdks
 
-build:: install_plugins provider build_sdks install_sdks
+build: install_plugins provider build_sdks install_sdks
 
-only_build:: build
+build_sdks: build_nodejs build_python build_go build_dotnet build_java
 
-tfgen:: install_plugins
-	(cd provider && go build -p 1 -o $(WORKING_DIR)/bin/$(TFGEN) -ldflags "-X $(PROJECT)/$(VERSION_PATH)=$(VERSION)" $(PROJECT)/$(PROVIDER_PATH)/cmd/$(TFGEN))
-	$(WORKING_DIR)/bin/$(TFGEN) schema --out provider/cmd/$(PROVIDER)
-	(cd provider && VERSION=$(VERSION) go generate cmd/$(PROVIDER)/main.go)
+install_go_sdk: 
 
-provider:: tfgen install_plugins
-	(cd provider && go build -p 1 -o $(WORKING_DIR)/bin/$(PROVIDER) -ldflags "-X $(PROJECT)/$(VERSION_PATH)=$(VERSION) -X github.com/hashicorp/terraform-provider-aws/version.ProviderVersion=$(VERSION)" $(PROJECT)/$(PROVIDER_PATH)/cmd/$(PROVIDER))
+install_java_sdk: 
+
+install_python_sdk: 
+
+install_sdks: install_dotnet_sdk install_python_sdk install_nodejs_sdk install_java_sdk
+
+only_build: build
+
+build_dotnet: DOTNET_VERSION := $(shell pulumictl get version --language dotnet)
+build_dotnet: 
+	pulumictl get version --language dotnet
+	$(WORKING_DIR)/bin/$(TFGEN) dotnet --overlays provider/overlays/dotnet --out sdk/dotnet/
+	cd sdk/dotnet/ && \
+		echo "module fake_dotnet_module // Exclude this directory from Go tools\n\ngo 1.17" > go.mod && \
+		echo "$(DOTNET_VERSION)" >version.txt && \
+		dotnet build /p:Version=$(DOTNET_VERSION)
 
-build_sdks:: build_nodejs build_python build_go build_dotnet build_java
+build_go: 
+	$(WORKING_DIR)/bin/$(TFGEN) go --overlays provider/overlays/go --out sdk/go/
 
-build_nodejs:: VERSION := $(shell pulumictl get version --language javascript)
-build_nodejs:: 
+build_java: PACKAGE_VERSION := $(shell pulumictl get version --language generic)
+build_java: bin/pulumi-java-gen
+	$(WORKING_DIR)/bin/$(JAVA_GEN) generate --schema provider/cmd/$(PROVIDER)/schema.json --out sdk/java  --build gradle-nexus
+	cd sdk/java/ && \
+		echo "module fake_java_module // Exclude this directory from Go tools\n\ngo 1.17" > go.mod && \
+		gradle --console=plain build
+
+build_nodejs: VERSION := $(shell pulumictl get version --language javascript)
+build_nodejs: 
 	$(WORKING_DIR)/bin/$(TFGEN) nodejs --overlays provider/overlays/nodejs --out sdk/nodejs/
 	cd sdk/nodejs/ && \
 		echo "module fake_nodejs_module // Exclude this directory from Go tools\n\ngo 1.17" > go.mod && \
@@ -39,8 +58,8 @@ build_nodejs::
 		cp ../../README.md ../../LICENSE* package.json yarn.lock ./bin/ && \
 		sed -i.bak -e "s/\$${VERSION}/$(VERSION)/g" ./bin/package.json
 
-build_python:: PYPI_VERSION := $(shell pulumictl get version --language python)
-build_python:: 
+build_python: PYPI_VERSION := $(shell pulumictl get version --language python)
+build_python: 
 	$(WORKING_DIR)/bin/$(TFGEN) python --overlays provider/overlays/python --out sdk/python/
 	cd sdk/python/ && \
 		echo "module fake_python_module // Exclude this directory from Go tools\n\ngo 1.17" > go.mod && \
@@ -51,66 +70,47 @@ build_python::
 		rm ./bin/setup.py.bak && rm ./bin/go.mod && \
 		cd ./bin && python3 setup.py build sdist
 
-build_go:: 
-	$(WORKING_DIR)/bin/$(TFGEN) go --overlays provider/overlays/go --out sdk/go/
-
-build_dotnet:: DOTNET_VERSION := $(shell pulumictl get version --language dotnet)
-build_dotnet:: 
-	pulumictl get version --language dotnet
-	$(WORKING_DIR)/bin/$(TFGEN) dotnet --overlays provider/overlays/dotnet --out sdk/dotnet/
-	cd sdk/dotnet/ && \
-		echo "module fake_dotnet_module // Exclude this directory from Go tools\n\ngo 1.17" > go.mod && \
-		echo "$(DOTNET_VERSION)" >version.txt && \
-		dotnet build /p:Version=$(DOTNET_VERSION)
-
-build_java:: PACKAGE_VERSION := $(shell pulumictl get version --language generic)
-build_java:: bin/pulumi-java-gen
-	$(WORKING_DIR)/bin/$(JAVA_GEN) generate --schema provider/cmd/$(PROVIDER)/schema.json --out sdk/java  --build gradle-nexus
-	cd sdk/java/ && \
-		echo "module fake_java_module // Exclude this directory from Go tools\n\ngo 1.17" > go.mod && \
-		gradle --console=plain build
-
-bin/pulumi-java-gen:: 
-	$(shell pulumictl download-binary -n pulumi-language-java -v $(JAVA_GEN_VERSION) -r pulumi/pulumi-java)
-
-lint_provider:: provider
-	cd provider && golangci-lint run -c ../.golangci.yml
+clean: 
+	rm -rf sdk/{dotnet,nodejs,go,python}
 
-cleanup:: 
+cleanup: 
 	rm -r $(WORKING_DIR)/bin
 	rm -f provider/cmd/$(PROVIDER)/schema.go
 
-help:: 
+help: 
 	@grep '^[^.#]\+:\s\+.*#' Makefile | \
 	sed "s/\(.\+\):\s*\(.*\) #\s*\(.*\)/`printf "\033[93m"`\1`printf "\033[0m"`	\3 [\2]/" | \
 	expand -t20
 
-clean:: 
-	rm -rf sdk/{dotnet,nodejs,go,python}
+install_dotnet_sdk: 
+	mkdir -p $(WORKING_DIR)/nuget
+	find . -name '*.nupkg' -print -exec cp -p {} $(WORKING_DIR)/nuget \;
+
+install_nodejs_sdk: 
+	yarn link --cwd $(WORKING_DIR)/sdk/nodejs/bin
 
-install_plugins:: 
+install_plugins: 
 	[ -x $(shell which pulumi) ] || curl -fsSL https://get.pulumi.com | sh
 	pulumi plugin install resource tls 4.1.0
 	pulumi plugin install resource github 4.10.0
 	pulumi plugin install resource kubernetes 3.17.0
 	pulumi plugin install resource random 4.8.2
 
-install_dotnet_sdk:: 
-	mkdir -p $(WORKING_DIR)/nuget
-	find . -name '*.nupkg' -print -exec cp -p {} $(WORKING_DIR)/nuget \;
-
-install_python_sdk:: 
-
-install_go_sdk:: 
+lint_provider: provider
+	cd provider && golangci-lint run -c ../.golangci.yml
 
-install_java_sdk:: 
+provider: tfgen install_plugins
+	(cd provider && go build -p 1 -o $(WORKING_DIR)/bin/$(PROVIDER) -ldflags "-X $(PROJECT)/$(VERSION_PATH)=$(VERSION) -X github.com/hashicorp/terraform-provider-aws/version.ProviderVersion=$(VERSION)" $(PROJECT)/$(PROVIDER_PATH)/cmd/$(PROVIDER))
 
-install_nodejs_sdk:: 
-	yarn link --cwd $(WORKING_DIR)/sdk/nodejs/bin
+test: 
+	cd examples && go test -v -tags=all -parallel $(TESTPARALLELISM) -timeout 2h
 
-install_sdks:: install_dotnet_sdk install_python_sdk install_nodejs_sdk install_java_sdk
+tfgen: install_plugins
+	(cd provider && go build -p 1 -o $(WORKING_DIR)/bin/$(TFGEN) -ldflags "-X $(PROJECT)/$(VERSION_PATH)=$(VERSION)" $(PROJECT)/$(PROVIDER_PATH)/cmd/$(TFGEN))
+	$(WORKING_DIR)/bin/$(TFGEN) schema --out provider/cmd/$(PROVIDER)
+	(cd provider && VERSION=$(VERSION) go generate cmd/$(PROVIDER)/main.go)
 
-test:: 
-	cd examples && go test -v -tags=all -parallel $(TESTPARALLELISM) -timeout 2h
+bin/pulumi-java-gen: 
+	$(shell pulumictl download-binary -n pulumi-language-java -v $(JAVA_GEN_VERSION) -r pulumi/pulumi-java)
 
-.PHONY:: development build tfgen provider build_sdks build_nodejs build_python build_go build_dotnet build_java lint_provider cleanup help clean install_plugins install_dotnet_sdk install_python_sdk install_go_sdk install_java_sdk install_nodejs_sdk install_sdks test
+.PHONY: development build build_sdks install_go_sdk install_java_sdk install_python_sdk install_sdks only_build build_dotnet build_go build_java build_nodejs build_python clean cleanup help install_dotnet_sdk install_nodejs_sdk install_plugins lint_provider provider test tfgen
diff --git a/sdk/python/README.md b/sdk/python/README.md
@@ -4,7 +4,7 @@
 [![Python version](https://badge.fury.io/py/pulumi-aws.svg)](https://pypi.org/project/pulumi-aws)
 [![NuGet version](https://badge.fury.io/nu/pulumi.aws.svg)](https://badge.fury.io/nu/pulumi.aws)
 [![PkgGoDev](https://pkg.go.dev/badge/github.com/pulumi/pulumi-aws/sdk/v5/go)](https://pkg.go.dev/github.com/pulumi/pulumi-aws/sdk/v5/go)
-[![License](https://img.shields.io/npm/l/%40pulumi%2Fpulumi.svg)](https://github.com/pulumi/pulumi-aws/blob/master/LICENSE)
+[![License](https://img.shields.io/github/license/pulumi/pulumi-aws)](https://github.com/pulumi/pulumi-aws/blob/master/LICENSE)
 
 # Amazon Web Services (AWS) provider
 
@@ -59,11 +59,11 @@ added to make development easier and to help avoid common mistakes, and to get s
 ### Serverless Functions
 
 The `aws.lambda.CallbackFunction` class allows you to create an AWS lambda function directly out of a JavaScript/TypeScript
-function object of the right signature.  This allows a Pulumi program to simply define a lambda using a simple lambda in
+function object of the right signature. This allows a Pulumi program to simply define a lambda using a simple lambda in
 the language of choice, while having Pulumi itself do the appropriate transformation into the final AWS Lambda resource.
 
 This makes many APIs easier to use, such as defining a Lambda to execute when an S3 Bucket is manipulated,
-or a CloudWatch timer is fired.  To see some examples of this in action, please refer to the `examples/` directory.
+or a CloudWatch timer is fired. To see some examples of this in action, please refer to the `examples/` directory.
 
 The [pulumi/pulumi-cloud](https://github.com/pulumi/pulumi-cloud) repo offer higher level abstractions that build on top
 of this underlying capability.
@@ -110,8 +110,7 @@ The following configuration points are available:
 
 ### Authenticating pulumi-aws via EC2 Instance Metadata?
 
-As of pulumi-aws v3.28.1, the default behaviour for the provider [was changed](https://github.com/pulumi/pulumi-aws/blob/master/CHANGELOG_OLD.md#3281-2021-02-10) to disable MetadataApiCheck by default. This means,
-you need to do either of the following
+As of pulumi-aws v3.28.1, the default behaviour for the provider [was changed](https://github.com/pulumi/pulumi-aws/blob/master/CHANGELOG_OLD.md#3281-2021-02-10) to disable MetadataApiCheck by default. This means, you need to do either of the following
 
 1. When using the default provider:
 ```