OCM-1988 | chore: update ROSA CLI with the latest ocm sdk to use addo…

…ns_mgmt
vivekgupta87 · Oct 28, 2024 · 4a72043 · 4a72043
1 parent bcd361b
commit 4a72043
Show file tree

Hide file tree

Showing 79 changed files with 16,267 additions and 11,584 deletions.
diff --git a/cmd/create/service/cmd.go b/cmd/create/service/cmd.go
@@ -25,7 +25,7 @@ import (
 
 	awssdk "github.com/aws/aws-sdk-go-v2/aws"
 	ocmConsts "github.com/openshift-online/ocm-common/pkg/ocm/consts"
-	cmv1 "github.com/openshift-online/ocm-sdk-go/clustersmgmt/v1"
+	asv1 "github.com/openshift-online/ocm-sdk-go/addonsmgmt/v1"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 
@@ -200,7 +200,7 @@ func run(cmd *cobra.Command, argv []string) {
 	if parameters.Len() > 0 {
 		args.Parameters = map[string]string{}
 		// Determine if all required parameters have already been set as flags.
-		parameters.Each(func(param *cmv1.AddOnParameter) bool {
+		parameters.Each(func(param *asv1.AddonParameter) bool {
 			flag := cmd.Flags().Lookup(param.ID())
 			if param.Required() && (flag == nil || flag.Value.String() == "") {
 				r.Reporter.Errorf("Required parameter --%s missing", param.ID())

diff --git a/cmd/describe/addon/cmd.go b/cmd/describe/addon/cmd.go
@@ -22,7 +22,7 @@ import (
 	"regexp"
 	"strings"
 
-	cmv1 "github.com/openshift-online/ocm-sdk-go/clustersmgmt/v1"
+	asv1 "github.com/openshift-online/ocm-sdk-go/addonsmgmt/v1"
 	"github.com/spf13/cobra"
 
 	"github.com/openshift/rosa/pkg/rosa"
@@ -65,7 +65,7 @@ func run(_ *cobra.Command, argv []string) {
 	printParameters(addOn.Parameters())
 }
 
-func printDescription(addOn *cmv1.AddOn) {
+func printDescription(addOn *asv1.Addon) {
 	fmt.Printf("ADD-ON\n"+
 		"ID:               %s\n"+
 		"Name:             %s\n"+
@@ -85,7 +85,7 @@ func printDescription(addOn *cmv1.AddOn) {
 	fmt.Println()
 }
 
-func printCredentialRequests(requests []*cmv1.CredentialRequest) {
+func printCredentialRequests(requests []*asv1.CredentialRequest) {
 	if len(requests) > 0 {
 		fmt.Printf("CREDENTIALS REQUESTS\n")
 		for _, cr := range requests {
@@ -108,10 +108,10 @@ func printCredentialRequests(requests []*cmv1.CredentialRequest) {
 	fmt.Println()
 }
 
-func printParameters(params *cmv1.AddOnParameterList) {
+func printParameters(params *asv1.AddonParameterList) {
 	if params.Len() > 0 {
 		fmt.Printf("ADD-ON PARAMETERS\n")
-		params.Each(func(param *cmv1.AddOnParameter) bool {
+		params.Each(func(param *asv1.AddonParameter) bool {
 			if !param.Enabled() {
 				return true
 			}

diff --git a/cmd/describe/installation/cmd.go b/cmd/describe/installation/cmd.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"os"
 
-	cmv1 "github.com/openshift-online/ocm-sdk-go/clustersmgmt/v1"
+	asv1 "github.com/openshift-online/ocm-sdk-go/addonsmgmt/v1"
 	"github.com/spf13/cobra"
 
 	"github.com/openshift/rosa/pkg/ocm"
@@ -106,8 +106,8 @@ func describeAddonInstallation(r *rosa.Runtime, installationKey string) error {
 	if parameters.Len() > 0 {
 		fmt.Println("Parameters:")
 	}
-	parameters.Each(func(parameter *cmv1.AddOnInstallationParameter) bool {
-		fmt.Printf("\t%-28q: %q\n", parameter.ID(), parameter.Value())
+	parameters.Each(func(parameter *asv1.AddonInstallationParameter) bool {
+		fmt.Printf("\t%-28q: %q\n", parameter.Id(), parameter.Value())
 		return true
 	})
 

diff --git a/cmd/edit/addon/cmd.go b/cmd/edit/addon/cmd.go
@@ -22,6 +22,7 @@ import (
 	"regexp"
 	"strings"
 
+	asv1 "github.com/openshift-online/ocm-sdk-go/addonsmgmt/v1"
 	cmv1 "github.com/openshift-online/ocm-sdk-go/clustersmgmt/v1"
 	"github.com/spf13/cobra"
 
@@ -101,7 +102,7 @@ func run(cmd *cobra.Command, argv []string) {
 	// set as flags, then we also ensure that interactive mode is enabled so that the
 	// user gets prompted.
 	if arguments.HasUnknownFlags() {
-		addonParameters.Each(func(param *cmv1.AddOnParameter) bool {
+		addonParameters.Each(func(param *asv1.AddonParameter) bool {
 			flag := cmd.Flags().Lookup(param.ID())
 			if flag != nil && !param.Editable() {
 				r.Reporter.Errorf("Parameter '%s' on addon '%s' cannot be modified", param.ID(), addOnID)
@@ -114,11 +115,11 @@ func run(cmd *cobra.Command, argv []string) {
 	}
 
 	var addonArguments []ocm.AddOnParam
-	addonParameters.Each(func(param *cmv1.AddOnParameter) bool {
+	addonParameters.Each(func(param *asv1.AddonParameter) bool {
 		// Find the installation parameter corresponding to the addon parameter
-		var addOnInstallationParam *cmv1.AddOnInstallationParameter
-		addOnInstallation.Parameters().Each(func(p *cmv1.AddOnInstallationParameter) bool {
-			if p.ID() == param.ID() {
+		var addOnInstallationParam *asv1.AddonInstallationParameter
+		addOnInstallation.Parameters().Each(func(p *asv1.AddonInstallationParameter) bool {
+			if p.Id() == param.ID() {
 				addOnInstallationParam = p
 				return false
 			}

diff --git a/cmd/edit/service/cmd.go b/cmd/edit/service/cmd.go
@@ -19,7 +19,7 @@ package service
 import (
 	"os"
 
-	cmv1 "github.com/openshift-online/ocm-sdk-go/clustersmgmt/v1"
+	asv1 "github.com/openshift-online/ocm-sdk-go/addonsmgmt/v1"
 	"github.com/spf13/cobra"
 
 	"github.com/openshift/rosa/pkg/arguments"
@@ -84,7 +84,7 @@ func run(cmd *cobra.Command, argv []string) {
 	}
 
 	addonParameters := addOn.Parameters()
-	addonParameters.Each(func(param *cmv1.AddOnParameter) bool {
+	addonParameters.Each(func(param *asv1.AddonParameter) bool {
 		arguments.AddStringFlag(cmd, param.ID())
 		return true
 	})
@@ -96,7 +96,7 @@ func run(cmd *cobra.Command, argv []string) {
 	}
 
 	args.Parameters = map[string]string{}
-	addonParameters.Each(func(param *cmv1.AddOnParameter) bool {
+	addonParameters.Each(func(param *asv1.AddonParameter) bool {
 		flag := cmd.Flags().Lookup(param.ID())
 		// Checking if the flag changed to ensure that the user set the value.
 		if flag != nil && flag.Changed {

diff --git a/cmd/install/addon/cmd.go b/cmd/install/addon/cmd.go
@@ -25,6 +25,7 @@ import (
 	awserr "github.com/openshift-online/ocm-common/pkg/aws/errors"
 	awsCommonUtils "github.com/openshift-online/ocm-common/pkg/aws/utils"
 	amv1 "github.com/openshift-online/ocm-sdk-go/accountsmgmt/v1"
+	asv1 "github.com/openshift-online/ocm-sdk-go/addonsmgmt/v1"
 	cmv1 "github.com/openshift-online/ocm-sdk-go/clustersmgmt/v1"
 	"github.com/spf13/cobra"
 	errors "github.com/zgalor/weberr"
@@ -180,7 +181,7 @@ func run(cmd *cobra.Command, argv []string) {
 		// set as flags, then we also ensure that interactive mode is enabled so that the
 		// user gets prompted.
 		if arguments.HasUnknownFlags() {
-			addonParameters.Each(func(param *cmv1.AddOnParameter) bool {
+			addonParameters.Each(func(param *asv1.AddonParameter) bool {
 				flag := cmd.Flags().Lookup(param.ID())
 				if param.Required() && (flag == nil || flag.Value.String() == "") {
 					interactive.Enable()
@@ -192,7 +193,7 @@ func run(cmd *cobra.Command, argv []string) {
 			interactive.Enable()
 		}
 
-		addonParameters.Each(func(param *cmv1.AddOnParameter) bool {
+		addonParameters.Each(func(param *asv1.AddonParameter) bool {
 			var val string
 			var options []string
 			var values []string
@@ -297,7 +298,7 @@ func ensureAddonNotInstalled(r *rosa.Runtime, clusterID, addOnID string) {
 	}
 }
 
-func createAddonRole(r *rosa.Runtime, roleName string, cr *cmv1.CredentialRequest, cmd *cobra.Command,
+func createAddonRole(r *rosa.Runtime, roleName string, cr *asv1.CredentialRequest, cmd *cobra.Command,
 	cluster *cmv1.Cluster) error {
 	policy := aws.NewPolicyDocument()
 	policy.AllowActions(cr.PolicyPermissions()...)
@@ -354,7 +355,7 @@ func buildCommand(
 	return command
 }
 
-func generateRoleName(cr *cmv1.CredentialRequest, prefix string) string {
+func generateRoleName(cr *asv1.CredentialRequest, prefix string) string {
 	roleName := fmt.Sprintf("%s-%s-%s", prefix, cr.Namespace(), cr.Name())
 	return awsCommonUtils.TruncateRoleName(roleName)
 }
diff --git a/go.mod b/go.mod
@@ -32,7 +32,7 @@ require (
 	github.com/onsi/ginkgo/v2 v2.17.1
 	github.com/onsi/gomega v1.30.0
 	github.com/openshift-online/ocm-common v0.0.12
-	github.com/openshift-online/ocm-sdk-go v0.1.440
+	github.com/openshift-online/ocm-sdk-go v0.1.447
 	github.com/pkg/errors v0.9.1
 	github.com/robfig/cron/v3 v3.0.1
 	github.com/sirupsen/logrus v1.9.3

diff --git a/go.sum b/go.sum
@@ -275,8 +275,8 @@ github.com/onsi/gomega v1.30.0 h1:hvMK7xYz4D3HapigLTeGdId/NcfQx1VHMJc60ew99+8=
 github.com/onsi/gomega v1.30.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ=
 github.com/openshift-online/ocm-common v0.0.12 h1:2oGZCXd8O/nZVlM0pvTtm3hDGbW/ncTtvSLLB+nuQf0=
 github.com/openshift-online/ocm-common v0.0.12/go.mod h1:6MWje2NFNJ3IWpGs7BYj6DWagWXHyp8EnmYY7XFTtI4=
-github.com/openshift-online/ocm-sdk-go v0.1.440 h1:qHVF8iZ0V3DPPuZq2LF7pwQKVsm0W0QxVDoXxDS7oyw=
-github.com/openshift-online/ocm-sdk-go v0.1.440/go.mod h1:CiAu2jwl3ITKOxkeV0Qnhzv4gs35AmpIzVABQLtcI2Y=
+github.com/openshift-online/ocm-sdk-go v0.1.447 h1:PLau6NVgTpwL+L5OcKrBZm+HbET34tjHbENd2GsFhRw=
+github.com/openshift-online/ocm-sdk-go v0.1.447/go.mod h1:CiAu2jwl3ITKOxkeV0Qnhzv4gs35AmpIzVABQLtcI2Y=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=

diff --git a/pkg/aws/policy_document.go b/pkg/aws/policy_document.go
@@ -11,6 +11,7 @@ import (
 	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/service/iam"
 	iamtypes "github.com/aws/aws-sdk-go-v2/service/iam/types"
+	asv1 "github.com/openshift-online/ocm-sdk-go/addonsmgmt/v1"
 	cmv1 "github.com/openshift-online/ocm-sdk-go/clustersmgmt/v1"
 )
 
@@ -314,7 +315,7 @@ func GenerateOperatorRolePolicyDoc(partition string, cluster *cmv1.Cluster,
 		accountID, operator, policyDetails)
 }
 
-func GenerateAddonPolicyDoc(partition string, cluster *cmv1.Cluster, accountID string, cr *cmv1.CredentialRequest,
+func GenerateAddonPolicyDoc(partition string, cluster *cmv1.Cluster, accountID string, cr *asv1.CredentialRequest,
 	policyDetails string) (string, error) {
 	service_accounts := fmt.Sprintf("system:serviceaccount:%s:%s", cr.Namespace(), cr.ServiceAccount())
 	return GenerateRolePolicyDoc(partition, cluster.AWS().STS().OIDCEndpointURL(),

diff --git a/pkg/interactive/addon.go b/pkg/interactive/addon.go
@@ -7,10 +7,10 @@ import (
 	"strconv"
 	"strings"
 
-	cmv1 "github.com/openshift-online/ocm-sdk-go/clustersmgmt/v1"
+	asv1 "github.com/openshift-online/ocm-sdk-go/addonsmgmt/v1"
 )
 
-func GetAddonArgument(param cmv1.AddOnParameter, dflt string) (string, error) {
+func GetAddonArgument(param asv1.AddonParameter, dflt string) (string, error) {
 	var input = Input{
 		Question: param.Name(),
 		Help:     fmt.Sprintf("%s: %s", param.ID(), param.Description()),
@@ -109,7 +109,7 @@ func GetAddonArgument(param cmv1.AddOnParameter, dflt string) (string, error) {
 	return "", fmt.Errorf("The parameter '%s' does not support interactive mode", param.ID())
 }
 
-func getOptionNames(param cmv1.AddOnParameter) []string {
+func getOptionNames(param asv1.AddonParameter) []string {
 	var optionNames []string
 	options, _ := param.GetOptions()
 	for _, option := range options {