Skip to content

Commit

Permalink
Merge pull request #4877 from werf/fix_cleanup_rare_panic_named_retur…
Browse files Browse the repository at this point in the history
…n_argument

fix(cleanup): rare panic related to misuse of named return argument
  • Loading branch information
alexey-igrychev committed Aug 31, 2022
2 parents f8a5dba + 9fad111 commit 1026317
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions pkg/cleaning/stage_manager/manager.go
Expand Up @@ -139,14 +139,14 @@ func (m *Manager) InitCustomTagsMetadata(ctx context.Context, storageManager man
return nil
}

func GetCustomTagsMetadata(ctx context.Context, storageManager manager.StorageManagerInterface) (stageIDCustomTagList map[string][]string, err error) {
func GetCustomTagsMetadata(ctx context.Context, storageManager manager.StorageManagerInterface) (map[string][]string, error) {
stageCustomTagMetadataIDs, err := storageManager.GetStagesStorage().GetStageCustomTagMetadataIDs(ctx, storage.WithCache())
if err != nil {
return nil, fmt.Errorf("unable to get stage custom tag metadata IDs: %w", err)
}

var mutex sync.Mutex
stageIDCustomTagList = make(map[string][]string)
stageIDCustomTagList := make(map[string][]string)
err = storageManager.ForEachGetStageCustomTagMetadata(ctx, stageCustomTagMetadataIDs, func(ctx context.Context, metadataID string, metadata *storage.CustomTagMetadata, err error) error {
if err != nil {
return err
Expand Down

0 comments on commit 1026317

Please sign in to comment.