Merge pull request #17 from MbolotSuse/product-fix

MbolotSuse · web-flow · commit 1993775321ca · 2022-07-20T12:00:18.000-05:00
Trimming v prefix from suse product string
diff --git a/pkg/manager/types.go b/pkg/manager/types.go
@@ -2,6 +2,7 @@ package manager
 
 import (
 	"fmt"
+	"strings"
 
 	"github.com/rancher/csp-adapter/pkg/clients/k8s"
 )
@@ -47,5 +48,7 @@ func GetDefaultSupportConfig(client k8s.Client) CSPSupportConfig {
 }
 
 func createProductString(rancherVersion string) string {
-	return fmt.Sprintf("cpe:/o:suse:rancher:%s", rancherVersion)
+	// rancher version that comes from k8s is prefixed with a v, but suse lists the product version without a v
+	productVersion := strings.TrimPrefix(rancherVersion, "v")
+	return fmt.Sprintf("cpe:/o:suse:rancher:%s", productVersion)
 }

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@ package manager`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"fmt"`
	`5`	`+ "strings"`
`5`	`6`
`6`	`7`	`"github.com/rancher/csp-adapter/pkg/clients/k8s"`
`7`	`8`	`)`
`@@ -47,5 +48,7 @@ func GetDefaultSupportConfig(client k8s.Client) CSPSupportConfig {`
`47`	`48`	`}`
`48`	`49`
`49`	`50`	`func createProductString(rancherVersion string) string {`
`50`		`- return fmt.Sprintf("cpe:/o:suse:rancher:%s", rancherVersion)`
	`51`	`+ // rancher version that comes from k8s is prefixed with a v, but suse lists the product version without a v`
	`52`	`+ productVersion := strings.TrimPrefix(rancherVersion, "v")`
	`53`	`+ return fmt.Sprintf("cpe:/o:suse:rancher:%s", productVersion)`
`51`	`54`	`}`