Uses Set.Merge helper from duffle.

Using a temporary fork until the PR is merged.

Signed-off-by: Ian Campbell <[email protected]>

Author: Ian Campbell

Gopkg.lock

@@ -40,9 +40,11 @@ required = ["github.com/wadey/gocovmerge"]
   name = "github.com/docker/cli"
   branch = "master"
 
+# Waiting for https://github.com/deislabs/duffle/pull/682 to be merged
 [[override]]
   name = "github.com/deislabs/duffle"
-  branch = "master"
+  source = "github.com/ijc/duffle"
+  branch = "set-merge"
 
 [[constraint]]
   name = "github.com/sirupsen/logrus"

Gopkg.toml

@@ -55,11 +55,8 @@ func addNamedCredentialSets(namedCredentialsets []string) credentialSetOpt {
 			if err != nil {
 				return err
 			}
-			for k, v := range values {
-				if _, ok := creds[k]; ok {
-					return fmt.Errorf("ambiguous credential resolution: %q is present in multiple credential sets", k)
-				}
-				creds[k] = v
+			if err := creds.Merge(values); err != nil {
+				return err
 			}
 		}
 		return nil