Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cli/compose/convert: driverObjectConfig - result 1 (error) is always nil (unparam) 

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 34f595975d)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2019-10-29 01:47:58 +01:00
parent 7467a6a7de
commit 1a57296c26
No known key found for this signature in database
GPG Key ID: 76698F39D527CE8C
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cli/compose/convert/compose.go
View File

@ -109,7 +109,7 @@ func Secrets(namespace Namespace, secrets map[string]composetypes.SecretConfig)
var obj swarmFileObject var obj swarmFileObject
var err error var err error
if secret.Driver != "" { if secret.Driver != "" {
obj, err = driverObjectConfig(namespace, name, composetypes.FileObjectConfig(secret)) obj = driverObjectConfig(namespace, name, composetypes.FileObjectConfig(secret))
} else { } else {
obj, err = fileObjectConfig(namespace, name, composetypes.FileObjectConfig(secret)) obj, err = fileObjectConfig(namespace, name, composetypes.FileObjectConfig(secret))
} }
@ -161,7 +161,7 @@ type swarmFileObject struct {
Data []byte Data []byte
} }
func driverObjectConfig(namespace Namespace, name string, obj composetypes.FileObjectConfig) (swarmFileObject, error) { func driverObjectConfig(namespace Namespace, name string, obj composetypes.FileObjectConfig) swarmFileObject {
if obj.Name != "" { if obj.Name != "" {
name = obj.Name name = obj.Name
} else { } else {
@ -174,7 +174,7 @@ func driverObjectConfig(namespace Namespace, name string, obj composetypes.FileO
Labels: AddStackLabel(namespace, obj.Labels), Labels: AddStackLabel(namespace, obj.Labels),
}, },
Data: []byte{}, Data: []byte{},
}, nil }
} }
func fileObjectConfig(namespace Namespace, name string, obj composetypes.FileObjectConfig) (swarmFileObject, error) { func fileObjectConfig(namespace Namespace, name string, obj composetypes.FileObjectConfig) (swarmFileObject, error) {