Show git commit in porchctl version

[kispaljr]

No description provided.

[liamfallon]

I think adding the git commit is very useful. But maybe we could also set the version itself.

This change will do it:

diff --git a/Makefile b/Makefile
index e6b7d32..a9b771a 100644
--- a/Makefile
+++ b/Makefile
@@ -19,6 +19,8 @@ export DEPLOYPORCHCONFIGDIR ?= $(BUILDDIR)/deploy
 DEPLOYKPTCONFIGDIR=$(BUILDDIR)/kpt_pkgs
 PORCHDIR=$(abspath $(CURDIR))
 
+PORCHCTL_VERSION := $(shell date | sed -e 's/\s/_/g' -e 's/^/development:/')
+
 # This includes the following targets:
 #   test, unit, unit-clean,
 #   gosec, lint,
@@ -192,7 +194,7 @@ porch:
 
 .PHONY: porchctl
 porchctl:
-       go build -o $(PORCHCTL) ./cmd/porchctl
+       go build -ldflags="-X github.com/nephio-project/porch/cmd/porchctl/run.version=$(PORCHCTL_VERSION)" -o $(PORCHCTL) ./cmd/porchctl
 
 .PHONY: fix-headers
 fix-headers:

Here, we are using the current date to set the PORCHCTL_VERSION env var but we could set that using some more official method.

The line var version = "unknown" here creates a global constant called github.com/nephio-project/porch/cmd/porchctl/run.version

porch/cmd/porchctl/run/run.go

Line 160 in 114895d

var version = "unknown"

You can examine the contants in the built porchctl binary just like in c with:
nm -ax build/porchctl | grep '\.version'

Then you build porchctl and set the value of the global constant at link time as follows:

go build -ldflags="-X github.com/nephio-project/porch/cmd/porchctl/run.version=1.2.3" -o build/porchctl ./cmd/porchctl
liam@saor porch % build/porchctl version                                                                                         
Version: 1.2.3
Git commit: 4ccec7d01918b599f59eca99f44c002a85ca88df (dirty)

[kispaljr]

thanks @liamfallon, it is a good idea to set the version not just during the release process, but also on every build. I've modified the Makefile as you suggested.

[liamfallon]

thanks @liamfallon, it is a good idea to set the version not just during the release process, but also on every build. I've modified the Makefile as you suggested.

I was looking for this yesterday, you solved my puzzlement as to how the version was set during the release!

[efiacor]

/approve

[liamfallon]

We need to merge this so we can figure out if the correct Porch version is being used in the failing e2e tests.

/approve
/lgtm

[nephio-prow]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: efiacor, kispaljr, liamfallon

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

• OWNERS [efiacor,liamfallon]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[efiacor]

/retest

[efiacor]

/retest

[liamfallon]

/retest