From c3b94705fa9bdbc66e5dc3258b64ac5eb91b6a09 Mon Sep 17 00:00:00 2001 From: Manuel Vaas Date: Fri, 30 Jan 2026 16:24:57 +0100 Subject: [PATCH 01/13] feat(logs): Onboard access-token commands relates to STACKITCLI-293 --- docs/stackit_beta_logs.md | 1 + docs/stackit_beta_logs_access-token.md | 40 +++++ docs/stackit_beta_logs_access-token_create.md | 51 ++++++ ...ta_logs_access-token_delete-all-expired.md | 41 +++++ ...ackit_beta_logs_access-token_delete-all.md | 41 +++++ docs/stackit_beta_logs_access-token_delete.md | 41 +++++ ...stackit_beta_logs_access-token_describe.md | 44 +++++ docs/stackit_beta_logs_access-token_list.md | 48 ++++++ docs/stackit_beta_logs_access-token_update.md | 46 +++++ .../beta/logs/access_token/access_token.go | 38 +++++ .../beta/logs/access_token/create/create.go | 161 ++++++++++++++++++ .../beta/logs/access_token/delete/delete.go | 117 +++++++++++++ .../access_token/delete_all/delete_all.go | 108 ++++++++++++ .../delete_all_expired/delete_all_expired.go | 108 ++++++++++++ .../logs/access_token/describe/describe.go | 135 +++++++++++++++ .../cmd/beta/logs/access_token/list/list.go | 159 +++++++++++++++++ .../beta/logs/access_token/update/update.go | 148 ++++++++++++++++ internal/cmd/beta/logs/logs.go | 2 + internal/pkg/services/logs/utils/utils.go | 13 ++ .../pkg/services/logs/utils/utils_test.go | 12 +- 20 files changed, 1352 insertions(+), 2 deletions(-) create mode 100644 docs/stackit_beta_logs_access-token.md create mode 100644 docs/stackit_beta_logs_access-token_create.md create mode 100644 docs/stackit_beta_logs_access-token_delete-all-expired.md create mode 100644 docs/stackit_beta_logs_access-token_delete-all.md create mode 100644 docs/stackit_beta_logs_access-token_delete.md create mode 100644 docs/stackit_beta_logs_access-token_describe.md create mode 100644 docs/stackit_beta_logs_access-token_list.md create mode 100644 docs/stackit_beta_logs_access-token_update.md create mode 100644 internal/cmd/beta/logs/access_token/access_token.go create mode 100644 internal/cmd/beta/logs/access_token/create/create.go create mode 100644 internal/cmd/beta/logs/access_token/delete/delete.go create mode 100644 internal/cmd/beta/logs/access_token/delete_all/delete_all.go create mode 100644 internal/cmd/beta/logs/access_token/delete_all_expired/delete_all_expired.go create mode 100644 internal/cmd/beta/logs/access_token/describe/describe.go create mode 100644 internal/cmd/beta/logs/access_token/list/list.go create mode 100644 internal/cmd/beta/logs/access_token/update/update.go diff --git a/docs/stackit_beta_logs.md b/docs/stackit_beta_logs.md index 91998e3c1..500e25e52 100644 --- a/docs/stackit_beta_logs.md +++ b/docs/stackit_beta_logs.md @@ -30,5 +30,6 @@ stackit beta logs [flags] ### SEE ALSO * [stackit beta](./stackit_beta.md) - Contains beta STACKIT CLI commands +* [stackit beta logs access-token](./stackit_beta_logs_access-token.md) - Provides functionality for Logs access-tokens * [stackit beta logs instance](./stackit_beta_logs_instance.md) - Provides functionality for Logs instances diff --git a/docs/stackit_beta_logs_access-token.md b/docs/stackit_beta_logs_access-token.md new file mode 100644 index 000000000..a1c099370 --- /dev/null +++ b/docs/stackit_beta_logs_access-token.md @@ -0,0 +1,40 @@ +## stackit beta logs access-token + +Provides functionality for Logs access-tokens + +### Synopsis + +Provides functionality for Logs access-tokens. + +``` +stackit beta logs access-token [flags] +``` + +### Options + +``` + -h, --help Help for "stackit beta logs access-token" +``` + +### 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 + --region string Target region for region-specific requests + --verbosity string Verbosity of the CLI, one of ["debug" "info" "warning" "error"] (default "info") +``` + +### SEE ALSO + +* [stackit beta logs](./stackit_beta_logs.md) - Provides functionality for Logs +* [stackit beta logs access-token create](./stackit_beta_logs_access-token_create.md) - Creates a log access token +* [stackit beta logs access-token delete](./stackit_beta_logs_access-token_delete.md) - Deletes a log access token +* [stackit beta logs access-token delete-all](./stackit_beta_logs_access-token_delete-all.md) - Deletes all log access token +* [stackit beta logs access-token delete-all-expired](./stackit_beta_logs_access-token_delete-all-expired.md) - Deletes all expired log access token +* [stackit beta logs access-token describe](./stackit_beta_logs_access-token_describe.md) - Shows details of a logs access token +* [stackit beta logs access-token list](./stackit_beta_logs_access-token_list.md) - Lists all access tokens of a project +* [stackit beta logs access-token update](./stackit_beta_logs_access-token_update.md) - Updates a access token + diff --git a/docs/stackit_beta_logs_access-token_create.md b/docs/stackit_beta_logs_access-token_create.md new file mode 100644 index 000000000..968775bf7 --- /dev/null +++ b/docs/stackit_beta_logs_access-token_create.md @@ -0,0 +1,51 @@ +## stackit beta logs access-token create + +Creates a log access token + +### Synopsis + +Creates a log access token. + +``` +stackit beta logs access-token create [flags] +``` + +### Examples + +``` + Create a access token with the display name "access-token-1" for the instance "xxx" with read and write permissions + $ stackit logs access-token create --display-name access-token-1 --instance-id xxx --permissions read,write + + Create a write only access token with a description + $ stackit logs access-token create --display-name access-token-2 --instance-id xxx --permissions write --description "Access token for service" + + Create a read only access token which expires in 30 days + $ stackit logs access-token create --display-name access-token-3 --instance-id xxx --permissions read --lifetime 30 +``` + +### Options + +``` + --description string Description of the access token + --display-name string Display name for the access token + -h, --help Help for "stackit beta logs access-token create" + --instance-id string ID of the logs instance + --lifetime int Lifetime of the access token in days [1 - 180] + --permissions strings Permissions of the access token ["read" "write"] +``` + +### 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 + --region string Target region for region-specific requests + --verbosity string Verbosity of the CLI, one of ["debug" "info" "warning" "error"] (default "info") +``` + +### SEE ALSO + +* [stackit beta logs access-token](./stackit_beta_logs_access-token.md) - Provides functionality for Logs access-tokens + diff --git a/docs/stackit_beta_logs_access-token_delete-all-expired.md b/docs/stackit_beta_logs_access-token_delete-all-expired.md new file mode 100644 index 000000000..63df756e9 --- /dev/null +++ b/docs/stackit_beta_logs_access-token_delete-all-expired.md @@ -0,0 +1,41 @@ +## stackit beta logs access-token delete-all-expired + +Deletes all expired log access token + +### Synopsis + +Deletes all expired log access token. + +``` +stackit beta logs access-token delete-all-expired [flags] +``` + +### Examples + +``` + Delete all expired access tokens in instance "xxx" + $ stackit logs access-token delete --instance-id xxx +``` + +### Options + +``` + -h, --help Help for "stackit beta logs access-token delete-all-expired" + --instance-id string ID of the logs 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 + --region string Target region for region-specific requests + --verbosity string Verbosity of the CLI, one of ["debug" "info" "warning" "error"] (default "info") +``` + +### SEE ALSO + +* [stackit beta logs access-token](./stackit_beta_logs_access-token.md) - Provides functionality for Logs access-tokens + diff --git a/docs/stackit_beta_logs_access-token_delete-all.md b/docs/stackit_beta_logs_access-token_delete-all.md new file mode 100644 index 000000000..8d97fcaf3 --- /dev/null +++ b/docs/stackit_beta_logs_access-token_delete-all.md @@ -0,0 +1,41 @@ +## stackit beta logs access-token delete-all + +Deletes all log access token + +### Synopsis + +Deletes all log access token. + +``` +stackit beta logs access-token delete-all [flags] +``` + +### Examples + +``` + Delete all access tokens in instance "xxx" + $ stackit logs access-token delete --instance-id xxx +``` + +### Options + +``` + -h, --help Help for "stackit beta logs access-token delete-all" + --instance-id string ID of the logs 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 + --region string Target region for region-specific requests + --verbosity string Verbosity of the CLI, one of ["debug" "info" "warning" "error"] (default "info") +``` + +### SEE ALSO + +* [stackit beta logs access-token](./stackit_beta_logs_access-token.md) - Provides functionality for Logs access-tokens + diff --git a/docs/stackit_beta_logs_access-token_delete.md b/docs/stackit_beta_logs_access-token_delete.md new file mode 100644 index 000000000..62d04c817 --- /dev/null +++ b/docs/stackit_beta_logs_access-token_delete.md @@ -0,0 +1,41 @@ +## stackit beta logs access-token delete + +Deletes a log access token + +### Synopsis + +Deletes a log access token. + +``` +stackit beta logs access-token delete ACCESS_TOKEN_ID [flags] +``` + +### Examples + +``` + Delete access token with ID "xxx" + $ stackit logs access-token delete xxx +``` + +### Options + +``` + -h, --help Help for "stackit beta logs access-token delete" + --instance-id string ID of the logs 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 + --region string Target region for region-specific requests + --verbosity string Verbosity of the CLI, one of ["debug" "info" "warning" "error"] (default "info") +``` + +### SEE ALSO + +* [stackit beta logs access-token](./stackit_beta_logs_access-token.md) - Provides functionality for Logs access-tokens + diff --git a/docs/stackit_beta_logs_access-token_describe.md b/docs/stackit_beta_logs_access-token_describe.md new file mode 100644 index 000000000..bc1551126 --- /dev/null +++ b/docs/stackit_beta_logs_access-token_describe.md @@ -0,0 +1,44 @@ +## stackit beta logs access-token describe + +Shows details of a logs access token + +### Synopsis + +Shows details of a logs access token. + +``` +stackit beta logs access-token describe ACCESS_TOKEN_ID [flags] +``` + +### Examples + +``` + Show details of a logs access token with ID "xxx" + $ stackit logs access-token describe xxx + + Show details of a logs access token with ID "xxx" in JSON format + $ stackit logs access-token describe xxx --output-format json +``` + +### Options + +``` + -h, --help Help for "stackit beta logs access-token describe" + --instance-id string ID of the logs 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 + --region string Target region for region-specific requests + --verbosity string Verbosity of the CLI, one of ["debug" "info" "warning" "error"] (default "info") +``` + +### SEE ALSO + +* [stackit beta logs access-token](./stackit_beta_logs_access-token.md) - Provides functionality for Logs access-tokens + diff --git a/docs/stackit_beta_logs_access-token_list.md b/docs/stackit_beta_logs_access-token_list.md new file mode 100644 index 000000000..ce1ad16c4 --- /dev/null +++ b/docs/stackit_beta_logs_access-token_list.md @@ -0,0 +1,48 @@ +## stackit beta logs access-token list + +Lists all access tokens of a project + +### Synopsis + +Lists all access tokens of a project. + +``` +stackit beta logs access-token list [flags] +``` + +### Examples + +``` + Lists all access tokens of the instance "xxx" + $ stackit logs access-token list --instance-id xxx + + Lists all access tokens in JSON format + $ stackit logs access-token list --instance-id xxx --output-format json + + Lists up to 10 access-token + $ stackit logs access-token list --instance-id xxx --limit 10 +``` + +### Options + +``` + -h, --help Help for "stackit beta logs access-token list" + --instance-id string ID of the logs instance + --limit int Maximum number of entries to list +``` + +### 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 + --region string Target region for region-specific requests + --verbosity string Verbosity of the CLI, one of ["debug" "info" "warning" "error"] (default "info") +``` + +### SEE ALSO + +* [stackit beta logs access-token](./stackit_beta_logs_access-token.md) - Provides functionality for Logs access-tokens + diff --git a/docs/stackit_beta_logs_access-token_update.md b/docs/stackit_beta_logs_access-token_update.md new file mode 100644 index 000000000..cd7c76c9b --- /dev/null +++ b/docs/stackit_beta_logs_access-token_update.md @@ -0,0 +1,46 @@ +## stackit beta logs access-token update + +Updates a access token + +### Synopsis + +Updates a access token. + +``` +stackit beta logs access-token update ACCESS_TOKEN_ID [flags] +``` + +### Examples + +``` + Update access token with ID "xxx" with new name "access-token-1" + $ stackit logs access-token update xxx --display-name access-token-1 + + Update access token with ID "xxx" with new description "Access token for Service XY" + $ stackit logs access-token update xxx --description "Access token for Service XY" +``` + +### Options + +``` + --description string Description of the access token + --display-name string Display name for the access token + -h, --help Help for "stackit beta logs access-token update" + --instance-id string ID of the logs 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 + --region string Target region for region-specific requests + --verbosity string Verbosity of the CLI, one of ["debug" "info" "warning" "error"] (default "info") +``` + +### SEE ALSO + +* [stackit beta logs access-token](./stackit_beta_logs_access-token.md) - Provides functionality for Logs access-tokens + diff --git a/internal/cmd/beta/logs/access_token/access_token.go b/internal/cmd/beta/logs/access_token/access_token.go new file mode 100644 index 000000000..a2fca6518 --- /dev/null +++ b/internal/cmd/beta/logs/access_token/access_token.go @@ -0,0 +1,38 @@ +package access_token + +import ( + "github.com/stackitcloud/stackit-cli/internal/cmd/beta/logs/access_token/create" + "github.com/stackitcloud/stackit-cli/internal/cmd/beta/logs/access_token/delete" + "github.com/stackitcloud/stackit-cli/internal/cmd/beta/logs/access_token/delete_all" + "github.com/stackitcloud/stackit-cli/internal/cmd/beta/logs/access_token/delete_all_expired" + "github.com/stackitcloud/stackit-cli/internal/cmd/beta/logs/access_token/describe" + "github.com/stackitcloud/stackit-cli/internal/cmd/beta/logs/access_token/list" + "github.com/stackitcloud/stackit-cli/internal/cmd/beta/logs/access_token/update" + "github.com/stackitcloud/stackit-cli/internal/pkg/args" + "github.com/stackitcloud/stackit-cli/internal/pkg/types" + "github.com/stackitcloud/stackit-cli/internal/pkg/utils" + + "github.com/spf13/cobra" +) + +func NewCmd(params *types.CmdParams) *cobra.Command { + cmd := &cobra.Command{ + Use: "access-token", + Short: "Provides functionality for Logs access-tokens", + Long: "Provides functionality for Logs access-tokens.", + Args: args.NoArgs, + Run: utils.CmdHelp, + } + addSubcommands(cmd, params) + return cmd +} + +func addSubcommands(cmd *cobra.Command, params *types.CmdParams) { + cmd.AddCommand(create.NewCmd(params)) + cmd.AddCommand(delete.NewCmd(params)) + cmd.AddCommand(delete_all.NewCmd(params)) + cmd.AddCommand(delete_all_expired.NewCmd(params)) + cmd.AddCommand(describe.NewCmd(params)) + cmd.AddCommand(list.NewCmd(params)) + cmd.AddCommand(update.NewCmd(params)) +} diff --git a/internal/cmd/beta/logs/access_token/create/create.go b/internal/cmd/beta/logs/access_token/create/create.go new file mode 100644 index 000000000..89add8cd9 --- /dev/null +++ b/internal/cmd/beta/logs/access_token/create/create.go @@ -0,0 +1,161 @@ +package create + +import ( + "context" + "fmt" + + "github.com/stackitcloud/stackit-cli/internal/pkg/types" + + "github.com/stackitcloud/stackit-cli/internal/pkg/args" + cliErr "github.com/stackitcloud/stackit-cli/internal/pkg/errors" + "github.com/stackitcloud/stackit-cli/internal/pkg/examples" + "github.com/stackitcloud/stackit-cli/internal/pkg/flags" + "github.com/stackitcloud/stackit-cli/internal/pkg/globalflags" + "github.com/stackitcloud/stackit-cli/internal/pkg/print" + "github.com/stackitcloud/stackit-cli/internal/pkg/projectname" + "github.com/stackitcloud/stackit-cli/internal/pkg/services/logs/client" + logsUtils "github.com/stackitcloud/stackit-cli/internal/pkg/services/logs/utils" + "github.com/stackitcloud/stackit-sdk-go/services/logs" + + "github.com/spf13/cobra" +) + +const ( + displayNameFlag = "display-name" + instanceIdFlag = "instance-id" + lifetimeFlag = "lifetime" + descriptionFlag = "description" + permissionsFlag = "permissions" +) + +type inputModel struct { + *globalflags.GlobalFlagModel + InstanceId string + Description *string + DisplayName string + Lifetime *int64 + Permissions []string +} + +func NewCmd(params *types.CmdParams) *cobra.Command { + cmd := &cobra.Command{ + Use: "create", + Short: "Creates a log access token", + Long: "Creates a log access token.", + Args: args.NoArgs, + Example: examples.Build( + examples.NewExample( + `Create a access token with the display name "access-token-1" for the instance "xxx" with read and write permissions`, + `$ stackit logs access-token create --display-name access-token-1 --instance-id xxx --permissions read,write`, + ), + examples.NewExample( + `Create a write only access token with a description`, + `$ stackit logs access-token create --display-name access-token-2 --instance-id xxx --permissions write --description "Access token for service"`, + ), + examples.NewExample( + `Create a read only access token which expires in 30 days`, + `$ stackit logs access-token create --display-name access-token-3 --instance-id xxx --permissions read --lifetime 30`, + ), + ), + RunE: func(cmd *cobra.Command, args []string) error { + ctx := context.Background() + model, err := parseInput(params.Printer, cmd, args) + if err != nil { + return err + } + + // Configure API client + apiClient, err := client.ConfigureClient(params.Printer, params.CliVersion) + if err != nil { + return err + } + + projectLabel, err := projectname.GetProjectName(ctx, params.Printer, params.CliVersion, cmd) + if err != nil { + params.Printer.Debug(print.ErrorLevel, "get project name: %v", err) + projectLabel = model.ProjectId + } else if projectLabel == "" { + projectLabel = model.ProjectId + } + + instanceLabel, err := logsUtils.GetInstanceName(ctx, apiClient, model.ProjectId, model.Region, model.InstanceId) + if err != nil { + params.Printer.Debug(print.ErrorLevel, "get instance name: %v", err) + instanceLabel = model.InstanceId + } + + prompt := fmt.Sprintf("Are you sure you want to create a access token for the log instance %q in the project %q?", instanceLabel, projectLabel) + err = params.Printer.PromptForConfirmation(prompt) + if err != nil { + return err + } + + // Call API + req := buildRequest(ctx, model, apiClient) + resp, err := req.Execute() + if err != nil { + return fmt.Errorf("create log access-token : %w", err) + } + + if resp == nil || resp.Id == nil { + return fmt.Errorf("create log access-token : empty response") + } + + return outputResult(params.Printer, model.OutputFormat, instanceLabel, resp) + }, + } + configureFlags(cmd) + return cmd +} + +func configureFlags(cmd *cobra.Command) { + cmd.Flags().Var(flags.UUIDFlag(), instanceIdFlag, "ID of the logs instance") + cmd.Flags().String(displayNameFlag, "", "Display name for the access token") + cmd.Flags().String(descriptionFlag, "", "Description of the access token") + cmd.Flags().Int64(lifetimeFlag, 0, "Lifetime of the access token in days [1 - 180]") + cmd.Flags().StringSlice(permissionsFlag, []string{}, `Permissions of the access token ["read" "write"]`) + + err := flags.MarkFlagsRequired(cmd, instanceIdFlag, displayNameFlag, permissionsFlag) + cobra.CheckErr(err) +} + +func parseInput(p *print.Printer, cmd *cobra.Command, _ []string) (*inputModel, error) { + globalFlags := globalflags.Parse(p, cmd) + if globalFlags.ProjectId == "" { + return nil, &cliErr.ProjectIdError{} + } + + model := inputModel{ + GlobalFlagModel: globalFlags, + DisplayName: flags.FlagToStringValue(p, cmd, displayNameFlag), + InstanceId: flags.FlagToStringValue(p, cmd, instanceIdFlag), + Description: flags.FlagToStringPointer(p, cmd, descriptionFlag), + Lifetime: flags.FlagToInt64Pointer(p, cmd, lifetimeFlag), + Permissions: flags.FlagToStringSliceValue(p, cmd, permissionsFlag), + } + + p.DebugInputModel(model) + return &model, nil +} + +func buildRequest(ctx context.Context, model *inputModel, apiClient *logs.APIClient) logs.ApiCreateAccessTokenRequest { + req := apiClient.CreateAccessToken(ctx, model.ProjectId, model.Region, model.InstanceId) + + return req.CreateAccessTokenPayload(logs.CreateAccessTokenPayload{ + Description: model.Description, + DisplayName: &model.DisplayName, + Lifetime: model.Lifetime, + Permissions: &model.Permissions, + }) +} + +func outputResult(p *print.Printer, outputFormat, instanceLabel string, accessToken *logs.AccessToken) error { + if accessToken == nil { + return fmt.Errorf("access token cannot be nil") + } + return p.OutputResult(outputFormat, accessToken, func() error { + operationState := "Created" + p.Outputf("%s access token for log instance %q.\n\nID: %s\nToken: %s\n", operationState, instanceLabel, *accessToken.Id, *accessToken.AccessToken) + return nil + }) +} diff --git a/internal/cmd/beta/logs/access_token/delete/delete.go b/internal/cmd/beta/logs/access_token/delete/delete.go new file mode 100644 index 000000000..6d4d0b2bb --- /dev/null +++ b/internal/cmd/beta/logs/access_token/delete/delete.go @@ -0,0 +1,117 @@ +package delete + +import ( + "context" + "fmt" + + "github.com/stackitcloud/stackit-cli/internal/pkg/flags" + "github.com/stackitcloud/stackit-cli/internal/pkg/types" + "github.com/stackitcloud/stackit-sdk-go/services/logs" + + "github.com/stackitcloud/stackit-cli/internal/pkg/args" + "github.com/stackitcloud/stackit-cli/internal/pkg/errors" + "github.com/stackitcloud/stackit-cli/internal/pkg/examples" + "github.com/stackitcloud/stackit-cli/internal/pkg/globalflags" + "github.com/stackitcloud/stackit-cli/internal/pkg/print" + "github.com/stackitcloud/stackit-cli/internal/pkg/services/logs/client" + logUtils "github.com/stackitcloud/stackit-cli/internal/pkg/services/logs/utils" + "github.com/stackitcloud/stackit-cli/internal/pkg/utils" + + "github.com/spf13/cobra" +) + +const ( + instanceIdFlag = "instance-id" + accessTokenIdArg = "ACCESS_TOKEN_ID" +) + +type inputModel struct { + *globalflags.GlobalFlagModel + InstanceId string + AccessTokenId string +} + +func NewCmd(params *types.CmdParams) *cobra.Command { + cmd := &cobra.Command{ + Use: fmt.Sprintf("delete %s", accessTokenIdArg), + Short: "Deletes a log access token", + Long: "Deletes a log access token.", + Args: args.SingleArg(accessTokenIdArg, utils.ValidateUUID), + Example: examples.Build( + examples.NewExample( + `Delete access token with ID "xxx"`, + "$ stackit logs access-token delete xxx", + ), + ), + RunE: func(cmd *cobra.Command, args []string) error { + ctx := context.Background() + model, err := parseInput(params.Printer, cmd, args) + if err != nil { + return err + } + + // Configure API client + apiClient, err := client.ConfigureClient(params.Printer, params.CliVersion) + if err != nil { + return err + } + + // Get the display name for confirmation + accessTokenLabel, err := logUtils.GetAccessTokenName(ctx, apiClient, model.ProjectId, model.Region, model.InstanceId, model.AccessTokenId) + if err != nil { + params.Printer.Debug(print.ErrorLevel, "get access token: %v", err) + } + if accessTokenLabel == "" { + accessTokenLabel = model.AccessTokenId + } + + prompt := fmt.Sprintf("Are you sure you want to delete access token %q?", accessTokenLabel) + err = params.Printer.PromptForConfirmation(prompt) + if err != nil { + return err + } + + // Call API + req := buildRequest(ctx, model, apiClient) + err = req.Execute() + if err != nil { + return fmt.Errorf("delete access token: %w", err) + } + + operationState := "Deleted" + params.Printer.Outputf("%s access token %q\n", operationState, accessTokenLabel) + return nil + }, + } + configureFlags(cmd) + return cmd +} + +func configureFlags(cmd *cobra.Command) { + cmd.Flags().Var(flags.UUIDFlag(), instanceIdFlag, "ID of the logs instance") + + err := flags.MarkFlagsRequired(cmd, instanceIdFlag) + cobra.CheckErr(err) +} + +func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inputModel, error) { + accessTokenId := inputArgs[0] + + globalFlags := globalflags.Parse(p, cmd) + if globalFlags.ProjectId == "" { + return nil, &errors.ProjectIdError{} + } + + model := inputModel{ + GlobalFlagModel: globalFlags, + AccessTokenId: accessTokenId, + InstanceId: flags.FlagToStringValue(p, cmd, instanceIdFlag), + } + + p.DebugInputModel(model) + return &model, nil +} + +func buildRequest(ctx context.Context, model *inputModel, apiClient *logs.APIClient) logs.ApiDeleteAccessTokenRequest { + return apiClient.DeleteAccessToken(ctx, model.ProjectId, model.Region, model.InstanceId, model.AccessTokenId) +} diff --git a/internal/cmd/beta/logs/access_token/delete_all/delete_all.go b/internal/cmd/beta/logs/access_token/delete_all/delete_all.go new file mode 100644 index 000000000..166234315 --- /dev/null +++ b/internal/cmd/beta/logs/access_token/delete_all/delete_all.go @@ -0,0 +1,108 @@ +package delete_all + +import ( + "context" + "fmt" + + "github.com/stackitcloud/stackit-cli/internal/pkg/args" + "github.com/stackitcloud/stackit-cli/internal/pkg/flags" + "github.com/stackitcloud/stackit-cli/internal/pkg/types" + "github.com/stackitcloud/stackit-sdk-go/services/logs" + + "github.com/stackitcloud/stackit-cli/internal/pkg/errors" + "github.com/stackitcloud/stackit-cli/internal/pkg/examples" + "github.com/stackitcloud/stackit-cli/internal/pkg/globalflags" + "github.com/stackitcloud/stackit-cli/internal/pkg/print" + "github.com/stackitcloud/stackit-cli/internal/pkg/services/logs/client" + "github.com/stackitcloud/stackit-cli/internal/pkg/services/logs/utils" + + "github.com/spf13/cobra" +) + +const ( + instanceIdFlag = "instance-id" +) + +type inputModel struct { + *globalflags.GlobalFlagModel + InstanceId string +} + +func NewCmd(params *types.CmdParams) *cobra.Command { + cmd := &cobra.Command{ + Use: "delete-all", + Short: "Deletes all log access token", + Long: "Deletes all log access token.", + Args: args.NoArgs, + Example: examples.Build( + examples.NewExample( + `Delete all access tokens in instance "xxx"`, + "$ stackit logs access-token delete --instance-id xxx", + ), + ), + RunE: func(cmd *cobra.Command, args []string) error { + ctx := context.Background() + model, err := parseInput(params.Printer, cmd, args) + if err != nil { + return err + } + + // Configure API client + apiClient, err := client.ConfigureClient(params.Printer, params.CliVersion) + if err != nil { + return err + } + + instanceLabel, err := utils.GetInstanceName(ctx, apiClient, model.ProjectId, model.Region, model.InstanceId) + if err != nil { + params.Printer.Debug(print.ErrorLevel, "get instance name: %v", err) + instanceLabel = model.InstanceId + } + + prompt := fmt.Sprintf("Are you sure you want to delete all access tokens in instance %q?", instanceLabel) + err = params.Printer.PromptForConfirmation(prompt) + if err != nil { + return err + } + + // Call API + req := buildRequest(ctx, model, apiClient) + items, err := req.Execute() + if err != nil { + return fmt.Errorf("delete access token: %w", err) + } + + operationState := "Deleted" + params.Printer.Outputf("%s %d access token(s)\n", operationState, len(*items.Tokens)) + return nil + }, + } + configureFlags(cmd) + return cmd +} + +func configureFlags(cmd *cobra.Command) { + cmd.Flags().Var(flags.UUIDFlag(), instanceIdFlag, "ID of the logs instance") + + err := flags.MarkFlagsRequired(cmd, instanceIdFlag) + cobra.CheckErr(err) +} + +func parseInput(p *print.Printer, cmd *cobra.Command, _ []string) (*inputModel, error) { + globalFlags := globalflags.Parse(p, cmd) + if globalFlags.ProjectId == "" { + return nil, &errors.ProjectIdError{} + } + + model := inputModel{ + GlobalFlagModel: globalFlags, + InstanceId: flags.FlagToStringValue(p, cmd, instanceIdFlag), + } + + p.DebugInputModel(model) + return &model, nil +} + +func buildRequest(ctx context.Context, model *inputModel, apiClient *logs.APIClient) logs.ApiDeleteAllAccessTokensRequest { + return apiClient.DeleteAllAccessTokens(ctx, model.ProjectId, model.Region, model.InstanceId) +} diff --git a/internal/cmd/beta/logs/access_token/delete_all_expired/delete_all_expired.go b/internal/cmd/beta/logs/access_token/delete_all_expired/delete_all_expired.go new file mode 100644 index 000000000..b0af69812 --- /dev/null +++ b/internal/cmd/beta/logs/access_token/delete_all_expired/delete_all_expired.go @@ -0,0 +1,108 @@ +package delete_all_expired + +import ( + "context" + "fmt" + + "github.com/stackitcloud/stackit-cli/internal/pkg/args" + "github.com/stackitcloud/stackit-cli/internal/pkg/flags" + "github.com/stackitcloud/stackit-cli/internal/pkg/types" + "github.com/stackitcloud/stackit-sdk-go/services/logs" + + "github.com/stackitcloud/stackit-cli/internal/pkg/errors" + "github.com/stackitcloud/stackit-cli/internal/pkg/examples" + "github.com/stackitcloud/stackit-cli/internal/pkg/globalflags" + "github.com/stackitcloud/stackit-cli/internal/pkg/print" + "github.com/stackitcloud/stackit-cli/internal/pkg/services/logs/client" + "github.com/stackitcloud/stackit-cli/internal/pkg/services/logs/utils" + + "github.com/spf13/cobra" +) + +const ( + instanceIdFlag = "instance-id" +) + +type inputModel struct { + *globalflags.GlobalFlagModel + InstanceId string +} + +func NewCmd(params *types.CmdParams) *cobra.Command { + cmd := &cobra.Command{ + Use: "delete-all-expired", + Short: "Deletes all expired log access token", + Long: "Deletes all expired log access token.", + Args: args.NoArgs, + Example: examples.Build( + examples.NewExample( + `Delete all expired access tokens in instance "xxx"`, + "$ stackit logs access-token delete --instance-id xxx", + ), + ), + RunE: func(cmd *cobra.Command, args []string) error { + ctx := context.Background() + model, err := parseInput(params.Printer, cmd, args) + if err != nil { + return err + } + + // Configure API client + apiClient, err := client.ConfigureClient(params.Printer, params.CliVersion) + if err != nil { + return err + } + + instanceLabel, err := utils.GetInstanceName(ctx, apiClient, model.ProjectId, model.Region, model.InstanceId) + if err != nil { + params.Printer.Debug(print.ErrorLevel, "get instance name: %v", err) + instanceLabel = model.InstanceId + } + + prompt := fmt.Sprintf("Are you sure you want to delete all expired access tokens in instance %q?", instanceLabel) + err = params.Printer.PromptForConfirmation(prompt) + if err != nil { + return err + } + + // Call API + req := buildRequest(ctx, model, apiClient) + items, err := req.Execute() + if err != nil { + return fmt.Errorf("delete access token: %w", err) + } + + operationState := "Deleted" + params.Printer.Outputf("%s %d expired access token(s)\n", operationState, len(*items.Tokens)) + return nil + }, + } + configureFlags(cmd) + return cmd +} + +func configureFlags(cmd *cobra.Command) { + cmd.Flags().Var(flags.UUIDFlag(), instanceIdFlag, "ID of the logs instance") + + err := flags.MarkFlagsRequired(cmd, instanceIdFlag) + cobra.CheckErr(err) +} + +func parseInput(p *print.Printer, cmd *cobra.Command, _ []string) (*inputModel, error) { + globalFlags := globalflags.Parse(p, cmd) + if globalFlags.ProjectId == "" { + return nil, &errors.ProjectIdError{} + } + + model := inputModel{ + GlobalFlagModel: globalFlags, + InstanceId: flags.FlagToStringValue(p, cmd, instanceIdFlag), + } + + p.DebugInputModel(model) + return &model, nil +} + +func buildRequest(ctx context.Context, model *inputModel, apiClient *logs.APIClient) logs.ApiDeleteAllAccessTokensRequest { + return apiClient.DeleteAllExpiredAccessTokens(ctx, model.ProjectId, model.Region, model.InstanceId) +} diff --git a/internal/cmd/beta/logs/access_token/describe/describe.go b/internal/cmd/beta/logs/access_token/describe/describe.go new file mode 100644 index 000000000..c2f1af910 --- /dev/null +++ b/internal/cmd/beta/logs/access_token/describe/describe.go @@ -0,0 +1,135 @@ +package describe + +import ( + "context" + "fmt" + + "github.com/stackitcloud/stackit-cli/internal/pkg/flags" + "github.com/stackitcloud/stackit-cli/internal/pkg/types" + + "github.com/stackitcloud/stackit-cli/internal/pkg/args" + "github.com/stackitcloud/stackit-cli/internal/pkg/errors" + "github.com/stackitcloud/stackit-cli/internal/pkg/examples" + "github.com/stackitcloud/stackit-cli/internal/pkg/globalflags" + "github.com/stackitcloud/stackit-cli/internal/pkg/print" + "github.com/stackitcloud/stackit-cli/internal/pkg/services/logs/client" + "github.com/stackitcloud/stackit-cli/internal/pkg/tables" + "github.com/stackitcloud/stackit-cli/internal/pkg/utils" + "github.com/stackitcloud/stackit-sdk-go/services/logs" + + "github.com/spf13/cobra" +) + +const ( + instanceIdFlag = "instance-id" + accessTokenIdArg = "ACCESS_TOKEN_ID" +) + +type inputModel struct { + *globalflags.GlobalFlagModel + InstanceId string + AccessTokenId string +} + +func NewCmd(params *types.CmdParams) *cobra.Command { + cmd := &cobra.Command{ + Use: fmt.Sprintf("describe %s", accessTokenIdArg), + Short: "Shows details of a logs access token", + Long: "Shows details of a logs access token.", + Args: args.SingleArg(accessTokenIdArg, utils.ValidateUUID), + Example: examples.Build( + examples.NewExample( + `Show details of a logs access token with ID "xxx"`, + "$ stackit logs access-token describe xxx", + ), + examples.NewExample( + `Show details of a logs access token with ID "xxx" in JSON format`, + "$ stackit logs access-token describe xxx --output-format json", + ), + ), + RunE: func(cmd *cobra.Command, args []string) error { + ctx := context.Background() + model, err := parseInput(params.Printer, cmd, args) + if err != nil { + return err + } + + // Configure API client + apiClient, err := client.ConfigureClient(params.Printer, params.CliVersion) + if err != nil { + return err + } + + // Call API + req := buildRequest(ctx, model, apiClient) + resp, err := req.Execute() + if err != nil { + return fmt.Errorf("read access token: %w", err) + } + + return outputResult(params.Printer, model.OutputFormat, resp) + }, + } + configureFlags(cmd) + return cmd +} + +func configureFlags(cmd *cobra.Command) { + cmd.Flags().Var(flags.UUIDFlag(), instanceIdFlag, "ID of the logs instance") + + err := flags.MarkFlagsRequired(cmd, instanceIdFlag) + cobra.CheckErr(err) +} + +func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inputModel, error) { + accessTokenId := inputArgs[0] + + globalFlags := globalflags.Parse(p, cmd) + if globalFlags.ProjectId == "" { + return nil, &errors.ProjectIdError{} + } + + model := inputModel{ + GlobalFlagModel: globalFlags, + InstanceId: flags.FlagToStringValue(p, cmd, instanceIdFlag), + AccessTokenId: accessTokenId, + } + + p.DebugInputModel(model) + return &model, nil +} + +func buildRequest(ctx context.Context, model *inputModel, apiClient *logs.APIClient) logs.ApiGetAccessTokenRequest { + return apiClient.GetAccessToken(ctx, model.ProjectId, model.Region, model.InstanceId, model.AccessTokenId) +} + +func outputResult(p *print.Printer, outputFormat string, token *logs.AccessToken) error { + if token == nil { + return fmt.Errorf("access token cannot be nil") + } + return p.OutputResult(outputFormat, token, func() error { + table := tables.NewTable() + table.AddRow("ID", utils.PtrString(token.Id)) + table.AddSeparator() + table.AddRow("DISPLAY NAME", utils.PtrString(token.DisplayName)) + table.AddSeparator() + table.AddRow("DESCRIPTION", utils.PtrString(token.Description)) + table.AddSeparator() + table.AddRow("PERMISSIONS", utils.PtrString(token.Permissions)) + table.AddSeparator() + table.AddRow("CREATOR", utils.PtrString(token.Creator)) + table.AddSeparator() + table.AddRow("STATE", utils.PtrString(token.Status)) + table.AddSeparator() + table.AddRow("EXPIRES", utils.PtrString(token.Expires)) + table.AddSeparator() + table.AddRow("VALID UNTIL", utils.PtrString(token.ValidUntil)) + table.AddSeparator() + + err := table.Display(p) + if err != nil { + return fmt.Errorf("render table: %w", err) + } + return nil + }) +} diff --git a/internal/cmd/beta/logs/access_token/list/list.go b/internal/cmd/beta/logs/access_token/list/list.go new file mode 100644 index 000000000..5a46419b0 --- /dev/null +++ b/internal/cmd/beta/logs/access_token/list/list.go @@ -0,0 +1,159 @@ +package list + +import ( + "context" + "fmt" + + "github.com/stackitcloud/stackit-cli/internal/pkg/types" + + "github.com/stackitcloud/stackit-cli/internal/pkg/args" + "github.com/stackitcloud/stackit-cli/internal/pkg/errors" + "github.com/stackitcloud/stackit-cli/internal/pkg/examples" + "github.com/stackitcloud/stackit-cli/internal/pkg/flags" + "github.com/stackitcloud/stackit-cli/internal/pkg/globalflags" + "github.com/stackitcloud/stackit-cli/internal/pkg/print" + "github.com/stackitcloud/stackit-cli/internal/pkg/projectname" + "github.com/stackitcloud/stackit-cli/internal/pkg/services/logs/client" + "github.com/stackitcloud/stackit-cli/internal/pkg/tables" + "github.com/stackitcloud/stackit-cli/internal/pkg/utils" + "github.com/stackitcloud/stackit-sdk-go/services/logs" + + "github.com/spf13/cobra" +) + +const ( + limitFlag = "limit" + instanceIdFlag = "instance-id" +) + +type inputModel struct { + *globalflags.GlobalFlagModel + InstanceId string + Limit *int64 +} + +func NewCmd(params *types.CmdParams) *cobra.Command { + cmd := &cobra.Command{ + Use: "list", + Short: "Lists all access tokens of a project", + Long: "Lists all access tokens of a project.", + Args: args.NoArgs, + Example: examples.Build( + examples.NewExample( + `Lists all access tokens of the instance "xxx"`, + "$ stackit logs access-token list --instance-id xxx", + ), + examples.NewExample( + `Lists all access tokens in JSON format`, + "$ stackit logs access-token list --instance-id xxx --output-format json", + ), + examples.NewExample( + `Lists up to 10 access-token`, + "$ stackit logs access-token list --instance-id xxx --limit 10", + ), + ), + RunE: func(cmd *cobra.Command, args []string) error { + ctx := context.Background() + model, err := parseInput(params.Printer, cmd, args) + if err != nil { + return err + } + + // Configure API client + apiClient, err := client.ConfigureClient(params.Printer, params.CliVersion) + if err != nil { + return err + } + + // Call API + req := buildRequest(ctx, model, apiClient) + resp, err := req.Execute() + if err != nil { + return fmt.Errorf("list access tokens: %w", err) + } + + if resp.Tokens == nil || len(*resp.Tokens) == 0 { + projectLabel, err := projectname.GetProjectName(ctx, params.Printer, params.CliVersion, cmd) + if err != nil { + params.Printer.Debug(print.ErrorLevel, "get project name: %v", err) + projectLabel = model.ProjectId + } else if projectLabel == "" { + projectLabel = model.ProjectId + } + params.Printer.Outputf("No access token found for project %q\n", projectLabel) + return nil + } + + // Truncate output + items := *resp.Tokens + if model.Limit != nil && len(items) > int(*model.Limit) { + items = items[:*model.Limit] + } + + return outputResult(params.Printer, model.OutputFormat, items) + }, + } + configureFlags(cmd) + return cmd +} + +func configureFlags(cmd *cobra.Command) { + cmd.Flags().Int64(limitFlag, 0, "Maximum number of entries to list") + cmd.Flags().Var(flags.UUIDFlag(), instanceIdFlag, "ID of the logs instance") + + err := flags.MarkFlagsRequired(cmd, instanceIdFlag) + cobra.CheckErr(err) +} + +func parseInput(p *print.Printer, cmd *cobra.Command, _ []string) (*inputModel, error) { + globalFlags := globalflags.Parse(p, cmd) + if globalFlags.ProjectId == "" { + return nil, &errors.ProjectIdError{} + } + + limit := flags.FlagToInt64Pointer(p, cmd, limitFlag) + if limit != nil && *limit < 1 { + return nil, &errors.FlagValidationError{ + Flag: limitFlag, + Details: "must be greater than 0", + } + } + + model := inputModel{ + GlobalFlagModel: globalFlags, + Limit: limit, + InstanceId: flags.FlagToStringValue(p, cmd, instanceIdFlag), + } + + p.DebugInputModel(model) + return &model, nil +} + +func buildRequest(ctx context.Context, model *inputModel, apiClient *logs.APIClient) logs.ApiListAccessTokensRequest { + return apiClient.ListAccessTokens(ctx, model.ProjectId, model.Region, model.InstanceId) +} + +func outputResult(p *print.Printer, outputFormat string, tokens []logs.AccessToken) error { + return p.OutputResult(outputFormat, tokens, func() error { + table := tables.NewTable() + table.SetHeader("ID", "NAME", "DESCRIPTION", "PERMISSIONS", "VALID UNTIL", "STATUS") + + for _, token := range tokens { + table.AddRow( + utils.PtrString(token.Id), + utils.PtrString(token.DisplayName), + utils.PtrString(token.Description), + utils.PtrString(token.Permissions), + utils.PtrString(token.ValidUntil), + utils.PtrString(token.Status), + ) + table.AddSeparator() + } + + err := table.Display(p) + if err != nil { + return fmt.Errorf("render table: %w", err) + } + return nil + }) +} diff --git a/internal/cmd/beta/logs/access_token/update/update.go b/internal/cmd/beta/logs/access_token/update/update.go new file mode 100644 index 000000000..a3a3df0f1 --- /dev/null +++ b/internal/cmd/beta/logs/access_token/update/update.go @@ -0,0 +1,148 @@ +package update + +import ( + "context" + "fmt" + + "github.com/stackitcloud/stackit-cli/internal/pkg/types" + "github.com/stackitcloud/stackit-sdk-go/services/logs" + + "github.com/stackitcloud/stackit-cli/internal/pkg/args" + cliErr "github.com/stackitcloud/stackit-cli/internal/pkg/errors" + "github.com/stackitcloud/stackit-cli/internal/pkg/examples" + "github.com/stackitcloud/stackit-cli/internal/pkg/flags" + "github.com/stackitcloud/stackit-cli/internal/pkg/globalflags" + "github.com/stackitcloud/stackit-cli/internal/pkg/print" + "github.com/stackitcloud/stackit-cli/internal/pkg/services/logs/client" + logUtils "github.com/stackitcloud/stackit-cli/internal/pkg/services/logs/utils" + "github.com/stackitcloud/stackit-cli/internal/pkg/utils" + + "github.com/spf13/cobra" +) + +const ( + instanceIdFlag = "instance-id" + displayNameFlag = "display-name" + descriptionFlag = "description" + accessTokenIdArg = "ACCESS_TOKEN_ID" +) + +type inputModel struct { + *globalflags.GlobalFlagModel + InstanceId string + AccessTokenId string + Description *string + DisplayName *string +} + +func NewCmd(params *types.CmdParams) *cobra.Command { + cmd := &cobra.Command{ + Use: fmt.Sprintf("update %s", accessTokenIdArg), + Short: "Updates a access token", + Long: "Updates a access token.", + Args: args.SingleArg(accessTokenIdArg, utils.ValidateUUID), + Example: examples.Build( + examples.NewExample( + `Update access token with ID "xxx" with new name "access-token-1"`, + `$ stackit logs access-token update xxx --display-name access-token-1`, + ), + examples.NewExample( + `Update access token with ID "xxx" with new description "Access token for Service XY"`, + `$ stackit logs access-token update xxx --description "Access token for Service XY"`, + ), + ), + RunE: func(cmd *cobra.Command, args []string) error { + ctx := context.Background() + model, err := parseInput(params.Printer, cmd, args) + if err != nil { + return err + } + + // Configure API client + apiClient, err := client.ConfigureClient(params.Printer, params.CliVersion) + if err != nil { + return err + } + + // Get the display name for confirmation + instanceLabel, err := logUtils.GetInstanceName(ctx, apiClient, model.ProjectId, model.Region, model.InstanceId) + if err != nil { + params.Printer.Debug(print.ErrorLevel, "get log instance: %v", err) + } + if instanceLabel == "" { + instanceLabel = model.InstanceId + } + + // Get the display name for confirmation + accessTokenLabel, err := logUtils.GetAccessTokenName(ctx, apiClient, model.ProjectId, model.Region, model.InstanceId, model.AccessTokenId) + if err != nil { + params.Printer.Debug(print.ErrorLevel, "get access token: %v", err) + } + if accessTokenLabel == "" { + accessTokenLabel = model.AccessTokenId + } + + prompt := fmt.Sprintf("Are you sure you want to update access token %q for instance %q?", accessTokenLabel, instanceLabel) + err = params.Printer.PromptForConfirmation(prompt) + if err != nil { + return err + } + + // Call API + req := buildRequest(ctx, model, apiClient) + err = req.Execute() + if err != nil { + return fmt.Errorf("update access token: %w", err) + } + + operationState := "Updated" + if model.Async { + operationState = "Triggered update of" + } + params.Printer.Outputf("%s access token %q\n", operationState, accessTokenLabel) + return nil + }, + } + configureFlags(cmd) + return cmd +} + +func configureFlags(cmd *cobra.Command) { + cmd.Flags().Var(flags.UUIDFlag(), instanceIdFlag, "ID of the logs instance") + cmd.Flags().String(displayNameFlag, "", "Display name for the access token") + cmd.Flags().String(descriptionFlag, "", "Description of the access token") + + err := flags.MarkFlagsRequired(cmd, instanceIdFlag) + cobra.CheckErr(err) +} + +func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inputModel, error) { + accessTokenId := inputArgs[0] + + globalFlags := globalflags.Parse(p, cmd) + if globalFlags.ProjectId == "" { + return nil, &cliErr.ProjectIdError{} + } + + model := inputModel{ + GlobalFlagModel: globalFlags, + AccessTokenId: accessTokenId, + DisplayName: flags.FlagToStringPointer(p, cmd, displayNameFlag), + InstanceId: flags.FlagToStringValue(p, cmd, instanceIdFlag), + Description: flags.FlagToStringPointer(p, cmd, descriptionFlag), + } + + p.DebugInputModel(model) + return &model, nil +} + +func buildRequest(ctx context.Context, model *inputModel, apiClient *logs.APIClient) logs.ApiUpdateAccessTokenRequest { + req := apiClient.UpdateAccessToken(ctx, model.ProjectId, model.Region, model.InstanceId, model.AccessTokenId) + + payload := logs.UpdateAccessTokenPayload{ + DisplayName: model.DisplayName, + Description: model.Description, + } + + return req.UpdateAccessTokenPayload(payload) +} diff --git a/internal/cmd/beta/logs/logs.go b/internal/cmd/beta/logs/logs.go index d7e0b803a..57e3f299f 100644 --- a/internal/cmd/beta/logs/logs.go +++ b/internal/cmd/beta/logs/logs.go @@ -1,6 +1,7 @@ package logs import ( + "github.com/stackitcloud/stackit-cli/internal/cmd/beta/logs/access_token" "github.com/stackitcloud/stackit-cli/internal/cmd/beta/logs/instance" "github.com/stackitcloud/stackit-cli/internal/pkg/args" "github.com/stackitcloud/stackit-cli/internal/pkg/types" @@ -23,4 +24,5 @@ func NewCmd(params *types.CmdParams) *cobra.Command { func addSubcommands(cmd *cobra.Command, params *types.CmdParams) { cmd.AddCommand(instance.NewCmd(params)) + cmd.AddCommand(access_token.NewCmd(params)) } diff --git a/internal/pkg/services/logs/utils/utils.go b/internal/pkg/services/logs/utils/utils.go index 4008db158..d67272254 100644 --- a/internal/pkg/services/logs/utils/utils.go +++ b/internal/pkg/services/logs/utils/utils.go @@ -15,6 +15,7 @@ var ( type LogsClient interface { GetLogsInstanceExecute(ctx context.Context, projectId, regionId, instanceId string) (*logs.LogsInstance, error) + GetAccessTokenExecute(ctx context.Context, projectId string, regionId string, instanceId string, tId string) (*logs.AccessToken, error) } func GetInstanceName(ctx context.Context, apiClient LogsClient, projectId, regionId, instanceId string) (string, error) { @@ -28,3 +29,15 @@ func GetInstanceName(ctx context.Context, apiClient LogsClient, projectId, regio } return *resp.DisplayName, nil } + +func GetAccessTokenName(ctx context.Context, apiClient LogsClient, projectId, regionId, instanceId, accessTokenId string) (string, error) { + resp, err := apiClient.GetAccessTokenExecute(ctx, projectId, regionId, instanceId, accessTokenId) + if err != nil { + return "", fmt.Errorf("get Logs access token: %w", err) + } else if resp == nil { + return "", ErrResponseNil + } else if resp.DisplayName == nil { + return "", ErrNameNil + } + return *resp.DisplayName, nil +} diff --git a/internal/pkg/services/logs/utils/utils_test.go b/internal/pkg/services/logs/utils/utils_test.go index 0c21b4d09..6f428f8f1 100644 --- a/internal/pkg/services/logs/utils/utils_test.go +++ b/internal/pkg/services/logs/utils/utils_test.go @@ -22,8 +22,9 @@ const ( ) type logsClientMocked struct { - getInstanceFails bool - getInstanceResp *logs.LogsInstance + getInstanceFails bool + getInstanceResp *logs.LogsInstance + getAccessTokenResp *logs.AccessToken } func (m *logsClientMocked) GetLogsInstanceExecute(_ context.Context, _, _, _ string) (*logs.LogsInstance, error) { @@ -33,6 +34,13 @@ func (m *logsClientMocked) GetLogsInstanceExecute(_ context.Context, _, _, _ str return m.getInstanceResp, nil } +func (m *logsClientMocked) GetAccessTokenExecute(_ context.Context, _, _, _, _ string) (*logs.AccessToken, error) { + if m.getInstanceFails { + return nil, fmt.Errorf("could not get instance") + } + return m.getAccessTokenResp, nil +} + func TestGetInstanceName(t *testing.T) { tests := []struct { description string From bf8741315fc7b14ce19c3119abd0c3942248133e Mon Sep 17 00:00:00 2001 From: Manuel Vaas Date: Fri, 30 Jan 2026 16:45:25 +0100 Subject: [PATCH 02/13] Added test for utils --- .../pkg/services/logs/utils/utils_test.go | 78 +++++++++++++++++-- 1 file changed, 71 insertions(+), 7 deletions(-) diff --git a/internal/pkg/services/logs/utils/utils_test.go b/internal/pkg/services/logs/utils/utils_test.go index 6f428f8f1..78839fb10 100644 --- a/internal/pkg/services/logs/utils/utils_test.go +++ b/internal/pkg/services/logs/utils/utils_test.go @@ -12,8 +12,9 @@ import ( ) var ( - testProjectId = uuid.NewString() - testInstanceId = uuid.NewString() + testProjectId = uuid.NewString() + testInstanceId = uuid.NewString() + testAccessTokenId = uuid.NewString() ) const ( @@ -22,9 +23,10 @@ const ( ) type logsClientMocked struct { - getInstanceFails bool - getInstanceResp *logs.LogsInstance - getAccessTokenResp *logs.AccessToken + getInstanceFails bool + getInstanceResp *logs.LogsInstance + getAccessTokenFails bool + getAccessTokenResp *logs.AccessToken } func (m *logsClientMocked) GetLogsInstanceExecute(_ context.Context, _, _, _ string) (*logs.LogsInstance, error) { @@ -35,8 +37,8 @@ func (m *logsClientMocked) GetLogsInstanceExecute(_ context.Context, _, _, _ str } func (m *logsClientMocked) GetAccessTokenExecute(_ context.Context, _, _, _, _ string) (*logs.AccessToken, error) { - if m.getInstanceFails { - return nil, fmt.Errorf("could not get instance") + if m.getAccessTokenFails { + return nil, fmt.Errorf("could not get access token") } return m.getAccessTokenResp, nil } @@ -102,3 +104,65 @@ func TestGetInstanceName(t *testing.T) { }) } } + +func TestGetAccessTokenName(t *testing.T) { + tests := []struct { + description string + getAccessTokenFails bool + getAccessTokenResp *logs.AccessToken + isValid bool + expectedOutput string + }{ + { + description: "base", + getAccessTokenResp: &logs.AccessToken{ + DisplayName: utils.Ptr(testInstanceName), + }, + isValid: true, + expectedOutput: testInstanceName, + }, + { + description: "get instance fails", + getAccessTokenFails: true, + isValid: false, + }, + { + description: "response is nil", + getAccessTokenFails: false, + getAccessTokenResp: nil, + isValid: false, + }, + { + description: "name in response is nil", + getAccessTokenFails: false, + getAccessTokenResp: &logs.AccessToken{ + DisplayName: nil, + }, + isValid: false, + }, + } + + for _, tt := range tests { + t.Run(tt.description, func(t *testing.T) { + client := &logsClientMocked{ + getAccessTokenFails: tt.getAccessTokenFails, + getAccessTokenResp: tt.getAccessTokenResp, + } + + output, err := GetAccessTokenName(context.Background(), client, testProjectId, testRegion, testInstanceId, testAccessTokenId) + + if tt.isValid && err != nil { + t.Errorf("failed on valid input") + } + if !tt.isValid && err == nil { + t.Errorf("did not fail on invalid input") + } + if !tt.isValid { + return + } + if output != tt.expectedOutput { + t.Errorf("expected output to be %s, got %s", tt.expectedOutput, output) + } + }) + } +} From a2503d502bc032377ea0ee6a24dc69d84df9c8b9 Mon Sep 17 00:00:00 2001 From: Manuel Vaas Date: Fri, 30 Jan 2026 18:38:09 +0100 Subject: [PATCH 03/13] removed operationState variable --- internal/cmd/beta/logs/access_token/delete/delete.go | 3 +-- .../cmd/beta/logs/access_token/delete_all/delete_all.go | 3 +-- .../access_token/delete_all_expired/delete_all_expired.go | 3 +-- internal/cmd/beta/logs/access_token/update/update.go | 6 +----- 4 files changed, 4 insertions(+), 11 deletions(-) diff --git a/internal/cmd/beta/logs/access_token/delete/delete.go b/internal/cmd/beta/logs/access_token/delete/delete.go index 6d4d0b2bb..4dff70e01 100644 --- a/internal/cmd/beta/logs/access_token/delete/delete.go +++ b/internal/cmd/beta/logs/access_token/delete/delete.go @@ -78,8 +78,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command { return fmt.Errorf("delete access token: %w", err) } - operationState := "Deleted" - params.Printer.Outputf("%s access token %q\n", operationState, accessTokenLabel) + params.Printer.Outputf("Deleted access token %q\n", accessTokenLabel) return nil }, } diff --git a/internal/cmd/beta/logs/access_token/delete_all/delete_all.go b/internal/cmd/beta/logs/access_token/delete_all/delete_all.go index 166234315..ff9866962 100644 --- a/internal/cmd/beta/logs/access_token/delete_all/delete_all.go +++ b/internal/cmd/beta/logs/access_token/delete_all/delete_all.go @@ -72,8 +72,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command { return fmt.Errorf("delete access token: %w", err) } - operationState := "Deleted" - params.Printer.Outputf("%s %d access token(s)\n", operationState, len(*items.Tokens)) + params.Printer.Outputf("Deleted %d access token(s)\n", len(*items.Tokens)) return nil }, } diff --git a/internal/cmd/beta/logs/access_token/delete_all_expired/delete_all_expired.go b/internal/cmd/beta/logs/access_token/delete_all_expired/delete_all_expired.go index b0af69812..8679567b8 100644 --- a/internal/cmd/beta/logs/access_token/delete_all_expired/delete_all_expired.go +++ b/internal/cmd/beta/logs/access_token/delete_all_expired/delete_all_expired.go @@ -72,8 +72,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command { return fmt.Errorf("delete access token: %w", err) } - operationState := "Deleted" - params.Printer.Outputf("%s %d expired access token(s)\n", operationState, len(*items.Tokens)) + params.Printer.Outputf("Deleted %d expired access token(s)\n", len(*items.Tokens)) return nil }, } diff --git a/internal/cmd/beta/logs/access_token/update/update.go b/internal/cmd/beta/logs/access_token/update/update.go index a3a3df0f1..af314c9af 100644 --- a/internal/cmd/beta/logs/access_token/update/update.go +++ b/internal/cmd/beta/logs/access_token/update/update.go @@ -95,11 +95,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command { return fmt.Errorf("update access token: %w", err) } - operationState := "Updated" - if model.Async { - operationState = "Triggered update of" - } - params.Printer.Outputf("%s access token %q\n", operationState, accessTokenLabel) + params.Printer.Outputf("Updated access token %q\n", accessTokenLabel) return nil }, } From df27ea902171f2e51894093dffac3a69c0bcc85a Mon Sep 17 00:00:00 2001 From: Manuel Vaas Date: Fri, 30 Jan 2026 19:38:09 +0100 Subject: [PATCH 04/13] Updated examples and fixed more comments --- internal/cmd/beta/logs/access_token/create/create.go | 3 +-- internal/cmd/beta/logs/access_token/delete/delete.go | 4 ++-- internal/cmd/beta/logs/access_token/delete_all/delete_all.go | 4 ++-- .../access_token/delete_all_expired/delete_all_expired.go | 2 +- internal/cmd/beta/logs/access_token/update/update.go | 4 ++-- 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/internal/cmd/beta/logs/access_token/create/create.go b/internal/cmd/beta/logs/access_token/create/create.go index 89add8cd9..9429c2a3e 100644 --- a/internal/cmd/beta/logs/access_token/create/create.go +++ b/internal/cmd/beta/logs/access_token/create/create.go @@ -154,8 +154,7 @@ func outputResult(p *print.Printer, outputFormat, instanceLabel string, accessTo return fmt.Errorf("access token cannot be nil") } return p.OutputResult(outputFormat, accessToken, func() error { - operationState := "Created" - p.Outputf("%s access token for log instance %q.\n\nID: %s\nToken: %s\n", operationState, instanceLabel, *accessToken.Id, *accessToken.AccessToken) + p.Outputf("Created access token for log instance %q.\n\nID: %s\nToken: %s\n", instanceLabel, *accessToken.Id, *accessToken.AccessToken) return nil }) } diff --git a/internal/cmd/beta/logs/access_token/delete/delete.go b/internal/cmd/beta/logs/access_token/delete/delete.go index 4dff70e01..23343ab1c 100644 --- a/internal/cmd/beta/logs/access_token/delete/delete.go +++ b/internal/cmd/beta/logs/access_token/delete/delete.go @@ -39,8 +39,8 @@ func NewCmd(params *types.CmdParams) *cobra.Command { Args: args.SingleArg(accessTokenIdArg, utils.ValidateUUID), Example: examples.Build( examples.NewExample( - `Delete access token with ID "xxx"`, - "$ stackit logs access-token delete xxx", + `Delete access token with ID "xxx" in instance "yyy"`, + "$ stackit logs access-token delete xxx --instance-id yyy", ), ), RunE: func(cmd *cobra.Command, args []string) error { diff --git a/internal/cmd/beta/logs/access_token/delete_all/delete_all.go b/internal/cmd/beta/logs/access_token/delete_all/delete_all.go index ff9866962..21edb9191 100644 --- a/internal/cmd/beta/logs/access_token/delete_all/delete_all.go +++ b/internal/cmd/beta/logs/access_token/delete_all/delete_all.go @@ -37,7 +37,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command { Example: examples.Build( examples.NewExample( `Delete all access tokens in instance "xxx"`, - "$ stackit logs access-token delete --instance-id xxx", + "$ stackit logs access-token delete-all --instance-id xxx", ), ), RunE: func(cmd *cobra.Command, args []string) error { @@ -59,7 +59,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command { instanceLabel = model.InstanceId } - prompt := fmt.Sprintf("Are you sure you want to delete all access tokens in instance %q?", instanceLabel) + prompt := fmt.Sprintf("Are you sure you want to delete all access tokens for instance %q?", instanceLabel) err = params.Printer.PromptForConfirmation(prompt) if err != nil { return err diff --git a/internal/cmd/beta/logs/access_token/delete_all_expired/delete_all_expired.go b/internal/cmd/beta/logs/access_token/delete_all_expired/delete_all_expired.go index 8679567b8..2f07d9ded 100644 --- a/internal/cmd/beta/logs/access_token/delete_all_expired/delete_all_expired.go +++ b/internal/cmd/beta/logs/access_token/delete_all_expired/delete_all_expired.go @@ -37,7 +37,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command { Example: examples.Build( examples.NewExample( `Delete all expired access tokens in instance "xxx"`, - "$ stackit logs access-token delete --instance-id xxx", + "$ stackit logs access-token delete-all-expired --instance-id xxx", ), ), RunE: func(cmd *cobra.Command, args []string) error { diff --git a/internal/cmd/beta/logs/access_token/update/update.go b/internal/cmd/beta/logs/access_token/update/update.go index af314c9af..c63fa040b 100644 --- a/internal/cmd/beta/logs/access_token/update/update.go +++ b/internal/cmd/beta/logs/access_token/update/update.go @@ -44,11 +44,11 @@ func NewCmd(params *types.CmdParams) *cobra.Command { Example: examples.Build( examples.NewExample( `Update access token with ID "xxx" with new name "access-token-1"`, - `$ stackit logs access-token update xxx --display-name access-token-1`, + `$ stackit logs access-token update xxx --instance-id yyy --display-name access-token-1`, ), examples.NewExample( `Update access token with ID "xxx" with new description "Access token for Service XY"`, - `$ stackit logs access-token update xxx --description "Access token for Service XY"`, + `$ stackit logs access-token update xxx --instance-id yyy --description "Access token for Service XY"`, ), ), RunE: func(cmd *cobra.Command, args []string) error { From f79980986e66bb3befad2ae5bd84e33f66bdde19 Mon Sep 17 00:00:00 2001 From: Manuel Vaas Date: Tue, 10 Feb 2026 11:31:53 +0100 Subject: [PATCH 05/13] Upgraded to logs api v1 --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 0de779f68..73255cfbd 100644 --- a/go.mod +++ b/go.mod @@ -24,7 +24,7 @@ require ( github.com/stackitcloud/stackit-sdk-go/services/git v0.10.3 github.com/stackitcloud/stackit-sdk-go/services/iaas v1.3.0 github.com/stackitcloud/stackit-sdk-go/services/intake v0.4.4 - github.com/stackitcloud/stackit-sdk-go/services/logs v0.4.0 + github.com/stackitcloud/stackit-sdk-go/services/logs v0.5.2 github.com/stackitcloud/stackit-sdk-go/services/mongodbflex v1.5.8 github.com/stackitcloud/stackit-sdk-go/services/opensearch v0.24.6 github.com/stackitcloud/stackit-sdk-go/services/postgresflex v1.3.5 diff --git a/go.sum b/go.sum index f89784b61..10db67967 100644 --- a/go.sum +++ b/go.sum @@ -624,8 +624,8 @@ github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v1.7.3 h1:d/qIj+XNa github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v1.7.3/go.mod h1:ClPE4TOM1FeaJiwTXvApq4gWaSgTLq6nU3PPHAIQDN4= github.com/stackitcloud/stackit-sdk-go/services/logme v0.25.6 h1:4x30lC+YBmo7XpsAzTn0W+C/oP5flnLVgIh5u3O/P0o= github.com/stackitcloud/stackit-sdk-go/services/logme v0.25.6/go.mod h1:ewaYUiZcBTSS6urE5zEJBPCqxu70w2IjnBHCvnKdFKE= -github.com/stackitcloud/stackit-sdk-go/services/logs v0.4.0 h1:EOUVSKvu/m5N+psxeB69IIpANev/jw6HIw2yfh/HO7w= -github.com/stackitcloud/stackit-sdk-go/services/logs v0.4.0/go.mod h1:m4IjH1/RtJOF072kjAB0E/ejoIc++myrKmIahphfO6Q= +github.com/stackitcloud/stackit-sdk-go/services/logs v0.5.2 h1:vr4atxFRT+EL+DqONMT5R44f7AzEMbePa9U7PEE0THU= +github.com/stackitcloud/stackit-sdk-go/services/logs v0.5.2/go.mod h1:CAPsiTX7osAImfrG5RnIjaJ/Iz3QpoBKuH2fS346wuQ= github.com/stackitcloud/stackit-sdk-go/services/mariadb v0.25.3 h1:Y5Ct3Zi5UcIOwjKMWpKl0nrqiq7psTf4NJv0IKgwTkc= github.com/stackitcloud/stackit-sdk-go/services/mariadb v0.25.3/go.mod h1:TMl5WcpjzUiAlLWaxMKbu9ysDzFziSPgg4xLxj9jjfY= github.com/stackitcloud/stackit-sdk-go/services/mongodbflex v1.5.8 h1:S7t4wcT6SN8ZzdoY8d6VbF903zFpGjzqrU0FN27rJPg= From 191ce17ff376e30536a71c3249bb4e12d884916e Mon Sep 17 00:00:00 2001 From: Manuel Vaas Date: Wed, 11 Feb 2026 14:07:07 +0100 Subject: [PATCH 06/13] implemented tests --- .../logs/access_token/create/create_test.go | 282 ++++++++++++++++++ .../logs/access_token/delete/delete_test.go | 207 +++++++++++++ .../delete_all/delete_all_test.go | 163 ++++++++++ .../delete_all_expired_test.go | 163 ++++++++++ .../access_token/describe/describe_test.go | 263 ++++++++++++++++ .../beta/logs/access_token/list/list_test.go | 239 +++++++++++++++ .../logs/access_token/update/update_test.go | 277 +++++++++++++++++ 7 files changed, 1594 insertions(+) create mode 100644 internal/cmd/beta/logs/access_token/create/create_test.go create mode 100644 internal/cmd/beta/logs/access_token/delete/delete_test.go create mode 100644 internal/cmd/beta/logs/access_token/delete_all/delete_all_test.go create mode 100644 internal/cmd/beta/logs/access_token/delete_all_expired/delete_all_expired_test.go create mode 100644 internal/cmd/beta/logs/access_token/describe/describe_test.go create mode 100644 internal/cmd/beta/logs/access_token/list/list_test.go create mode 100644 internal/cmd/beta/logs/access_token/update/update_test.go diff --git a/internal/cmd/beta/logs/access_token/create/create_test.go b/internal/cmd/beta/logs/access_token/create/create_test.go new file mode 100644 index 000000000..e29fc864e --- /dev/null +++ b/internal/cmd/beta/logs/access_token/create/create_test.go @@ -0,0 +1,282 @@ +package create + +import ( + "context" + "testing" + + "github.com/stackitcloud/stackit-cli/internal/pkg/types" + + "github.com/stackitcloud/stackit-cli/internal/pkg/globalflags" + "github.com/stackitcloud/stackit-cli/internal/pkg/print" + "github.com/stackitcloud/stackit-cli/internal/pkg/testutils" + "github.com/stackitcloud/stackit-cli/internal/pkg/utils" + + "github.com/google/go-cmp/cmp" + "github.com/google/go-cmp/cmp/cmpopts" + "github.com/google/uuid" + "github.com/stackitcloud/stackit-sdk-go/services/logs" +) + +const ( + testRegion = "eu01" + + testDisplayName = "display-name" + testDescription = "description" +) + +type testCtxKey struct{} + +var ( + testCtx = context.WithValue(context.Background(), testCtxKey{}, "foo") + testClient = &logs.APIClient{} + testProjectId = uuid.NewString() + testInstanceId = uuid.NewString() +) + +func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]string { + flagValues := map[string]string{ + globalflags.ProjectIdFlag: testProjectId, + globalflags.RegionFlag: testRegion, + + instanceIdFlag: testInstanceId, + displayNameFlag: testDisplayName, + descriptionFlag: testDescription, + permissionsFlag: "read,write", + lifetimeFlag: "0", + } + for _, mod := range mods { + mod(flagValues) + } + return flagValues +} + +func fixtureInputModel(mods ...func(model *inputModel)) *inputModel { + model := &inputModel{ + GlobalFlagModel: &globalflags.GlobalFlagModel{ + Verbosity: globalflags.VerbosityDefault, + ProjectId: testProjectId, + Region: testRegion, + }, + + InstanceId: testInstanceId, + Description: utils.Ptr(testDescription), + DisplayName: testDisplayName, + Lifetime: utils.Ptr(int64(0)), + Permissions: []string{ + "read", + "write", + }, + } + for _, mod := range mods { + mod(model) + } + return model +} + +func fixtureRequest(mods ...func(request *logs.ApiCreateAccessTokenRequest)) logs.ApiCreateAccessTokenRequest { + request := testClient.CreateAccessToken(testCtx, testProjectId, testRegion, testInstanceId) + request = request.CreateAccessTokenPayload(fixturePayload()) + for _, mod := range mods { + mod(&request) + } + return request +} + +func fixturePayload(mods ...func(payload *logs.CreateAccessTokenPayload)) logs.CreateAccessTokenPayload { + payload := logs.CreateAccessTokenPayload{ + DisplayName: utils.Ptr(testDisplayName), + Description: utils.Ptr(testDescription), + Lifetime: utils.Ptr(int64(0)), + Permissions: utils.Ptr([]string{ + "read", + "write", + }), + } + for _, mod := range mods { + mod(&payload) + } + return payload +} + +func TestParseInput(t *testing.T) { + tests := []struct { + description string + argValues []string + flagValues map[string]string + isValid bool + expectedModel *inputModel + }{ + { + description: "base", + flagValues: fixtureFlagValues(), + isValid: true, + expectedModel: fixtureInputModel(), + }, + { + description: "only required flags", + flagValues: fixtureFlagValues(func(flagValues map[string]string) { + delete(flagValues, lifetimeFlag) + delete(flagValues, descriptionFlag) + }), + isValid: true, + expectedModel: fixtureInputModel(func(model *inputModel) { + model.Lifetime = nil + model.Description = nil + }), + }, + { + description: "one permission", + flagValues: fixtureFlagValues(func(flagValues map[string]string) { + flagValues[permissionsFlag] = "read" + }), + isValid: true, + expectedModel: fixtureInputModel(func(model *inputModel) { + model.Permissions = []string{ + "read", + } + }), + }, + { + description: "no values", + flagValues: map[string]string{}, + isValid: false, + }, + { + description: "project id missing", + flagValues: fixtureFlagValues(func(flagValues map[string]string) { + delete(flagValues, globalflags.ProjectIdFlag) + }), + isValid: false, + }, + { + description: "project id invalid 1", + flagValues: fixtureFlagValues(func(flagValues map[string]string) { + flagValues[globalflags.ProjectIdFlag] = "" + }), + isValid: false, + }, + { + description: "project id invalid 2", + flagValues: fixtureFlagValues(func(flagValues map[string]string) { + flagValues[globalflags.ProjectIdFlag] = "invalid-uuid" + }), + isValid: false, + }, + { + description: "instance id missing", + flagValues: fixtureFlagValues(func(flagValues map[string]string) { + delete(flagValues, instanceIdFlag) + }), + isValid: false, + }, + { + description: "instance id invalid 1", + flagValues: fixtureFlagValues(func(flagValues map[string]string) { + flagValues[instanceIdFlag] = "" + }), + isValid: false, + }, + { + description: "instance id invalid 2", + flagValues: fixtureFlagValues(func(flagValues map[string]string) { + flagValues[instanceIdFlag] = "invalid-uuid" + }), + isValid: false, + }, + { + description: "lifetime invalid", + flagValues: fixtureFlagValues(func(flagValues map[string]string) { + flagValues[lifetimeFlag] = "invalid-integer" + }), + isValid: false, + }, + } + + for _, tt := range tests { + t.Run(tt.description, func(t *testing.T) { + testutils.TestParseInput(t, NewCmd, parseInput, tt.expectedModel, tt.argValues, tt.flagValues, tt.isValid) + }) + } +} + +func TestBuildRequest(t *testing.T) { + var tests = []struct { + description string + model *inputModel + expectedRequest logs.ApiCreateAccessTokenRequest + }{ + { + description: "base", + model: fixtureInputModel(), + expectedRequest: fixtureRequest(), + }, + } + for _, tt := range tests { + t.Run(tt.description, func(t *testing.T) { + request := buildRequest(testCtx, tt.model, testClient) + + diff := cmp.Diff(tt.expectedRequest, request, + cmp.AllowUnexported(tt.expectedRequest), + cmpopts.EquateComparable(testCtx), + ) + if diff != "" { + t.Fatalf("Data does not match: %s", diff) + } + }) + } +} + +func TestOutputResult(t *testing.T) { + type args struct { + outputFormat string + instanceLabel string + accessToken *logs.AccessToken + } + tests := []struct { + name string + args args + wantErr bool + }{ + { + name: "base", + args: args{ + instanceLabel: "", + accessToken: utils.Ptr(logs.AccessToken{ + Id: utils.Ptr(uuid.NewString()), + Permissions: utils.Ptr([]string{ + "read", + "write", + }), + DisplayName: utils.Ptr("Token"), + AccessToken: utils.Ptr("Secret access token"), + Creator: utils.Ptr(uuid.NewString()), + Expires: utils.Ptr(false), + Status: utils.Ptr(logs.ACCESSTOKENSTATUS_ACTIVE), + }), + }, + wantErr: false, + }, + { + name: "empty access token", + args: args{ + instanceLabel: "", + accessToken: utils.Ptr(logs.AccessToken{}), + }, + wantErr: false, + }, + { + name: "empty", + args: args{}, + wantErr: true, + }, + } + p := print.NewPrinter() + p.Cmd = NewCmd(&types.CmdParams{Printer: p}) + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + if err := outputResult(p, tt.args.outputFormat, tt.args.instanceLabel, tt.args.accessToken); (err != nil) != tt.wantErr { + t.Errorf("outputResult() error = %v, wantErr %v", err, tt.wantErr) + } + }) + } +} diff --git a/internal/cmd/beta/logs/access_token/delete/delete_test.go b/internal/cmd/beta/logs/access_token/delete/delete_test.go new file mode 100644 index 000000000..23bbb5464 --- /dev/null +++ b/internal/cmd/beta/logs/access_token/delete/delete_test.go @@ -0,0 +1,207 @@ +package delete + +import ( + "context" + "testing" + + "github.com/stackitcloud/stackit-cli/internal/pkg/globalflags" + "github.com/stackitcloud/stackit-cli/internal/pkg/testutils" + + "github.com/google/go-cmp/cmp" + "github.com/google/go-cmp/cmp/cmpopts" + "github.com/google/uuid" + "github.com/stackitcloud/stackit-sdk-go/services/logs" +) + +const ( + testRegion = "eu01" +) + +type testCtxKey struct{} + +var ( + testCtx = context.WithValue(context.Background(), testCtxKey{}, "foo") + testClient = &logs.APIClient{} + + testProjectId = uuid.NewString() + testInstanceId = uuid.NewString() + testAccessTokenId = uuid.NewString() +) + +func fixtureArgValues(mods ...func(argValues []string)) []string { + argValues := []string{ + testAccessTokenId, + } + for _, mod := range mods { + mod(argValues) + } + return argValues +} + +func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]string { + flagValues := map[string]string{ + globalflags.ProjectIdFlag: testProjectId, + globalflags.RegionFlag: testRegion, + + instanceIdFlag: testInstanceId, + } + for _, mod := range mods { + mod(flagValues) + } + return flagValues +} + +func fixtureInputModel(mods ...func(model *inputModel)) *inputModel { + model := &inputModel{ + GlobalFlagModel: &globalflags.GlobalFlagModel{ + Verbosity: globalflags.VerbosityDefault, + ProjectId: testProjectId, + Region: testRegion, + }, + + InstanceId: testInstanceId, + AccessTokenId: testAccessTokenId, + } + for _, mod := range mods { + mod(model) + } + return model +} + +func fixtureRequest(mods ...func(request *logs.ApiDeleteAccessTokenRequest)) logs.ApiDeleteAccessTokenRequest { + request := testClient.DeleteAccessToken(testCtx, testProjectId, testRegion, testInstanceId, testAccessTokenId) + for _, mod := range mods { + mod(&request) + } + return request +} + +func TestParseInput(t *testing.T) { + tests := []struct { + description string + argValues []string + flagValues map[string]string + isValid bool + expectedModel *inputModel + }{ + { + description: "base", + argValues: fixtureArgValues(), + flagValues: fixtureFlagValues(), + isValid: true, + expectedModel: fixtureInputModel(), + }, + { + description: "no values", + argValues: []string{}, + flagValues: map[string]string{}, + isValid: false, + }, + { + description: "no arg values", + argValues: []string{}, + flagValues: fixtureFlagValues(), + isValid: false, + }, + { + description: "no flag values", + argValues: fixtureArgValues(), + flagValues: map[string]string{}, + isValid: false, + }, + { + description: "project id missing", + argValues: fixtureArgValues(), + flagValues: fixtureFlagValues(func(flagValues map[string]string) { + delete(flagValues, globalflags.ProjectIdFlag) + }), + isValid: false, + }, + { + description: "project id invalid 1", + argValues: fixtureArgValues(), + flagValues: fixtureFlagValues(func(flagValues map[string]string) { + flagValues[globalflags.ProjectIdFlag] = "" + }), + isValid: false, + }, + { + description: "project id invalid 2", + argValues: fixtureArgValues(), + flagValues: fixtureFlagValues(func(flagValues map[string]string) { + flagValues[globalflags.ProjectIdFlag] = "invalid-uuid" + }), + isValid: false, + }, + { + description: "instance id missing", + argValues: fixtureArgValues(), + flagValues: fixtureFlagValues(func(flagValues map[string]string) { + delete(flagValues, instanceIdFlag) + }), + isValid: false, + }, + { + description: "instance id invalid 1", + argValues: fixtureArgValues(), + flagValues: fixtureFlagValues(func(flagValues map[string]string) { + flagValues[instanceIdFlag] = "" + }), + isValid: false, + }, + { + description: "instance id invalid 2", + argValues: fixtureArgValues(), + flagValues: fixtureFlagValues(func(flagValues map[string]string) { + flagValues[instanceIdFlag] = "invalid-uuid" + }), + isValid: false, + }, + { + description: "access token id invalid 1", + argValues: []string{""}, + flagValues: fixtureFlagValues(), + isValid: false, + }, + { + description: "access token id invalid 2", + argValues: []string{"invalid-uuid"}, + flagValues: fixtureFlagValues(), + isValid: false, + }, + } + + for _, tt := range tests { + t.Run(tt.description, func(t *testing.T) { + testutils.TestParseInput(t, NewCmd, parseInput, tt.expectedModel, tt.argValues, tt.flagValues, tt.isValid) + }) + } +} + +func TestBuildRequest(t *testing.T) { + tests := []struct { + description string + model *inputModel + expectedRequest logs.ApiDeleteAccessTokenRequest + }{ + { + description: "base", + model: fixtureInputModel(), + expectedRequest: fixtureRequest(), + }, + } + + for _, tt := range tests { + t.Run(tt.description, func(t *testing.T) { + request := buildRequest(testCtx, tt.model, testClient) + + diff := cmp.Diff(request, tt.expectedRequest, + cmp.AllowUnexported(tt.expectedRequest), + cmpopts.EquateComparable(testCtx), + ) + if diff != "" { + t.Fatalf("Data does not match: %s", diff) + } + }) + } +} diff --git a/internal/cmd/beta/logs/access_token/delete_all/delete_all_test.go b/internal/cmd/beta/logs/access_token/delete_all/delete_all_test.go new file mode 100644 index 000000000..7cc8e8a81 --- /dev/null +++ b/internal/cmd/beta/logs/access_token/delete_all/delete_all_test.go @@ -0,0 +1,163 @@ +package delete_all + +import ( + "context" + "testing" + + "github.com/stackitcloud/stackit-cli/internal/pkg/globalflags" + "github.com/stackitcloud/stackit-cli/internal/pkg/testutils" + + "github.com/google/go-cmp/cmp" + "github.com/google/go-cmp/cmp/cmpopts" + "github.com/google/uuid" + "github.com/stackitcloud/stackit-sdk-go/services/logs" +) + +const ( + testRegion = "eu01" +) + +type testCtxKey struct{} + +var ( + testCtx = context.WithValue(context.Background(), testCtxKey{}, "foo") + testClient = &logs.APIClient{} + + testProjectId = uuid.NewString() + testInstanceId = uuid.NewString() +) + +func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]string { + flagValues := map[string]string{ + globalflags.ProjectIdFlag: testProjectId, + globalflags.RegionFlag: testRegion, + + instanceIdFlag: testInstanceId, + } + for _, mod := range mods { + mod(flagValues) + } + return flagValues +} + +func fixtureInputModel(mods ...func(model *inputModel)) *inputModel { + model := &inputModel{ + GlobalFlagModel: &globalflags.GlobalFlagModel{ + Verbosity: globalflags.VerbosityDefault, + ProjectId: testProjectId, + Region: testRegion, + }, + + InstanceId: testInstanceId, + } + for _, mod := range mods { + mod(model) + } + return model +} + +func fixtureRequest(mods ...func(request *logs.ApiDeleteAllAccessTokensRequest)) logs.ApiDeleteAllAccessTokensRequest { + request := testClient.DeleteAllAccessTokens(testCtx, testProjectId, testRegion, testInstanceId) + for _, mod := range mods { + mod(&request) + } + return request +} + +func TestParseInput(t *testing.T) { + tests := []struct { + description string + argValues []string + flagValues map[string]string + isValid bool + expectedModel *inputModel + }{ + { + description: "base", + flagValues: fixtureFlagValues(), + isValid: true, + expectedModel: fixtureInputModel(), + }, + { + description: "no flag values", + flagValues: map[string]string{}, + isValid: false, + }, + { + description: "project id missing", + flagValues: fixtureFlagValues(func(flagValues map[string]string) { + delete(flagValues, globalflags.ProjectIdFlag) + }), + isValid: false, + }, + { + description: "project id invalid 1", + flagValues: fixtureFlagValues(func(flagValues map[string]string) { + flagValues[globalflags.ProjectIdFlag] = "" + }), + isValid: false, + }, + { + description: "project id invalid 2", + flagValues: fixtureFlagValues(func(flagValues map[string]string) { + flagValues[globalflags.ProjectIdFlag] = "invalid-uuid" + }), + isValid: false, + }, + { + description: "instance id missing", + flagValues: fixtureFlagValues(func(flagValues map[string]string) { + delete(flagValues, instanceIdFlag) + }), + isValid: false, + }, + { + description: "instance id invalid 1", + flagValues: fixtureFlagValues(func(flagValues map[string]string) { + flagValues[instanceIdFlag] = "" + }), + isValid: false, + }, + { + description: "instance id invalid 2", + flagValues: fixtureFlagValues(func(flagValues map[string]string) { + flagValues[instanceIdFlag] = "invalid-uuid" + }), + isValid: false, + }, + } + + for _, tt := range tests { + t.Run(tt.description, func(t *testing.T) { + testutils.TestParseInput(t, NewCmd, parseInput, tt.expectedModel, tt.argValues, tt.flagValues, tt.isValid) + }) + } +} + +func TestBuildRequest(t *testing.T) { + tests := []struct { + description string + model *inputModel + expectedRequest logs.ApiDeleteAllAccessTokensRequest + }{ + { + description: "base", + model: fixtureInputModel(), + expectedRequest: fixtureRequest(), + }, + } + + for _, tt := range tests { + t.Run(tt.description, func(t *testing.T) { + request := buildRequest(testCtx, tt.model, testClient) + + diff := cmp.Diff(request, tt.expectedRequest, + cmp.AllowUnexported(tt.expectedRequest), + cmpopts.EquateComparable(testCtx), + ) + if diff != "" { + t.Fatalf("Data does not match: %s", diff) + } + }) + } +} diff --git a/internal/cmd/beta/logs/access_token/delete_all_expired/delete_all_expired_test.go b/internal/cmd/beta/logs/access_token/delete_all_expired/delete_all_expired_test.go new file mode 100644 index 000000000..f369afa91 --- /dev/null +++ b/internal/cmd/beta/logs/access_token/delete_all_expired/delete_all_expired_test.go @@ -0,0 +1,163 @@ +package delete_all_expired + +import ( + "context" + "testing" + + "github.com/stackitcloud/stackit-cli/internal/pkg/globalflags" + "github.com/stackitcloud/stackit-cli/internal/pkg/testutils" + + "github.com/google/go-cmp/cmp" + "github.com/google/go-cmp/cmp/cmpopts" + "github.com/google/uuid" + "github.com/stackitcloud/stackit-sdk-go/services/logs" +) + +const ( + testRegion = "eu01" +) + +type testCtxKey struct{} + +var ( + testCtx = context.WithValue(context.Background(), testCtxKey{}, "foo") + testClient = &logs.APIClient{} + + testProjectId = uuid.NewString() + testInstanceId = uuid.NewString() +) + +func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]string { + flagValues := map[string]string{ + globalflags.ProjectIdFlag: testProjectId, + globalflags.RegionFlag: testRegion, + + instanceIdFlag: testInstanceId, + } + for _, mod := range mods { + mod(flagValues) + } + return flagValues +} + +func fixtureInputModel(mods ...func(model *inputModel)) *inputModel { + model := &inputModel{ + GlobalFlagModel: &globalflags.GlobalFlagModel{ + Verbosity: globalflags.VerbosityDefault, + ProjectId: testProjectId, + Region: testRegion, + }, + + InstanceId: testInstanceId, + } + for _, mod := range mods { + mod(model) + } + return model +} + +func fixtureRequest(mods ...func(request *logs.ApiDeleteAllExpiredAccessTokensRequest)) logs.ApiDeleteAllExpiredAccessTokensRequest { + request := testClient.DeleteAllExpiredAccessTokens(testCtx, testProjectId, testRegion, testInstanceId) + for _, mod := range mods { + mod(&request) + } + return request +} + +func TestParseInput(t *testing.T) { + tests := []struct { + description string + argValues []string + flagValues map[string]string + isValid bool + expectedModel *inputModel + }{ + { + description: "base", + flagValues: fixtureFlagValues(), + isValid: true, + expectedModel: fixtureInputModel(), + }, + { + description: "no flag values", + flagValues: map[string]string{}, + isValid: false, + }, + { + description: "project id missing", + flagValues: fixtureFlagValues(func(flagValues map[string]string) { + delete(flagValues, globalflags.ProjectIdFlag) + }), + isValid: false, + }, + { + description: "project id invalid 1", + flagValues: fixtureFlagValues(func(flagValues map[string]string) { + flagValues[globalflags.ProjectIdFlag] = "" + }), + isValid: false, + }, + { + description: "project id invalid 2", + flagValues: fixtureFlagValues(func(flagValues map[string]string) { + flagValues[globalflags.ProjectIdFlag] = "invalid-uuid" + }), + isValid: false, + }, + { + description: "instance id missing", + flagValues: fixtureFlagValues(func(flagValues map[string]string) { + delete(flagValues, instanceIdFlag) + }), + isValid: false, + }, + { + description: "instance id invalid 1", + flagValues: fixtureFlagValues(func(flagValues map[string]string) { + flagValues[instanceIdFlag] = "" + }), + isValid: false, + }, + { + description: "instance id invalid 2", + flagValues: fixtureFlagValues(func(flagValues map[string]string) { + flagValues[instanceIdFlag] = "invalid-uuid" + }), + isValid: false, + }, + } + + for _, tt := range tests { + t.Run(tt.description, func(t *testing.T) { + testutils.TestParseInput(t, NewCmd, parseInput, tt.expectedModel, tt.argValues, tt.flagValues, tt.isValid) + }) + } +} + +func TestBuildRequest(t *testing.T) { + tests := []struct { + description string + model *inputModel + expectedRequest logs.ApiDeleteAllExpiredAccessTokensRequest + }{ + { + description: "base", + model: fixtureInputModel(), + expectedRequest: fixtureRequest(), + }, + } + + for _, tt := range tests { + t.Run(tt.description, func(t *testing.T) { + request := buildRequest(testCtx, tt.model, testClient) + + diff := cmp.Diff(request, tt.expectedRequest, + cmp.AllowUnexported(tt.expectedRequest), + cmpopts.EquateComparable(testCtx), + ) + if diff != "" { + t.Fatalf("Data does not match: %s", diff) + } + }) + } +} diff --git a/internal/cmd/beta/logs/access_token/describe/describe_test.go b/internal/cmd/beta/logs/access_token/describe/describe_test.go new file mode 100644 index 000000000..be083cd72 --- /dev/null +++ b/internal/cmd/beta/logs/access_token/describe/describe_test.go @@ -0,0 +1,263 @@ +package describe + +import ( + "context" + "testing" + + "github.com/stackitcloud/stackit-cli/internal/pkg/types" + + "github.com/stackitcloud/stackit-cli/internal/pkg/globalflags" + "github.com/stackitcloud/stackit-cli/internal/pkg/print" + "github.com/stackitcloud/stackit-cli/internal/pkg/testutils" + "github.com/stackitcloud/stackit-cli/internal/pkg/utils" + + "github.com/google/go-cmp/cmp" + "github.com/google/go-cmp/cmp/cmpopts" + "github.com/google/uuid" + "github.com/stackitcloud/stackit-sdk-go/services/logs" +) + +const ( + testRegion = "eu01" +) + +type testCtxKey struct{} + +var ( + testCtx = context.WithValue(context.Background(), testCtxKey{}, "foo") + testClient = &logs.APIClient{} + + testProjectId = uuid.NewString() + testInstanceId = uuid.NewString() + testAccessTokenId = uuid.NewString() +) + +func fixtureArgValues(mods ...func(argValues []string)) []string { + argValues := []string{ + testAccessTokenId, + } + for _, mod := range mods { + mod(argValues) + } + return argValues +} + +func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]string { + flagValues := map[string]string{ + globalflags.ProjectIdFlag: testProjectId, + globalflags.RegionFlag: testRegion, + + instanceIdFlag: testInstanceId, + } + for _, mod := range mods { + mod(flagValues) + } + return flagValues +} + +func fixtureInputModel(mods ...func(model *inputModel)) *inputModel { + model := &inputModel{ + GlobalFlagModel: &globalflags.GlobalFlagModel{ + Verbosity: globalflags.VerbosityDefault, + ProjectId: testProjectId, + Region: testRegion, + }, + + InstanceId: testInstanceId, + AccessTokenId: testAccessTokenId, + } + for _, mod := range mods { + mod(model) + } + return model +} + +func fixtureRequest(mods ...func(request *logs.ApiGetAccessTokenRequest)) logs.ApiGetAccessTokenRequest { + request := testClient.GetAccessToken(testCtx, testProjectId, testRegion, testInstanceId, testAccessTokenId) + for _, mod := range mods { + mod(&request) + } + return request +} + +func TestParseInput(t *testing.T) { + tests := []struct { + description string + argValues []string + flagValues map[string]string + isValid bool + expectedModel *inputModel + }{ + { + description: "base", + argValues: fixtureArgValues(), + flagValues: fixtureFlagValues(), + isValid: true, + expectedModel: fixtureInputModel(), + }, + { + description: "no values", + argValues: []string{}, + flagValues: map[string]string{}, + isValid: false, + }, + { + description: "no arg values", + argValues: []string{}, + flagValues: fixtureFlagValues(), + isValid: false, + }, + { + description: "no flag values", + argValues: fixtureArgValues(), + flagValues: map[string]string{}, + isValid: false, + }, + { + description: "project id missing", + argValues: fixtureArgValues(), + flagValues: fixtureFlagValues(func(flagValues map[string]string) { + delete(flagValues, globalflags.ProjectIdFlag) + }), + isValid: false, + }, + { + description: "project id invalid 1", + argValues: fixtureArgValues(), + flagValues: fixtureFlagValues(func(flagValues map[string]string) { + flagValues[globalflags.ProjectIdFlag] = "" + }), + isValid: false, + }, + { + description: "project id invalid 2", + argValues: fixtureArgValues(), + flagValues: fixtureFlagValues(func(flagValues map[string]string) { + flagValues[globalflags.ProjectIdFlag] = "invalid-uuid" + }), + isValid: false, + }, + { + description: "instance id missing", + argValues: fixtureArgValues(), + flagValues: fixtureFlagValues(func(flagValues map[string]string) { + delete(flagValues, instanceIdFlag) + }), + isValid: false, + }, + { + description: "instance id invalid 1", + argValues: fixtureArgValues(), + flagValues: fixtureFlagValues(func(flagValues map[string]string) { + flagValues[instanceIdFlag] = "" + }), + isValid: false, + }, + { + description: "instance id invalid 2", + argValues: fixtureArgValues(), + flagValues: fixtureFlagValues(func(flagValues map[string]string) { + flagValues[instanceIdFlag] = "invalid-uuid" + }), + isValid: false, + }, + { + description: "access token id invalid 1", + argValues: []string{""}, + flagValues: fixtureFlagValues(), + isValid: false, + }, + { + description: "access token id invalid 2", + argValues: []string{"invalid-uuid"}, + flagValues: fixtureFlagValues(), + isValid: false, + }, + } + + for _, tt := range tests { + t.Run(tt.description, func(t *testing.T) { + testutils.TestParseInput(t, NewCmd, parseInput, tt.expectedModel, tt.argValues, tt.flagValues, tt.isValid) + }) + } +} + +func TestBuildRequest(t *testing.T) { + tests := []struct { + description string + model *inputModel + expectedRequest logs.ApiGetAccessTokenRequest + }{ + { + description: "base", + model: fixtureInputModel(), + expectedRequest: fixtureRequest(), + }, + } + + for _, tt := range tests { + t.Run(tt.description, func(t *testing.T) { + request := buildRequest(testCtx, tt.model, testClient) + + diff := cmp.Diff(request, tt.expectedRequest, + cmp.AllowUnexported(tt.expectedRequest), + cmpopts.EquateComparable(testCtx), + ) + if diff != "" { + t.Fatalf("Data does not match: %s", diff) + } + }) + } +} + +func TestOutputResult(t *testing.T) { + type args struct { + outputFormat string + accessToken *logs.AccessToken + } + tests := []struct { + name string + args args + wantErr bool + }{ + { + name: "base", + args: args{ + accessToken: utils.Ptr(logs.AccessToken{ + Id: utils.Ptr(uuid.NewString()), + Permissions: utils.Ptr([]string{ + "read", + "write", + }), + DisplayName: utils.Ptr("Token"), + AccessToken: utils.Ptr("Secret access token"), + Creator: utils.Ptr(uuid.NewString()), + Expires: utils.Ptr(false), + Status: utils.Ptr(logs.ACCESSTOKENSTATUS_ACTIVE), + }), + }, + wantErr: false, + }, + { + name: "set empty access token", + args: args{ + accessToken: utils.Ptr(logs.AccessToken{}), + }, + wantErr: false, + }, + { + name: "empty", + args: args{}, + wantErr: true, + }, + } + p := print.NewPrinter() + p.Cmd = NewCmd(&types.CmdParams{Printer: p}) + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + if err := outputResult(p, tt.args.outputFormat, tt.args.accessToken); (err != nil) != tt.wantErr { + t.Errorf("outputResult() error = %v, wantErr %v", err, tt.wantErr) + } + }) + } +} diff --git a/internal/cmd/beta/logs/access_token/list/list_test.go b/internal/cmd/beta/logs/access_token/list/list_test.go new file mode 100644 index 000000000..6ff348e3c --- /dev/null +++ b/internal/cmd/beta/logs/access_token/list/list_test.go @@ -0,0 +1,239 @@ +package list + +import ( + "context" + "testing" + + "github.com/stackitcloud/stackit-cli/internal/pkg/types" + + "github.com/stackitcloud/stackit-cli/internal/pkg/globalflags" + "github.com/stackitcloud/stackit-cli/internal/pkg/print" + "github.com/stackitcloud/stackit-cli/internal/pkg/testutils" + "github.com/stackitcloud/stackit-cli/internal/pkg/utils" + + "github.com/google/go-cmp/cmp" + "github.com/google/go-cmp/cmp/cmpopts" + "github.com/google/uuid" + "github.com/stackitcloud/stackit-sdk-go/services/logs" +) + +const ( + testRegion = "eu01" +) + +type testCtxKey struct{} + +var ( + testCtx = context.WithValue(context.Background(), testCtxKey{}, "foo") + testClient = &logs.APIClient{} + + testProjectId = uuid.NewString() + testInstanceId = uuid.NewString() +) + +func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]string { + flagValues := map[string]string{ + globalflags.ProjectIdFlag: testProjectId, + globalflags.RegionFlag: testRegion, + + instanceIdFlag: testInstanceId, + limitFlag: "10", + } + for _, mod := range mods { + mod(flagValues) + } + return flagValues +} + +func fixtureInputModel(mods ...func(model *inputModel)) *inputModel { + model := &inputModel{ + GlobalFlagModel: &globalflags.GlobalFlagModel{ + Verbosity: globalflags.VerbosityDefault, + ProjectId: testProjectId, + Region: testRegion, + }, + + InstanceId: testInstanceId, + Limit: utils.Ptr(int64(10)), + } + for _, mod := range mods { + mod(model) + } + return model +} + +func fixtureRequest(mods ...func(request *logs.ApiListAccessTokensRequest)) logs.ApiListAccessTokensRequest { + request := testClient.ListAccessTokens(testCtx, testProjectId, testRegion, testInstanceId) + for _, mod := range mods { + mod(&request) + } + return request +} + +func TestParseInput(t *testing.T) { + tests := []struct { + description string + argValues []string + flagValues map[string]string + isValid bool + expectedModel *inputModel + }{ + { + description: "base", + flagValues: fixtureFlagValues(), + isValid: true, + expectedModel: fixtureInputModel(), + }, + { + description: "no flag values", + flagValues: map[string]string{}, + isValid: false, + }, + { + description: "project id missing", + flagValues: fixtureFlagValues(func(flagValues map[string]string) { + delete(flagValues, globalflags.ProjectIdFlag) + }), + isValid: false, + }, + { + description: "project id invalid 1", + flagValues: fixtureFlagValues(func(flagValues map[string]string) { + flagValues[globalflags.ProjectIdFlag] = "" + }), + isValid: false, + }, + { + description: "project id invalid 2", + flagValues: fixtureFlagValues(func(flagValues map[string]string) { + flagValues[globalflags.ProjectIdFlag] = "invalid-uuid" + }), + isValid: false, + }, + { + description: "instance id missing", + flagValues: fixtureFlagValues(func(flagValues map[string]string) { + delete(flagValues, instanceIdFlag) + }), + isValid: false, + }, + { + description: "instance id invalid 1", + flagValues: fixtureFlagValues(func(flagValues map[string]string) { + flagValues[instanceIdFlag] = "" + }), + isValid: false, + }, + { + description: "instance id invalid 2", + flagValues: fixtureFlagValues(func(flagValues map[string]string) { + flagValues[instanceIdFlag] = "invalid-uuid" + }), + isValid: false, + }, + { + description: "limit invalid", + flagValues: fixtureFlagValues(func(flagValues map[string]string) { + flagValues[limitFlag] = "invalid" + }), + isValid: false, + }, + { + description: "limit invalid 2", + flagValues: fixtureFlagValues(func(flagValues map[string]string) { + flagValues[limitFlag] = "0" + }), + isValid: false, + }, + } + + for _, tt := range tests { + t.Run(tt.description, func(t *testing.T) { + testutils.TestParseInput(t, NewCmd, parseInput, tt.expectedModel, tt.argValues, tt.flagValues, tt.isValid) + }) + } +} + +func TestBuildRequest(t *testing.T) { + tests := []struct { + description string + model *inputModel + expectedRequest logs.ApiListAccessTokensRequest + }{ + { + description: "base", + model: fixtureInputModel(), + expectedRequest: fixtureRequest(), + }, + } + + for _, tt := range tests { + t.Run(tt.description, func(t *testing.T) { + request := buildRequest(testCtx, tt.model, testClient) + + diff := cmp.Diff(request, tt.expectedRequest, + cmp.AllowUnexported(tt.expectedRequest), + cmpopts.EquateComparable(testCtx), + ) + if diff != "" { + t.Fatalf("Data does not match: %s", diff) + } + }) + } +} + +func TestOutputResult(t *testing.T) { + type args struct { + outputFormat string + accessTokens []logs.AccessToken + } + tests := []struct { + name string + args args + wantErr bool + }{ + { + name: "base", + args: args{ + accessTokens: []logs.AccessToken{ + logs.AccessToken{ + Id: utils.Ptr(uuid.NewString()), + Permissions: utils.Ptr([]string{ + "read", + "write", + }), + DisplayName: utils.Ptr("Token"), + AccessToken: utils.Ptr("Secret access token"), + Creator: utils.Ptr(uuid.NewString()), + Expires: utils.Ptr(false), + Status: utils.Ptr(logs.ACCESSTOKENSTATUS_ACTIVE), + }, + }, + }, + wantErr: false, + }, + { + name: "set empty access token", + args: args{ + accessTokens: []logs.AccessToken{ + logs.AccessToken{}, + }, + }, + wantErr: false, + }, + { + name: "empty", + args: args{}, + wantErr: false, + }, + } + p := print.NewPrinter() + p.Cmd = NewCmd(&types.CmdParams{Printer: p}) + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + if err := outputResult(p, tt.args.outputFormat, tt.args.accessTokens); (err != nil) != tt.wantErr { + t.Errorf("outputResult() error = %v, wantErr %v", err, tt.wantErr) + } + }) + } +} diff --git a/internal/cmd/beta/logs/access_token/update/update_test.go b/internal/cmd/beta/logs/access_token/update/update_test.go new file mode 100644 index 000000000..fa458e5fc --- /dev/null +++ b/internal/cmd/beta/logs/access_token/update/update_test.go @@ -0,0 +1,277 @@ +package update + +import ( + "context" + "testing" + + "github.com/stackitcloud/stackit-cli/internal/pkg/types" + + "github.com/stackitcloud/stackit-cli/internal/pkg/globalflags" + "github.com/stackitcloud/stackit-cli/internal/pkg/print" + "github.com/stackitcloud/stackit-cli/internal/pkg/utils" + + "github.com/google/go-cmp/cmp" + "github.com/google/go-cmp/cmp/cmpopts" + "github.com/google/uuid" + "github.com/stackitcloud/stackit-sdk-go/services/logs" +) + +const ( + testRegion = "eu01" + + testDisplayName = "display-name" + testDescription = "description" +) + +type testCtxKey struct{} + +var ( + testCtx = context.WithValue(context.Background(), testCtxKey{}, "foo") + testClient = &logs.APIClient{} + + testProjectId = uuid.NewString() + testInstanceId = uuid.NewString() + testAccessTokenId = uuid.NewString() +) + +func fixtureArgValues(mods ...func(argValues []string)) []string { + argValues := []string{ + testAccessTokenId, + } + for _, mod := range mods { + mod(argValues) + } + return argValues +} + +func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]string { + flagValues := map[string]string{ + globalflags.ProjectIdFlag: testProjectId, + globalflags.RegionFlag: testRegion, + + instanceIdFlag: testInstanceId, + displayNameFlag: testDisplayName, + descriptionFlag: testDescription, + } + for _, mod := range mods { + mod(flagValues) + } + return flagValues +} + +func fixtureInputModel(mods ...func(model *inputModel)) *inputModel { + model := &inputModel{ + GlobalFlagModel: &globalflags.GlobalFlagModel{ + Verbosity: globalflags.VerbosityDefault, + ProjectId: testProjectId, + Region: testRegion, + }, + + InstanceId: testInstanceId, + AccessTokenId: testAccessTokenId, + DisplayName: utils.Ptr(testDisplayName), + Description: utils.Ptr(testDescription), + } + for _, mod := range mods { + mod(model) + } + return model +} + +func fixtureRequest(mods ...func(request *logs.ApiUpdateAccessTokenRequest)) logs.ApiUpdateAccessTokenRequest { + request := testClient.UpdateAccessToken(testCtx, testProjectId, testRegion, testInstanceId, testAccessTokenId) + request = request.UpdateAccessTokenPayload(fixturePayload()) + for _, mod := range mods { + mod(&request) + } + return request +} + +func fixturePayload(mods ...func(payload *logs.UpdateAccessTokenPayload)) logs.UpdateAccessTokenPayload { + payload := logs.UpdateAccessTokenPayload{ + DisplayName: utils.Ptr(testDisplayName), + Description: utils.Ptr(testDescription), + } + for _, mod := range mods { + mod(&payload) + } + return payload +} + +func TestParseInput(t *testing.T) { + tests := []struct { + description string + argValues []string + flagValues map[string]string + isValid bool + expectedModel *inputModel + }{ + { + description: "base", + argValues: fixtureArgValues(), + flagValues: fixtureFlagValues(), + isValid: true, + expectedModel: fixtureInputModel(), + }, + { + description: "required only", + argValues: fixtureArgValues(), + flagValues: fixtureFlagValues(func(flagValues map[string]string) { + delete(flagValues, displayNameFlag) + delete(flagValues, descriptionFlag) + }), + isValid: true, + expectedModel: fixtureInputModel(func(model *inputModel) { + model.DisplayName = nil + model.Description = nil + }), + }, + { + description: "no values", + argValues: []string{}, + flagValues: map[string]string{}, + isValid: false, + }, + { + description: "project id missing", + argValues: fixtureArgValues(), + flagValues: fixtureFlagValues(func(flagValues map[string]string) { + delete(flagValues, globalflags.ProjectIdFlag) + }), + isValid: false, + }, + { + description: "project id invalid 1", + argValues: fixtureArgValues(), + flagValues: fixtureFlagValues(func(flagValues map[string]string) { + flagValues[globalflags.ProjectIdFlag] = "" + }), + isValid: false, + }, + { + description: "project id invalid 2", + argValues: fixtureArgValues(), + flagValues: fixtureFlagValues(func(flagValues map[string]string) { + flagValues[globalflags.ProjectIdFlag] = "invalid-uuid" + }), + isValid: false, + }, + { + description: "instance id missing", + argValues: fixtureArgValues(), + flagValues: fixtureFlagValues(func(flagValues map[string]string) { + delete(flagValues, instanceIdFlag) + }), + isValid: false, + }, + { + description: "instance id invalid 1", + argValues: fixtureArgValues(), + flagValues: fixtureFlagValues(func(flagValues map[string]string) { + flagValues[instanceIdFlag] = "" + }), + isValid: false, + }, + { + description: "instance id invalid 2", + argValues: fixtureArgValues(), + flagValues: fixtureFlagValues(func(flagValues map[string]string) { + flagValues[instanceIdFlag] = "invalid-uuid" + }), + isValid: false, + }, + { + description: "access token id invalid 1", + argValues: []string{}, + flagValues: fixtureFlagValues(), + isValid: false, + }, + { + description: "access token id invalid 2", + argValues: []string{"invalid-uuid"}, + flagValues: fixtureFlagValues(), + isValid: false, + }, + } + + for _, tt := range tests { + t.Run(tt.description, func(t *testing.T) { + p := print.NewPrinter() + cmd := NewCmd(&types.CmdParams{Printer: p}) + err := globalflags.Configure(cmd.Flags()) + if err != nil { + t.Fatalf("configure global flags: %v", err) + } + + for flag, value := range tt.flagValues { + err := cmd.Flags().Set(flag, value) + if err != nil { + if !tt.isValid { + return + } + t.Fatalf("setting flag --%s=%s: %v", flag, value, err) + } + } + + err = cmd.ValidateRequiredFlags() + if err != nil { + if !tt.isValid { + return + } + t.Fatalf("error validating flags: %v", err) + } + + err = cmd.ValidateArgs(tt.argValues) + if err != nil { + if !tt.isValid { + return + } + t.Fatalf("error validating args: %v", err) + } + + model, err := parseInput(p, cmd, tt.argValues) + if err != nil { + if !tt.isValid { + return + } + t.Fatalf("error parsing flags: %v", err) + } + + if !tt.isValid { + t.Fatalf("did not fail on invalid input") + } + diff := cmp.Diff(model, tt.expectedModel) + if diff != "" { + t.Fatalf("Data does not match: %s", diff) + } + }) + } +} + +func TestBuildRequest(t *testing.T) { + tests := []struct { + description string + model *inputModel + expectedRequest logs.ApiUpdateAccessTokenRequest + }{ + { + description: "base", + model: fixtureInputModel(), + expectedRequest: fixtureRequest(), + }, + } + + for _, tt := range tests { + t.Run(tt.description, func(t *testing.T) { + request := buildRequest(testCtx, tt.model, testClient) + + diff := cmp.Diff(request, tt.expectedRequest, + cmp.AllowUnexported(tt.expectedRequest), + cmpopts.EquateComparable(testCtx), + ) + if diff != "" { + t.Fatalf("Data does not match: %s", diff) + } + }) + } +} From dda5343d333636c728009b14217e300505e301e6 Mon Sep 17 00:00:00 2001 From: Manuel Vaas Date: Wed, 11 Feb 2026 14:07:27 +0100 Subject: [PATCH 07/13] fixed nil pointer in create --- internal/cmd/beta/logs/access_token/create/create.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/internal/cmd/beta/logs/access_token/create/create.go b/internal/cmd/beta/logs/access_token/create/create.go index 9429c2a3e..9662c6c35 100644 --- a/internal/cmd/beta/logs/access_token/create/create.go +++ b/internal/cmd/beta/logs/access_token/create/create.go @@ -5,6 +5,7 @@ import ( "fmt" "github.com/stackitcloud/stackit-cli/internal/pkg/types" + "github.com/stackitcloud/stackit-cli/internal/pkg/utils" "github.com/stackitcloud/stackit-cli/internal/pkg/args" cliErr "github.com/stackitcloud/stackit-cli/internal/pkg/errors" @@ -154,7 +155,7 @@ func outputResult(p *print.Printer, outputFormat, instanceLabel string, accessTo return fmt.Errorf("access token cannot be nil") } return p.OutputResult(outputFormat, accessToken, func() error { - p.Outputf("Created access token for log instance %q.\n\nID: %s\nToken: %s\n", instanceLabel, *accessToken.Id, *accessToken.AccessToken) + p.Outputf("Created access token for log instance %q.\n\nID: %s\nToken: %s\n", instanceLabel, utils.PtrValue(accessToken.Id), utils.PtrValue(accessToken.AccessToken)) return nil }) } From d4bf7d2e94a81c9c0de61504c067b806d63e4ddc Mon Sep 17 00:00:00 2001 From: Manuel Vaas Date: Wed, 11 Feb 2026 14:11:43 +0100 Subject: [PATCH 08/13] fixed json/yaml for list --- .../cmd/beta/logs/access_token/list/list.go | 25 ++++++++++--------- .../beta/logs/access_token/list/list_test.go | 3 ++- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/internal/cmd/beta/logs/access_token/list/list.go b/internal/cmd/beta/logs/access_token/list/list.go index 5a46419b0..e26fb5c1f 100644 --- a/internal/cmd/beta/logs/access_token/list/list.go +++ b/internal/cmd/beta/logs/access_token/list/list.go @@ -72,16 +72,12 @@ func NewCmd(params *types.CmdParams) *cobra.Command { return fmt.Errorf("list access tokens: %w", err) } - if resp.Tokens == nil || len(*resp.Tokens) == 0 { - projectLabel, err := projectname.GetProjectName(ctx, params.Printer, params.CliVersion, cmd) - if err != nil { - params.Printer.Debug(print.ErrorLevel, "get project name: %v", err) - projectLabel = model.ProjectId - } else if projectLabel == "" { - projectLabel = model.ProjectId - } - params.Printer.Outputf("No access token found for project %q\n", projectLabel) - return nil + projectLabel, err := projectname.GetProjectName(ctx, params.Printer, params.CliVersion, cmd) + if err != nil { + params.Printer.Debug(print.ErrorLevel, "get project name: %v", err) + projectLabel = model.ProjectId + } else if projectLabel == "" { + projectLabel = model.ProjectId } // Truncate output @@ -90,7 +86,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command { items = items[:*model.Limit] } - return outputResult(params.Printer, model.OutputFormat, items) + return outputResult(params.Printer, model.OutputFormat, items, projectLabel) }, } configureFlags(cmd) @@ -133,8 +129,13 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *logs.APICli return apiClient.ListAccessTokens(ctx, model.ProjectId, model.Region, model.InstanceId) } -func outputResult(p *print.Printer, outputFormat string, tokens []logs.AccessToken) error { +func outputResult(p *print.Printer, outputFormat string, tokens []logs.AccessToken, projectLabel string) error { return p.OutputResult(outputFormat, tokens, func() error { + if len(tokens) == 0 { + p.Outputf("No access token found for project %q\n", projectLabel) + return nil + } + table := tables.NewTable() table.SetHeader("ID", "NAME", "DESCRIPTION", "PERMISSIONS", "VALID UNTIL", "STATUS") diff --git a/internal/cmd/beta/logs/access_token/list/list_test.go b/internal/cmd/beta/logs/access_token/list/list_test.go index 6ff348e3c..f0257cd7a 100644 --- a/internal/cmd/beta/logs/access_token/list/list_test.go +++ b/internal/cmd/beta/logs/access_token/list/list_test.go @@ -186,6 +186,7 @@ func TestOutputResult(t *testing.T) { type args struct { outputFormat string accessTokens []logs.AccessToken + projectLabel string } tests := []struct { name string @@ -231,7 +232,7 @@ func TestOutputResult(t *testing.T) { p.Cmd = NewCmd(&types.CmdParams{Printer: p}) for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - if err := outputResult(p, tt.args.outputFormat, tt.args.accessTokens); (err != nil) != tt.wantErr { + if err := outputResult(p, tt.args.outputFormat, tt.args.accessTokens, tt.args.projectLabel); (err != nil) != tt.wantErr { t.Errorf("outputResult() error = %v, wantErr %v", err, tt.wantErr) } }) From 683b0d4b150ade70965cf0bae8be691879141f31 Mon Sep 17 00:00:00 2001 From: Manuel Vaas Date: Wed, 11 Feb 2026 14:25:06 +0100 Subject: [PATCH 09/13] formatting and generated docs --- docs/stackit_beta_logs_access-token_delete-all-expired.md | 2 +- docs/stackit_beta_logs_access-token_delete-all.md | 2 +- docs/stackit_beta_logs_access-token_delete.md | 4 ++-- docs/stackit_beta_logs_access-token_update.md | 4 ++-- internal/cmd/beta/logs/access_token/list/list_test.go | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/stackit_beta_logs_access-token_delete-all-expired.md b/docs/stackit_beta_logs_access-token_delete-all-expired.md index 63df756e9..639527019 100644 --- a/docs/stackit_beta_logs_access-token_delete-all-expired.md +++ b/docs/stackit_beta_logs_access-token_delete-all-expired.md @@ -14,7 +14,7 @@ stackit beta logs access-token delete-all-expired [flags] ``` Delete all expired access tokens in instance "xxx" - $ stackit logs access-token delete --instance-id xxx + $ stackit logs access-token delete-all-expired --instance-id xxx ``` ### Options diff --git a/docs/stackit_beta_logs_access-token_delete-all.md b/docs/stackit_beta_logs_access-token_delete-all.md index 8d97fcaf3..81e1d4a84 100644 --- a/docs/stackit_beta_logs_access-token_delete-all.md +++ b/docs/stackit_beta_logs_access-token_delete-all.md @@ -14,7 +14,7 @@ stackit beta logs access-token delete-all [flags] ``` Delete all access tokens in instance "xxx" - $ stackit logs access-token delete --instance-id xxx + $ stackit logs access-token delete-all --instance-id xxx ``` ### Options diff --git a/docs/stackit_beta_logs_access-token_delete.md b/docs/stackit_beta_logs_access-token_delete.md index 62d04c817..e21ed64dd 100644 --- a/docs/stackit_beta_logs_access-token_delete.md +++ b/docs/stackit_beta_logs_access-token_delete.md @@ -13,8 +13,8 @@ stackit beta logs access-token delete ACCESS_TOKEN_ID [flags] ### Examples ``` - Delete access token with ID "xxx" - $ stackit logs access-token delete xxx + Delete access token with ID "xxx" in instance "yyy" + $ stackit logs access-token delete xxx --instance-id yyy ``` ### Options diff --git a/docs/stackit_beta_logs_access-token_update.md b/docs/stackit_beta_logs_access-token_update.md index cd7c76c9b..642659b6a 100644 --- a/docs/stackit_beta_logs_access-token_update.md +++ b/docs/stackit_beta_logs_access-token_update.md @@ -14,10 +14,10 @@ stackit beta logs access-token update ACCESS_TOKEN_ID [flags] ``` Update access token with ID "xxx" with new name "access-token-1" - $ stackit logs access-token update xxx --display-name access-token-1 + $ stackit logs access-token update xxx --instance-id yyy --display-name access-token-1 Update access token with ID "xxx" with new description "Access token for Service XY" - $ stackit logs access-token update xxx --description "Access token for Service XY" + $ stackit logs access-token update xxx --instance-id yyy --description "Access token for Service XY" ``` ### Options diff --git a/internal/cmd/beta/logs/access_token/list/list_test.go b/internal/cmd/beta/logs/access_token/list/list_test.go index f0257cd7a..41c8c2b29 100644 --- a/internal/cmd/beta/logs/access_token/list/list_test.go +++ b/internal/cmd/beta/logs/access_token/list/list_test.go @@ -197,7 +197,7 @@ func TestOutputResult(t *testing.T) { name: "base", args: args{ accessTokens: []logs.AccessToken{ - logs.AccessToken{ + { Id: utils.Ptr(uuid.NewString()), Permissions: utils.Ptr([]string{ "read", @@ -217,7 +217,7 @@ func TestOutputResult(t *testing.T) { name: "set empty access token", args: args{ accessTokens: []logs.AccessToken{ - logs.AccessToken{}, + {}, }, }, wantErr: false, From 14b7c0b1c57148e97c96c3c2dbcf898e68dc3522 Mon Sep 17 00:00:00 2001 From: Manuel Vaas Date: Wed, 11 Feb 2026 16:21:47 +0100 Subject: [PATCH 10/13] resolved comment --- internal/cmd/logs/access_token/create/create.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/internal/cmd/logs/access_token/create/create.go b/internal/cmd/logs/access_token/create/create.go index 9662c6c35..d8130188c 100644 --- a/internal/cmd/logs/access_token/create/create.go +++ b/internal/cmd/logs/access_token/create/create.go @@ -98,10 +98,6 @@ func NewCmd(params *types.CmdParams) *cobra.Command { return fmt.Errorf("create log access-token : %w", err) } - if resp == nil || resp.Id == nil { - return fmt.Errorf("create log access-token : empty response") - } - return outputResult(params.Printer, model.OutputFormat, instanceLabel, resp) }, } From 195b000abb4ac829d93eaea981cc3a4f2ac43597 Mon Sep 17 00:00:00 2001 From: Manuel Vaas Date: Wed, 11 Feb 2026 17:11:28 +0100 Subject: [PATCH 11/13] renamed log -> logs --- docs/stackit_logs_access-token.md | 8 ++++---- docs/stackit_logs_access-token_create.md | 4 ++-- docs/stackit_logs_access-token_delete-all-expired.md | 4 ++-- docs/stackit_logs_access-token_delete-all.md | 4 ++-- docs/stackit_logs_access-token_delete.md | 4 ++-- internal/cmd/logs/access_token/create/create.go | 10 +++++----- internal/cmd/logs/access_token/delete/delete.go | 4 ++-- .../cmd/logs/access_token/delete_all/delete_all.go | 4 ++-- .../delete_all_expired/delete_all_expired.go | 4 ++-- internal/cmd/logs/access_token/update/update.go | 2 +- 10 files changed, 24 insertions(+), 24 deletions(-) diff --git a/docs/stackit_logs_access-token.md b/docs/stackit_logs_access-token.md index 820f00ca2..10c70992b 100644 --- a/docs/stackit_logs_access-token.md +++ b/docs/stackit_logs_access-token.md @@ -30,10 +30,10 @@ stackit logs access-token [flags] ### SEE ALSO * [stackit logs](./stackit_logs.md) - Provides functionality for Logs -* [stackit logs access-token create](./stackit_logs_access-token_create.md) - Creates a log access token -* [stackit logs access-token delete](./stackit_logs_access-token_delete.md) - Deletes a log access token -* [stackit logs access-token delete-all](./stackit_logs_access-token_delete-all.md) - Deletes all log access token -* [stackit logs access-token delete-all-expired](./stackit_logs_access-token_delete-all-expired.md) - Deletes all expired log access token +* [stackit logs access-token create](./stackit_logs_access-token_create.md) - Creates a logs access token +* [stackit logs access-token delete](./stackit_logs_access-token_delete.md) - Deletes a logs access token +* [stackit logs access-token delete-all](./stackit_logs_access-token_delete-all.md) - Deletes all logs access token +* [stackit logs access-token delete-all-expired](./stackit_logs_access-token_delete-all-expired.md) - Deletes all expired logs access token * [stackit logs access-token describe](./stackit_logs_access-token_describe.md) - Shows details of a logs access token * [stackit logs access-token list](./stackit_logs_access-token_list.md) - Lists all access tokens of a project * [stackit logs access-token update](./stackit_logs_access-token_update.md) - Updates a access token diff --git a/docs/stackit_logs_access-token_create.md b/docs/stackit_logs_access-token_create.md index 76e9ab143..cf41b2699 100644 --- a/docs/stackit_logs_access-token_create.md +++ b/docs/stackit_logs_access-token_create.md @@ -1,10 +1,10 @@ ## stackit logs access-token create -Creates a log access token +Creates a logs access token ### Synopsis -Creates a log access token. +Creates a logs access token. ``` stackit logs access-token create [flags] diff --git a/docs/stackit_logs_access-token_delete-all-expired.md b/docs/stackit_logs_access-token_delete-all-expired.md index 50f3ab890..110cea228 100644 --- a/docs/stackit_logs_access-token_delete-all-expired.md +++ b/docs/stackit_logs_access-token_delete-all-expired.md @@ -1,10 +1,10 @@ ## stackit logs access-token delete-all-expired -Deletes all expired log access token +Deletes all expired logs access token ### Synopsis -Deletes all expired log access token. +Deletes all expired logs access token. ``` stackit logs access-token delete-all-expired [flags] diff --git a/docs/stackit_logs_access-token_delete-all.md b/docs/stackit_logs_access-token_delete-all.md index 0bf6f658b..e391c4671 100644 --- a/docs/stackit_logs_access-token_delete-all.md +++ b/docs/stackit_logs_access-token_delete-all.md @@ -1,10 +1,10 @@ ## stackit logs access-token delete-all -Deletes all log access token +Deletes all logs access token ### Synopsis -Deletes all log access token. +Deletes all logs access token. ``` stackit logs access-token delete-all [flags] diff --git a/docs/stackit_logs_access-token_delete.md b/docs/stackit_logs_access-token_delete.md index 410758513..e0c9ac47a 100644 --- a/docs/stackit_logs_access-token_delete.md +++ b/docs/stackit_logs_access-token_delete.md @@ -1,10 +1,10 @@ ## stackit logs access-token delete -Deletes a log access token +Deletes a logs access token ### Synopsis -Deletes a log access token. +Deletes a logs access token. ``` stackit logs access-token delete ACCESS_TOKEN_ID [flags] diff --git a/internal/cmd/logs/access_token/create/create.go b/internal/cmd/logs/access_token/create/create.go index d8130188c..82932de42 100644 --- a/internal/cmd/logs/access_token/create/create.go +++ b/internal/cmd/logs/access_token/create/create.go @@ -41,8 +41,8 @@ type inputModel struct { func NewCmd(params *types.CmdParams) *cobra.Command { cmd := &cobra.Command{ Use: "create", - Short: "Creates a log access token", - Long: "Creates a log access token.", + Short: "Creates a logs access token", + Long: "Creates a logs access token.", Args: args.NoArgs, Example: examples.Build( examples.NewExample( @@ -85,7 +85,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command { instanceLabel = model.InstanceId } - prompt := fmt.Sprintf("Are you sure you want to create a access token for the log instance %q in the project %q?", instanceLabel, projectLabel) + prompt := fmt.Sprintf("Are you sure you want to create a access token for the logs instance %q in the project %q?", instanceLabel, projectLabel) err = params.Printer.PromptForConfirmation(prompt) if err != nil { return err @@ -95,7 +95,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command { req := buildRequest(ctx, model, apiClient) resp, err := req.Execute() if err != nil { - return fmt.Errorf("create log access-token : %w", err) + return fmt.Errorf("create logs access-token : %w", err) } return outputResult(params.Printer, model.OutputFormat, instanceLabel, resp) @@ -151,7 +151,7 @@ func outputResult(p *print.Printer, outputFormat, instanceLabel string, accessTo return fmt.Errorf("access token cannot be nil") } return p.OutputResult(outputFormat, accessToken, func() error { - p.Outputf("Created access token for log instance %q.\n\nID: %s\nToken: %s\n", instanceLabel, utils.PtrValue(accessToken.Id), utils.PtrValue(accessToken.AccessToken)) + p.Outputf("Created access token for logs instance %q.\n\nID: %s\nToken: %s\n", instanceLabel, utils.PtrValue(accessToken.Id), utils.PtrValue(accessToken.AccessToken)) return nil }) } diff --git a/internal/cmd/logs/access_token/delete/delete.go b/internal/cmd/logs/access_token/delete/delete.go index 23343ab1c..e72d0f863 100644 --- a/internal/cmd/logs/access_token/delete/delete.go +++ b/internal/cmd/logs/access_token/delete/delete.go @@ -34,8 +34,8 @@ type inputModel struct { func NewCmd(params *types.CmdParams) *cobra.Command { cmd := &cobra.Command{ Use: fmt.Sprintf("delete %s", accessTokenIdArg), - Short: "Deletes a log access token", - Long: "Deletes a log access token.", + Short: "Deletes a logs access token", + Long: "Deletes a logs access token.", Args: args.SingleArg(accessTokenIdArg, utils.ValidateUUID), Example: examples.Build( examples.NewExample( diff --git a/internal/cmd/logs/access_token/delete_all/delete_all.go b/internal/cmd/logs/access_token/delete_all/delete_all.go index 21edb9191..a19879840 100644 --- a/internal/cmd/logs/access_token/delete_all/delete_all.go +++ b/internal/cmd/logs/access_token/delete_all/delete_all.go @@ -31,8 +31,8 @@ type inputModel struct { func NewCmd(params *types.CmdParams) *cobra.Command { cmd := &cobra.Command{ Use: "delete-all", - Short: "Deletes all log access token", - Long: "Deletes all log access token.", + Short: "Deletes all logs access token", + Long: "Deletes all logs access token.", Args: args.NoArgs, Example: examples.Build( examples.NewExample( diff --git a/internal/cmd/logs/access_token/delete_all_expired/delete_all_expired.go b/internal/cmd/logs/access_token/delete_all_expired/delete_all_expired.go index 2f07d9ded..74dedd727 100644 --- a/internal/cmd/logs/access_token/delete_all_expired/delete_all_expired.go +++ b/internal/cmd/logs/access_token/delete_all_expired/delete_all_expired.go @@ -31,8 +31,8 @@ type inputModel struct { func NewCmd(params *types.CmdParams) *cobra.Command { cmd := &cobra.Command{ Use: "delete-all-expired", - Short: "Deletes all expired log access token", - Long: "Deletes all expired log access token.", + Short: "Deletes all expired logs access token", + Long: "Deletes all expired logs access token.", Args: args.NoArgs, Example: examples.Build( examples.NewExample( diff --git a/internal/cmd/logs/access_token/update/update.go b/internal/cmd/logs/access_token/update/update.go index c63fa040b..beb442fc0 100644 --- a/internal/cmd/logs/access_token/update/update.go +++ b/internal/cmd/logs/access_token/update/update.go @@ -67,7 +67,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command { // Get the display name for confirmation instanceLabel, err := logUtils.GetInstanceName(ctx, apiClient, model.ProjectId, model.Region, model.InstanceId) if err != nil { - params.Printer.Debug(print.ErrorLevel, "get log instance: %v", err) + params.Printer.Debug(print.ErrorLevel, "get logs instance: %v", err) } if instanceLabel == "" { instanceLabel = model.InstanceId From a728c2b0ba2f10e9d528a6170356214169927033 Mon Sep 17 00:00:00 2001 From: Manuel Vaas Date: Wed, 11 Feb 2026 17:26:10 +0100 Subject: [PATCH 12/13] resolved comments --- internal/cmd/logs/access_token/create/create.go | 12 ++++++------ internal/cmd/logs/access_token/delete/delete.go | 6 +++--- .../cmd/logs/access_token/delete_all/delete_all.go | 13 +++++++------ .../delete_all_expired/delete_all_expired.go | 13 +++++++------ internal/cmd/logs/access_token/describe/describe.go | 10 +++++----- internal/cmd/logs/access_token/list/list.go | 4 ++-- internal/cmd/logs/access_token/update/update.go | 4 ++-- 7 files changed, 32 insertions(+), 30 deletions(-) diff --git a/internal/cmd/logs/access_token/create/create.go b/internal/cmd/logs/access_token/create/create.go index 82932de42..452342b3d 100644 --- a/internal/cmd/logs/access_token/create/create.go +++ b/internal/cmd/logs/access_token/create/create.go @@ -41,8 +41,8 @@ type inputModel struct { func NewCmd(params *types.CmdParams) *cobra.Command { cmd := &cobra.Command{ Use: "create", - Short: "Creates a logs access token", - Long: "Creates a logs access token.", + Short: "Creates a Logs access token", + Long: "Creates a Logs access token.", Args: args.NoArgs, Example: examples.Build( examples.NewExample( @@ -85,7 +85,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command { instanceLabel = model.InstanceId } - prompt := fmt.Sprintf("Are you sure you want to create a access token for the logs instance %q in the project %q?", instanceLabel, projectLabel) + prompt := fmt.Sprintf("Are you sure you want to create a access token for the Logs instance %q in the project %q?", instanceLabel, projectLabel) err = params.Printer.PromptForConfirmation(prompt) if err != nil { return err @@ -95,7 +95,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command { req := buildRequest(ctx, model, apiClient) resp, err := req.Execute() if err != nil { - return fmt.Errorf("create logs access-token : %w", err) + return fmt.Errorf("create Logs access-token : %w", err) } return outputResult(params.Printer, model.OutputFormat, instanceLabel, resp) @@ -106,7 +106,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command { } func configureFlags(cmd *cobra.Command) { - cmd.Flags().Var(flags.UUIDFlag(), instanceIdFlag, "ID of the logs instance") + cmd.Flags().Var(flags.UUIDFlag(), instanceIdFlag, "ID of the Logs instance") cmd.Flags().String(displayNameFlag, "", "Display name for the access token") cmd.Flags().String(descriptionFlag, "", "Description of the access token") cmd.Flags().Int64(lifetimeFlag, 0, "Lifetime of the access token in days [1 - 180]") @@ -151,7 +151,7 @@ func outputResult(p *print.Printer, outputFormat, instanceLabel string, accessTo return fmt.Errorf("access token cannot be nil") } return p.OutputResult(outputFormat, accessToken, func() error { - p.Outputf("Created access token for logs instance %q.\n\nID: %s\nToken: %s\n", instanceLabel, utils.PtrValue(accessToken.Id), utils.PtrValue(accessToken.AccessToken)) + p.Outputf("Created access token for Logs instance %q.\n\nID: %s\nToken: %s\n", instanceLabel, utils.PtrValue(accessToken.Id), utils.PtrValue(accessToken.AccessToken)) return nil }) } diff --git a/internal/cmd/logs/access_token/delete/delete.go b/internal/cmd/logs/access_token/delete/delete.go index e72d0f863..77b4777dc 100644 --- a/internal/cmd/logs/access_token/delete/delete.go +++ b/internal/cmd/logs/access_token/delete/delete.go @@ -34,8 +34,8 @@ type inputModel struct { func NewCmd(params *types.CmdParams) *cobra.Command { cmd := &cobra.Command{ Use: fmt.Sprintf("delete %s", accessTokenIdArg), - Short: "Deletes a logs access token", - Long: "Deletes a logs access token.", + Short: "Deletes a Logs access token", + Long: "Deletes a Logs access token.", Args: args.SingleArg(accessTokenIdArg, utils.ValidateUUID), Example: examples.Build( examples.NewExample( @@ -87,7 +87,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command { } func configureFlags(cmd *cobra.Command) { - cmd.Flags().Var(flags.UUIDFlag(), instanceIdFlag, "ID of the logs instance") + cmd.Flags().Var(flags.UUIDFlag(), instanceIdFlag, "ID of the Logs instance") err := flags.MarkFlagsRequired(cmd, instanceIdFlag) cobra.CheckErr(err) diff --git a/internal/cmd/logs/access_token/delete_all/delete_all.go b/internal/cmd/logs/access_token/delete_all/delete_all.go index a19879840..876082a6a 100644 --- a/internal/cmd/logs/access_token/delete_all/delete_all.go +++ b/internal/cmd/logs/access_token/delete_all/delete_all.go @@ -7,6 +7,7 @@ import ( "github.com/stackitcloud/stackit-cli/internal/pkg/args" "github.com/stackitcloud/stackit-cli/internal/pkg/flags" "github.com/stackitcloud/stackit-cli/internal/pkg/types" + "github.com/stackitcloud/stackit-cli/internal/pkg/utils" "github.com/stackitcloud/stackit-sdk-go/services/logs" "github.com/stackitcloud/stackit-cli/internal/pkg/errors" @@ -14,7 +15,7 @@ import ( "github.com/stackitcloud/stackit-cli/internal/pkg/globalflags" "github.com/stackitcloud/stackit-cli/internal/pkg/print" "github.com/stackitcloud/stackit-cli/internal/pkg/services/logs/client" - "github.com/stackitcloud/stackit-cli/internal/pkg/services/logs/utils" + logUtils "github.com/stackitcloud/stackit-cli/internal/pkg/services/logs/utils" "github.com/spf13/cobra" ) @@ -31,8 +32,8 @@ type inputModel struct { func NewCmd(params *types.CmdParams) *cobra.Command { cmd := &cobra.Command{ Use: "delete-all", - Short: "Deletes all logs access token", - Long: "Deletes all logs access token.", + Short: "Deletes all Logs access token", + Long: "Deletes all Logs access token.", Args: args.NoArgs, Example: examples.Build( examples.NewExample( @@ -53,7 +54,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command { return err } - instanceLabel, err := utils.GetInstanceName(ctx, apiClient, model.ProjectId, model.Region, model.InstanceId) + instanceLabel, err := logUtils.GetInstanceName(ctx, apiClient, model.ProjectId, model.Region, model.InstanceId) if err != nil { params.Printer.Debug(print.ErrorLevel, "get instance name: %v", err) instanceLabel = model.InstanceId @@ -72,7 +73,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command { return fmt.Errorf("delete access token: %w", err) } - params.Printer.Outputf("Deleted %d access token(s)\n", len(*items.Tokens)) + params.Printer.Outputf("Deleted %d access token(s)\n", len(utils.PtrValue(items.Tokens))) return nil }, } @@ -81,7 +82,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command { } func configureFlags(cmd *cobra.Command) { - cmd.Flags().Var(flags.UUIDFlag(), instanceIdFlag, "ID of the logs instance") + cmd.Flags().Var(flags.UUIDFlag(), instanceIdFlag, "ID of the Logs instance") err := flags.MarkFlagsRequired(cmd, instanceIdFlag) cobra.CheckErr(err) diff --git a/internal/cmd/logs/access_token/delete_all_expired/delete_all_expired.go b/internal/cmd/logs/access_token/delete_all_expired/delete_all_expired.go index 74dedd727..e74438f2e 100644 --- a/internal/cmd/logs/access_token/delete_all_expired/delete_all_expired.go +++ b/internal/cmd/logs/access_token/delete_all_expired/delete_all_expired.go @@ -7,6 +7,7 @@ import ( "github.com/stackitcloud/stackit-cli/internal/pkg/args" "github.com/stackitcloud/stackit-cli/internal/pkg/flags" "github.com/stackitcloud/stackit-cli/internal/pkg/types" + "github.com/stackitcloud/stackit-cli/internal/pkg/utils" "github.com/stackitcloud/stackit-sdk-go/services/logs" "github.com/stackitcloud/stackit-cli/internal/pkg/errors" @@ -14,7 +15,7 @@ import ( "github.com/stackitcloud/stackit-cli/internal/pkg/globalflags" "github.com/stackitcloud/stackit-cli/internal/pkg/print" "github.com/stackitcloud/stackit-cli/internal/pkg/services/logs/client" - "github.com/stackitcloud/stackit-cli/internal/pkg/services/logs/utils" + logUtils "github.com/stackitcloud/stackit-cli/internal/pkg/services/logs/utils" "github.com/spf13/cobra" ) @@ -31,8 +32,8 @@ type inputModel struct { func NewCmd(params *types.CmdParams) *cobra.Command { cmd := &cobra.Command{ Use: "delete-all-expired", - Short: "Deletes all expired logs access token", - Long: "Deletes all expired logs access token.", + Short: "Deletes all expired Logs access token", + Long: "Deletes all expired Logs access token.", Args: args.NoArgs, Example: examples.Build( examples.NewExample( @@ -53,7 +54,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command { return err } - instanceLabel, err := utils.GetInstanceName(ctx, apiClient, model.ProjectId, model.Region, model.InstanceId) + instanceLabel, err := logUtils.GetInstanceName(ctx, apiClient, model.ProjectId, model.Region, model.InstanceId) if err != nil { params.Printer.Debug(print.ErrorLevel, "get instance name: %v", err) instanceLabel = model.InstanceId @@ -72,7 +73,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command { return fmt.Errorf("delete access token: %w", err) } - params.Printer.Outputf("Deleted %d expired access token(s)\n", len(*items.Tokens)) + params.Printer.Outputf("Deleted %d expired access token(s)\n", len(utils.PtrValue(items.Tokens))) return nil }, } @@ -81,7 +82,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command { } func configureFlags(cmd *cobra.Command) { - cmd.Flags().Var(flags.UUIDFlag(), instanceIdFlag, "ID of the logs instance") + cmd.Flags().Var(flags.UUIDFlag(), instanceIdFlag, "ID of the Logs instance") err := flags.MarkFlagsRequired(cmd, instanceIdFlag) cobra.CheckErr(err) diff --git a/internal/cmd/logs/access_token/describe/describe.go b/internal/cmd/logs/access_token/describe/describe.go index c2f1af910..21f734a51 100644 --- a/internal/cmd/logs/access_token/describe/describe.go +++ b/internal/cmd/logs/access_token/describe/describe.go @@ -34,16 +34,16 @@ type inputModel struct { func NewCmd(params *types.CmdParams) *cobra.Command { cmd := &cobra.Command{ Use: fmt.Sprintf("describe %s", accessTokenIdArg), - Short: "Shows details of a logs access token", - Long: "Shows details of a logs access token.", + Short: "Shows details of a Logs access token", + Long: "Shows details of a Logs access token.", Args: args.SingleArg(accessTokenIdArg, utils.ValidateUUID), Example: examples.Build( examples.NewExample( - `Show details of a logs access token with ID "xxx"`, + `Show details of a Logs access token with ID "xxx"`, "$ stackit logs access-token describe xxx", ), examples.NewExample( - `Show details of a logs access token with ID "xxx" in JSON format`, + `Show details of a Logs access token with ID "xxx" in JSON format`, "$ stackit logs access-token describe xxx --output-format json", ), ), @@ -75,7 +75,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command { } func configureFlags(cmd *cobra.Command) { - cmd.Flags().Var(flags.UUIDFlag(), instanceIdFlag, "ID of the logs instance") + cmd.Flags().Var(flags.UUIDFlag(), instanceIdFlag, "ID of the Logs instance") err := flags.MarkFlagsRequired(cmd, instanceIdFlag) cobra.CheckErr(err) diff --git a/internal/cmd/logs/access_token/list/list.go b/internal/cmd/logs/access_token/list/list.go index e26fb5c1f..01a60b375 100644 --- a/internal/cmd/logs/access_token/list/list.go +++ b/internal/cmd/logs/access_token/list/list.go @@ -81,7 +81,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command { } // Truncate output - items := *resp.Tokens + items := utils.PtrValue(resp.Tokens) if model.Limit != nil && len(items) > int(*model.Limit) { items = items[:*model.Limit] } @@ -95,7 +95,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command { func configureFlags(cmd *cobra.Command) { cmd.Flags().Int64(limitFlag, 0, "Maximum number of entries to list") - cmd.Flags().Var(flags.UUIDFlag(), instanceIdFlag, "ID of the logs instance") + cmd.Flags().Var(flags.UUIDFlag(), instanceIdFlag, "ID of the Logs instance") err := flags.MarkFlagsRequired(cmd, instanceIdFlag) cobra.CheckErr(err) diff --git a/internal/cmd/logs/access_token/update/update.go b/internal/cmd/logs/access_token/update/update.go index beb442fc0..2d61b5afb 100644 --- a/internal/cmd/logs/access_token/update/update.go +++ b/internal/cmd/logs/access_token/update/update.go @@ -67,7 +67,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command { // Get the display name for confirmation instanceLabel, err := logUtils.GetInstanceName(ctx, apiClient, model.ProjectId, model.Region, model.InstanceId) if err != nil { - params.Printer.Debug(print.ErrorLevel, "get logs instance: %v", err) + params.Printer.Debug(print.ErrorLevel, "get Logs instance: %v", err) } if instanceLabel == "" { instanceLabel = model.InstanceId @@ -104,7 +104,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command { } func configureFlags(cmd *cobra.Command) { - cmd.Flags().Var(flags.UUIDFlag(), instanceIdFlag, "ID of the logs instance") + cmd.Flags().Var(flags.UUIDFlag(), instanceIdFlag, "ID of the Logs instance") cmd.Flags().String(displayNameFlag, "", "Display name for the access token") cmd.Flags().String(descriptionFlag, "", "Description of the access token") From bbaab79caa48c69f19c1f82292f277cbe22e8922 Mon Sep 17 00:00:00 2001 From: Manuel Vaas Date: Wed, 11 Feb 2026 17:41:00 +0100 Subject: [PATCH 13/13] generated docs --- docs/stackit_logs_access-token.md | 10 +++++----- docs/stackit_logs_access-token_create.md | 6 +++--- docs/stackit_logs_access-token_delete-all-expired.md | 6 +++--- docs/stackit_logs_access-token_delete-all.md | 6 +++--- docs/stackit_logs_access-token_delete.md | 6 +++--- docs/stackit_logs_access-token_describe.md | 10 +++++----- docs/stackit_logs_access-token_list.md | 2 +- docs/stackit_logs_access-token_update.md | 2 +- 8 files changed, 24 insertions(+), 24 deletions(-) diff --git a/docs/stackit_logs_access-token.md b/docs/stackit_logs_access-token.md index 10c70992b..e5501892e 100644 --- a/docs/stackit_logs_access-token.md +++ b/docs/stackit_logs_access-token.md @@ -30,11 +30,11 @@ stackit logs access-token [flags] ### SEE ALSO * [stackit logs](./stackit_logs.md) - Provides functionality for Logs -* [stackit logs access-token create](./stackit_logs_access-token_create.md) - Creates a logs access token -* [stackit logs access-token delete](./stackit_logs_access-token_delete.md) - Deletes a logs access token -* [stackit logs access-token delete-all](./stackit_logs_access-token_delete-all.md) - Deletes all logs access token -* [stackit logs access-token delete-all-expired](./stackit_logs_access-token_delete-all-expired.md) - Deletes all expired logs access token -* [stackit logs access-token describe](./stackit_logs_access-token_describe.md) - Shows details of a logs access token +* [stackit logs access-token create](./stackit_logs_access-token_create.md) - Creates a Logs access token +* [stackit logs access-token delete](./stackit_logs_access-token_delete.md) - Deletes a Logs access token +* [stackit logs access-token delete-all](./stackit_logs_access-token_delete-all.md) - Deletes all Logs access token +* [stackit logs access-token delete-all-expired](./stackit_logs_access-token_delete-all-expired.md) - Deletes all expired Logs access token +* [stackit logs access-token describe](./stackit_logs_access-token_describe.md) - Shows details of a Logs access token * [stackit logs access-token list](./stackit_logs_access-token_list.md) - Lists all access tokens of a project * [stackit logs access-token update](./stackit_logs_access-token_update.md) - Updates a access token diff --git a/docs/stackit_logs_access-token_create.md b/docs/stackit_logs_access-token_create.md index cf41b2699..947260d03 100644 --- a/docs/stackit_logs_access-token_create.md +++ b/docs/stackit_logs_access-token_create.md @@ -1,10 +1,10 @@ ## stackit logs access-token create -Creates a logs access token +Creates a Logs access token ### Synopsis -Creates a logs access token. +Creates a Logs access token. ``` stackit logs access-token create [flags] @@ -29,7 +29,7 @@ stackit logs access-token create [flags] --description string Description of the access token --display-name string Display name for the access token -h, --help Help for "stackit logs access-token create" - --instance-id string ID of the logs instance + --instance-id string ID of the Logs instance --lifetime int Lifetime of the access token in days [1 - 180] --permissions strings Permissions of the access token ["read" "write"] ``` diff --git a/docs/stackit_logs_access-token_delete-all-expired.md b/docs/stackit_logs_access-token_delete-all-expired.md index 110cea228..b63792e63 100644 --- a/docs/stackit_logs_access-token_delete-all-expired.md +++ b/docs/stackit_logs_access-token_delete-all-expired.md @@ -1,10 +1,10 @@ ## stackit logs access-token delete-all-expired -Deletes all expired logs access token +Deletes all expired Logs access token ### Synopsis -Deletes all expired logs access token. +Deletes all expired Logs access token. ``` stackit logs access-token delete-all-expired [flags] @@ -21,7 +21,7 @@ stackit logs access-token delete-all-expired [flags] ``` -h, --help Help for "stackit logs access-token delete-all-expired" - --instance-id string ID of the logs instance + --instance-id string ID of the Logs instance ``` ### Options inherited from parent commands diff --git a/docs/stackit_logs_access-token_delete-all.md b/docs/stackit_logs_access-token_delete-all.md index e391c4671..de546fdef 100644 --- a/docs/stackit_logs_access-token_delete-all.md +++ b/docs/stackit_logs_access-token_delete-all.md @@ -1,10 +1,10 @@ ## stackit logs access-token delete-all -Deletes all logs access token +Deletes all Logs access token ### Synopsis -Deletes all logs access token. +Deletes all Logs access token. ``` stackit logs access-token delete-all [flags] @@ -21,7 +21,7 @@ stackit logs access-token delete-all [flags] ``` -h, --help Help for "stackit logs access-token delete-all" - --instance-id string ID of the logs instance + --instance-id string ID of the Logs instance ``` ### Options inherited from parent commands diff --git a/docs/stackit_logs_access-token_delete.md b/docs/stackit_logs_access-token_delete.md index e0c9ac47a..99d700c81 100644 --- a/docs/stackit_logs_access-token_delete.md +++ b/docs/stackit_logs_access-token_delete.md @@ -1,10 +1,10 @@ ## stackit logs access-token delete -Deletes a logs access token +Deletes a Logs access token ### Synopsis -Deletes a logs access token. +Deletes a Logs access token. ``` stackit logs access-token delete ACCESS_TOKEN_ID [flags] @@ -21,7 +21,7 @@ stackit logs access-token delete ACCESS_TOKEN_ID [flags] ``` -h, --help Help for "stackit logs access-token delete" - --instance-id string ID of the logs instance + --instance-id string ID of the Logs instance ``` ### Options inherited from parent commands diff --git a/docs/stackit_logs_access-token_describe.md b/docs/stackit_logs_access-token_describe.md index 33b45de48..1e690bcda 100644 --- a/docs/stackit_logs_access-token_describe.md +++ b/docs/stackit_logs_access-token_describe.md @@ -1,10 +1,10 @@ ## stackit logs access-token describe -Shows details of a logs access token +Shows details of a Logs access token ### Synopsis -Shows details of a logs access token. +Shows details of a Logs access token. ``` stackit logs access-token describe ACCESS_TOKEN_ID [flags] @@ -13,10 +13,10 @@ stackit logs access-token describe ACCESS_TOKEN_ID [flags] ### Examples ``` - Show details of a logs access token with ID "xxx" + Show details of a Logs access token with ID "xxx" $ stackit logs access-token describe xxx - Show details of a logs access token with ID "xxx" in JSON format + Show details of a Logs access token with ID "xxx" in JSON format $ stackit logs access-token describe xxx --output-format json ``` @@ -24,7 +24,7 @@ stackit logs access-token describe ACCESS_TOKEN_ID [flags] ``` -h, --help Help for "stackit logs access-token describe" - --instance-id string ID of the logs instance + --instance-id string ID of the Logs instance ``` ### Options inherited from parent commands diff --git a/docs/stackit_logs_access-token_list.md b/docs/stackit_logs_access-token_list.md index 1f7f577e1..0c286341b 100644 --- a/docs/stackit_logs_access-token_list.md +++ b/docs/stackit_logs_access-token_list.md @@ -27,7 +27,7 @@ stackit logs access-token list [flags] ``` -h, --help Help for "stackit logs access-token list" - --instance-id string ID of the logs instance + --instance-id string ID of the Logs instance --limit int Maximum number of entries to list ``` diff --git a/docs/stackit_logs_access-token_update.md b/docs/stackit_logs_access-token_update.md index ea275e709..e0abfebb6 100644 --- a/docs/stackit_logs_access-token_update.md +++ b/docs/stackit_logs_access-token_update.md @@ -26,7 +26,7 @@ stackit logs access-token update ACCESS_TOKEN_ID [flags] --description string Description of the access token --display-name string Display name for the access token -h, --help Help for "stackit logs access-token update" - --instance-id string ID of the logs instance + --instance-id string ID of the Logs instance ``` ### Options inherited from parent commands