Detect single value advanced config/secret syntax

Fixes docker#2058 allowing the use of the advanced source=x syntax for config and secret values when there is no comma Before this change the following would fail with config not found: docker service create --name hello1 --config source=myconfig nginx:alpine And the following would fail with secret not found: docker service create --name hello2 --secret source=mysecret nginx:alpine Signed-off-by: Nick Adcock <[email protected]>
zappy-shu · Jan 7, 2020 · da3c1dd · da3c1dd
1 parent f7f4a19
commit da3c1dd
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/opts/config.go b/opts/config.go
@@ -32,7 +32,7 @@ func (o *ConfigOpt) Set(value string) error {
 	}
 
 	// support a simple syntax of --config foo
-	if len(fields) == 1 {
+	if len(fields) == 1 && !strings.Contains(fields[0], "=") {
 		options.File.Name = fields[0]
 		options.ConfigName = fields[0]
 		o.values = append(o.values, options)

diff --git a/opts/secret.go b/opts/secret.go
@@ -32,7 +32,7 @@ func (o *SecretOpt) Set(value string) error {
 	}
 
 	// support a simple syntax of --secret foo
-	if len(fields) == 1 {
+	if len(fields) == 1 && !strings.Contains(fields[0], "=") {
 		options.File.Name = fields[0]
 		options.SecretName = fields[0]
 		o.values = append(o.values, options)

diff --git a/opts/secret_test.go b/opts/secret_test.go
@@ -23,6 +23,18 @@ func TestSecretOptionsSimple(t *testing.T) {
 	assert.Check(t, is.Equal("0", req.File.GID))
 }
 
+func TestSecretOptionsSingle(t *testing.T) {
+	var opt SecretOpt
+
+	testCase := "source=foo"
+	assert.NilError(t, opt.Set(testCase))
+
+	reqs := opt.Value()
+	assert.Assert(t, is.Len(reqs, 1))
+	req := reqs[0]
+	assert.Check(t, is.Equal("foo", req.SecretName))
+}
+
 func TestSecretOptionsSourceTarget(t *testing.T) {
 	var opt SecretOpt