From 96ec7299d86536c33914f8f7e5bad274f3224717 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 29 Oct 2019 13:37:58 +0100 Subject: [PATCH] cli/compose/loader: Using a reference for the variable on range scope `overrideService` (scopelint) ``` cli/compose/loader/merge.go:64:41: Using a reference for the variable on range scope `overrideService` (scopelint) if err := mergo.Merge(&baseService, &overrideService, mergo.WithAppendSlice, mergo.WithOverride, mergo.WithTransformers(specials)); err != nil { ^ cli/compose/loader/loader_test.go:1587:28: Using the variable on range scope `testcase` in function literal (scopelint) config, err := loadYAML(testcase.yaml) ^ cli/compose/loader/loader_test.go:1590:58: Using the variable on range scope `testcase` in function literal (scopelint) assert.Check(t, is.DeepEqual(config.Services[0].Init, testcase.init)) ^ ``` Signed-off-by: Sebastiaan van Stijn --- cli/compose/loader/loader_test.go | 1 + cli/compose/loader/merge.go | 1 + 2 files changed, 2 insertions(+) diff --git a/cli/compose/loader/loader_test.go b/cli/compose/loader/loader_test.go index d956fb9f5f..6acdacc160 100644 --- a/cli/compose/loader/loader_test.go +++ b/cli/compose/loader/loader_test.go @@ -1583,6 +1583,7 @@ services: }, } for _, testcase := range testcases { + testcase := testcase t.Run(testcase.doc, func(t *testing.T) { config, err := loadYAML(testcase.yaml) assert.NilError(t, err) diff --git a/cli/compose/loader/merge.go b/cli/compose/loader/merge.go index 24b74ffbc5..015b1f5a55 100644 --- a/cli/compose/loader/merge.go +++ b/cli/compose/loader/merge.go @@ -60,6 +60,7 @@ func mergeServices(base, override []types.ServiceConfig) ([]types.ServiceConfig, }, } for name, overrideService := range overrideServices { + overrideService := overrideService if baseService, ok := baseServices[name]; ok { if err := mergo.Merge(&baseService, &overrideService, mergo.WithAppendSlice, mergo.WithOverride, mergo.WithTransformers(specials)); err != nil { return base, errors.Wrapf(err, "cannot merge service %s", name)