From 1077bc99b95263ce7f83388e2949ddd35a6f4c3f Mon Sep 17 00:00:00 2001 From: Gus Rivera Date: Tue, 13 Aug 2024 15:40:19 -0500 Subject: [PATCH 1/2] Updating darwin plugin builds to notarize binaries --- integrations/event-handler/Makefile | 10 ++++++++++ integrations/terraform/Makefile | 15 +++++++++++++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/integrations/event-handler/Makefile b/integrations/event-handler/Makefile index f4fd8850d1a1..94b95a4a8338 100644 --- a/integrations/event-handler/Makefile +++ b/integrations/event-handler/Makefile @@ -46,8 +46,18 @@ RELEASE_MESSAGE = "Building with GOOS=$(OS) GOARCH=$(ARCH)." build: GOOS=$(OS) GOARCH=$(ARCH) $(CGOFLAG) go build -o $(BUILDDIR)/teleport-event-handler $(BUILDFLAGS) +# darwin-signed-build is a wrapper around the build target that ensures it is codesigned +include ../../darwin-signing.mk +.PHONY: darwin-signed-build +darwin-signed-build: build + $(NOTARIZE_BINARIES) + .PHONY: release +ifeq ($(OS),darwin) +release: darwin-signed-build +else release: build +endif @echo "---> $(RELEASE_MESSAGE)" mkdir $(RELEASE_NAME) cp -rf $(BINARY) \ diff --git a/integrations/terraform/Makefile b/integrations/terraform/Makefile index 517b915e848f..bb682808f92c 100644 --- a/integrations/terraform/Makefile +++ b/integrations/terraform/Makefile @@ -113,9 +113,20 @@ endif rm -r ./tfschema/github.com/ @go run ./gen/main.go -.PHONY: release +# darwin-signed-build is a wrapper around the build target that ensures it is codesigned +include ../../darwin-signing.mk +.PHONY: darwin-signed-build +darwin-signed-build: BINARIES=$(BUILDDIR)/terraform-provider-teleport ifeq ($(OS)-$(ARCH),darwin-universal) -release: build-darwin-universal +darwin-signed-build: build-darwin-universal +else +darwin-signed-build: build +endif + $(NOTARIZE_BINARIES) + +.PHONY: release +ifeq ($(OS),darwin) +release: darwin-signed-build else release: build endif From 773f140ea40fd5303f6c2a28510a0a2ac4b8dc41 Mon Sep 17 00:00:00 2001 From: Gus Rivera Date: Tue, 13 Aug 2024 15:45:55 -0500 Subject: [PATCH 2/2] Updating event-handler signing to include binaries --- integrations/event-handler/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/integrations/event-handler/Makefile b/integrations/event-handler/Makefile index 94b95a4a8338..d0a0906bada0 100644 --- a/integrations/event-handler/Makefile +++ b/integrations/event-handler/Makefile @@ -49,6 +49,7 @@ build: # darwin-signed-build is a wrapper around the build target that ensures it is codesigned include ../../darwin-signing.mk .PHONY: darwin-signed-build +darwin-signed-build: BINARIES=$(BINARY) darwin-signed-build: build $(NOTARIZE_BINARIES)