fix(RHTAP-5734): Display the commit id in the application version

- ldflags added for commit id
- Makefile updated to have full commit id
- Set the default value for image as <quay location>:<commit>/<latest> for mcp-server command

Assisted-By: Cursor
Signed-off-by: Raisa Varghese <[email protected]>

Author: Raisa Varghese

.goreleaser.yaml

@@ -19,4 +19,4 @@ builds:
       - amd64
     ldflags:
       - -X github.com/redhat-appstudio/tssc-cli/pkg/constants.Version={{.Version}}
-      - -X github.com/redhat-appstudio/tssc-cli/pkg/constants.Commit={{.Commit}}
+      - -X github.com/redhat-appstudio/tssc-cli/pkg/constants.CommitID={{.Commit}}

.tekton/tssc-cli-pull-request.yaml

@@ -31,8 +31,6 @@ spec:
     value: 5d
   - name: dockerfile
     value: Dockerfile
-  - name: version
-    value: "" 
   - name: prefetch-input
     value: ""
   - name: path-context
@@ -200,10 +198,6 @@ spec:
         results:
         - name: version
           description: Git version/tag
-        workspaces:
-        - name: basic-auth
-          description: Workspace for git authentication credentials
-          optional: true
         steps:
         - name: clone-and-get-version
           image: quay.io/konflux-ci/appstudio-utils:ab6b0b8e40e440158e7288c73aff1cf83a2cc8a9@sha256:24179f0efd06c65d16868c2d7eb82573cce8e43533de6cea14fec3b7446e0b14
@@ -224,21 +218,25 @@ spec:
             echo "Cloning repository..."
             # Use unshallow clone to get full history and tags for git describe
             git clone --no-single-branch "$GIT_URL" .
+
+            # Checkout the specific revision
+            git checkout "$GIT_REVISION"  
+
+            # Fetch all tags explicitly
+            git fetch origin --tags 
             
             # Get version using git describe (same logic as Makefile)
             # Try to get the closest tag, or use commit SHA as fallback
             VERSION=$(git describe --tags --always 2>/dev/null || echo "v0.0.0-SNAPSHOT")
             
-            echo "Computed version: $VERSION"
             printf "%s" "$VERSION" > $(results.version.path)
+            echo "Version: $VERSION"
+            echo "Commit ID: $GIT_REVISION"
       when:
       - input: $(tasks.init.results.build)
         operator: in
         values:
         - "true"
-      workspaces:
-      - name: basic-auth
-        workspace: git-auth
     - name: prefetch-dependencies
       params:
       - name: input
@@ -269,10 +267,6 @@ spec:
       params:
       - name: IMAGE
         value: $(params.output-image)
-      - name: revision
-        value: $(params.revision)
-      - name: version
-        value: $(tasks.get-version.results.version)
       - name: DOCKERFILE
         value: $(params.dockerfile)
       - name: CONTEXT
@@ -287,8 +281,8 @@ spec:
         value: $(tasks.clone-repository.results.commit)
       - name: BUILD_ARGS
         value:
-        - revision=$(params.revision)
-        - version=$(tasks.get-version.results.version)
+        - COMMIT_ID=$(params.revision)
+        - VERSION_ID=$(tasks.get-version.results.version)
         - $(params.build-args[*])
       - name: BUILD_ARGS_FILE
         value: $(params.build-args-file)

.tekton/tssc-cli-push.yaml

@@ -28,8 +28,6 @@ spec:
     value: quay.io/redhat-user-workloads/rhtap-shared-team-tenant/tssc-cli:{{revision}}
   - name: dockerfile
     value: Dockerfile
-  - name: prefetch-input
-    value: '{"type": "generic", "path": "."}'
   - name: path-context
     value: .
   pipelineSpec:
@@ -175,6 +173,65 @@ spec:
       workspaces:
       - name: basic-auth
         workspace: git-auth
