openshift-bot
diff --git a/‎.ci-operator.yaml‎
Lines changed: 4 additions & 0 deletions b/‎.ci-operator.yaml‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎DOWNSTREAM_OWNERS‎
Lines changed: 9 additions & 0 deletions b/‎DOWNSTREAM_OWNERS‎
Lines changed: 9 additions & 0 deletions
diff --git a/‎DOWNSTREAM_OWNERS_ALIASES‎
Lines changed: 27 additions & 0 deletions b/‎DOWNSTREAM_OWNERS_ALIASES‎
Lines changed: 27 additions & 0 deletions
diff --git a/‎Makefile‎
Lines changed: 9 additions & 3 deletions b/‎Makefile‎
Lines changed: 9 additions & 3 deletions
diff --git a/‎internal/shared/version/version.go‎
Lines changed: 32 additions & 5 deletions b/‎internal/shared/version/version.go‎
Lines changed: 32 additions & 5 deletions
diff --git a/‎openshift/.bingo/.gitignore‎
Lines changed: 13 additions & 0 deletions b/‎openshift/.bingo/.gitignore‎
Lines changed: 13 additions & 0 deletions
diff --git a/‎openshift/.bingo/README.md‎
Lines changed: 14 additions & 0 deletions b/‎openshift/.bingo/README.md‎
Lines changed: 14 additions & 0 deletions
diff --git a/‎openshift/.bingo/Variables.mk‎
Lines changed: 49 additions & 0 deletions b/‎openshift/.bingo/Variables.mk‎
Lines changed: 49 additions & 0 deletions
diff --git a/‎openshift/.bingo/go-bindata.mod‎
Lines changed: 5 additions & 0 deletions b/‎openshift/.bingo/go-bindata.mod‎
Lines changed: 5 additions & 0 deletions
diff --git a/‎openshift/.bingo/go-bindata.sum‎
Lines changed: 2 additions & 0 deletions b/‎openshift/.bingo/go-bindata.sum‎
Lines changed: 2 additions & 0 deletions
@@ -0,0 +1,4 @@
+build_root_image:
+  name: release
+  namespace: openshift
+  tag: rhel-9-release-golang-1.24-openshift-4.21
@@ -0,0 +1,9 @@
+# administrators of this repo are controlled via GitHub teams, not this file
+
+approvers:
+- operator-framework-approvers
+
+reviewers:
+- operator-framework-approvers
+- operator-framework-reviewers
+
@@ -0,0 +1,27 @@
+
+aliases:
+   # contributors who can approve any PRs in the repo
+   operator-framework-approvers:
+   - grokspawn
+   - joelanford
+   - oceanc80
+   - perdasilva
+   - tmshort
+   - jianzhangbjz
+
+   # contributors who can review/lgtm any PRs in the repo
+   operator-framework-reviewers:
+   - anik120
+   - ankitathomas
+   - bentito
+   - camilamacedo86
+   - dtfranz
+   - grokspawn
+   - joelanford
+   - oceanc80
+   - pedjak
+   - perdasilva
+   - rashmigottipati
+   - thetechnick
+   - tmshort
+   - trgeiger
@@ -260,7 +260,10 @@ E2E_REGISTRY_IMAGE=localhost/e2e-test-registry:devel
 image-registry: export GOOS=linux
 image-registry: export GOARCH=amd64
 image-registry: ## Build the testdata catalog used for e2e tests and push it to the image registry
-	go build $(GO_BUILD_FLAGS) $(GO_BUILD_EXTRA_FLAGS) -tags '$(GO_BUILD_TAGS)' -ldflags '$(GO_BUILD_LDFLAGS)' -gcflags '$(GO_BUILD_GCFLAGS)' -asmflags '$(GO_BUILD_ASMFLAGS)' -o ./testdata/push/bin/push         ./testdata/push/push.go
+	# Use double quotes (not single quotes) for build flags like -ldflags, -tags, etc.
+	# Single quotes are passed literally and not stripped by `go build`, which can cause errors
+	# or inject unintended characters into the binary (e.g., version metadata).
+	go build $(GO_BUILD_FLAGS) $(GO_BUILD_EXTRA_FLAGS) -tags '$(GO_BUILD_TAGS)' -ldflags "$(GO_BUILD_LDFLAGS)" -gcflags '$(GO_BUILD_GCFLAGS)' -asmflags '$(GO_BUILD_ASMFLAGS)' -o ./testdata/push/bin/push         ./testdata/push/push.go
 	$(CONTAINER_RUNTIME) build -f ./testdata/Dockerfile -t $(E2E_REGISTRY_IMAGE) ./testdata
 	$(CONTAINER_RUNTIME) save $(E2E_REGISTRY_IMAGE) | $(KIND) load image-archive /dev/stdin --name $(KIND_CLUSTER_NAME)
 	./testdata/build-test-registry.sh $(E2E_REGISTRY_NAMESPACE) $(E2E_REGISTRY_NAME) $(E2E_REGISTRY_IMAGE)
