hcq/influx-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: set newly-created config as active in setup (#302)

Browse Source
This commit is contained in:
Daniel Moran
2021-10-14 07:00:16 -07:00
committed by GitHub
parent af631b4da8
commit 964bc4fe03
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
clients/setup/setup.go
View File

@ -66,10 +66,11 @@ func (c Client) Setup(ctx context.Context, params *Params) error {
}
cfg := config.Config{
Name: config.DefaultConfig.Name,
Host: config.DefaultConfig.Host,
Token: *resp.Auth.Token,
Org: resp.Org.Name,
Name: config.DefaultConfig.Name,
Host: config.DefaultConfig.Host,
Token: *resp.Auth.Token,
Org: resp.Org.Name,
Active: true,
}
if params.ConfigName != "" {
cfg.Name = params.ConfigName

9
clients/setup/setup_test.go
View File

@ -145,7 +145,8 @@ func Test_SetupSuccessNoninteractive(t *testing.T) {
return assert.Equal(t, params.ConfigName, in.Name) &&
assert.Equal(t, params.AuthToken, in.Token) &&
assert.Equal(t, config.DefaultConfig.Host, in.Host) &&
assert.Equal(t, params.Org, in.Org)
assert.Equal(t, params.Org, in.Org) &&
assert.True(t, in.Active)
})).DoAndReturn(func(in config.Config) (config.Config, error) {
return in, nil
})
@ -203,7 +204,8 @@ func Test_SetupSuccessInteractive(t *testing.T) {
return assert.Equal(t, config.DefaultConfig.Name, in.Name) &&
assert.Equal(t, token, in.Token) &&
assert.Equal(t, config.DefaultConfig.Host, in.Host) &&
assert.Equal(t, org, in.Org)
assert.Equal(t, org, in.Org) &&
assert.True(t, in.Active)
})).DoAndReturn(func(in config.Config) (config.Config, error) {
return in, nil
})
@ -338,7 +340,8 @@ func Test_SetupNonDefaultHost(t *testing.T) {
return assert.Equal(t, params.ConfigName, in.Name) &&
assert.Equal(t, params.AuthToken, in.Token) &&
assert.Equal(t, params.Host, in.Host) &&
assert.Equal(t, params.Org, in.Org)
assert.Equal(t, params.Org, in.Org) &&
assert.True(t, in.Active)
})).DoAndReturn(func(in config.Config) (config.Config, error) {
return in, nil
})