Skip to content

Commit edf78a9

Browse files
authored
Revert "Add support for config profiles (#334)" (#338)
This reverts commit 2d0a4b7.
1 parent c794352 commit edf78a9

28 files changed

+97
-923
lines changed

docs/stackit_config.md

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ Provides functionality for CLI configuration options
44

55
### Synopsis
66

7-
Provides functionality for CLI configuration options.
8-
You can set and unset different configuration options via the "stackit config set" and "stackit config unset" commands.
9-
10-
Additionally, you can configure the CLI to use different profiles, each with its own configuration.
11-
Additional profiles can be configured via the "STACKIT_CLI_PROFILE" environment variable or using the "stackit config profile set PROFILE" and "stackit config profile unset" commands.
12-
The environment variable takes precedence over what is set via the commands.
7+
Provides functionality for CLI configuration options
8+
The configuration is stored in a file in the user's config directory, which is OS dependent.
9+
Windows: %APPDATA%\stackit
10+
Linux: $XDG_CONFIG_HOME/stackit
11+
macOS: $HOME/Library/Application Support/stackit
12+
The configuration file is named `cli-config.json` and is created automatically in your first CLI run.
1313

1414
```
1515
stackit config [flags]
@@ -35,7 +35,6 @@ stackit config [flags]
3535

3636
* [stackit](./stackit.md) - Manage STACKIT resources using the command line
3737
* [stackit config list](./stackit_config_list.md) - Lists the current CLI configuration values
38-
* [stackit config profile](./stackit_config_profile.md) - Manage the CLI configuration profiles
3938
* [stackit config set](./stackit_config_set.md) - Sets CLI configuration options
4039
* [stackit config unset](./stackit_config_unset.md) - Unsets CLI configuration options
4140

docs/stackit_config_profile.md

Lines changed: 0 additions & 37 deletions
This file was deleted.

docs/stackit_config_profile_set.md

Lines changed: 0 additions & 43 deletions
This file was deleted.

docs/stackit_config_profile_unset.md

Lines changed: 0 additions & 40 deletions
This file was deleted.

docs/stackit_load-balancer_observability-credentials_cleanup.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,5 @@ stackit load-balancer observability-credentials cleanup [flags]
3535

3636
### SEE ALSO
3737

38-
- [stackit load-balancer observability-credentials](./stackit_load-balancer_observability-credentials.md) - Provides functionality for Load Balancer observability credentials
38+
* [stackit load-balancer observability-credentials](./stackit_load-balancer_observability-credentials.md) - Provides functionality for Load Balancer observability credentials
39+

internal/cmd/config/config.go

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import (
44
"fmt"
55

66
"github.com/stackitcloud/stackit-cli/internal/cmd/config/list"
7-
"github.com/stackitcloud/stackit-cli/internal/cmd/config/profile"
87
"github.com/stackitcloud/stackit-cli/internal/cmd/config/set"
98
"github.com/stackitcloud/stackit-cli/internal/cmd/config/unset"
109
"github.com/stackitcloud/stackit-cli/internal/pkg/args"
@@ -18,12 +17,12 @@ func NewCmd(p *print.Printer) *cobra.Command {
1817
cmd := &cobra.Command{
1918
Use: "config",
2019
Short: "Provides functionality for CLI configuration options",
21-
Long: fmt.Sprintf("%s\n%s\n\n%s\n%s\n%s",
22-
"Provides functionality for CLI configuration options.",
23-
`You can set and unset different configuration options via the "stackit config set" and "stackit config unset" commands.`,
24-
"Additionally, you can configure the CLI to use different profiles, each with its own configuration.",
25-
`Additional profiles can be configured via the "STACKIT_CLI_PROFILE" environment variable or using the "stackit config profile set PROFILE" and "stackit config profile unset" commands.`,
26-
"The environment variable takes precedence over what is set via the commands.",
20+
Long: fmt.Sprintf("%s\n%s\n%s\n%s\n%s\n%s", "Provides functionality for CLI configuration options",
21+
"The configuration is stored in a file in the user's config directory, which is OS dependent.",
22+
"Windows: %APPDATA%\\stackit",
23+
"Linux: $XDG_CONFIG_HOME/stackit",
24+
"macOS: $HOME/Library/Application Support/stackit",
25+
"The configuration file is named `cli-config.json` and is created automatically in your first CLI run.",
2726
),
2827
Args: args.NoArgs,
2928
Run: utils.CmdHelp,
@@ -36,5 +35,4 @@ func addSubcommands(cmd *cobra.Command, p *print.Printer) {
3635
cmd.AddCommand(list.NewCmd(p))
3736
cmd.AddCommand(set.NewCmd(p))
3837
cmd.AddCommand(unset.NewCmd(p))
39-
cmd.AddCommand(profile.NewCmd(p))
4038
}

internal/cmd/config/list/list.go

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,7 @@ func NewCmd(p *print.Printer) *cobra.Command {
5151
configData := viper.AllSettings()
5252

5353
model := parseInput(p, cmd)
54-
55-
activeProfile, err := config.GetProfile()
56-
if err != nil {
57-
return fmt.Errorf("get profile: %w", err)
58-
}
59-
60-
return outputResult(p, model.OutputFormat, configData, activeProfile)
54+
return outputResult(p, model.OutputFormat, configData)
6155
},
6256
}
6357
return cmd
@@ -71,12 +65,9 @@ func parseInput(p *print.Printer, cmd *cobra.Command) *inputModel {
7165
}
7266
}
7367

74-
func outputResult(p *print.Printer, outputFormat string, configData map[string]any, activeProfile string) error {
68+
func outputResult(p *print.Printer, outputFormat string, configData map[string]any) error {
7569
switch outputFormat {
7670
case print.JSONOutputFormat:
77-
if activeProfile != "" {
78-
configData["profile"] = activeProfile
79-
}
8071
details, err := json.MarshalIndent(configData, "", " ")
8172
if err != nil {
8273
return fmt.Errorf("marshal config list: %w", err)
@@ -92,7 +83,6 @@ func outputResult(p *print.Printer, outputFormat string, configData map[string]a
9283

9384
return nil
9485
default:
95-
9686
// Sort the config options by key
9787
configKeys := make([]string, 0, len(configData))
9888
for k := range configData {
@@ -101,9 +91,6 @@ func outputResult(p *print.Printer, outputFormat string, configData map[string]a
10191
sort.Strings(configKeys)
10292

10393
table := tables.NewTable()
104-
if activeProfile != "" {
105-
table.SetTitle(fmt.Sprintf("Profile: %q", activeProfile))
106-
}
10794
table.SetHeader("NAME", "VALUE")
10895
for _, key := range configKeys {
10996
value := configData[key]

internal/cmd/config/profile/profile.go

Lines changed: 0 additions & 35 deletions
This file was deleted.

internal/cmd/config/profile/set/set.go

Lines changed: 0 additions & 94 deletions
This file was deleted.

0 commit comments

Comments
 (0)