From e22c5a357941957c3e9e13a3625291ba9f6e9a59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Palet?= Date: Mon, 27 May 2024 14:53:47 +0100 Subject: [PATCH 1/3] Move sqlserverflex commands to beta command group --- docs/stackit.md | 2 +- docs/stackit_beta.md | 43 +++++++++++++++++++ ...rflex.md => stackit_beta_sqlserverflex.md} | 10 ++--- docs/stackit_beta_sqlserverflex_instance.md | 37 ++++++++++++++++ ...kit_beta_sqlserverflex_instance_create.md} | 8 ++-- ...kit_beta_sqlserverflex_instance_delete.md} | 8 ++-- ...t_beta_sqlserverflex_instance_describe.md} | 8 ++-- ...ackit_beta_sqlserverflex_instance_list.md} | 8 ++-- ...kit_beta_sqlserverflex_instance_update.md} | 8 ++-- docs/stackit_sqlserverflex_instance.md | 37 ---------------- internal/cmd/beta/beta.go | 35 +++++++++++++++ .../sqlserverflex/instance/create/create.go | 0 .../instance/create/create_test.go | 0 .../sqlserverflex/instance/delete/delete.go | 0 .../instance/delete/delete_test.go | 0 .../instance/describe/describe.go | 0 .../instance/describe/describe_test.go | 0 .../sqlserverflex/instance/instance.go | 10 ++--- .../sqlserverflex/instance/list/list.go | 0 .../sqlserverflex/instance/list/list_test.go | 0 .../sqlserverflex/instance/update/update.go | 0 .../instance/update/update_test.go | 0 .../{ => beta}/sqlserverflex/sqlserverflex.go | 2 +- internal/cmd/root.go | 4 +- 24 files changed, 149 insertions(+), 71 deletions(-) create mode 100644 docs/stackit_beta.md rename docs/{stackit_sqlserverflex.md => stackit_beta_sqlserverflex.md} (63%) create mode 100644 docs/stackit_beta_sqlserverflex_instance.md rename docs/{stackit_sqlserverflex_instance_create.md => stackit_beta_sqlserverflex_instance_create.md} (87%) rename docs/{stackit_sqlserverflex_instance_delete.md => stackit_beta_sqlserverflex_instance_delete.md} (68%) rename docs/{stackit_sqlserverflex_instance_describe.md => stackit_beta_sqlserverflex_instance_describe.md} (72%) rename docs/{stackit_sqlserverflex_instance_list.md => stackit_beta_sqlserverflex_instance_list.md} (75%) rename docs/{stackit_sqlserverflex_instance_update.md => stackit_beta_sqlserverflex_instance_update.md} (79%) delete mode 100644 docs/stackit_sqlserverflex_instance.md create mode 100644 internal/cmd/beta/beta.go rename internal/cmd/{ => beta}/sqlserverflex/instance/create/create.go (100%) rename internal/cmd/{ => beta}/sqlserverflex/instance/create/create_test.go (100%) rename internal/cmd/{ => beta}/sqlserverflex/instance/delete/delete.go (100%) rename internal/cmd/{ => beta}/sqlserverflex/instance/delete/delete_test.go (100%) rename internal/cmd/{ => beta}/sqlserverflex/instance/describe/describe.go (100%) rename internal/cmd/{ => beta}/sqlserverflex/instance/describe/describe_test.go (100%) rename internal/cmd/{ => beta}/sqlserverflex/instance/instance.go (63%) rename internal/cmd/{ => beta}/sqlserverflex/instance/list/list.go (100%) rename internal/cmd/{ => beta}/sqlserverflex/instance/list/list_test.go (100%) rename internal/cmd/{ => beta}/sqlserverflex/instance/update/update.go (100%) rename internal/cmd/{ => beta}/sqlserverflex/instance/update/update_test.go (100%) rename internal/cmd/{ => beta}/sqlserverflex/sqlserverflex.go (88%) diff --git a/docs/stackit.md b/docs/stackit.md index fb84d7f5d..fe489155c 100644 --- a/docs/stackit.md +++ b/docs/stackit.md @@ -28,6 +28,7 @@ stackit [flags] * [stackit argus](./stackit_argus.md) - Provides functionality for Argus * [stackit auth](./stackit_auth.md) - Authenticates the STACKIT CLI +* [stackit beta](./stackit_beta.md) - Contains Beta STACKIT CLI commands * [stackit config](./stackit_config.md) - Provides functionality for CLI configuration options * [stackit curl](./stackit_curl.md) - Executes an authenticated HTTP request to an endpoint * [stackit dns](./stackit_dns.md) - Provides functionality for DNS @@ -45,5 +46,4 @@ stackit [flags] * [stackit secrets-manager](./stackit_secrets-manager.md) - Provides functionality for Secrets Manager * [stackit service-account](./stackit_service-account.md) - Provides functionality for service accounts * [stackit ske](./stackit_ske.md) - Provides functionality for SKE -* [stackit sqlserverflex](./stackit_sqlserverflex.md) - Provides functionality for SQLServer Flex diff --git a/docs/stackit_beta.md b/docs/stackit_beta.md new file mode 100644 index 000000000..e12a659e6 --- /dev/null +++ b/docs/stackit_beta.md @@ -0,0 +1,43 @@ +## stackit beta + +Contains Beta STACKIT CLI commands + +### Synopsis + +Contains Beta STACKIT CLI commands. + +``` +stackit beta [flags] +``` + +### Examples + +``` + See the currently available Beta commands + $ stackit beta --help + + Execute a Beta command + $ stackit beta MY_COMMAND +``` + +### Options + +``` + -h, --help Help for "stackit beta" +``` + +### Options inherited from parent commands + +``` + -y, --assume-yes If set, skips all confirmation prompts + --async If set, runs the command asynchronously + -o, --output-format string Output format, one of ["json" "pretty" "none" "yaml"] + -p, --project-id string Project ID + --verbosity string Verbosity of the CLI, one of ["debug" "info" "warning" "error"] (default "info") +``` + +### SEE ALSO + +* [stackit](./stackit.md) - Manage STACKIT resources using the command line +* [stackit beta sqlserverflex](./stackit_beta_sqlserverflex.md) - Provides functionality for SQLServer Flex + diff --git a/docs/stackit_sqlserverflex.md b/docs/stackit_beta_sqlserverflex.md similarity index 63% rename from docs/stackit_sqlserverflex.md rename to docs/stackit_beta_sqlserverflex.md index f047e2b07..7fa873a98 100644 --- a/docs/stackit_sqlserverflex.md +++ b/docs/stackit_beta_sqlserverflex.md @@ -1,4 +1,4 @@ -## stackit sqlserverflex +## stackit beta sqlserverflex Provides functionality for SQLServer Flex @@ -7,13 +7,13 @@ Provides functionality for SQLServer Flex Provides functionality for SQLServer Flex. ``` -stackit sqlserverflex [flags] +stackit beta sqlserverflex [flags] ``` ### Options ``` - -h, --help Help for "stackit sqlserverflex" + -h, --help Help for "stackit beta sqlserverflex" ``` ### Options inherited from parent commands @@ -28,6 +28,6 @@ stackit sqlserverflex [flags] ### SEE ALSO -* [stackit](./stackit.md) - Manage STACKIT resources using the command line -* [stackit sqlserverflex instance](./stackit_sqlserverflex_instance.md) - Provides functionality for SQLServer Flex instances +* [stackit beta](./stackit_beta.md) - Contains Beta STACKIT CLI commands +* [stackit beta sqlserverflex instance](./stackit_beta_sqlserverflex_instance.md) - Provides functionality for SQLServer Flex instances diff --git a/docs/stackit_beta_sqlserverflex_instance.md b/docs/stackit_beta_sqlserverflex_instance.md new file mode 100644 index 000000000..b2408a0b1 --- /dev/null +++ b/docs/stackit_beta_sqlserverflex_instance.md @@ -0,0 +1,37 @@ +## stackit beta sqlserverflex instance + +Provides functionality for SQLServer Flex instances + +### Synopsis + +Provides functionality for SQLServer Flex instances. + +``` +stackit beta sqlserverflex instance [flags] +``` + +### Options + +``` + -h, --help Help for "stackit beta sqlserverflex instance" +``` + +### Options inherited from parent commands + +``` + -y, --assume-yes If set, skips all confirmation prompts + --async If set, runs the command asynchronously + -o, --output-format string Output format, one of ["json" "pretty" "none" "yaml"] + -p, --project-id string Project ID + --verbosity string Verbosity of the CLI, one of ["debug" "info" "warning" "error"] (default "info") +``` + +### SEE ALSO + +* [stackit beta sqlserverflex](./stackit_beta_sqlserverflex.md) - Provides functionality for SQLServer Flex +* [stackit beta sqlserverflex instance create](./stackit_beta_sqlserverflex_instance_create.md) - Creates an SQLServer Flex instance +* [stackit beta sqlserverflex instance delete](./stackit_beta_sqlserverflex_instance_delete.md) - Deletes an SQLServer Flex instance +* [stackit beta sqlserverflex instance describe](./stackit_beta_sqlserverflex_instance_describe.md) - Shows details of an SQLServer Flex instance +* [stackit beta sqlserverflex instance list](./stackit_beta_sqlserverflex_instance_list.md) - Lists all SQLServer Flex instances +* [stackit beta sqlserverflex instance update](./stackit_beta_sqlserverflex_instance_update.md) - Updates an SQLServer Flex instance + diff --git a/docs/stackit_sqlserverflex_instance_create.md b/docs/stackit_beta_sqlserverflex_instance_create.md similarity index 87% rename from docs/stackit_sqlserverflex_instance_create.md rename to docs/stackit_beta_sqlserverflex_instance_create.md index 9f4bfa452..58dda15a2 100644 --- a/docs/stackit_sqlserverflex_instance_create.md +++ b/docs/stackit_beta_sqlserverflex_instance_create.md @@ -1,4 +1,4 @@ -## stackit sqlserverflex instance create +## stackit beta sqlserverflex instance create Creates an SQLServer Flex instance @@ -7,7 +7,7 @@ Creates an SQLServer Flex instance Creates an SQLServer Flex instance. ``` -stackit sqlserverflex instance create [flags] +stackit beta sqlserverflex instance create [flags] ``` ### Examples @@ -31,7 +31,7 @@ stackit sqlserverflex instance create [flags] --cpu int Number of CPUs --edition string Edition of the SQLServer instance --flavor-id string ID of the flavor - -h, --help Help for "stackit sqlserverflex instance create" + -h, --help Help for "stackit beta sqlserverflex instance create" -n, --name string Instance name --ram int Amount of RAM (in GB) --retention-days int The days for how long the backup files should be stored before being cleaned up @@ -52,5 +52,5 @@ stackit sqlserverflex instance create [flags] ### SEE ALSO -* [stackit sqlserverflex instance](./stackit_sqlserverflex_instance.md) - Provides functionality for SQLServer Flex instances +* [stackit beta sqlserverflex instance](./stackit_beta_sqlserverflex_instance.md) - Provides functionality for SQLServer Flex instances diff --git a/docs/stackit_sqlserverflex_instance_delete.md b/docs/stackit_beta_sqlserverflex_instance_delete.md similarity index 68% rename from docs/stackit_sqlserverflex_instance_delete.md rename to docs/stackit_beta_sqlserverflex_instance_delete.md index 3342cb009..920c047e9 100644 --- a/docs/stackit_sqlserverflex_instance_delete.md +++ b/docs/stackit_beta_sqlserverflex_instance_delete.md @@ -1,4 +1,4 @@ -## stackit sqlserverflex instance delete +## stackit beta sqlserverflex instance delete Deletes an SQLServer Flex instance @@ -7,7 +7,7 @@ Deletes an SQLServer Flex instance Deletes an SQLServer Flex instance. ``` -stackit sqlserverflex instance delete INSTANCE_ID [flags] +stackit beta sqlserverflex instance delete INSTANCE_ID [flags] ``` ### Examples @@ -20,7 +20,7 @@ stackit sqlserverflex instance delete INSTANCE_ID [flags] ### Options ``` - -h, --help Help for "stackit sqlserverflex instance delete" + -h, --help Help for "stackit beta sqlserverflex instance delete" ``` ### Options inherited from parent commands @@ -35,5 +35,5 @@ stackit sqlserverflex instance delete INSTANCE_ID [flags] ### SEE ALSO -* [stackit sqlserverflex instance](./stackit_sqlserverflex_instance.md) - Provides functionality for SQLServer Flex instances +* [stackit beta sqlserverflex instance](./stackit_beta_sqlserverflex_instance.md) - Provides functionality for SQLServer Flex instances diff --git a/docs/stackit_sqlserverflex_instance_describe.md b/docs/stackit_beta_sqlserverflex_instance_describe.md similarity index 72% rename from docs/stackit_sqlserverflex_instance_describe.md rename to docs/stackit_beta_sqlserverflex_instance_describe.md index 5d7da8f99..0574fe358 100644 --- a/docs/stackit_sqlserverflex_instance_describe.md +++ b/docs/stackit_beta_sqlserverflex_instance_describe.md @@ -1,4 +1,4 @@ -## stackit sqlserverflex instance describe +## stackit beta sqlserverflex instance describe Shows details of an SQLServer Flex instance @@ -7,7 +7,7 @@ Shows details of an SQLServer Flex instance Shows details of an SQLServer Flex instance. ``` -stackit sqlserverflex instance describe INSTANCE_ID [flags] +stackit beta sqlserverflex instance describe INSTANCE_ID [flags] ``` ### Examples @@ -23,7 +23,7 @@ stackit sqlserverflex instance describe INSTANCE_ID [flags] ### Options ``` - -h, --help Help for "stackit sqlserverflex instance describe" + -h, --help Help for "stackit beta sqlserverflex instance describe" ``` ### Options inherited from parent commands @@ -38,5 +38,5 @@ stackit sqlserverflex instance describe INSTANCE_ID [flags] ### SEE ALSO -* [stackit sqlserverflex instance](./stackit_sqlserverflex_instance.md) - Provides functionality for SQLServer Flex instances +* [stackit beta sqlserverflex instance](./stackit_beta_sqlserverflex_instance.md) - Provides functionality for SQLServer Flex instances diff --git a/docs/stackit_sqlserverflex_instance_list.md b/docs/stackit_beta_sqlserverflex_instance_list.md similarity index 75% rename from docs/stackit_sqlserverflex_instance_list.md rename to docs/stackit_beta_sqlserverflex_instance_list.md index c84cc44ee..3a11bc2cd 100644 --- a/docs/stackit_sqlserverflex_instance_list.md +++ b/docs/stackit_beta_sqlserverflex_instance_list.md @@ -1,4 +1,4 @@ -## stackit sqlserverflex instance list +## stackit beta sqlserverflex instance list Lists all SQLServer Flex instances @@ -7,7 +7,7 @@ Lists all SQLServer Flex instances Lists all SQLServer Flex instances. ``` -stackit sqlserverflex instance list [flags] +stackit beta sqlserverflex instance list [flags] ``` ### Examples @@ -26,7 +26,7 @@ stackit sqlserverflex instance list [flags] ### Options ``` - -h, --help Help for "stackit sqlserverflex instance list" + -h, --help Help for "stackit beta sqlserverflex instance list" --limit int Maximum number of entries to list ``` @@ -42,5 +42,5 @@ stackit sqlserverflex instance list [flags] ### SEE ALSO -* [stackit sqlserverflex instance](./stackit_sqlserverflex_instance.md) - Provides functionality for SQLServer Flex instances +* [stackit beta sqlserverflex instance](./stackit_beta_sqlserverflex_instance.md) - Provides functionality for SQLServer Flex instances diff --git a/docs/stackit_sqlserverflex_instance_update.md b/docs/stackit_beta_sqlserverflex_instance_update.md similarity index 79% rename from docs/stackit_sqlserverflex_instance_update.md rename to docs/stackit_beta_sqlserverflex_instance_update.md index 9c999085e..ae4dbc1f0 100644 --- a/docs/stackit_sqlserverflex_instance_update.md +++ b/docs/stackit_beta_sqlserverflex_instance_update.md @@ -1,4 +1,4 @@ -## stackit sqlserverflex instance update +## stackit beta sqlserverflex instance update Updates an SQLServer Flex instance @@ -7,7 +7,7 @@ Updates an SQLServer Flex instance Updates an SQLServer Flex instance. ``` -stackit sqlserverflex instance update INSTANCE_ID [flags] +stackit beta sqlserverflex instance update INSTANCE_ID [flags] ``` ### Examples @@ -27,7 +27,7 @@ stackit sqlserverflex instance update INSTANCE_ID [flags] --backup-schedule string Backup schedule --cpu int Number of CPUs --flavor-id string ID of the flavor - -h, --help Help for "stackit sqlserverflex instance update" + -h, --help Help for "stackit beta sqlserverflex instance update" -n, --name string Instance name --ram int Amount of RAM (in GB) --version string Version @@ -45,5 +45,5 @@ stackit sqlserverflex instance update INSTANCE_ID [flags] ### SEE ALSO -* [stackit sqlserverflex instance](./stackit_sqlserverflex_instance.md) - Provides functionality for SQLServer Flex instances +* [stackit beta sqlserverflex instance](./stackit_beta_sqlserverflex_instance.md) - Provides functionality for SQLServer Flex instances diff --git a/docs/stackit_sqlserverflex_instance.md b/docs/stackit_sqlserverflex_instance.md deleted file mode 100644 index 79a13188f..000000000 --- a/docs/stackit_sqlserverflex_instance.md +++ /dev/null @@ -1,37 +0,0 @@ -## stackit sqlserverflex instance - -Provides functionality for SQLServer Flex instances - -### Synopsis - -Provides functionality for SQLServer Flex instances. - -``` -stackit sqlserverflex instance [flags] -``` - -### Options - -``` - -h, --help Help for "stackit sqlserverflex instance" -``` - -### Options inherited from parent commands - -``` - -y, --assume-yes If set, skips all confirmation prompts - --async If set, runs the command asynchronously - -o, --output-format string Output format, one of ["json" "pretty" "none" "yaml"] - -p, --project-id string Project ID - --verbosity string Verbosity of the CLI, one of ["debug" "info" "warning" "error"] (default "info") -``` - -### SEE ALSO - -* [stackit sqlserverflex](./stackit_sqlserverflex.md) - Provides functionality for SQLServer Flex -* [stackit sqlserverflex instance create](./stackit_sqlserverflex_instance_create.md) - Creates an SQLServer Flex instance -* [stackit sqlserverflex instance delete](./stackit_sqlserverflex_instance_delete.md) - Deletes an SQLServer Flex instance -* [stackit sqlserverflex instance describe](./stackit_sqlserverflex_instance_describe.md) - Shows details of an SQLServer Flex instance -* [stackit sqlserverflex instance list](./stackit_sqlserverflex_instance_list.md) - Lists all SQLServer Flex instances -* [stackit sqlserverflex instance update](./stackit_sqlserverflex_instance_update.md) - Updates an SQLServer Flex instance - diff --git a/internal/cmd/beta/beta.go b/internal/cmd/beta/beta.go new file mode 100644 index 000000000..500fec710 --- /dev/null +++ b/internal/cmd/beta/beta.go @@ -0,0 +1,35 @@ +package beta + +import ( + "github.com/stackitcloud/stackit-cli/internal/cmd/beta/sqlserverflex" + "github.com/stackitcloud/stackit-cli/internal/pkg/args" + "github.com/stackitcloud/stackit-cli/internal/pkg/examples" + "github.com/stackitcloud/stackit-cli/internal/pkg/print" + "github.com/stackitcloud/stackit-cli/internal/pkg/utils" + + "github.com/spf13/cobra" +) + +func NewCmd(p *print.Printer) *cobra.Command { + cmd := &cobra.Command{ + Use: "beta", + Short: "Contains Beta STACKIT CLI commands", + Long: "Contains Beta STACKIT CLI commands.", + Args: args.NoArgs, + Run: utils.CmdHelp, + Example: examples.Build( + examples.NewExample( + "See the currently available Beta commands", + "$ stackit beta --help"), + examples.NewExample( + "Execute a Beta command", + "$ stackit beta MY_COMMAND"), + ), + } + addSubcommands(cmd, p) + return cmd +} + +func addSubcommands(cmd *cobra.Command, p *print.Printer) { + cmd.AddCommand(sqlserverflex.NewCmd(p)) +} diff --git a/internal/cmd/sqlserverflex/instance/create/create.go b/internal/cmd/beta/sqlserverflex/instance/create/create.go similarity index 100% rename from internal/cmd/sqlserverflex/instance/create/create.go rename to internal/cmd/beta/sqlserverflex/instance/create/create.go diff --git a/internal/cmd/sqlserverflex/instance/create/create_test.go b/internal/cmd/beta/sqlserverflex/instance/create/create_test.go similarity index 100% rename from internal/cmd/sqlserverflex/instance/create/create_test.go rename to internal/cmd/beta/sqlserverflex/instance/create/create_test.go diff --git a/internal/cmd/sqlserverflex/instance/delete/delete.go b/internal/cmd/beta/sqlserverflex/instance/delete/delete.go similarity index 100% rename from internal/cmd/sqlserverflex/instance/delete/delete.go rename to internal/cmd/beta/sqlserverflex/instance/delete/delete.go diff --git a/internal/cmd/sqlserverflex/instance/delete/delete_test.go b/internal/cmd/beta/sqlserverflex/instance/delete/delete_test.go similarity index 100% rename from internal/cmd/sqlserverflex/instance/delete/delete_test.go rename to internal/cmd/beta/sqlserverflex/instance/delete/delete_test.go diff --git a/internal/cmd/sqlserverflex/instance/describe/describe.go b/internal/cmd/beta/sqlserverflex/instance/describe/describe.go similarity index 100% rename from internal/cmd/sqlserverflex/instance/describe/describe.go rename to internal/cmd/beta/sqlserverflex/instance/describe/describe.go diff --git a/internal/cmd/sqlserverflex/instance/describe/describe_test.go b/internal/cmd/beta/sqlserverflex/instance/describe/describe_test.go similarity index 100% rename from internal/cmd/sqlserverflex/instance/describe/describe_test.go rename to internal/cmd/beta/sqlserverflex/instance/describe/describe_test.go diff --git a/internal/cmd/sqlserverflex/instance/instance.go b/internal/cmd/beta/sqlserverflex/instance/instance.go similarity index 63% rename from internal/cmd/sqlserverflex/instance/instance.go rename to internal/cmd/beta/sqlserverflex/instance/instance.go index 5aa1e8b20..a74e41085 100644 --- a/internal/cmd/sqlserverflex/instance/instance.go +++ b/internal/cmd/beta/sqlserverflex/instance/instance.go @@ -1,11 +1,11 @@ package instance import ( - "github.com/stackitcloud/stackit-cli/internal/cmd/sqlserverflex/instance/create" - "github.com/stackitcloud/stackit-cli/internal/cmd/sqlserverflex/instance/delete" - "github.com/stackitcloud/stackit-cli/internal/cmd/sqlserverflex/instance/describe" - "github.com/stackitcloud/stackit-cli/internal/cmd/sqlserverflex/instance/list" - "github.com/stackitcloud/stackit-cli/internal/cmd/sqlserverflex/instance/update" + "github.com/stackitcloud/stackit-cli/internal/cmd/beta/sqlserverflex/instance/create" + "github.com/stackitcloud/stackit-cli/internal/cmd/beta/sqlserverflex/instance/delete" + "github.com/stackitcloud/stackit-cli/internal/cmd/beta/sqlserverflex/instance/describe" + "github.com/stackitcloud/stackit-cli/internal/cmd/beta/sqlserverflex/instance/list" + "github.com/stackitcloud/stackit-cli/internal/cmd/beta/sqlserverflex/instance/update" "github.com/stackitcloud/stackit-cli/internal/pkg/args" "github.com/stackitcloud/stackit-cli/internal/pkg/print" "github.com/stackitcloud/stackit-cli/internal/pkg/utils" diff --git a/internal/cmd/sqlserverflex/instance/list/list.go b/internal/cmd/beta/sqlserverflex/instance/list/list.go similarity index 100% rename from internal/cmd/sqlserverflex/instance/list/list.go rename to internal/cmd/beta/sqlserverflex/instance/list/list.go diff --git a/internal/cmd/sqlserverflex/instance/list/list_test.go b/internal/cmd/beta/sqlserverflex/instance/list/list_test.go similarity index 100% rename from internal/cmd/sqlserverflex/instance/list/list_test.go rename to internal/cmd/beta/sqlserverflex/instance/list/list_test.go diff --git a/internal/cmd/sqlserverflex/instance/update/update.go b/internal/cmd/beta/sqlserverflex/instance/update/update.go similarity index 100% rename from internal/cmd/sqlserverflex/instance/update/update.go rename to internal/cmd/beta/sqlserverflex/instance/update/update.go diff --git a/internal/cmd/sqlserverflex/instance/update/update_test.go b/internal/cmd/beta/sqlserverflex/instance/update/update_test.go similarity index 100% rename from internal/cmd/sqlserverflex/instance/update/update_test.go rename to internal/cmd/beta/sqlserverflex/instance/update/update_test.go diff --git a/internal/cmd/sqlserverflex/sqlserverflex.go b/internal/cmd/beta/sqlserverflex/sqlserverflex.go similarity index 88% rename from internal/cmd/sqlserverflex/sqlserverflex.go rename to internal/cmd/beta/sqlserverflex/sqlserverflex.go index ac441c137..a8fe01d38 100644 --- a/internal/cmd/sqlserverflex/sqlserverflex.go +++ b/internal/cmd/beta/sqlserverflex/sqlserverflex.go @@ -1,7 +1,7 @@ package sqlserverflex import ( - "github.com/stackitcloud/stackit-cli/internal/cmd/sqlserverflex/instance" + "github.com/stackitcloud/stackit-cli/internal/cmd/beta/sqlserverflex/instance" "github.com/stackitcloud/stackit-cli/internal/pkg/args" "github.com/stackitcloud/stackit-cli/internal/pkg/print" "github.com/stackitcloud/stackit-cli/internal/pkg/utils" diff --git a/internal/cmd/root.go b/internal/cmd/root.go index 3957c4449..a51773448 100644 --- a/internal/cmd/root.go +++ b/internal/cmd/root.go @@ -8,6 +8,7 @@ import ( "github.com/stackitcloud/stackit-cli/internal/cmd/argus" "github.com/stackitcloud/stackit-cli/internal/cmd/auth" + "github.com/stackitcloud/stackit-cli/internal/cmd/beta" "github.com/stackitcloud/stackit-cli/internal/cmd/config" "github.com/stackitcloud/stackit-cli/internal/cmd/curl" "github.com/stackitcloud/stackit-cli/internal/cmd/dns" @@ -25,7 +26,6 @@ import ( secretsmanager "github.com/stackitcloud/stackit-cli/internal/cmd/secrets-manager" serviceaccount "github.com/stackitcloud/stackit-cli/internal/cmd/service-account" "github.com/stackitcloud/stackit-cli/internal/cmd/ske" - "github.com/stackitcloud/stackit-cli/internal/cmd/sqlserverflex" "github.com/stackitcloud/stackit-cli/internal/pkg/args" "github.com/stackitcloud/stackit-cli/internal/pkg/errors" "github.com/stackitcloud/stackit-cli/internal/pkg/flags" @@ -124,6 +124,7 @@ func configureFlags(cmd *cobra.Command) error { func addSubcommands(cmd *cobra.Command, p *print.Printer) { cmd.AddCommand(argus.NewCmd(p)) cmd.AddCommand(auth.NewCmd(p)) + cmd.AddCommand(beta.NewCmd(p)) cmd.AddCommand(config.NewCmd(p)) cmd.AddCommand(curl.NewCmd(p)) cmd.AddCommand(dns.NewCmd(p)) @@ -141,7 +142,6 @@ func addSubcommands(cmd *cobra.Command, p *print.Printer) { cmd.AddCommand(secretsmanager.NewCmd(p)) cmd.AddCommand(serviceaccount.NewCmd(p)) cmd.AddCommand(ske.NewCmd(p)) - cmd.AddCommand(sqlserverflex.NewCmd(p)) } // traverseCommands calls f for c and all of its children. From f489cf5653362ed97843d95c4db3e04ae8999dae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Palet?= Date: Mon, 27 May 2024 15:01:13 +0100 Subject: [PATCH 2/3] Extend beta command description --- docs/stackit_beta.md | 1 + internal/cmd/beta/beta.go | 10 +++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/docs/stackit_beta.md b/docs/stackit_beta.md index e12a659e6..49bb0ce30 100644 --- a/docs/stackit_beta.md +++ b/docs/stackit_beta.md @@ -5,6 +5,7 @@ Contains Beta STACKIT CLI commands ### Synopsis Contains Beta STACKIT CLI commands. +The commands under this group are still in a Beta state, and functionality may be incomplete or have breaking changes. ``` stackit beta [flags] diff --git a/internal/cmd/beta/beta.go b/internal/cmd/beta/beta.go index 500fec710..d6e55f2b7 100644 --- a/internal/cmd/beta/beta.go +++ b/internal/cmd/beta/beta.go @@ -1,6 +1,8 @@ package beta import ( + "fmt" + "github.com/stackitcloud/stackit-cli/internal/cmd/beta/sqlserverflex" "github.com/stackitcloud/stackit-cli/internal/pkg/args" "github.com/stackitcloud/stackit-cli/internal/pkg/examples" @@ -14,9 +16,11 @@ func NewCmd(p *print.Printer) *cobra.Command { cmd := &cobra.Command{ Use: "beta", Short: "Contains Beta STACKIT CLI commands", - Long: "Contains Beta STACKIT CLI commands.", - Args: args.NoArgs, - Run: utils.CmdHelp, + Long: fmt.Sprintf("%s\n%s", + "Contains Beta STACKIT CLI commands.", + "The commands under this group are still in a Beta state, and functionality may be incomplete or have breaking changes."), + Args: args.NoArgs, + Run: utils.CmdHelp, Example: examples.Build( examples.NewExample( "See the currently available Beta commands", From 5eaadb1a32b07064a3f886f06a9885508f57a5db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Palet?= Date: Mon, 27 May 2024 15:14:52 +0100 Subject: [PATCH 3/3] Make beta lowercase --- .goreleaser.yaml | 4 ++-- docs/stackit.md | 2 +- docs/stackit_beta.md | 10 +++++----- docs/stackit_beta_sqlserverflex.md | 2 +- internal/cmd/beta/beta.go | 10 +++++----- internal/cmd/root.go | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.goreleaser.yaml b/.goreleaser.yaml index 2a1791612..2f44eb6b0 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -100,7 +100,7 @@ brews: name: CLI Release Bot email: noreply@stackit.de homepage: "https://github.com/stackitcloud/stackit-cli" - description: "A command-line interface to manage STACKIT resources.\nThis CLI is in a BETA state. More services and functionality will be supported soon." + description: "A command-line interface to manage STACKIT resources.\nThis CLI is in a beta state. More services and functionality will be supported soon." directory: Formula license: "Apache-2.0" # If set to auto, the release will not be uploaded to the homebrew tap repo @@ -117,7 +117,7 @@ snapcrafts: # centre graphical frontends title: STACKIT CLI summary: A command-line interface to manage STACKIT resources. - description: "A command-line interface to manage STACKIT resources.\nThis CLI is in a BETA state. More services and functionality will be supported soon." + description: "A command-line interface to manage STACKIT resources.\nThis CLI is in a beta state. More services and functionality will be supported soon." license: Apache-2.0 confinement: classic # Grade "devel" will only release to `edge` and `beta` channels diff --git a/docs/stackit.md b/docs/stackit.md index fe489155c..cb2915ace 100644 --- a/docs/stackit.md +++ b/docs/stackit.md @@ -28,7 +28,7 @@ stackit [flags] * [stackit argus](./stackit_argus.md) - Provides functionality for Argus * [stackit auth](./stackit_auth.md) - Authenticates the STACKIT CLI -* [stackit beta](./stackit_beta.md) - Contains Beta STACKIT CLI commands +* [stackit beta](./stackit_beta.md) - Contains beta STACKIT CLI commands * [stackit config](./stackit_config.md) - Provides functionality for CLI configuration options * [stackit curl](./stackit_curl.md) - Executes an authenticated HTTP request to an endpoint * [stackit dns](./stackit_dns.md) - Provides functionality for DNS diff --git a/docs/stackit_beta.md b/docs/stackit_beta.md index 49bb0ce30..3fbc2395a 100644 --- a/docs/stackit_beta.md +++ b/docs/stackit_beta.md @@ -1,11 +1,11 @@ ## stackit beta -Contains Beta STACKIT CLI commands +Contains beta STACKIT CLI commands ### Synopsis -Contains Beta STACKIT CLI commands. -The commands under this group are still in a Beta state, and functionality may be incomplete or have breaking changes. +Contains beta STACKIT CLI commands. +The commands under this group are still in a beta state, and functionality may be incomplete or have breaking changes. ``` stackit beta [flags] @@ -14,10 +14,10 @@ stackit beta [flags] ### Examples ``` - See the currently available Beta commands + See the currently available beta commands $ stackit beta --help - Execute a Beta command + Execute a beta command $ stackit beta MY_COMMAND ``` diff --git a/docs/stackit_beta_sqlserverflex.md b/docs/stackit_beta_sqlserverflex.md index 7fa873a98..3ea58da12 100644 --- a/docs/stackit_beta_sqlserverflex.md +++ b/docs/stackit_beta_sqlserverflex.md @@ -28,6 +28,6 @@ stackit beta sqlserverflex [flags] ### SEE ALSO -* [stackit beta](./stackit_beta.md) - Contains Beta STACKIT CLI commands +* [stackit beta](./stackit_beta.md) - Contains beta STACKIT CLI commands * [stackit beta sqlserverflex instance](./stackit_beta_sqlserverflex_instance.md) - Provides functionality for SQLServer Flex instances diff --git a/internal/cmd/beta/beta.go b/internal/cmd/beta/beta.go index d6e55f2b7..ed6873b0e 100644 --- a/internal/cmd/beta/beta.go +++ b/internal/cmd/beta/beta.go @@ -15,18 +15,18 @@ import ( func NewCmd(p *print.Printer) *cobra.Command { cmd := &cobra.Command{ Use: "beta", - Short: "Contains Beta STACKIT CLI commands", + Short: "Contains beta STACKIT CLI commands", Long: fmt.Sprintf("%s\n%s", - "Contains Beta STACKIT CLI commands.", - "The commands under this group are still in a Beta state, and functionality may be incomplete or have breaking changes."), + "Contains beta STACKIT CLI commands.", + "The commands under this group are still in a beta state, and functionality may be incomplete or have breaking changes."), Args: args.NoArgs, Run: utils.CmdHelp, Example: examples.Build( examples.NewExample( - "See the currently available Beta commands", + "See the currently available beta commands", "$ stackit beta --help"), examples.NewExample( - "Execute a Beta command", + "Execute a beta command", "$ stackit beta MY_COMMAND"), ), } diff --git a/internal/cmd/root.go b/internal/cmd/root.go index a51773448..c64fa8059 100644 --- a/internal/cmd/root.go +++ b/internal/cmd/root.go @@ -62,7 +62,7 @@ func NewRootCmd(version, date string, p *print.Printer) *cobra.Command { }, RunE: func(cmd *cobra.Command, args []string) error { if flags.FlagToBoolValue(p, cmd, "version") { - p.Outputf("STACKIT CLI (BETA)\n") + p.Outputf("STACKIT CLI (beta)\n") parsedDate, err := time.Parse(time.RFC3339, date) if err != nil {