Dapr build flavors. (dapr#6290)

* Dapr build flavors. Signed-off-by: Artur Souza <[email protected]> * Split unit test & lint + add darwin,win unit tests to worklow again. Signed-off-by: Artur Souza <[email protected]> --------- Signed-off-by: Artur Souza <[email protected]>
msfussell · Apr 27, 2023 · acb348d · acb348d
1 parent 07a6e03
commit acb348d
Show file tree

Hide file tree

Showing 124 changed files with 576 additions and 123 deletions.
diff --git a/.github/workflows/dapr.yml b/.github/workflows/dapr.yml
diff --git a/Makefile b/Makefile
@@ -27,6 +27,11 @@ BINARIES    ?= daprd placement operator injector sentry
 HA_MODE     ?= false
 # Force in-memory log for placement
 FORCE_INMEM ?= true
+# Go's build tags:
+# all_components - includes all components in Dapr sidecar
+# stable_components - includes all stable components in Dapr sidecar
+DAPR_SIDECAR_FLAVOR ?= all
+DAPR_GO_BUILD_TAGS = $(DAPR_SIDECAR_FLAVOR)_components
 
 # Add latest tag if LATEST_RELEASE is true
 LATEST_RELEASE ?=
@@ -176,7 +181,7 @@ build: $(DAPR_BINS)
 define genBinariesForTarget
 .PHONY: $(5)/$(1)
 $(5)/$(1):
-	CGO_ENABLED=$(CGO) GOOS=$(3) GOARCH=$(4) go build $(GCFLAGS) -ldflags=$(LDFLAGS) \
+	CGO_ENABLED=$(CGO) GOOS=$(3) GOARCH=$(4) go build $(GCFLAGS) -ldflags=$(LDFLAGS) -tags=$(DAPR_GO_BUILD_TAGS) \
 	-o $(5)/$(1) $(2)/;
 endef
 
@@ -199,8 +204,10 @@ endif
 ################################################################################
 ARCHIVE_OUT_DIR ?= $(DAPR_OUT_DIR)
 ARCHIVE_FILE_EXTS:=$(foreach ITEM,$(BINARIES),archive-$(ITEM)$(ARCHIVE_EXT))
+ARCHIVE_FILE_FLAVOR_EXTS:=$(foreach ITEM,$(BINARIES),archive-$(ITEM)-$(DAPR_SIDECAR_FLAVOR)$(ARCHIVE_EXT))
 
 archive: $(ARCHIVE_FILE_EXTS)
+archive-flavor: $(ARCHIVE_FILE_FLAVOR_EXTS)
 
 # Generate archive files for each binary
 # $(1): the binary name to be archived
@@ -209,14 +216,18 @@ define genArchiveBinary
 ifeq ($(GOOS),windows)
 archive-$(1).zip:
 	7z.exe a -tzip "$(2)\\$(1)_$(GOOS)_$(GOARCH)$(ARCHIVE_EXT)" "$(DAPR_OUT_DIR)\\$(1)$(BINARY_EXT)"
+archive-$(1)-$(3).zip:
+	7z.exe a -tzip "$(2)\\$(1)_$(GOOS)_$(GOARCH)-$(3)$(ARCHIVE_EXT)" "$(DAPR_OUT_DIR)\\$(1)$(BINARY_EXT)"
 else
 archive-$(1).tar.gz:
 	tar czf "$(2)/$(1)_$(GOOS)_$(GOARCH)$(ARCHIVE_EXT)" -C "$(DAPR_OUT_DIR)" "$(1)$(BINARY_EXT)"
+archive-$(1)-$(3).tar.gz:
+	tar czf "$(2)/$(1)_$(GOOS)_$(GOARCH)-$(3)$(ARCHIVE_EXT)" -C "$(DAPR_OUT_DIR)" "$(1)$(BINARY_EXT)"
 endif
 endef
 
 # Generate archive-*.[zip|tar.gz] targets
-$(foreach ITEM,$(BINARIES),$(eval $(call genArchiveBinary,$(ITEM),$(ARCHIVE_OUT_DIR))))
+$(foreach ITEM,$(BINARIES),$(eval $(call genArchiveBinary,$(ITEM),$(ARCHIVE_OUT_DIR),$(DAPR_SIDECAR_FLAVOR))))
 
 
 ################################################################################
@@ -276,6 +287,7 @@ docker-deploy-k8s: check-docker-env check-arch
 # Target: archive                                                              #
 ################################################################################
 release: build archive
+release-flavor: build archive-flavor
 
 ################################################################################
 # Target: test                                                                 #
@@ -288,9 +300,9 @@ test: test-deps
 			--format standard-quiet \
 			-- \
 				./pkg/... ./utils/... ./cmd/... \
-				$(COVERAGE_OPTS) --tags=unit
+				$(COVERAGE_OPTS) --tags=unit,all_components
 	CGO_ENABLED=$(CGO) \
-		go test ./tests/...
+		go test --tags=all_components ./tests/...
 
 ################################################################################
 # Target: test-race                                                            #
@@ -329,7 +341,7 @@ TEST_WITH_RACE=./pkg/acl/... \
 .PHONY: test-race
 test-race:
 	echo "$(TEST_WITH_RACE)" | xargs \
-		go test -tags=unit -race
+		go test -tags="all_components unit" -race
 
 ################################################################################
 # Target: lint                                                                 #
@@ -338,7 +350,7 @@ test-race:
 # You can download version v1.51.2 at https://github.com/golangci/golangci-lint/releases/tag/v1.51.2
 .PHONY: lint
 lint:
-	$(GOLANGCI_LINT) run --timeout=20m
+	$(GOLANGCI_LINT) run --build-tags=all_components --timeout=20m
 
 ################################################################################
 # Target: modtidy-all                                                          #

diff --git a/cmd/daprd/components/binding_alicloud_oss.go b/cmd/daprd/components/binding_alicloud_oss.go
@@ -1,3 +1,5 @@
+//go:build all_components
+
 /*
 Copyright 2021 The Dapr Authors
 Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/cmd/daprd/components/binding_alicloud_sls.go b/cmd/daprd/components/binding_alicloud_sls.go
@@ -1,3 +1,5 @@
+//go:build all_components
+
 /*
 Copyright 2021 The Dapr Authors
 Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/cmd/daprd/components/binding_alicloud_tablestore.go b/cmd/daprd/components/binding_alicloud_tablestore.go
@@ -1,3 +1,5 @@
+//go:build all_components
+
 /*
 Copyright 2021 The Dapr Authors
 Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/cmd/daprd/components/binding_apns.go b/cmd/daprd/components/binding_apns.go
@@ -1,3 +1,5 @@
+//go:build all_components
+
 /*
 Copyright 2021 The Dapr Authors
 Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/cmd/daprd/components/binding_aws_dynamodb.go b/cmd/daprd/components/binding_aws_dynamodb.go
@@ -1,3 +1,5 @@
+//go:build all_components
+
 /*
 Copyright 2021 The Dapr Authors
 Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/cmd/daprd/components/binding_aws_kinesis.go b/cmd/daprd/components/binding_aws_kinesis.go
@@ -1,3 +1,5 @@
+//go:build all_components
+
 /*
 Copyright 2021 The Dapr Authors
 Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/cmd/daprd/components/binding_aws_s3.go b/cmd/daprd/components/binding_aws_s3.go
@@ -1,3 +1,5 @@
+//go:build all_components
+
 /*
 Copyright 2021 The Dapr Authors
 Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/cmd/daprd/components/binding_aws_ses.go b/cmd/daprd/components/binding_aws_ses.go
@@ -1,3 +1,5 @@
+//go:build all_components
+
 /*
 Copyright 2021 The Dapr Authors
 Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/cmd/daprd/components/binding_aws_sns.go b/cmd/daprd/components/binding_aws_sns.go
@@ -1,3 +1,5 @@
+//go:build all_components
+
 /*
 Copyright 2021 The Dapr Authors
 Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/cmd/daprd/components/binding_aws_sqs.go b/cmd/daprd/components/binding_aws_sqs.go
@@ -1,3 +1,5 @@
+//go:build all_components
+
 /*
 Copyright 2021 The Dapr Authors
 Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/cmd/daprd/components/binding_azure_blobstorage.go b/cmd/daprd/components/binding_azure_blobstorage.go
@@ -1,3 +1,5 @@
+//go:build all_components || stable_components
+
 /*
 Copyright 2021 The Dapr Authors
 Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/cmd/daprd/components/binding_azure_cosmosdb.go b/cmd/daprd/components/binding_azure_cosmosdb.go
@@ -1,3 +1,5 @@
+//go:build all_components || stable_components
+
 /*
 Copyright 2021 The Dapr Authors
 Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/cmd/daprd/components/binding_azure_cosmosdb_gremlinapi.go b/cmd/daprd/components/binding_azure_cosmosdb_gremlinapi.go
@@ -1,3 +1,5 @@
+//go:build all_components
+
 /*
 Copyright 2021 The Dapr Authors
 Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/cmd/daprd/components/binding_azure_eventgrid.go b/cmd/daprd/components/binding_azure_eventgrid.go
@@ -1,3 +1,5 @@
+//go:build all_components
+
 /*
 Copyright 2021 The Dapr Authors
 Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/cmd/daprd/components/binding_azure_eventhubs.go b/cmd/daprd/components/binding_azure_eventhubs.go
@@ -1,3 +1,5 @@
+//go:build all_components || stable_components
+
 /*
 Copyright 2021 The Dapr Authors
 Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/cmd/daprd/components/binding_azure_servicebus_queues.go b/cmd/daprd/components/binding_azure_servicebus_queues.go
@@ -1,3 +1,5 @@
+//go:build all_components || stable_components
+
 /*
 Copyright 2021 The Dapr Authors
 Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/cmd/daprd/components/binding_azure_signalr.go b/cmd/daprd/components/binding_azure_signalr.go
@@ -1,3 +1,5 @@
+//go:build all_components
+
 /*
 Copyright 2021 The Dapr Authors
 Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/cmd/daprd/components/binding_azure_storagequeues.go b/cmd/daprd/components/binding_azure_storagequeues.go
@@ -1,3 +1,5 @@
+//go:build all_components || stable_components
+
 /*
 Copyright 2021 The Dapr Authors
 Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/cmd/daprd/components/binding_cloudflare_queues.go b/cmd/daprd/components/binding_cloudflare_queues.go
@@ -1,3 +1,5 @@
+//go:build all_components
+
 /*
 Copyright 2021 The Dapr Authors
 Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/cmd/daprd/components/binding_commercetools.go b/cmd/daprd/components/binding_commercetools.go
@@ -1,3 +1,5 @@
+//go:build all_components
+
 /*
 Copyright 2021 The Dapr Authors
 Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/cmd/daprd/components/binding_cron.go b/cmd/daprd/components/binding_cron.go
@@ -1,3 +1,5 @@
+//go:build all_components || stable_components
+
 /*
 Copyright 2021 The Dapr Authors
 Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/cmd/daprd/components/binding_dingtalk_webhook.go b/cmd/daprd/components/binding_dingtalk_webhook.go
@@ -1,3 +1,5 @@
+//go:build all_components
+
 /*
 Copyright 2021 The Dapr Authors
 Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/cmd/daprd/components/binding_dubbo.go b/cmd/daprd/components/binding_dubbo.go
@@ -1,3 +1,5 @@
+//go:build all_components
+
 /*
 Copyright 2021 The Dapr Authors
 Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/cmd/daprd/components/binding_gcp_bucket.go b/cmd/daprd/components/binding_gcp_bucket.go
@@ -1,3 +1,5 @@
+//go:build all_components
+
 /*
 Copyright 2021 The Dapr Authors
 Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/cmd/daprd/components/binding_gcp_pubsub.go b/cmd/daprd/components/binding_gcp_pubsub.go
@@ -1,3 +1,5 @@
+//go:build all_components
+
 /*
 Copyright 2021 The Dapr Authors
 Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/cmd/daprd/components/binding_graphql.go b/cmd/daprd/components/binding_graphql.go
@@ -1,3 +1,5 @@
+//go:build all_components
+
 /*
 Copyright 2021 The Dapr Authors
 Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/cmd/daprd/components/binding_http.go b/cmd/daprd/components/binding_http.go
@@ -1,3 +1,5 @@
+//go:build all_components || stable_components
+
 /*
 Copyright 2021 The Dapr Authors
 Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/cmd/daprd/components/binding_huawei_obs.go b/cmd/daprd/components/binding_huawei_obs.go
@@ -1,3 +1,5 @@
+//go:build all_components
+
 /*
 Copyright 2021 The Dapr Authors
 Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/cmd/daprd/components/binding_influx.go b/cmd/daprd/components/binding_influx.go
@@ -1,3 +1,5 @@
+//go:build all_components
+
 /*
 Copyright 2021 The Dapr Authors
 Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/cmd/daprd/components/binding_kafka.go b/cmd/daprd/components/binding_kafka.go
@@ -1,3 +1,5 @@
+//go:build all_components || stable_components
+
 /*
 Copyright 2021 The Dapr Authors
 Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/cmd/daprd/components/binding_kubemq.go b/cmd/daprd/components/binding_kubemq.go
@@ -1,3 +1,5 @@
+//go:build all_components
+
 /*
 Copyright 2021 The Dapr Authors
 Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/cmd/daprd/components/binding_kubernetes.go b/cmd/daprd/components/binding_kubernetes.go
@@ -1,3 +1,5 @@
+//go:build all_components
+
 /*
 Copyright 2021 The Dapr Authors
 Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/cmd/daprd/components/binding_localstorage.go b/cmd/daprd/components/binding_localstorage.go
@@ -1,3 +1,5 @@
+//go:build all_components || stable_components
+
 /*
 Copyright 2021 The Dapr Authors
 Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/cmd/daprd/components/binding_mqtt.go b/cmd/daprd/components/binding_mqtt.go
@@ -1,3 +1,5 @@
+//go:build all_components
+
 /*
 Copyright 2021 The Dapr Authors
 Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/cmd/daprd/components/binding_mysql.go b/cmd/daprd/components/binding_mysql.go
@@ -1,3 +1,5 @@
+//go:build all_components
+
 /*
 Copyright 2021 The Dapr Authors
 Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/cmd/daprd/components/binding_postgres.go b/cmd/daprd/components/binding_postgres.go
@@ -1,3 +1,5 @@
+//go:build all_components || stable_components
+
 /*
 Copyright 2021 The Dapr Authors
 Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/cmd/daprd/components/binding_postmark.go b/cmd/daprd/components/binding_postmark.go
@@ -1,3 +1,5 @@
+//go:build all_components
+
 /*
 Copyright 2021 The Dapr Authors
 Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/cmd/daprd/components/binding_rabbitmq.go b/cmd/daprd/components/binding_rabbitmq.go
@@ -1,3 +1,5 @@
+//go:build all_components || stable_components
+
 /*
 Copyright 2021 The Dapr Authors
 Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/cmd/daprd/components/binding_redis.go b/cmd/daprd/components/binding_redis.go
@@ -1,3 +1,5 @@
+//go:build all_components || stable_components
+
 /*
 Copyright 2021 The Dapr Authors
 Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/cmd/daprd/components/binding_rethinkdb_statechange.go b/cmd/daprd/components/binding_rethinkdb_statechange.go
@@ -1,3 +1,5 @@
+//go:build all_components
+
 /*
 Copyright 2021 The Dapr Authors
 Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/cmd/daprd/components/binding_smtp.go b/cmd/daprd/components/binding_smtp.go
@@ -1,3 +1,5 @@
+//go:build all_components
+
 /*
 Copyright 2021 The Dapr Authors
 Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/cmd/daprd/components/binding_twilio_sendgrid.go b/cmd/daprd/components/binding_twilio_sendgrid.go
@@ -1,3 +1,5 @@
+//go:build all_components
+
 /*
 Copyright 2021 The Dapr Authors
 Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/cmd/daprd/components/binding_twilio_sms.go b/cmd/daprd/components/binding_twilio_sms.go
@@ -1,3 +1,5 @@
+//go:build all_components
+
 /*
 Copyright 2021 The Dapr Authors
 Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/cmd/daprd/components/binding_wasm.go b/cmd/daprd/components/binding_wasm.go
@@ -1,3 +1,5 @@
+//go:build all_components
+
 /*
 Copyright 2023 The Dapr Authors
 Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/cmd/daprd/components/binding_zeebe_command.go b/cmd/daprd/components/binding_zeebe_command.go
@@ -1,3 +1,5 @@
+//go:build all_components
+
 /*
 Copyright 2021 The Dapr Authors
 Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/cmd/daprd/components/binding_zeebe_jobworker.go b/cmd/daprd/components/binding_zeebe_jobworker.go
@@ -1,3 +1,5 @@
+//go:build all_components
+
 /*
 Copyright 2021 The Dapr Authors
 Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/cmd/daprd/components/configuration_azure_appconfig.go b/cmd/daprd/components/configuration_azure_appconfig.go
@@ -1,3 +1,5 @@
+//go:build all_components
+
 /*
 Copyright 2021 The Dapr Authors
 Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/cmd/daprd/components/configuration_postgres.go b/cmd/daprd/components/configuration_postgres.go
@@ -1,3 +1,5 @@
+//go:build all_components
+
 /*
 Copyright 2021 The Dapr Authors
 Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/cmd/daprd/components/configuration_redis.go b/cmd/daprd/components/configuration_redis.go
@@ -1,3 +1,5 @@
+//go:build all_components
+
 /*
 Copyright 2021 The Dapr Authors
 Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/cmd/daprd/components/crypto_azure_keyvault.go b/cmd/daprd/components/crypto_azure_keyvault.go
@@ -1,3 +1,5 @@
+//go:build all_components
+
 /*
 Copyright 2023 The Dapr Authors
 Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/cmd/daprd/components/crypto_dapr_jwks.go b/cmd/daprd/components/crypto_dapr_jwks.go
@@ -1,3 +1,5 @@
+//go:build all_components
+
 /*
 Copyright 2023 The Dapr Authors
 Licensed under the Apache License, Version 2.0 (the "License");