delete the useless 'error'

Author: Flsorescence

apis/opts/labels.go

@@ -5,14 +5,14 @@ import (
 )
 
 // ParseLabels parses the labels params of container.
-func ParseLabels(labels []string) (map[string]string, error) {
+func ParseLabels(labels []string) map[string]string {
 	results := make(map[string]string)
 	for _, label := range labels {
 		fields := parseLabel(label)
 		k, v := fields[0], fields[1]
 		results[k] = v
 	}
-	return results, nil
+	return results
 }
 
 func parseLabel(label string) []string {

apis/opts/labels_test.go

@@ -9,7 +9,6 @@ import (
 func TestParseLabels(t *testing.T) {
 	type result struct {
 		labels map[string]string
-		err    error
 	}
 
 	type TestCase struct {
@@ -24,7 +23,6 @@ func TestParseLabels(t *testing.T) {
 				labels: map[string]string{
 					"a": "b",
 				},
-				err: nil,
 			},
 		},
 		{
@@ -33,7 +31,6 @@ func TestParseLabels(t *testing.T) {
 				labels: map[string]string{
 					"a": "b",
 				},
-				err: nil,
 			},
 		},
 		{
@@ -43,7 +40,6 @@ func TestParseLabels(t *testing.T) {
 				labels: map[string]string{
 					"a": "bb",
 				},
-				err: nil,
 			},
 		},
 		// only input key
@@ -53,7 +49,6 @@ func TestParseLabels(t *testing.T) {
 				labels: map[string]string{
 					"a": "",
 				},
-				err: nil,
 			},
 		},
 		{
@@ -62,7 +57,6 @@ func TestParseLabels(t *testing.T) {
 				labels: map[string]string{
 					"a": "",
 				},
-				err: nil,
 			},
 		},
 		{
@@ -71,28 +65,24 @@ func TestParseLabels(t *testing.T) {
 				labels: map[string]string{
 					"a": "b=c",
 				},
-				err: nil,
 			},
 		},
 		{
 			input: []string{},
 			expected: result{
 				labels: map[string]string{},
-				err:    nil,
 			},
 		},
 		{
 			input: nil,
 			expected: result{
 				labels: map[string]string{},
-				err:    nil,
 			},
 		},
 	}
 
 	for _, testCase := range testCases {
-		labels, err := ParseLabels(testCase.input)
+		labels := ParseLabels(testCase.input)
 		assert.Equal(t, testCase.expected.labels, labels)
-		assert.Equal(t, testCase.expected.err, err)
 	}
 }

cli/container.go

@@ -97,10 +97,7 @@ type container struct {
 }
 
 func (c *container) config() (*types.ContainerCreateConfig, error) {
-	labels, err := opts.ParseLabels(c.labels)
-	if err != nil {
-		return nil, err
-	}
+	labels := opts.ParseLabels(c.labels)
 
 	memory, err := opts.ParseMemory(c.memory)
 	if err != nil {

daemon/mgr/container.go

@@ -1149,10 +1149,7 @@ func (mgr *ContainerManager) Update(ctx context.Context, name string, config *ty
 	// but ContainerConfig.Labels is map[string]string
 	if len(config.Label) != 0 {
 		// support remove some labels
-		newLabels, err := opts.ParseLabels(config.Label)
-		if err != nil {
-			return errors.Wrapf(err, "failed to parse labels")
-		}
+		newLabels := opts.ParseLabels(config.Label)
 
 		for k, v := range newLabels {
 			if v == "" {