diff --git a/.github/actions/upload-sdk/action.yml b/.github/actions/upload-sdk/action.yml index bea11eed..401eedab 100644 --- a/.github/actions/upload-sdk/action.yml +++ b/.github/actions/upload-sdk/action.yml @@ -13,7 +13,7 @@ runs: shell: bash run: tar -zcf sdk/${{ inputs.language }}.tar.gz -C sdk/${{ inputs.language }} . - name: Upload artifacts - uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0 + uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0 with: name: ${{ inputs.language }}-sdk.tar.gz path: ${{ github.workspace}}/sdk/${{ inputs.language }}.tar.gz diff --git a/.github/workflows/build_provider.yml b/.github/workflows/build_provider.yml index 3dba0ae1..ca7eeac8 100644 --- a/.github/workflows/build_provider.yml +++ b/.github/workflows/build_provider.yml @@ -36,6 +36,11 @@ jobs: uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: persist-credentials: false + # Without ldid cross-compiling Node binaries on a Linux worker intended to work on darwin-arm64 fails to sign the + # binaries properly and they do not work as expected. See https://github.com/pulumi/pulumi-awsx/issues/1490 + - uses: MOZGIII/install-ldid-action@v1 + with: + tag: v2.1.5-procursus2 - name: Setup tools uses: ./.github/actions/setup-tools with: @@ -66,7 +71,7 @@ jobs: run: make provider_dist-${{ matrix.platform.os }}-${{ matrix.platform.arch }} - name: Upload artifacts - uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0 + uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0 with: name: pulumi-resource-azuread-v${{ inputs.version }}-${{ matrix.platform.os }}-${{ matrix.platform.arch }}.tar.gz path: bin/pulumi-resource-azuread-v${{ inputs.version }}-${{ matrix.platform.os }}-${{ matrix.platform.arch }}.tar.gz diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index e3391a88..5d438b2d 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -54,7 +54,7 @@ jobs: continue-on-error: true run: make prepare_local_workspace - name: golangci-lint - uses: golangci/golangci-lint-action@971e284b6050e8a5849b72094c50ab08da042db8 # v6 + uses: golangci/golangci-lint-action@ec5d18412c0aeab7936cb16880d708ba2a64e1ae # v6 with: version: v1.60 working-directory: provider diff --git a/.github/workflows/prerequisites.yml b/.github/workflows/prerequisites.yml index bd94ca02..504b3d2d 100644 --- a/.github/workflows/prerequisites.yml +++ b/.github/workflows/prerequisites.yml @@ -102,14 +102,14 @@ jobs: Maintainer note: consult the [runbook](https://github.com/pulumi/platform-providers-team/blob/main/playbooks/tf-provider-updating.md) for dealing with any breaking changes. - name: Upload codegen binary for azuread - uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0 + uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0 with: name: pulumi-tfgen-azuread path: ${{ github.workspace }}/bin/pulumi-tfgen-azuread retention-days: 30 - name: Upload schema-embed.json - uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0 + uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0 with: name: schema-embed.json path: provider/cmd/pulumi-resource-azuread/schema-embed.json diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 7d3063e6..27db84c0 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -216,6 +216,6 @@ jobs: with: providerVersion: ${{ inputs.version }} # Prelease is run often but we only have 5 concurrent macos runners, so we only test after the stable release. - enableMacosRunner: ${{ inputs.isPrerelease == false }} + enableMacRunner: ${{ inputs.isPrerelease == false }} skipGoSdk: ${{ inputs.skipGoSdk }} pythonVersion: ${{ needs.publish_sdk.outputs.python_version }} diff --git a/.github/workflows/verify-release.yml b/.github/workflows/verify-release.yml index 4ed0b74a..f8fc6cb3 100644 --- a/.github/workflows/verify-release.yml +++ b/.github/workflows/verify-release.yml @@ -26,7 +26,7 @@ on: description: "The version of the provider to verify" required: true type: string - enableMacosRunner: + enableMacRunner: description: "Enable the macos-latest runner in addition to ubuntu-latest and windows-latest. Defaults to 'false'." required: false type: boolean diff --git a/Makefile b/Makefile index 5b141535..f15b795d 100644 --- a/Makefile +++ b/Makefile @@ -9,6 +9,7 @@ CODEGEN := pulumi-tfgen-$(PACK) PROVIDER := pulumi-resource-$(PACK) JAVA_GEN := pulumi-java-gen TESTPARALLELISM := 10 +GOTESTARGS := "" WORKING_DIR := $(shell pwd) PULUMI_PROVIDER_BUILD_PARALLELISM ?= PULUMI_CONVERT := 1 @@ -219,29 +220,30 @@ lint_provider: provider lint_provider.fix: cd provider && golangci-lint run --path-prefix provider -c ../.golangci.yml --fix .PHONY: lint_provider lint_provider.fix +build_provider_cmd = cd provider && GOOS=$(1) GOARCH=$(2) CGO_ENABLED=0 go build $(PULUMI_PROVIDER_BUILD_PARALLELISM) -o "$(3)" -ldflags "$(LDFLAGS)" $(PROJECT)/$(PROVIDER_PATH)/cmd/$(PROVIDER) + +provider: bin/$(PROVIDER) # `make provider_no_deps` builds the provider binary directly, without ensuring that # `cmd/pulumi-resource-azuread/schema.json` is valid and up to date. # To create a release ready binary, you should use `make provider`. -build_provider_cmd = cd provider && CGO_ENABLED=0 go build $(PULUMI_PROVIDER_BUILD_PARALLELISM) -o "$(1)" -ldflags "$(LDFLAGS)" $(PROJECT)/$(PROVIDER_PATH)/cmd/$(PROVIDER) -provider: bin/$(PROVIDER) provider_no_deps: - $(call build_provider_cmd,$(WORKING_DIR)/bin/$(PROVIDER)) + $(call build_provider_cmd,$(shell go env GOOS),$(shell go env GOARCH),$(WORKING_DIR)/bin/$(PROVIDER)) bin/$(PROVIDER): .make/schema - $(call build_provider_cmd,$(WORKING_DIR)/bin/$(PROVIDER)) + $(call build_provider_cmd,$(shell go env GOOS),$(shell go env GOARCH),$(WORKING_DIR)/bin/$(PROVIDER)) .PHONY: provider provider_no_deps test: export PATH := $(WORKING_DIR)/bin:$(PATH) test: - cd examples && go test -v -tags=all -parallel $(TESTPARALLELISM) -timeout 2h + cd examples && go test -v -tags=all -parallel $(TESTPARALLELISM) -timeout 2h $(value GOTESTARGS) .PHONY: test - +test_provider_cmd = cd provider && go test -v -short \ + -coverprofile="coverage.txt" \ + -coverpkg="./...,github.com/hashicorp/terraform-provider-..." \ + -parallel $(TESTPARALLELISM) \ + ./... test_provider: - cd provider && go test -v -short \ - -coverprofile="coverage.txt" \ - -coverpkg="./...,github.com/hashicorp/terraform-provider-..." \ - -parallel $(TESTPARALLELISM) \ - ./... + $(call test_provider_cmd) .PHONY: test_provider tfgen: schema @@ -320,18 +322,18 @@ SKIP_SIGNING ?= # These targets assume that the schema-embed.json exists - it's generated by tfgen. # We disable CGO to ensure that the binary is statically linked. -bin/linux-amd64/$(PROVIDER): export GOOS := linux -bin/linux-amd64/$(PROVIDER): export GOARCH := amd64 -bin/linux-arm64/$(PROVIDER): export GOOS := linux -bin/linux-arm64/$(PROVIDER): export GOARCH := arm64 -bin/darwin-amd64/$(PROVIDER): export GOOS := darwin -bin/darwin-amd64/$(PROVIDER): export GOARCH := amd64 -bin/darwin-arm64/$(PROVIDER): export GOOS := darwin -bin/darwin-arm64/$(PROVIDER): export GOARCH := arm64 -bin/windows-amd64/$(PROVIDER).exe: export GOOS := windows -bin/windows-amd64/$(PROVIDER).exe: export GOARCH := amd64 +bin/linux-amd64/$(PROVIDER): GOOS := linux +bin/linux-amd64/$(PROVIDER): GOARCH := amd64 +bin/linux-arm64/$(PROVIDER): GOOS := linux +bin/linux-arm64/$(PROVIDER): GOARCH := arm64 +bin/darwin-amd64/$(PROVIDER): GOOS := darwin +bin/darwin-amd64/$(PROVIDER): GOARCH := amd64 +bin/darwin-arm64/$(PROVIDER): GOOS := darwin +bin/darwin-arm64/$(PROVIDER): GOARCH := arm64 +bin/windows-amd64/$(PROVIDER).exe: GOOS := windows +bin/windows-amd64/$(PROVIDER).exe: GOARCH := amd64 bin/%/$(PROVIDER) bin/%/$(PROVIDER).exe: bin/jsign-6.0.jar - $(call build_provider_cmd,$(WORKING_DIR)/$@) + $(call build_provider_cmd,$(GOOS),$(GOARCH),$(WORKING_DIR)/$@) @# Only sign windows binary if fully configured. @# Test variables set by joining with | between and looking for || showing at least one variable is empty.