fix: set newly-created config as active in setup
(#302)
This commit is contained in:
@ -8,6 +8,7 @@
|
|||||||
### Bug Fixes
|
### Bug Fixes
|
||||||
|
|
||||||
1. [297](https://github.com/influxdata/influx-cli/pull/297): Detect and warn when `restore --full` changes the operator token.
|
1. [297](https://github.com/influxdata/influx-cli/pull/297): Detect and warn when `restore --full` changes the operator token.
|
||||||
|
1. [302](https://github.com/influxdata/influx-cli/pull/302): Set newly-created config as active in `setup`.
|
||||||
|
|
||||||
## v2.1.1 [2021-09-22]
|
## v2.1.1 [2021-09-22]
|
||||||
|
|
||||||
|
@ -66,10 +66,11 @@ func (c Client) Setup(ctx context.Context, params *Params) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
cfg := config.Config{
|
cfg := config.Config{
|
||||||
Name: config.DefaultConfig.Name,
|
Name: config.DefaultConfig.Name,
|
||||||
Host: config.DefaultConfig.Host,
|
Host: config.DefaultConfig.Host,
|
||||||
Token: *resp.Auth.Token,
|
Token: *resp.Auth.Token,
|
||||||
Org: resp.Org.Name,
|
Org: resp.Org.Name,
|
||||||
|
Active: true,
|
||||||
}
|
}
|
||||||
if params.ConfigName != "" {
|
if params.ConfigName != "" {
|
||||||
cfg.Name = params.ConfigName
|
cfg.Name = params.ConfigName
|
||||||
|
@ -145,7 +145,8 @@ func Test_SetupSuccessNoninteractive(t *testing.T) {
|
|||||||
return assert.Equal(t, params.ConfigName, in.Name) &&
|
return assert.Equal(t, params.ConfigName, in.Name) &&
|
||||||
assert.Equal(t, params.AuthToken, in.Token) &&
|
assert.Equal(t, params.AuthToken, in.Token) &&
|
||||||
assert.Equal(t, config.DefaultConfig.Host, in.Host) &&
|
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) {
|
})).DoAndReturn(func(in config.Config) (config.Config, error) {
|
||||||
return in, nil
|
return in, nil
|
||||||
})
|
})
|
||||||
@ -203,7 +204,8 @@ func Test_SetupSuccessInteractive(t *testing.T) {
|
|||||||
return assert.Equal(t, config.DefaultConfig.Name, in.Name) &&
|
return assert.Equal(t, config.DefaultConfig.Name, in.Name) &&
|
||||||
assert.Equal(t, token, in.Token) &&
|
assert.Equal(t, token, in.Token) &&
|
||||||
assert.Equal(t, config.DefaultConfig.Host, in.Host) &&
|
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) {
|
})).DoAndReturn(func(in config.Config) (config.Config, error) {
|
||||||
return in, nil
|
return in, nil
|
||||||
})
|
})
|
||||||
@ -338,7 +340,8 @@ func Test_SetupNonDefaultHost(t *testing.T) {
|
|||||||
return assert.Equal(t, params.ConfigName, in.Name) &&
|
return assert.Equal(t, params.ConfigName, in.Name) &&
|
||||||
assert.Equal(t, params.AuthToken, in.Token) &&
|
assert.Equal(t, params.AuthToken, in.Token) &&
|
||||||
assert.Equal(t, params.Host, in.Host) &&
|
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) {
|
})).DoAndReturn(func(in config.Config) (config.Config, error) {
|
||||||
return in, nil
|
return in, nil
|
||||||
})
|
})
|
||||||
|
Reference in New Issue
Block a user