Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions docs/stackit_observability_grafana_describe.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@ stackit observability grafana describe INSTANCE_ID [flags]
### Options

```
-h, --help Help for "stackit observability grafana describe"
-s, --show-password Show password in output
-h, --help Help for "stackit observability grafana describe"
```

### Options inherited from parent commands
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ require (
github.com/stackitcloud/stackit-sdk-go/services/logme v0.25.3
github.com/stackitcloud/stackit-sdk-go/services/mariadb v0.25.3
github.com/stackitcloud/stackit-sdk-go/services/objectstorage v1.4.2
github.com/stackitcloud/stackit-sdk-go/services/observability v0.15.1
github.com/stackitcloud/stackit-sdk-go/services/observability v0.16.1
github.com/stackitcloud/stackit-sdk-go/services/rabbitmq v0.25.3
github.com/stackitcloud/stackit-sdk-go/services/redis v0.25.3
github.com/stackitcloud/stackit-sdk-go/services/sfs v0.3.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -632,8 +632,8 @@ github.com/stackitcloud/stackit-sdk-go/services/mongodbflex v1.5.8 h1:S7t4wcT6SN
github.com/stackitcloud/stackit-sdk-go/services/mongodbflex v1.5.8/go.mod h1:CdrhFUsBO7/iJleCc2yQjDChIbG6YaxKNBQRNCjgcF4=
github.com/stackitcloud/stackit-sdk-go/services/objectstorage v1.4.2 h1:nsC6oA1whA4ibxEuD+0Osngmnpz8dLdV6bv+9jYP4Eo=
github.com/stackitcloud/stackit-sdk-go/services/objectstorage v1.4.2/go.mod h1:WA6QlAAQ8aaw81W0VSVoDrxOfchGkdtmn2jQL/ub/50=
github.com/stackitcloud/stackit-sdk-go/services/observability v0.15.1 h1:zk+47GhutK2ajO4Yiek0laGm2PdXvY8BvFZc8yHFnSE=
github.com/stackitcloud/stackit-sdk-go/services/observability v0.15.1/go.mod h1:vapb/sJqbHlf+c7pZWdE9GqrbyI8wesGvUc9o7oJ1Xk=
github.com/stackitcloud/stackit-sdk-go/services/observability v0.16.1 h1:FKeW3uiMXRl6Oau3xE6yBriXh4t7CwPb8QH6PR0uQXM=
github.com/stackitcloud/stackit-sdk-go/services/observability v0.16.1/go.mod h1:RiknJnL3OuU9wb2lyb80Hu+EnlyDQMG8vejDV7B9a5U=
github.com/stackitcloud/stackit-sdk-go/services/opensearch v0.24.3 h1:CAgu3Wsmo8pA1/VWqnqLftMn7X26uDs5zctTci4WG7A=
github.com/stackitcloud/stackit-sdk-go/services/opensearch v0.24.3/go.mod h1:VC3vqIQIDN+8SAzhlMdrK4eXeiSaNE1JtjIGFzpgiRI=
github.com/stackitcloud/stackit-sdk-go/services/postgresflex v1.3.2 h1:uQIpj0phDRGrV78/vhtULwxaO2cBdHwqZcFKYUrH1Hs=
Expand Down
7 changes: 6 additions & 1 deletion internal/cmd/observability/grafana/describe/describe.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ import (
)

const (
instanceIdArg = "INSTANCE_ID"
instanceIdArg = "INSTANCE_ID"
// Deprecated: showPasswordFlag is deprecated and will be removed on 2026-07-05.
showPasswordFlag = "show-password"
)

Expand Down Expand Up @@ -86,6 +87,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command {

func configureFlags(cmd *cobra.Command) {
cmd.Flags().BoolP(showPasswordFlag, "s", false, "Show password in output")
cobra.CheckErr(cmd.Flags().MarkDeprecated(showPasswordFlag, "This flag is deprecated and will be removed on 2026-07-05."))
}

func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inputModel, error) {
Expand Down Expand Up @@ -122,8 +124,10 @@ func outputResult(p *print.Printer, outputFormat string, showPassword bool, graf
} else if grafanaConfigs == nil {
return fmt.Errorf("grafanaConfigs is nil")
}
p.Warn("GrafanaAdminPassword and GrafanaAdminUser are deprecated and will be removed on 2026-07-05.")

return p.OutputResult(outputFormat, grafanaConfigs, func() error {
//nolint:staticcheck // field is deprecated but still supported until 2026-07-05
initialAdminPassword := utils.PtrString(instance.Instance.GrafanaAdminPassword)
if !showPassword {
initialAdminPassword = "<hidden>"
Expand All @@ -136,6 +140,7 @@ func outputResult(p *print.Printer, outputFormat string, showPassword bool, graf
table.AddSeparator()
table.AddRow("SINGLE SIGN-ON", utils.PtrString(grafanaConfigs.UseStackitSso))
table.AddSeparator()
//nolint:staticcheck // field is deprecated but still supported until 2026-07-05
table.AddRow("INITIAL ADMIN USER (DEFAULT)", utils.PtrString(instance.Instance.GrafanaAdminUser))
table.AddSeparator()
table.AddRow("INITIAL ADMIN PASSWORD (DEFAULT)", initialAdminPassword)
Expand Down
Loading