Skip to content

Revert "Add support for config profiles" #338

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 22, 2024
Merged
Show file tree
Hide file tree
Changes from all 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
13 changes: 6 additions & 7 deletions docs/stackit_config.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ Provides functionality for CLI configuration options

### Synopsis

Provides functionality for CLI configuration options.
You can set and unset different configuration options via the "stackit config set" and "stackit config unset" commands.

Additionally, you can configure the CLI to use different profiles, each with its own configuration.
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.
The environment variable takes precedence over what is set via the commands.
Provides functionality for CLI configuration options
The configuration is stored in a file in the user's config directory, which is OS dependent.
Windows: %APPDATA%\stackit
Linux: $XDG_CONFIG_HOME/stackit
macOS: $HOME/Library/Application Support/stackit
The configuration file is named `cli-config.json` and is created automatically in your first CLI run.

```
stackit config [flags]
Expand All @@ -35,7 +35,6 @@ stackit config [flags]

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

37 changes: 0 additions & 37 deletions docs/stackit_config_profile.md

This file was deleted.

43 changes: 0 additions & 43 deletions docs/stackit_config_profile_set.md

This file was deleted.

40 changes: 0 additions & 40 deletions docs/stackit_config_profile_unset.md

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,5 @@ stackit load-balancer observability-credentials cleanup [flags]

### SEE ALSO

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

14 changes: 6 additions & 8 deletions internal/cmd/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import (
"fmt"

"github.com/stackitcloud/stackit-cli/internal/cmd/config/list"
"github.com/stackitcloud/stackit-cli/internal/cmd/config/profile"
"github.com/stackitcloud/stackit-cli/internal/cmd/config/set"
"github.com/stackitcloud/stackit-cli/internal/cmd/config/unset"
"github.com/stackitcloud/stackit-cli/internal/pkg/args"
Expand All @@ -18,12 +17,12 @@ func NewCmd(p *print.Printer) *cobra.Command {
cmd := &cobra.Command{
Use: "config",
Short: "Provides functionality for CLI configuration options",
Long: fmt.Sprintf("%s\n%s\n\n%s\n%s\n%s",
"Provides functionality for CLI configuration options.",
`You can set and unset different configuration options via the "stackit config set" and "stackit config unset" commands.`,
"Additionally, you can configure the CLI to use different profiles, each with its own configuration.",
`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.`,
"The environment variable takes precedence over what is set via the commands.",
Long: fmt.Sprintf("%s\n%s\n%s\n%s\n%s\n%s", "Provides functionality for CLI configuration options",
"The configuration is stored in a file in the user's config directory, which is OS dependent.",
"Windows: %APPDATA%\\stackit",
"Linux: $XDG_CONFIG_HOME/stackit",
"macOS: $HOME/Library/Application Support/stackit",
"The configuration file is named `cli-config.json` and is created automatically in your first CLI run.",
),
Args: args.NoArgs,
Run: utils.CmdHelp,
Expand All @@ -36,5 +35,4 @@ func addSubcommands(cmd *cobra.Command, p *print.Printer) {
cmd.AddCommand(list.NewCmd(p))
cmd.AddCommand(set.NewCmd(p))
cmd.AddCommand(unset.NewCmd(p))
cmd.AddCommand(profile.NewCmd(p))
}
17 changes: 2 additions & 15 deletions internal/cmd/config/list/list.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,7 @@ func NewCmd(p *print.Printer) *cobra.Command {
configData := viper.AllSettings()

model := parseInput(p, cmd)

activeProfile, err := config.GetProfile()
if err != nil {
return fmt.Errorf("get profile: %w", err)
}

return outputResult(p, model.OutputFormat, configData, activeProfile)
return outputResult(p, model.OutputFormat, configData)
},
}
return cmd
Expand All @@ -71,12 +65,9 @@ func parseInput(p *print.Printer, cmd *cobra.Command) *inputModel {
}
}

func outputResult(p *print.Printer, outputFormat string, configData map[string]any, activeProfile string) error {
func outputResult(p *print.Printer, outputFormat string, configData map[string]any) error {
switch outputFormat {
case print.JSONOutputFormat:
if activeProfile != "" {
configData["profile"] = activeProfile
}
details, err := json.MarshalIndent(configData, "", " ")
if err != nil {
return fmt.Errorf("marshal config list: %w", err)
Expand All @@ -92,7 +83,6 @@ func outputResult(p *print.Printer, outputFormat string, configData map[string]a

return nil
default:

// Sort the config options by key
configKeys := make([]string, 0, len(configData))
for k := range configData {
Expand All @@ -101,9 +91,6 @@ func outputResult(p *print.Printer, outputFormat string, configData map[string]a
sort.Strings(configKeys)

table := tables.NewTable()
if activeProfile != "" {
table.SetTitle(fmt.Sprintf("Profile: %q", activeProfile))
}
table.SetHeader("NAME", "VALUE")
for _, key := range configKeys {
value := configData[key]
Expand Down
35 changes: 0 additions & 35 deletions internal/cmd/config/profile/profile.go

This file was deleted.

94 changes: 0 additions & 94 deletions internal/cmd/config/profile/set/set.go

This file was deleted.

Loading