Skip to content
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
15 changes: 8 additions & 7 deletions internal/state/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -95,17 +95,17 @@ func (cfg *config) reset() {
}

func (cfg *config) Read(f any) error {
// error is ignored since invalid flags are already handled by cobra
_ = cfg.fs.Parse(os.Args[1:])
// we ignore unknown flags since we are only interested in config option flags
cfg.fs.ParseErrorsWhitelist.UnknownFlags = true

err := cfg.fs.Parse(os.Args[1:])
if err != nil && !errors.Is(err, pflag.ErrHelp) {
return err
}

// load env already so we can determine the active context
cfg.v.AutomaticEnv()

var (
cfgBytes []byte
err error
)

cfg.path, err = OptionConfig.Get(cfg)
if err != nil {
return err
Expand All @@ -120,6 +120,7 @@ func (cfg *config) Read(f any) error {
cfg.path = DefaultConfigPath()
}

var cfgBytes []byte
if f == nil || ok {
// read config from file
cfgBytes, err = os.ReadFile(cfg.path)
Expand Down
48 changes: 48 additions & 0 deletions internal/state/config/config_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
package config_test

import (
"testing"

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"go.uber.org/mock/gomock"

"github.com/hetznercloud/cli/internal/cli"
"github.com/hetznercloud/cli/internal/state/config"
"github.com/hetznercloud/cli/internal/testutil"
"github.com/hetznercloud/hcloud-go/v2/hcloud"
)

func TestOptionFlagParsing(t *testing.T) {
fx := testutil.NewFixture(t)
defer fx.Finish()

cmd := cli.NewRootCommand(fx.State())
fx.ExpectEnsureToken()

net := &hcloud.Network{ID: 1, Name: "foo"}
srv := &hcloud.Server{ID: 2, Name: "bar"}

fx.Client.ServerClient.EXPECT().
Get(gomock.Any(), "bar").
Return(srv, nil, nil)
fx.Client.NetworkClient.EXPECT().
Get(gomock.Any(), "foo").
Return(net, nil, nil)
fx.Client.ServerClient.EXPECT().
AttachToNetwork(gomock.Any(), srv, hcloud.ServerAttachToNetworkOpts{Network: net}).
Return(&hcloud.Action{ID: 3}, nil, nil)
fx.ActionWaiter.EXPECT().
WaitForActions(gomock.Any(), gomock.Any(), &hcloud.Action{ID: 3}).
Return(nil)

out, errOut, err := fx.Run(cmd, []string{"server", "attach-to-network", "--network", "foo", "bar", "--debug"})

require.NoError(t, err)
assert.Empty(t, errOut)
assert.Equal(t, "Server 2 attached to network 1\n", out)

val, err := config.OptionDebug.Get(fx.State().Config())
require.NoError(t, err)
assert.True(t, val)
}