diff --git a/Makefile.core.mk b/Makefile.core.mk index 628c54b14..7d5799c08 100644 --- a/Makefile.core.mk +++ b/Makefile.core.mk @@ -25,7 +25,7 @@ TARGET_ARCH ?= amd64 GOARCH_LOCAL := $(TARGET_ARCH) GOOS_LOCAL := $(TARGET_OS) -RELEASE_LDFLAGS='$(GO_LDFLAGS) -extldflags -static -s -w -X google.golang.org/protobuf/reflect/protoregistry.conflictPolicy=warn' +RELEASE_LDFLAGS='$(GO_LDFLAGS) -extldflags -static -s -w' export OUT:=$(TARGET_OUT) export OUT_LINUX:=$(TARGET_OUT_LINUX) @@ -68,7 +68,7 @@ default: build .PHONY: go.test.coverage go.test.coverage: prebuild - go test -ldflags "-X google.golang.org/protobuf/reflect/protoregistry.conflictPolicy=warn" ./cmd/... ./pkg/... -race -coverprofile=coverage.xml -covermode=atomic + go test ./cmd/... ./pkg/... -race -coverprofile=coverage.xml -covermode=atomic .PHONY: build build: prebuild $(OUT) @@ -101,11 +101,11 @@ build-hgctl-multiarch: prebuild $(OUT) .PHONY: build-hgctl-macos-arm64 build-hgctl-macos-arm64: prebuild $(OUT) - CGO_ENABLED=1 GOPROXY=$(GOPROXY) GOOS=darwin GOARCH=arm64 LDFLAGS="-X google.golang.org/protobuf/reflect/protoregistry.conflictPolicy=warn" PROJECT_DIR="$(HGCTL_PROJECT_DIR)" tools/hack/gobuild.sh ../out/darwin_arm64/ $(HGCTL_BINARIES) + CGO_ENABLED=1 GOPROXY=$(GOPROXY) GOOS=darwin GOARCH=arm64 PROJECT_DIR="$(HGCTL_PROJECT_DIR)" tools/hack/gobuild.sh ../out/darwin_arm64/ $(HGCTL_BINARIES) .PHONY: build-hgctl-macos-amd64 build-hgctl-macos-amd64: prebuild $(OUT) - CGO_ENABLED=1 GOPROXY=$(GOPROXY) GOOS=darwin GOARCH=amd64 LDFLAGS="-X google.golang.org/protobuf/reflect/protoregistry.conflictPolicy=warn" PROJECT_DIR="$(HGCTL_PROJECT_DIR)" tools/hack/gobuild.sh ../out/darwin_amd64/ $(HGCTL_BINARIES) + CGO_ENABLED=1 GOPROXY=$(GOPROXY) GOOS=darwin GOARCH=amd64 PROJECT_DIR="$(HGCTL_PROJECT_DIR)" tools/hack/gobuild.sh ../out/darwin_amd64/ $(HGCTL_BINARIES) # Create targets for OUT_LINUX/binary # There are two use cases here: diff --git a/api/extensions/v1alpha1/wasm.pb.go b/api/extensions/v1alpha1/wasmplugin.pb.go similarity index 63% rename from api/extensions/v1alpha1/wasm.pb.go rename to api/extensions/v1alpha1/wasmplugin.pb.go index 3865a8cfa..947d6d822 100644 --- a/api/extensions/v1alpha1/wasm.pb.go +++ b/api/extensions/v1alpha1/wasmplugin.pb.go @@ -17,7 +17,7 @@ // versions: // protoc-gen-go v1.31.0 // protoc (unknown) -// source: extensions/v1alpha1/wasm.proto +// source: extensions/v1alpha1/wasmplugin.proto // $schema: higress.extensions.v1alpha1.WasmPlugin // $title: WasmPlugin @@ -84,11 +84,11 @@ func (x PluginPhase) String() string { } func (PluginPhase) Descriptor() protoreflect.EnumDescriptor { - return file_extensions_v1alpha1_wasm_proto_enumTypes[0].Descriptor() + return file_extensions_v1alpha1_wasmplugin_proto_enumTypes[0].Descriptor() } func (PluginPhase) Type() protoreflect.EnumType { - return &file_extensions_v1alpha1_wasm_proto_enumTypes[0] + return &file_extensions_v1alpha1_wasmplugin_proto_enumTypes[0] } func (x PluginPhase) Number() protoreflect.EnumNumber { @@ -97,7 +97,7 @@ func (x PluginPhase) Number() protoreflect.EnumNumber { // Deprecated: Use PluginPhase.Descriptor instead. func (PluginPhase) EnumDescriptor() ([]byte, []int) { - return file_extensions_v1alpha1_wasm_proto_rawDescGZIP(), []int{0} + return file_extensions_v1alpha1_wasmplugin_proto_rawDescGZIP(), []int{0} } // The pull behaviour to be applied when fetching an OCI image, @@ -146,11 +146,11 @@ func (x PullPolicy) String() string { } func (PullPolicy) Descriptor() protoreflect.EnumDescriptor { - return file_extensions_v1alpha1_wasm_proto_enumTypes[1].Descriptor() + return file_extensions_v1alpha1_wasmplugin_proto_enumTypes[1].Descriptor() } func (PullPolicy) Type() protoreflect.EnumType { - return &file_extensions_v1alpha1_wasm_proto_enumTypes[1] + return &file_extensions_v1alpha1_wasmplugin_proto_enumTypes[1] } func (x PullPolicy) Number() protoreflect.EnumNumber { @@ -159,7 +159,7 @@ func (x PullPolicy) Number() protoreflect.EnumNumber { // Deprecated: Use PullPolicy.Descriptor instead. func (PullPolicy) EnumDescriptor() ([]byte, []int) { - return file_extensions_v1alpha1_wasm_proto_rawDescGZIP(), []int{1} + return file_extensions_v1alpha1_wasmplugin_proto_rawDescGZIP(), []int{1} } type EnvValueSource int32 @@ -194,11 +194,11 @@ func (x EnvValueSource) String() string { } func (EnvValueSource) Descriptor() protoreflect.EnumDescriptor { - return file_extensions_v1alpha1_wasm_proto_enumTypes[2].Descriptor() + return file_extensions_v1alpha1_wasmplugin_proto_enumTypes[2].Descriptor() } func (EnvValueSource) Type() protoreflect.EnumType { - return &file_extensions_v1alpha1_wasm_proto_enumTypes[2] + return &file_extensions_v1alpha1_wasmplugin_proto_enumTypes[2] } func (x EnvValueSource) Number() protoreflect.EnumNumber { @@ -207,7 +207,7 @@ func (x EnvValueSource) Number() protoreflect.EnumNumber { // Deprecated: Use EnvValueSource.Descriptor instead. func (EnvValueSource) EnumDescriptor() ([]byte, []int) { - return file_extensions_v1alpha1_wasm_proto_rawDescGZIP(), []int{2} + return file_extensions_v1alpha1_wasmplugin_proto_rawDescGZIP(), []int{2} } type FailStrategy int32 @@ -246,11 +246,11 @@ func (x FailStrategy) String() string { } func (FailStrategy) Descriptor() protoreflect.EnumDescriptor { - return file_extensions_v1alpha1_wasm_proto_enumTypes[3].Descriptor() + return file_extensions_v1alpha1_wasmplugin_proto_enumTypes[3].Descriptor() } func (FailStrategy) Type() protoreflect.EnumType { - return &file_extensions_v1alpha1_wasm_proto_enumTypes[3] + return &file_extensions_v1alpha1_wasmplugin_proto_enumTypes[3] } func (x FailStrategy) Number() protoreflect.EnumNumber { @@ -259,7 +259,7 @@ func (x FailStrategy) Number() protoreflect.EnumNumber { // Deprecated: Use FailStrategy.Descriptor instead. func (FailStrategy) EnumDescriptor() ([]byte, []int) { - return file_extensions_v1alpha1_wasm_proto_rawDescGZIP(), []int{3} + return file_extensions_v1alpha1_wasmplugin_proto_rawDescGZIP(), []int{3} } //