diff --git a/make/go/dep_go_fuzz.mk b/make/go/dep_go_fuzz.mk deleted file mode 100644 index 577ca909..00000000 --- a/make/go/dep_go_fuzz.mk +++ /dev/null @@ -1,23 +0,0 @@ -# Managed by makego. DO NOT EDIT. - -# Must be set -$(call _assert_var,MAKEGO) -$(call _conditional_include,$(MAKEGO)/base.mk) -$(call _assert_var,CACHE_VERSIONS) -$(call _assert_var,CACHE_BIN) - -# Settable -# https://github.com/dvyukov/go-fuzz/commits/master 20220220 checked 20220224 -GO_FUZZ_VERSION ?= a217d9bdbecea610d10f4a3a901d69b05ee99196 - -GO_FUZZ := $(CACHE_VERSIONS)/go-fuzz/$(GO_FUZZ_VERSION) -$(GO_FUZZ): - @rm -f $(CACHE_BIN)/go-fuzz $(CACHE_BIN)/go-fuzz-build - GOBIN=$(CACHE_BIN) go install \ - github.com/dvyukov/go-fuzz/go-fuzz@$(GO_FUZZ_VERSION) \ - github.com/dvyukov/go-fuzz/go-fuzz-build@$(GO_FUZZ_VERSION) - @rm -rf $(dir $(GO_FUZZ)) - @mkdir -p $(dir $(GO_FUZZ)) - @touch $(GO_FUZZ) - -dockerdeps:: $(GO_FUZZ) diff --git a/make/go/dep_golangci_lint.mk b/make/go/dep_golangci_lint.mk index 44574011..4b295b55 100644 --- a/make/go/dep_golangci_lint.mk +++ b/make/go/dep_golangci_lint.mk @@ -7,9 +7,9 @@ $(call _assert_var,CACHE_VERSIONS) $(call _assert_var,CACHE_BIN) # Settable -# https://github.com/golangci/golangci-lint/releases 20220517 checked 20220520 +# https://github.com/golangci/golangci-lint/releases 20220824 checked 20220920 # Check for new linters and add to .golangci.yml (even if commented out) when upgrading -GOLANGCI_LINT_VERSION ?= v1.46.2 +GOLANGCI_LINT_VERSION ?= v1.49.0 GOLANGCI_LINT := $(CACHE_VERSIONS)/golangci-lint/$(GOLANGCI_LINT_VERSION) $(GOLANGCI_LINT): diff --git a/make/go/dep_protoc.mk b/make/go/dep_protoc.mk index e5e4d22f..9e3c822c 100644 --- a/make/go/dep_protoc.mk +++ b/make/go/dep_protoc.mk @@ -10,8 +10,8 @@ $(call _assert_var,CACHE_INCLUDE) $(call _assert_var,CACHE_BIN) # Settable -# https://github.com/protocolbuffers/protobuf/releases 20220525 checked 20220526 -PROTOC_VERSION ?= 21.0 +# https://github.com/protocolbuffers/protobuf/releases 20220929 checked 20220930 +PROTOC_VERSION ?= 21.7 ifeq ($(UNAME_OS),Darwin) PROTOC_OS := osx diff --git a/make/go/dep_protoc_gen_connect_go.mk b/make/go/dep_protoc_gen_connect_go.mk index 233ca5c3..5d11bb27 100644 --- a/make/go/dep_protoc_gen_connect_go.mk +++ b/make/go/dep_protoc_gen_connect_go.mk @@ -7,8 +7,11 @@ $(call _assert_var,CACHE_VERSIONS) $(call _assert_var,CACHE_BIN) # Settable -# https://github.com/bufbuild/connect-go 20220531 checked 20220601 -CONNECT_VERSION ?= v0.1.0 +# https://github.com/bufbuild/connect-go 20221018 checked 20221024 +CONNECT_VERSION ?= v1.1.0 + +GO_GET_PKGS := $(GO_GET_PKGS) \ + github.com/bufbuild/connect-go@$(CONNECT_VERSION) PROTOC_GEN_CONNECT_GO := $(CACHE_VERSIONS)/connect-go/$(CONNECT_VERSION) $(PROTOC_GEN_CONNECT_GO): diff --git a/make/go/dep_protoc_gen_go.mk b/make/go/dep_protoc_gen_go.mk index 2d8db0f6..2cff2109 100644 --- a/make/go/dep_protoc_gen_go.mk +++ b/make/go/dep_protoc_gen_go.mk @@ -7,8 +7,11 @@ $(call _assert_var,CACHE_VERSIONS) $(call _assert_var,CACHE_BIN) # Settable -# https://github.com/protocolbuffers/protobuf-go/releases 20220322 checked 20220517 -PROTOC_GEN_GO_VERSION ?= v1.28.0 +# https://github.com/protocolbuffers/protobuf-go/releases 20220831 checked 20221004 +# NOTE: This is temporary until the following fix is available in a release: +# https://github.com/protocolbuffers/protobuf-go/commit/692f4a24f8dc0d375508fc41e657920d411b5b68 +PROTOC_GEN_GO_VERSION ?= v1.28.2-0.20220831092852-f930b1dc76e8 + GO_GET_PKGS := $(GO_GET_PKGS) \ google.golang.org/protobuf/proto@$(PROTOC_GEN_GO_VERSION) diff --git a/make/go/docker.mk b/make/go/docker.mk index a45d778f..86c5f1b8 100644 --- a/make/go/docker.mk +++ b/make/go/docker.mk @@ -26,7 +26,7 @@ DOCKERMAKETARGET ?= all .PHONY: dockerbuildworkspace dockerbuildworkspace: - docker build \ + docker buildx build \ $(DOCKER_BUILD_EXTRA_FLAGS) \ --build-arg PROJECT=$(PROJECT) \ --build-arg GO_MODULE=$(GO_MODULE) \ @@ -38,6 +38,11 @@ dockerbuildworkspace: dockermakeworkspace: dockerbuildworkspace docker run -v "$(CURDIR):$(DOCKER_WORKSPACE_DIR)" $(DOCKER_WORKSPACE_IMAGE) make -j 8 $(DOCKERMAKETARGET) +# To build for amd64 machines (in prod): `make dockerbuild amd64` +ifneq (,$(findstring amd64,$(MAKECMDGOALS))) + DOCKER_BUILD_EXTRA_FLAGS=--platform=linux/amd64 +endif + .PHONY: dockerbuild dockerbuild:: govendor @@ -47,7 +52,7 @@ dockerbuilddeps$(1):: .PHONY: dockerbuild$(1) dockerbuild$(1): dockerbuilddeps$(1) - docker build $(DOCKER_BUILD_EXTRA_FLAGS) -t $(DOCKER_ORG)/$(1):latest -f Dockerfile.$(1) . + docker buildx build $(DOCKER_BUILD_EXTRA_FLAGS) -t $(DOCKER_ORG)/$(1):latest -f Dockerfile.$(1) . ifdef EXTRA_DOCKER_ORG docker tag $(DOCKER_ORG)/$(1):latest $(EXTRA_DOCKER_ORG)/$(1):latest endif diff --git a/pkg/gen/proto/go/lekko/backend/v1beta1/configuration_service.pb.go b/pkg/gen/proto/go/lekko/backend/v1beta1/configuration_service.pb.go index 53a88352..74ac040f 100644 --- a/pkg/gen/proto/go/lekko/backend/v1beta1/configuration_service.pb.go +++ b/pkg/gen/proto/go/lekko/backend/v1beta1/configuration_service.pb.go @@ -14,7 +14,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.0 +// protoc-gen-go v1.28.1-devel // protoc (unknown) // source: lekko/backend/v1beta1/configuration_service.proto diff --git a/pkg/gen/proto/go/lekko/backend/v1beta1/distribution_service.pb.go b/pkg/gen/proto/go/lekko/backend/v1beta1/distribution_service.pb.go index ec522b8f..4e787658 100644 --- a/pkg/gen/proto/go/lekko/backend/v1beta1/distribution_service.pb.go +++ b/pkg/gen/proto/go/lekko/backend/v1beta1/distribution_service.pb.go @@ -14,7 +14,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.0 +// protoc-gen-go v1.28.1-devel // protoc (unknown) // source: lekko/backend/v1beta1/distribution_service.proto diff --git a/pkg/gen/proto/go/lekko/feature/v1beta1/feature.pb.go b/pkg/gen/proto/go/lekko/feature/v1beta1/feature.pb.go index 8b9bdf36..9a049ebd 100644 --- a/pkg/gen/proto/go/lekko/feature/v1beta1/feature.pb.go +++ b/pkg/gen/proto/go/lekko/feature/v1beta1/feature.pb.go @@ -14,7 +14,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.0 +// protoc-gen-go v1.28.1-devel // protoc (unknown) // source: lekko/feature/v1beta1/feature.proto diff --git a/pkg/gen/proto/go/lekko/rules/v1beta2/rules.pb.go b/pkg/gen/proto/go/lekko/rules/v1beta2/rules.pb.go index 777beaf0..ffa4b165 100644 --- a/pkg/gen/proto/go/lekko/rules/v1beta2/rules.pb.go +++ b/pkg/gen/proto/go/lekko/rules/v1beta2/rules.pb.go @@ -14,7 +14,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.0 +// protoc-gen-go v1.28.1-devel // protoc (unknown) // source: lekko/rules/v1beta2/rules.proto