+    - name: get-version
+      params:
+      - name: url
+        value: $(params.git-url)
+      - name: revision
+        value: $(params.revision)
+      runAfter:
+      - clone-repository
+      taskSpec:
+        description: Extract version from git repository by cloning it
+        params:
+        - name: url
+          description: Git repository URL
+          type: string
+        - name: revision
+          description: Git revision to checkout
+          type: string
+        results:
+        - name: version
+          description: Git version/tag
+        steps:
+        - name: clone-and-get-version
+          image: quay.io/konflux-ci/appstudio-utils:ab6b0b8e40e440158e7288c73aff1cf83a2cc8a9@sha256:24179f0efd06c65d16868c2d7eb82573cce8e43533de6cea14fec3b7446e0b14
+          env:
+          - name: GIT_URL
+            value: $(params.url)
+          - name: GIT_REVISION
+            value: $(params.revision)
+          script: |
+            #!/usr/bin/env bash
+            set -eo pipefail
+            
+            # Create temporary directory
+            WORKDIR=$(mktemp -d)
+            cd "$WORKDIR"
+            
+            # Clone repository with tags
+            echo "Cloning repository..."
+            # Use unshallow clone to get full history and tags for git describe
+            git clone --no-single-branch "$GIT_URL" .
+
+            # Checkout the specific revision
+            git checkout "$GIT_REVISION"  
+
+            # Fetch all tags explicitly
+            git fetch origin --tags 
+            
+            # Get version using git describe (same logic as Makefile)
+            # Try to get the closest tag, or use commit SHA as fallback
+            VERSION=$(git describe --tags --always 2>/dev/null || echo "v0.0.0-SNAPSHOT")
+            
+            printf "%s" "$VERSION" > $(results.version.path)
+            echo "Version: $VERSION"
+            echo "Commit ID: $GIT_REVISION"
+      when:
+      - input: $(tasks.init.results.build)
+        operator: in
+        values:
+        - "true"
     - name: prefetch-dependencies
       params:
       - name: input
@@ -219,6 +276,8 @@ spec:
         value: $(tasks.clone-repository.results.commit)
       - name: BUILD_ARGS
         value:
+        - COMMIT_ID=$(params.revision)
+        - VERSION_ID=$(tasks.get-version.results.version)
         - $(params.build-args[*])
       - name: BUILD_ARGS_FILE
         value: $(params.build-args-file)

Dockerfile

@@ -5,8 +5,8 @@
 FROM registry.redhat.io/openshift4/ose-tools-rhel9@sha256:c1baccf320b0acaed693a07fd8df76758db0a38767ace30ccc79aed9ba8c4987 AS ose-tools
 FROM registry.access.redhat.com/ubi9/go-toolset:9.7-1763038106 AS builder
 
-ARG revision
-ARG version
+ARG COMMIT_ID
+ARG VERSION_ID
 
 USER root
 WORKDIR /workdir/tssc
@@ -25,7 +25,7 @@ COPY go.mod go.sum Makefile .goreleaser.yaml ./
 RUN tar -xvf ./image/gh_2.81.0_linux_amd64.tar.gz -C ./image
 
 RUN make test
-RUN make GOFLAGS='-buildvcs=false' COMMIT=${revision} VERSION=${version}
+RUN make GOFLAGS='-buildvcs=false' COMMIT_ID=${COMMIT_ID} VERSION=${VERSION_ID}
 
 #
 # Run

Makefile

@@ -57,7 +57,7 @@ VERSION ?= $(shell \
 	fi)
 
 # Commit will be set at build time via git commit hash
-COMMIT ?= $(shell git rev-parse --short HEAD)
+COMMIT_ID ?= $(shell git rev-parse HEAD)
 
 .EXPORT_ALL_VARIABLES:
 
@@ -73,7 +73,7 @@ $(BIN): installer-tarball
 $(BIN):  
 	@echo "# Building '$(BIN)'"
 	@[ -d $(BIN_DIR) ] || mkdir -p $(BIN_DIR)
