Feat: enhance opc version command to display openshift pipelines product version

Signed-off-by: Shubham Bhardwaj <[email protected]>

Author: infernus01

pkg/version.go

@@ -1,33 +1,116 @@
 package opc
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 	"html/template"
+	"strings"
 
 	_ "embed"
 
 	paccli "github.com/openshift-pipelines/pipelines-as-code/pkg/cli"
+	"github.com/spf13/cobra"
+	"github.com/tektoncd/cli/pkg/cli"
 	tkncli "github.com/tektoncd/cli/pkg/cli"
 	tknversion "github.com/tektoncd/cli/pkg/version"
-
-	"github.com/spf13/cobra"
+	corev1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/api/errors"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 var serverFlag = "server"
 
+const operatorInfo string = "tekton-operator-info"
+
 //go:embed version.json
 var versionFile string
 
 //go:embed version.tmpl
 var versionTmpl string
 
+var defaultNamespaces = []string{"tekton-pipelines", "openshift-pipelines", "tekton-chains", "tekton-operator", "openshift-operators"}
+
 type versions struct {
-	Opc                string `json:"opc"`
-	Tkn                string `json:"tkn"`
-	Pac                string `json:"pac"`
-	Results            string `json:"results"`
-	ManualApprovalGate string `json:"manualapprovalgate"`
+	Opc                      string `json:"opc"`
+	Tkn                      string `json:"tkn"`
+	Pac                      string `json:"pac"`
+	Results                  string `json:"results"`
+	ManualApprovalGate       string `json:"manualapprovalgate"`
+	OpenShiftPipelines string `json:"openshiftpipelines"`
+}
+
+func getConfigMap(c *cli.Clients, name, ns string) (*corev1.ConfigMap, error) {
+
+	var (
+		err       error
+		configMap *corev1.ConfigMap
+	)
+
+	if ns != "" {
+		configMap, err = c.Kube.CoreV1().ConfigMaps(ns).Get(context.Background(), name, metav1.GetOptions{})
+		if err != nil {
+			return nil, err
+		}
+		return configMap, nil
+	}
+
+	for _, n := range defaultNamespaces {
+		configMap, err = c.Kube.CoreV1().ConfigMaps(n).Get(context.Background(), name, metav1.GetOptions{})
+		if err != nil {
+			if errors.IsNotFound(err) {
+				continue
+			}
+			if strings.Contains(err.Error(), fmt.Sprintf(`cannot get resource "configmaps" in API group "" in the namespace "%s"`, n)) {
+				continue
+			}
+			return nil, err
+		}
+		if configMap != nil {
+			break
+		}
+	}
+
+	if configMap == nil {
+		return nil, fmt.Errorf("ConfigMap with name %s not found in the namespace %s", name, ns)
+	}
+	return configMap, nil
+}
+
+func GetRedHatOpenShiftPipelinesVersion(c *cli.Clients, ns string) (string, error) {
+	configMap, err := getConfigMap(c, operatorInfo, ns)
+	if err != nil {
+		return "", nil // Not found or inaccessible, return no version
+	}
+
+	// 1. Check for a dedicated "product" field
+	if product, exists := configMap.Data["product"]; exists && product != "" {
+		return product, nil
+	}
+
+	// 2. Check for embedded version in the "version" field
+	if version, exists := configMap.Data["version"]; exists && version != "" {
+		if strings.Contains(version, "(") && strings.Contains(version, ")") {
+			parts := strings.SplitN(version, "(", 2)
+			if len(parts) > 1 {
+				productVersion := strings.TrimSuffix(strings.TrimSpace(parts[1]), ")")
+				if strings.HasPrefix(productVersion, "Red Hat OpenShift Pipelines") {
+					productVersion = strings.TrimSpace(
+						strings.TrimPrefix(productVersion, "Red Hat OpenShift Pipelines"),
+					)
+					return productVersion, nil
+				}
+				return productVersion, nil
+			}
+		}
+	}
+
+	// 3. Fallback to "rhProduct" field
+	if rhProduct, exists := configMap.Data["rhProduct"]; exists && rhProduct != "" {
+		return rhProduct, nil
+	}
+
+	return "", nil
 }
 
 func getLiveInformations(iostreams *paccli.IOStreams) error {
@@ -61,6 +144,10 @@ func getLiveInformations(iostreams *paccli.IOStreams) error {
 	if hubVersion != "" {
 		fmt.Fprintf(iostreams.Out, "Hub version: %s\n", hubVersion)
 	}
+	productVersion, _ := GetRedHatOpenShiftPipelinesVersion(cs, namespace)
+	if productVersion != "" {
+		fmt.Fprintf(iostreams.Out, "OpenShift Pipelines: %s\n", productVersion)
+	}
 	return nil
 }
 
@@ -94,6 +181,8 @@ func VersionCommand(ioStreams *paccli.IOStreams) *cobra.Command {
 					fmt.Fprintln(ioStreams.Out, v.Results)
 				case "manualapprovalgate":
 					fmt.Fprintln(ioStreams.Out, v.ManualApprovalGate)
+				case "openShiftpipelines":
+					fmt.Fprintln(ioStreams.Out, v.OpenShiftPipelines)
 				default:
 					return fmt.Errorf("unknown component: %v", args[1])
 				}

pkg/version.json

@@ -1 +1 @@
-{"pac": "0.35.0", "tkn": "0.41.0", "results": "0.15.0", "manualapprovalgate": "0.6.0", "opc": "devel"}
+{"pac": "0.35.0", "tkn": "0.41.0", "results": "0.15.0", "manualapprovalgate": "0.6.0", "opc": "devel", "openshiftpipelines": "test"}

pkg/version.tmpl

@@ -3,3 +3,4 @@ Tekton CLI: {{ .Tkn }}
 Pipelines as Code CLI: {{ .Pac }}
 Tekton Results CLI: {{ .Results }}
 Manual Approval Gate CLI: {{ .ManualApprovalGate }}
+OpenShift Pipelines: {{ .OpenShiftPipelines }}