OCM-2966 : Feat : Added subscription_type parameter to create cluster command #531
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -19,6 +19,7 @@ package cluster | |
| import ( | ||
| "encoding/json" | ||
| "fmt" | ||
| "github.com/openshift-online/ocm-cli/pkg/billing" | ||
| "io" | ||
| "net" | ||
| "os" | ||
|
|
@@ -68,6 +69,7 @@ var args struct { | |
| clusterWideProxy c.ClusterWideProxy | ||
| gcpServiceAccountFile arguments.FilePath | ||
| etcdEncryption bool | ||
| subscriptionType string | ||
|
|
||
| // Scaling options | ||
| computeMachineType string | ||
|
|
@@ -92,6 +94,8 @@ const clusterNameHelp = "will be used when generating a sub-domain for your clus | |
|
|
||
| const subnetTemplate = "%s (%s)" | ||
|
|
||
| const subscriptionTypeTemplate = "%s (%s)" | ||
|
|
||
| // Creates a subnet options using a predefined template. | ||
| func setSubnetOption(subnet, zone string) string { | ||
| return fmt.Sprintf(subnetTemplate, subnet, zone) | ||
|
|
@@ -102,6 +106,14 @@ func parseSubnet(subnetOption string) string { | |
| return strings.Split(subnetOption, " ")[0] | ||
| } | ||
|
|
||
| func setSubscriptionTypeOption(id, description string) string { | ||
| return fmt.Sprintf(subscriptionTypeTemplate, id, description) | ||
| } | ||
|
|
||
| func parseSubscriptionType(subscriptionTypeOption string) string { | ||
| return strings.Split(subscriptionTypeOption, " ")[0] | ||
| } | ||
|
|
||
| // Cmd Constant: | ||
| var Cmd = &cobra.Command{ | ||
| Use: "cluster [flags] NAME", | ||
|
|
@@ -301,6 +313,16 @@ func init() { | |
| fmt.Sprintf("Namespace Ownership Policy for ingress. Options are %s", | ||
| strings.Join(ingress.ValidNamespaceOwnershipPolicies, ",")), | ||
| ) | ||
|
|
||
| fs.StringVar( | ||
| &args.subscriptionType, | ||
| "subscription-type", | ||
| billing.StandardSubscriptionType, | ||
| fmt.Sprintf("The subscription billing model for the cluster. Options are %s", | ||
|
There was a problem hiding this comment. missing punctuation mark There was a problem hiding this comment. Keeping the options description consistent with https://github.com/openshift-online/ocm-cli/blob/main/cmd/ocm/create/cluster/cmd.go#L294 and https://github.com/openshift-online/ocm-cli/blob/main/cmd/ocm/create/cluster/cmd.go#L301 |
||
| strings.Join(billing.ValidSubscriptionTypes, ",")), | ||
| ) | ||
| arguments.SetQuestion(fs, "subscription-type", "Subscription type:") | ||
| Cmd.RegisterFlagCompletionFunc("subscription-type", arguments.MakeCompleteFunc(getSubscriptionTypeOptions)) | ||
| } | ||
|
|
||
| func osdProviderOptions(_ *sdk.Connection) ([]arguments.Option, error) { | ||
|
|
@@ -377,6 +399,36 @@ func getVersionOptionsWithDefault(connection *sdk.Connection, channelGroup strin | |
| return | ||
| } | ||
|
|
||
| func getSubscriptionTypeOptions(connection *sdk.Connection) ([]arguments.Option, error) { | ||
| options := []arguments.Option{} | ||
| billingModels, err := billing.GetBillingModels(connection) | ||
| if err != nil { | ||
| return options, err | ||
| } | ||
| for _, billingModel := range billingModels { | ||
| option := subscriptionTypeOption(billingModel.ID(), billingModel.Description()) | ||
| //Standard billing model should always be the first option | ||
This comment was marked as resolved.
Sorry, something went wrong. There was a problem hiding this comment. Simplified by using a function to create the option and reusing outside the if else block There was a problem hiding this comment. I think we can simplify further... How about this: |
||
| if billingModel.ID() == billing.StandardSubscriptionType { | ||
| if len(options) == 0 { // nil or empty slice or after last element | ||
| options = append(options, option) | ||
| } else { | ||
| options = append(options[:1], options[0:]...) | ||
| options[0] = option | ||
| } | ||
| } else { | ||
| options = append(options, option) | ||
| } | ||
| } | ||
| return options, nil | ||
| } | ||
|
|
||
| func subscriptionTypeOption(id string, description string) arguments.Option { | ||
| option := arguments.Option{ | ||
| Value: setSubscriptionTypeOption(id, description), | ||
| } | ||
| return option | ||
| } | ||
|
|
||
| func getMachineTypeOptions(connection *sdk.Connection) ([]arguments.Option, error) { | ||
| return provider.GetMachineTypeOptions( | ||
| connection.ClustersMgmt().V1(), | ||
|
|
@@ -421,12 +473,29 @@ func preRun(cmd *cobra.Command, argv []string) error { | |
| // Validate flags / ask for missing data. | ||
| fs := cmd.Flags() | ||
|
|
||
| // Get options for subscription type | ||
| subscriptionTypeOptions, _ := getSubscriptionTypeOptions(connection) | ||
| err = arguments.PromptOneOf(fs, "subscription-type", subscriptionTypeOptions) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| // Only offer the 2 providers known to support OSD now; | ||
| // but don't validate if set, to not block `ocm` CLI from creating clusters on future providers. | ||
| providers, _ := osdProviderOptions(connection) | ||
| // If marketplace-gcp subscription type is used, provider can only be GCP | ||
| gcpBillingModel, _ := billing.GetBillingModel(connection, billing.MarketplaceGcpSubscriptionType) | ||
| gcpSubscriptionTypeTemplate := subscriptionTypeOption(gcpBillingModel.ID(), gcpBillingModel.Description()) | ||
| isGcpMarketplaceSubscriptionType := args.subscriptionType == gcpSubscriptionTypeTemplate.Value | ||
|
|
||
| if isGcpMarketplaceSubscriptionType { | ||
| fmt.Println("setting provider to", c.ProviderGCP) | ||
| args.provider = c.ProviderGCP | ||
| } else { | ||
| err = arguments.PromptOneOf(fs, "provider", providers) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| } | ||
|
|
||
| if wasClusterWideProxyReceived() { | ||
|
|
@@ -435,7 +504,12 @@ func preRun(cmd *cobra.Command, argv []string) error { | |
| args.clusterWideProxy.Enabled = true | ||
| } | ||
|
|
||
| // If marketplace-gcp subscription type is used, ccs should by default be true | ||
| if isGcpMarketplaceSubscriptionType { | ||
| fmt.Println("setting ccs to 'true'") | ||
| args.ccs.Enabled = true | ||
| } | ||
| err = promptCCS(fs, args.ccs.Enabled == true) | ||
|
There was a problem hiding this comment. promptCCS(fs, args.ccs.Enabled == true) can go in a else block here, no ? This way we could avoid the extra parameter. There was a problem hiding this comment. We still need to call promtCCS as "service account file" prompt logic is present over there. And that is based on whether args.ccs.Enables is true or false There was a problem hiding this comment. okay... I was not expecting that. Should we replace "args.ccs.Enabled == true" with args.ccs.Enabled ? |
||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
@@ -530,6 +604,7 @@ func preRun(cmd *cobra.Command, argv []string) error { | |
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
|
|
@@ -554,6 +629,10 @@ func run(cmd *cobra.Command, argv []string) error { | |
| return err | ||
| } | ||
|
|
||
| if args.interactive { | ||
| args.subscriptionType = parseSubscriptionType(args.subscriptionType) | ||
| } | ||
|
|
||
| clusterConfig := c.Spec{ | ||
| Name: args.clusterName, | ||
| Region: args.region, | ||
|
|
@@ -577,6 +656,7 @@ func run(cmd *cobra.Command, argv []string) error { | |
| Private: &args.private, | ||
| EtcdEncryption: args.etcdEncryption, | ||
| DefaultIngress: defaultIngress, | ||
| SubscriptionType: args.subscriptionType, | ||
| } | ||
|
|
||
| cluster, err := c.CreateCluster(connection.ClustersMgmt().V1(), clusterConfig, args.dryRun) | ||
|
|
@@ -1036,8 +1116,11 @@ func promptExistingVPC(fs *pflag.FlagSet, connection *sdk.Connection) error { | |
| return err | ||
| } | ||
|
|
||
| func promptCCS(fs *pflag.FlagSet, presetCCS bool) error { | ||
| var err error | ||
| if !presetCCS { | ||
| err = arguments.PromptBool(fs, "ccs") | ||
| } | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| package billing | ||
|
|
||
| import ( | ||
| sdk "github.com/openshift-online/ocm-sdk-go" | ||
| amv1 "github.com/openshift-online/ocm-sdk-go/accountsmgmt/v1" | ||
| ) | ||
|
|
||
| const ( | ||
| StandardSubscriptionType = "standard" | ||
| MarketplaceRhmSubscriptionType = "marketplace-rhm" | ||
| MarketplaceGcpSubscriptionType = "marketplace-gcp" | ||
| ) | ||
|
|
||
| var ValidSubscriptionTypes = []string{StandardSubscriptionType, MarketplaceRhmSubscriptionType, MarketplaceGcpSubscriptionType} | ||
|
|
||
| func GetBillingModel(connection *sdk.Connection, billingModelID string) (*amv1.BillingModelItem, error) { | ||
| bilingModel, err := connection.AccountsMgmt().V1().BillingModels().BillingModel(billingModelID).Get().Send() | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| return bilingModel.Body(), nil | ||
| } | ||
|
|
||
| func GetBillingModels(connection *sdk.Connection) ([]*amv1.BillingModelItem, error) { | ||
| response, err := connection.AccountsMgmt().V1().BillingModels().List().Send() | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| billingModels := response.Items().Slice() | ||
| var validBillingModel []*amv1.BillingModelItem | ||
| for _, billingModel := range billingModels { | ||
| for _, validSubscriptionTypeId := range ValidSubscriptionTypes { | ||
| if billingModel.ID() == validSubscriptionTypeId { | ||
| validBillingModel = append(validBillingModel, billingModel) | ||
| } | ||
| } | ||
| } | ||
| return validBillingModel, nil | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
order of imports...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed