Merge pull request #1387 from raisavarghese/RHTAP-5734

openshift-merge-bot[bot] · web-flow · commit 5ac739934729 · 2025-11-24T16:16:50.000Z
fix(RHTAP-5734): Display the commit id in the application version
diff --git a/.goreleaser.yaml b/.goreleaser.yaml
@@ -19,3 +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.CommitID={{.Commit}}
diff --git a/.tekton/tssc-cli-pull-request.yaml b/.tekton/tssc-cli-pull-request.yaml
@@ -31,6 +31,8 @@ spec:
     value: 5d
   - name: dockerfile
     value: Dockerfile
+  - name: prefetch-input
+    value: ""
   - name: path-context
     value: .
   pipelineSpec:
@@ -84,10 +86,10 @@ spec:
       description: Execute the build with network isolation
       name: hermetic
       type: string
-    - default: ""
-      description: Build dependencies to be prefetched by Cachi2
+    - description: Build dependencies to be prefetched by Cachi2
       name: prefetch-input
       type: string
+      default: ""
     - default: ""
       description: Image tag expiration time, time values could be something like 1h, 2d, 3w for hours, days, and weeks, respectively.
       name: image-expires-after
@@ -176,6 +178,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
@@ -220,6 +281,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)
@@ -233,6 +296,7 @@ spec:
         value: $(params.buildah-format)
       runAfter:
       - prefetch-dependencies
+      - get-version
       taskRef:
         params:
         - name: name
diff --git a/.tekton/tssc-cli-push.yaml b/.tekton/tssc-cli-push.yaml
@@ -173,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
@@ -217,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)
diff --git a/Dockerfile b/Dockerfile
@@ -5,6 +5,9 @@
 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 COMMIT_ID
+ARG VERSION_ID
+
 USER root
 WORKDIR /workdir/tssc
 
@@ -17,11 +20,12 @@ COPY test/ ./test/
 COPY image/ ./image/
 COPY vendor/ ./vendor/
 
-COPY go.mod go.sum Makefile ./
+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'
+RUN make GOFLAGS='-buildvcs=false' COMMIT_ID=${COMMIT_ID} VERSION=${VERSION_ID}
 
 #
 # Run
diff --git a/Makefile b/Makefile
@@ -56,6 +56,9 @@ VERSION ?= $(shell \
 	else git describe --tags --always || echo "v0.0.0-SNAPSHOT"; \
 	fi)
 
+# Commit will be set at build time via git commit hash
+COMMIT_ID ?= $(shell git rev-parse HEAD)
+
 .EXPORT_ALL_VARIABLES:
 
 .default: build
@@ -67,9 +70,10 @@ VERSION ?= $(shell \
 # Builds the application executable with installer resources embedded.
 .PHONY: $(BIN)
 $(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)" -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)
@@ -160,8 +164,8 @@ tool-gh:
 # Installs GoReleaser.
 tool-goreleaser: GOFLAGS =
 tool-goreleaser:
-	@which goreleaser >/dev/null 2>&1 || \
-		go install github.com/goreleaser/goreleaser@latest >/dev/null 2>&1
+	@which goreleaser  || \
+		go install github.com/goreleaser/goreleaser@latest
 
 #
 # Test and Lint
diff --git a/pkg/constants/constants.go b/pkg/constants/constants.go
@@ -20,3 +20,6 @@ var (
 
 // Version is the application version, set at build time via ldflags.
 var Version = "v0.0.0-SNAPSHOT"
+
+// CommitID is the commit ID of the application, set at build time via git commit hash.
+var CommitID = ""
diff --git a/pkg/flags/flags.go b/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 %s\n", constants.AppName, constants.Version)
+	fmt.Printf("%s Version: %s\nCommit: %s\n", constants.AppName, constants.Version, constants.CommitID)
 }
 
 // NewFlags instantiates the global flags with default values.
diff --git a/pkg/subcmd/mcpserver.go b/pkg/subcmd/mcpserver.go
@@ -1,11 +1,13 @@
 package subcmd
 
 import (
+	"fmt"
 	"io"
 	"log/slog"
 
 	"github.com/redhat-appstudio/tssc-cli/pkg/chartfs"
 	"github.com/redhat-appstudio/tssc-cli/pkg/config"
+	"github.com/redhat-appstudio/tssc-cli/pkg/constants"
 	"github.com/redhat-appstudio/tssc-cli/pkg/flags"
 	"github.com/redhat-appstudio/tssc-cli/pkg/installer"
 	"github.com/redhat-appstudio/tssc-cli/pkg/integrations"
@@ -37,11 +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()
-	p.StringVar(&m.image, "image", "", "container image for the installer")
-
-	if err := cmd.MarkPersistentFlagRequired("image"); err != nil {
-		panic(err)
-	}
+	p.StringVar(&m.image, "image", m.image, "container image for the installer\n")
 }
 
 // Cmd exposes the cobra instance.
@@ -107,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
 }

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ func (f Flags) LoggerWith(l slog.Logger) *slog.Logger {`
`66`	`66`
`67`	`67`	`// ShowVersion shows the application version and exits`
`68`	`68`	`func (f *Flags) ShowVersion() {`
`69`		`- fmt.Printf("%s %s\n", constants.AppName, constants.Version)`
	`69`	`+ fmt.Printf("%s Version: %s\nCommit: %s\n", constants.AppName, constants.Version, constants.CommitID)`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`// NewFlags instantiates the global flags with default values.`