Git-Mirrors/constellation
1
0
Fork 0
mirror of https://github.com/edgelesssys/constellation.git synced 2024-12-25 15:39:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

cli: show instance types on help and usage

Browse Source
This commit is contained in:
Thomas Tendyck 2022-05-10 12:34:47 +02:00 committed by Thomas Tendyck
parent c63d7126e7
commit 69d0ecd26d
3 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cli/cmd/create.go
View File

@ -37,6 +37,15 @@ func newCreateCmd() *cobra.Command {
must(cobra.MarkFlagRequired(cmd.Flags(), "worker-nodes"))
cmd.Flags().StringP("instance-type", "t", "", "instance type of cluster nodes")
must(cmd.RegisterFlagCompletionFunc("instance-type", instanceTypeCompletion))
cmd.SetHelpTemplate(cmd.HelpTemplate() + fmt.Sprintf(`
Azure instance types:
%v
GCP instance types:
%v
`, formatInstanceTypes(azure.InstanceTypes), formatInstanceTypes(gcp.InstanceTypes)))
return cmd
}
@ -117,7 +126,7 @@ func parseCreateFlags(cmd *cobra.Command, provider cloudprovider.Provider) (crea
if insType == "" {
insType = defaultInstanceType(provider)
}
if err := validInstanceTypeForProvider(insType, provider); err != nil {
if err := validInstanceTypeForProvider(cmd, insType, provider); err != nil {
return createFlags{}, err
}

7
cli/cmd/instancetypes.go Normal file
View File

@ -0,0 +1,7 @@
package cmd
import "strings"
func formatInstanceTypes(types []string) string {
return " " + strings.Join(types, "\n ")
}

6
cli/cmd/validargs.go
View File

@ -32,7 +32,7 @@ func isCloudProvider(arg int) cobra.PositionalArgs {
}
}
func validInstanceTypeForProvider(insType string, provider cloudprovider.Provider) error {
func validInstanceTypeForProvider(cmd *cobra.Command, insType string, provider cloudprovider.Provider) error {
switch provider {
case cloudprovider.GCP:
for _, instanceType := range gcp.InstanceTypes {
@ -40,6 +40,8 @@ func validInstanceTypeForProvider(insType string, provider cloudprovider.Provide
return nil
}
}
cmd.SetUsageTemplate("GCP instance types:\n" + formatInstanceTypes(gcp.InstanceTypes))
cmd.SilenceUsage = false
return fmt.Errorf("%s isn't a valid GCP instance type", insType)
case cloudprovider.Azure:
for _, instanceType := range azure.InstanceTypes {
@ -47,6 +49,8 @@ func validInstanceTypeForProvider(insType string, provider cloudprovider.Provide
return nil
}
}
cmd.SetUsageTemplate("Azure instance types:\n" + formatInstanceTypes(azure.InstanceTypes))
cmd.SilenceUsage = false
return fmt.Errorf("%s isn't a valid Azure instance type", insType)
default:
return fmt.Errorf("%s isn't a valid cloud platform", provider)