Skip to content

Commit 9d6a60a

Browse files
committed
fix test
1 parent f2b6165 commit 9d6a60a

File tree

2 files changed

+5
-13
lines changed

2 files changed

+5
-13
lines changed

internal/adc/client/client.go

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,7 @@ type Task struct {
6969
func (d *Client) Update(ctx context.Context, args Task) error {
7070
d.mu.Lock()
7171
defer d.mu.Unlock()
72-
deleteConfigs, err := d.ConfigManager.Update(args.Key, args.Configs)
73-
if err != nil {
74-
log.Errorw("failed to update configs", zap.Error(err))
75-
return err
76-
}
72+
deleteConfigs := d.ConfigManager.Update(args.Key, args.Configs)
7773

7874
for _, config := range deleteConfigs {
7975
if err := d.Store.Delete(config.Name, args.ResourceTypes, args.Labels); err != nil {
@@ -112,12 +108,8 @@ func (d *Client) Update(ctx context.Context, args Task) error {
112108
func (d *Client) UpdateConfig(ctx context.Context, args Task) error {
113109
d.mu.Lock()
114110
defer d.mu.Unlock()
115-
deleteConfigs, err := d.ConfigManager.Update(args.Key, args.Configs)
116-
if err != nil {
117-
log.Errorw("failed to update configs", zap.Error(err))
118-
119-
return err
120-
}
111+
deleteConfigs := d.ConfigManager.Update(args.Key, args.Configs)
112+
d.ConfigManager.Delete(args.Key)
121113

122114
for _, config := range deleteConfigs {
123115
if err := d.Store.Delete(config.Name, args.ResourceTypes, args.Labels); err != nil {

internal/provider/common/configmanager.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ func (s *ConfigManager[K, T]) UpdateConfig(cfg T, parents ...K) {
8282
func (s *ConfigManager[K, T]) Update(
8383
key K,
8484
mapRefs map[K]T,
85-
) (discard map[K]T, err error) {
85+
) (discard map[K]T) {
8686
s.mu.Lock()
8787
defer s.mu.Unlock()
8888

@@ -105,7 +105,7 @@ func (s *ConfigManager[K, T]) Update(
105105
}
106106
}
107107

108-
return discard, nil
108+
return discard
109109
}
110110

111111
func (s *ConfigManager[K, T]) Set(key K, cfg T) {

0 commit comments

Comments
 (0)