fix(influx): select an active config when deleting the active config
parent
74722d5191
commit
5612930a83
|
@ -221,6 +221,14 @@ func (svc localConfigsSVC) DeleteConfig(name string) (Config, error) {
|
||||||
}
|
}
|
||||||
delete(cfgs, name)
|
delete(cfgs, name)
|
||||||
|
|
||||||
|
if p.Active && len(cfgs) > 0 {
|
||||||
|
for name, cfg := range cfgs {
|
||||||
|
cfg.Active = true
|
||||||
|
cfgs[name] = cfg
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return p, svc.writeConfigs(cfgs)
|
return p, svc.writeConfigs(cfgs)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -770,6 +770,7 @@ func TestConfigDelete(t *testing.T) {
|
||||||
},
|
},
|
||||||
stored: Configs{
|
stored: Configs{
|
||||||
"a2": {
|
"a2": {
|
||||||
|
Active: true,
|
||||||
Name: "a2",
|
Name: "a2",
|
||||||
Host: "host2",
|
Host: "host2",
|
||||||
Org: "org2",
|
Org: "org2",
|
||||||
|
@ -779,6 +780,7 @@ func TestConfigDelete(t *testing.T) {
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
for _, c := range cases {
|
for _, c := range cases {
|
||||||
|
fn := func(t *testing.T) {
|
||||||
svc, store := newBufferSVC()
|
svc, store := newBufferSVC()
|
||||||
_ = store.writeConfigs(c.exists)
|
_ = store.writeConfigs(c.exists)
|
||||||
result, err := svc.DeleteConfig(c.target)
|
result, err := svc.DeleteConfig(c.target)
|
||||||
|
@ -796,6 +798,8 @@ func TestConfigDelete(t *testing.T) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
t.Run(c.name, fn)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func newBufferSVC() (ConfigsService, *bytesStore) {
|
func newBufferSVC() (ConfigsService, *bytesStore) {
|
||||||
|
|
Loading…
Reference in New Issue