-	go build -ldflags "-X github.com/redhat-appstudio/tssc-cli/pkg/constants.Version=$(VERSION) -X github.com/redhat-appstudio/tssc-cli/pkg/constants.Commit=$(COMMIT)" -o $(BIN) $(CMD)
+	go build -ldflags "-X github.com/redhat-appstudio/tssc-cli/pkg/constants.Version=$(VERSION) -X github.com/redhat-appstudio/tssc-cli/pkg/constants.CommitID=$(COMMIT_ID)" -o $(BIN) $(CMD)
 
 .PHONY: build
 build: $(BIN)

go.sum

@@ -587,4 +587,4 @@ sigs.k8s.io/randfill v1.0.0/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxO
 sigs.k8s.io/structured-merge-diff/v6 v6.3.0 h1:jTijUJbW353oVOd9oTlifJqOGEkUw2jB/fXCbTiQEco=
 sigs.k8s.io/structured-merge-diff/v6 v6.3.0/go.mod h1:M3W8sfWvn2HhQDIbGWj3S099YozAsymCo/wrT5ohRUE=
 sigs.k8s.io/yaml v1.6.0 h1:G8fkbMSAFqgEFgh4b1wmtzDnioxFCUgTZhlbj5P9QYs=
-sigs.k8s.io/yaml v1.6.0/go.mod h1:796bPqUfzR/0jLAl6XjHl3Ck7MiyVv8dbTdyT3/pMf4=
+sigs.k8s.io/yaml v1.6.0/go.mod h1:796bPqUfzR/0jLAl6XjHl3Ck7MiyVv8dbTdyT3/pMf4=

pkg/constants/constants.go

@@ -20,4 +20,6 @@ var (
 
 // Version is the application version, set at build time via ldflags.
 var Version = "v0.0.0-SNAPSHOT"
-var Commit = "unknown"
+
+// CommitID is the commit ID of the application, set at build time via git commit hash.
+var CommitID = ""

pkg/flags/flags.go

@@ -66,7 +66,7 @@ func (f *Flags) LoggerWith(l *slog.Logger) *slog.Logger {
 
 // ShowVersion shows the application version and exits
 func (f *Flags) ShowVersion() {
-	fmt.Printf("%s Version: %s\nCommit: %s\n", constants.AppName, constants.Version, constants.Commit)
+	fmt.Printf("%s Version: %s\nCommit: %s\n", constants.AppName, constants.Version, constants.CommitID)
 }
 
 // NewFlags instantiates the global flags with default values.

pkg/subcmd/mcpserver.go

@@ -39,13 +39,7 @@ Starts the MCP server for the TSSC installer, using STDIO communication.
 // PersistentFlags adds flags to the command.
 func (m *MCPServer) PersistentFlags(cmd *cobra.Command) {
 	p := cmd.PersistentFlags()
-	var defaultImage string
-	if constants.Commit == "unknown" || constants.Commit == "" {
-		defaultImage = "quay.io/redhat-user-workloads/rhtap-shared-team-tenant/tssc-cli:latest"
-	} else {
-		defaultImage = fmt.Sprintf("quay.io/redhat-user-workloads/rhtap-shared-team-tenant/tssc-cli:on-pr-%s", constants.Commit)
-	}
-	p.StringVar(&m.image, "image", defaultImage, "container image for the installer\n")
+	p.StringVar(&m.image, "image", m.image, "container image for the installer\n")
 }
 
 // Cmd exposes the cobra instance.
@@ -111,6 +105,14 @@ func NewMCPServer(
 		cfs:    cfs,
 		kube:   kube,
 	}
+
+	m.image = "quay.io/redhat-user-workloads/rhtap-shared-team-tenant/tssc-cli"
+	// Set default image based on CommitID
+	if constants.CommitID == "" {
+		m.image = fmt.Sprintf("%s:latest", m.image)
+	} else {
+		m.image = fmt.Sprintf("%s:%s", m.image, constants.CommitID)
+	}
 	m.PersistentFlags(m.cmd)
 	return m
 }