@@ -392,13 +395,16 @@ export GO_BUILD_GCFLAGS := all=-trimpath=$(PWD)
 export GO_BUILD_EXTRA_FLAGS :=
 export GO_BUILD_LDFLAGS := -s -w \
     -X '$(VERSION_PATH).version=$(VERSION)' \
-    -X '$(VERSION_PATH).gitCommit=$(GIT_COMMIT)' \
+    -X '$(VERSION_PATH).gitCommit=$(GIT_COMMIT)'
 
 BINARIES=operator-controller catalogd
 
 .PHONY: $(BINARIES)
 $(BINARIES):
-	go build $(GO_BUILD_FLAGS) $(GO_BUILD_EXTRA_FLAGS) -tags '$(GO_BUILD_TAGS)' -ldflags '$(GO_BUILD_LDFLAGS)' -gcflags '$(GO_BUILD_GCFLAGS)' -asmflags '$(GO_BUILD_ASMFLAGS)' -o $(BUILDBIN)/$@ ./cmd/$@
+	# use double quotes around $(GO_BUILD_LDFLAGS) to avoid conflicts with the
+	# single quotes that are embedded inside the variable itself. this prevents
+	# malformed arguments such as "malformed import path \" \"" when the git commit is empty.
+	go build $(GO_BUILD_FLAGS) $(GO_BUILD_EXTRA_FLAGS) -tags '$(GO_BUILD_TAGS)' -ldflags "$(GO_BUILD_LDFLAGS)" -gcflags '$(GO_BUILD_GCFLAGS)' -asmflags '$(GO_BUILD_ASMFLAGS)' -o $(BUILDBIN)/$@ ./cmd/$@
 
 .PHONY: build-deps
 build-deps: manifests generate fmt
 
@@ -3,6 +3,7 @@ package version
 import (
 	"fmt"
 	"runtime/debug"
+	"strings"
 )
 
 var (
@@ -17,8 +18,32 @@ var (
 	}
 )
 
