From 51d62933c0866705b65e4f858a3be91dac8f85b4 Mon Sep 17 00:00:00 2001
From: Juan Diaz Suarez <jdiazsua@redhat.com>
Date: Fri, 8 Jul 2022 12:22:43 +0200
Subject: [PATCH 1/3] pass the ocp rules version as build arg

---
 build.sh           | 4 +++-
 content-service.go | 7 +++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/build.sh b/build.sh
index 4ae4044a..e22c429f 100755
--- a/build.sh
+++ b/build.sh
@@ -22,5 +22,7 @@ commit=$(git rev-parse HEAD)
 
 utils_version=$(go list -m github.com/RedHatInsights/insights-operator-utils | awk '{print $2}')
 
-go build -ldflags="-X 'main.BuildTime=$buildtime' -X 'main.BuildVersion=$version' -X 'main.BuildBranch=$branch' -X 'main.BuildCommit=$commit' -X 'main.UtilsVersion=$utils_version'"
+ocp_rules_version=$(grep "^FROM quay.io\/cloudservices\/.* AS rules$" Dockerfile | awk -F'FROM quay.io/cloudservices/|AS rules' '{print $2}')
+
+go build -ldflags="-X 'main.BuildTime=$buildtime' -X 'main.BuildVersion=$version' -X 'main.BuildBranch=$branch' -X 'main.BuildCommit=$commit' -X 'main.UtilsVersion=$utils_version' -X 'main.OCPRulesVersion=$ocp_rules_version'"
 exit $?
diff --git a/content-service.go b/content-service.go
index 3f71427c..e1944cca 100644
--- a/content-service.go
+++ b/content-service.go
@@ -72,6 +72,10 @@ var (
 	// UtilsVersion contains currently used version of
 	// github.com/RedHatInsights/insights-operator-utils package
 	UtilsVersion = "*not set*"
+
+	// OCPRulesVersion contains currently used version of
+	// https://gitlab.cee.redhat.com/ccx/ccx-rules-ocp package
+	OCPRulesVersion = "*not set*"
 )
 
 // startService starts service and returns error code
@@ -125,6 +129,7 @@ func fillInInfoParams(params map[string]string) {
 	params["BuildBranch"] = BuildBranch
 	params["BuildCommit"] = BuildCommit
 	params["UtilsVersion"] = UtilsVersion
+	params["OCPRulesVersion"] = OCPRulesVersion
 }
 
 func printInfo(msg, val string) {
@@ -137,6 +142,7 @@ func printVersionInfo() ExitCode {
 	printInfo("Branch:", BuildBranch)
 	printInfo("Commit:", BuildCommit)
 	printInfo("Utils version:", UtilsVersion)
+	printInfo("OCP rules version:", OCPRulesVersion)
 	return ExitStatusOK
 }
 
@@ -207,6 +213,7 @@ func logVersionInfo() {
 	initInfoLog("Branch: " + BuildBranch)
 	initInfoLog("Commit: " + BuildCommit)
 	initInfoLog("Utils version:" + UtilsVersion)
+	initInfoLog("OCP rules version:" + OCPRulesVersion)
 }
 
 const helpMessageTemplate = `

From 74bec00e2500e325ef4cad61434b6500eae0f12b Mon Sep 17 00:00:00 2001
From: juandspy <juandiazsuarez0@gmail.com>
Date: Fri, 8 Jul 2022 12:29:56 +0200
Subject: [PATCH 2/3] update unit test

---
 content-service_test.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/content-service_test.go b/content-service_test.go
index b5d0dbf8..45ccca80 100644
--- a/content-service_test.go
+++ b/content-service_test.go
@@ -199,7 +199,7 @@ func TestFillInInfoParams(t *testing.T) {
 	main.FillInInfoParams(m)
 
 	// preliminary test if Go Universe is still ok
-	assert.Len(t, m, 5, "Map should contains exactly five items")
+	assert.Len(t, m, 6, "Map should contains exactly six items")
 
 	// does the map contain all expected keys?
 	assert.Contains(t, m, "BuildVersion")
@@ -207,4 +207,5 @@ func TestFillInInfoParams(t *testing.T) {
 	assert.Contains(t, m, "BuildBranch")
 	assert.Contains(t, m, "BuildCommit")
 	assert.Contains(t, m, "UtilsVersion")
+	assert.Contains(t, m, "OCPRulesVersion")
 }

From ed6b5623d935808077a47f1f4d0ce2335b44cf19 Mon Sep 17 00:00:00 2001
From: juandspy <juandiazsuarez0@gmail.com>
Date: Fri, 8 Jul 2022 12:43:38 +0200
Subject: [PATCH 3/3] typo

---
 build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.sh b/build.sh
index e22c429f..37e4436d 100755
--- a/build.sh
+++ b/build.sh
@@ -22,7 +22,7 @@ commit=$(git rev-parse HEAD)
 
 utils_version=$(go list -m github.com/RedHatInsights/insights-operator-utils | awk '{print $2}')
 
-ocp_rules_version=$(grep "^FROM quay.io\/cloudservices\/.* AS rules$" Dockerfile | awk -F'FROM quay.io/cloudservices/|AS rules' '{print $2}')
+ocp_rules_version=$(grep "^FROM quay.io\/cloudservices\/.* AS rules$" Dockerfile | awk -F'FROM quay.io/cloudservices/| AS rules' '{print $2}')
 
 go build -ldflags="-X 'main.BuildTime=$buildtime' -X 'main.BuildVersion=$version' -X 'main.BuildBranch=$branch' -X 'main.BuildCommit=$commit' -X 'main.UtilsVersion=$utils_version' -X 'main.OCPRulesVersion=$ocp_rules_version'"
 exit $?