Changed string pointer to string and removed nil check

openshift-online · Sep 27, 2023 · a9f32b7 · a9f32b7
1 parent 498c54e
commit a9f32b7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/cmd/ocm/create/cluster/cmd.go b/cmd/ocm/create/cluster/cmd.go
@@ -401,11 +401,11 @@ func GetDefaultClusterFlavors(connection *sdk.Connection, flavour string) (dMach
 }
 
 func getVersionOptions(connection *sdk.Connection) ([]arguments.Option, error) {
-	options, _, err := getVersionOptionsWithDefault(connection, "", nil)
+	options, _, err := getVersionOptionsWithDefault(connection, "", "")
 	return options, err
 }
 
-func getVersionOptionsWithDefault(connection *sdk.Connection, channelGroup string, gcpMarketplaceEnabled *string) (
+func getVersionOptionsWithDefault(connection *sdk.Connection, channelGroup string, gcpMarketplaceEnabled string) (
 	options []arguments.Option, defaultVersion string, err error,
 ) {
 	// Check and set the cluster version
@@ -557,7 +557,7 @@ func preRun(cmd *cobra.Command, argv []string) error {
 		gcpMarketplaceEnabled = strconv.FormatBool(isGcpMarketplaceSubscriptionType)
 	}
 	versions, defaultVersion, err := getVersionOptionsWithDefault(connection, args.channelGroup,
-		&gcpMarketplaceEnabled)
+		gcpMarketplaceEnabled)
 	if err != nil {
 		return err
 	}

diff --git a/cmd/ocm/list/version/cmd.go b/cmd/ocm/list/version/cmd.go
@@ -74,7 +74,7 @@ func run(cmd *cobra.Command, argv []string) error {
 	defer connection.Close()
 
 	client := connection.ClustersMgmt().V1()
-	versions, defaultVersion, err := cluster.GetEnabledVersions(client, args.channelGroup, &args.gcpMarketplace)
+	versions, defaultVersion, err := cluster.GetEnabledVersions(client, args.channelGroup, args.gcpMarketplace)
 	if err != nil {
 		return fmt.Errorf("Can't retrieve versions: %v", err)
 	}

diff --git a/pkg/cluster/versions.go b/pkg/cluster/versions.go
@@ -42,14 +42,14 @@ func EnsureOpenshiftVPrefix(v string) string {
 // GetEnabledVersions returns the versions with enabled=true, and the one that has default=true.
 // The returned strings are the IDs without "openshift-v" prefix (e.g. "4.6.0-rc.4-candidate")
 // sorted in approximate SemVer order (handling of text parts is somewhat arbitrary).
-func GetEnabledVersions(client *cmv1.Client, channelGroup string, gcpMarketplaceEnabled *string) (
+func GetEnabledVersions(client *cmv1.Client, channelGroup string, gcpMarketplaceEnabled string) (
 	versions []string, defaultVersion string, err error) {
 	collection := client.Versions()
 	page := 1
 	size := 100
 	filter := "enabled = 'true'"
-	if gcpMarketplaceEnabled != nil && *gcpMarketplaceEnabled != "" {
-		filter = fmt.Sprintf("%s AND gcp_marketplace_enabled = '%s'", filter, *gcpMarketplaceEnabled)
+	if gcpMarketplaceEnabled != "" {
+		filter = fmt.Sprintf("%s AND gcp_marketplace_enabled = '%s'", filter, gcpMarketplaceEnabled)
 	}
 	if channelGroup != "" {
 		filter = fmt.Sprintf("%s AND channel_group = '%s'", filter, channelGroup)