+// isUnset returns true when the provided string should be treated as an
+// "unset" value. Builds that inject ldflags such as "-X var=" will set the
+// variable to the empty string, which previously prevented the runtime build
+// information gathered via debug.ReadBuildInfo from populating the field. For
+// the purposes of version reporting we treat both the empty string and the
+// literal "unknown" as unset.
+func isUnset(s string) bool {
+	// trim any surrounding whitespace to ensure accurate unset detection
+	s = strings.TrimSpace(s)
+	return s == "" || s == "unknown"
+}
+
 func String() string {
-	return fmt.Sprintf("version: %q, commit: %q, date: %q, state: %q", version, gitCommit, commitDate, repoState)
+	return fmt.Sprintf("version: %q, commit: %q, date: %q, state: %q",
+		valueOrUnknown(version),
+		valueOrUnknown(gitCommit),
+		valueOrUnknown(commitDate),
+		valueOrUnknown(repoState))
+}
+
+func valueOrUnknown(v string) string {
+	v = strings.TrimSpace(v)
+	if v == "" {
+		return "unknown"
+	}
+	return v
 }
 
 func init() {
@@ -29,18 +54,20 @@ func init() {
 	for _, setting := range info.Settings {
 		switch setting.Key {
 		case "vcs.revision":
-			if gitCommit == "unknown" {
+			if isUnset(gitCommit) {
 				gitCommit = setting.Value
 			}
 		case "vcs.time":
-			commitDate = setting.Value
+			if isUnset(commitDate) {
+				commitDate = setting.Value
+			}
 		case "vcs.modified":
-			if v, ok := stateMap[setting.Value]; ok {
+			if v, ok := stateMap[setting.Value]; ok && isUnset(repoState) {
 				repoState = v
 			}
 		}
 	}
-	if version == "unknown" {
+	if isUnset(version) && info.Main.Version != "" {
 		version = info.Main.Version
 	}
 }
@@ -0,0 +1,13 @@
+
+# Ignore everything
+*
+
+# But not these files:
+!.gitignore
+!*.mod
+!*.sum
+!README.md
+!Variables.mk
+!variables.env
+
+*tmp.mod
@@ -0,0 +1,14 @@
+# Project Development Dependencies.
+
+This is directory which stores Go modules with pinned buildable package that is used within this repository, managed by https://github.com/bwplotka/bingo.
+
+* Run `bingo get` to install all tools having each own module file in this directory.
+* Run `bingo get <tool>` to install <tool> that have own module file in this directory.
+* For Makefile: Make sure to put `include .bingo/Variables.mk` in your Makefile, then use $(<upper case tool name>) variable where <tool> is the .bingo/<tool>.mod.
+* For shell: Run `source .bingo/variables.env` to source all environment variable for each tool.
+* For go: Import `.bingo/variables.go` to for variable names.
+* See https://github.com/bwplotka/bingo or -h on how to add, remove or change binaries dependencies.
+
+## Requirements
+
+* Go 1.14+
@@ -0,0 +1,49 @@
+# Auto generated binary variables helper managed by https://github.com/bwplotka/bingo v0.9. DO NOT EDIT.
+# All tools are designed to be build inside $GOBIN.
+BINGO_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
+GOPATH ?= $(shell go env GOPATH)
+GOBIN  ?= $(firstword $(subst :, ,${GOPATH}))/bin
+GO     ?= $(shell which go)
+
+# Below generated variables ensure that every time a tool under each variable is invoked, the correct version
+# will be used; reinstalling only if needed.
+# For example for go-bindata variable:
+#
+# In your main Makefile (for non array binaries):
+#
+#include .bingo/Variables.mk # Assuming -dir was set to .bingo .
+#
+#command: $(GO_BINDATA)
+#	@echo "Running go-bindata"
+#	@$(GO_BINDATA) <flags/args..>
+#
+GO_BINDATA := $(GOBIN)/go-bindata-v3.1.2+incompatible
+$(GO_BINDATA): $(BINGO_DIR)/go-bindata.mod
+	@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
+	@echo "(re)installing $(GOBIN)/go-bindata-v3.1.2+incompatible"
+	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=go-bindata.mod -o=$(GOBIN)/go-bindata-v3.1.2+incompatible "github.com/go-bindata/go-bindata/go-bindata"
+
+GOLANGCI_LINT := $(GOBIN)/golangci-lint-v2.1.6
+$(GOLANGCI_LINT): $(BINGO_DIR)/golangci-lint.mod
+	@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
+	@echo "(re)installing $(GOBIN)/golangci-lint-v2.1.6"
+	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=golangci-lint.mod -o=$(GOBIN)/golangci-lint-v2.1.6 "github.com/golangci/golangci-lint/v2/cmd/golangci-lint"
+
+HELM := $(GOBIN)/helm-v3.18.4
+$(HELM): $(BINGO_DIR)/helm.mod
+	@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
+	@echo "(re)installing $(GOBIN)/helm-v3.18.4"
+	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=helm.mod -o=$(GOBIN)/helm-v3.18.4 "helm.sh/helm/v3/cmd/helm"
+
+KUSTOMIZE := $(GOBIN)/kustomize-v5.0.1
+$(KUSTOMIZE): $(BINGO_DIR)/kustomize.mod
+	@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
+	@echo "(re)installing $(GOBIN)/kustomize-v5.0.1"
+	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=kustomize.mod -o=$(GOBIN)/kustomize-v5.0.1 "sigs.k8s.io/kustomize/kustomize/v5"
+
+YQ := $(GOBIN)/yq-v4.34.2
+$(YQ): $(BINGO_DIR)/yq.mod
+	@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
+	@echo "(re)installing $(GOBIN)/yq-v4.34.2"
+	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=yq.mod -o=$(GOBIN)/yq-v4.34.2 "github.com/mikefarah/yq/v4"
+
@@ -0,0 +1,5 @@
+module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
+
+go 1.24.4
+
+require github.com/go-bindata/go-bindata v3.1.2+incompatible // go-bindata
@@ -0,0 +1,2 @@
+github.com/go-bindata/go-bindata v3.1.2+incompatible h1:5vjJMVhowQdPzjE1LdxyFF7YFTXg5IgGVW4gBr5IbvE=
+github.com/go-bindata/go-bindata v3.1.2+incompatible/go.mod h1:xK8Dsgwmeed+BBsSy2XTopBn/8uK2HWuGSnA11C3Joo=
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+github.com/go-bindata/go-bindata v3.1.2+incompatible h1:5vjJMVhowQdPzjE1LdxyFF7YFTXg5IgGVW4gBr5IbvE=`
	`2`	`+github.com/go-bindata/go-bindata v3.1.2+incompatible/go.mod h1:xK8Dsgwmeed+BBsSy2XTopBn/8uK2HWuGSnA11C3Joo=`