1. docker
  2. Commit bdb878ab2c9f033a416d11f712b411ee4d904f01
Browse code

filters: lowercase error

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Sebastiaan van Stijn authored on 2022/03/03 02:56:06
Showing 10 changed files
daemon/errors.go
History View file @ bdb878a
... ... 
@@ -115,7 +115,7 @@ type invalidFilter struct {
115 115 
 }
116 116
117 117 
 func (e invalidFilter) Error() string {
118 
-	msg := "Invalid filter '" + e.filter
118 
+	msg := "invalid filter '" + e.filter
119 119 
 	if e.value != nil {
120 120 
 		msg += fmt.Sprintf("=%s", e.value)
121 121 
 	}
daemon/images/image_search_test.go
History View file @ bdb878a
... ... 
@@ -46,31 +46,31 @@ func TestSearchRegistryForImagesErrors(t *testing.T) {
46 46 
 		},
47 47 
 		{
48 48 
 			filtersArgs:   `{"type":{"custom":true}}`,
49 
-			expectedError: "Invalid filter 'type'",
49 
+			expectedError: "invalid filter 'type'",
50 50 
 		},
51 51 
 		{
52 52 
 			filtersArgs:   `{"is-automated":{"invalid":true}}`,
53 
-			expectedError: "Invalid filter 'is-automated=[invalid]'",
53 
+			expectedError: "invalid filter 'is-automated=[invalid]'",
54 54 
 		},
55 55 
 		{
56 56 
 			filtersArgs:   `{"is-automated":{"true":true,"false":true}}`,
57 
-			expectedError: "Invalid filter 'is-automated",
57 
+			expectedError: "invalid filter 'is-automated",
58 58 
 		},
59 59 
 		{
60 60 
 			filtersArgs:   `{"is-official":{"invalid":true}}`,
61 
-			expectedError: "Invalid filter 'is-official=[invalid]'",
61 
+			expectedError: "invalid filter 'is-official=[invalid]'",
62 62 
 		},
63 63 
 		{
64 64 
 			filtersArgs:   `{"is-official":{"true":true,"false":true}}`,
65 
-			expectedError: "Invalid filter 'is-official",
65 
+			expectedError: "invalid filter 'is-official",
66 66 
 		},
67 67 
 		{
68 68 
 			filtersArgs:   `{"stars":{"invalid":true}}`,
69 
-			expectedError: "Invalid filter 'stars=invalid'",
69 
+			expectedError: "invalid filter 'stars=invalid'",
70 70 
 		},
71 71 
 		{
72 72 
 			filtersArgs:   `{"stars":{"1":true,"invalid":true}}`,
73 
-			expectedError: "Invalid filter 'stars=invalid'",
73 
+			expectedError: "invalid filter 'stars=invalid'",
74 74 
 		},
75 75 
 	}
76 76 
 	for index, e := range errorCases {
daemon/images/locals.go
History View file @ bdb878a
... ... 
@@ -12,7 +12,7 @@ type invalidFilter struct {
12 12 
 }
13 13
14 14 
 func (e invalidFilter) Error() string {
15 
-	msg := "Invalid filter '" + e.filter
15 
+	msg := "invalid filter '" + e.filter
16 16 
 	if e.value != nil {
17 17 
 		msg += fmt.Sprintf("=%s", e.value)
18 18 
 	}
daemon/list_test.go
History View file @ bdb878a
... ... 
@@ -91,7 +91,7 @@ func TestListInvalidFilter(t *testing.T) {
91 91 
 	_, err = d.Containers(&types.ContainerListOptions{
92 92 
 		Filters: f,
93 93 
 	})
94 
-	assert.Assert(t, is.Error(err, "Invalid filter 'invalid'"))
94 
+	assert.Assert(t, is.Error(err, "invalid filter 'invalid'"))
95 95 
 }
96 96
97 97 
 func TestNameFilter(t *testing.T) {
integration-cli/docker_cli_images_test.go
History View file @ bdb878a
... ... 
@@ -68,7 +68,7 @@ func (s *DockerSuite) TestImagesOrderedByCreationDate(c *testing.T) {
68 68 
 func (s *DockerSuite) TestImagesErrorWithInvalidFilterNameTest(c *testing.T) {
69 69 
 	out, _, err := dockerCmdWithError("images", "-f", "FOO=123")
70 70 
 	assert.ErrorContains(c, err, "")
71 
-	assert.Assert(c, strings.Contains(out, "Invalid filter"))
71 
+	assert.Assert(c, strings.Contains(out, "invalid filter"))
72 72 
 }
73 73
74 74 
 func (s *DockerSuite) TestImagesFilterLabelMatch(c *testing.T) {
... ... 
@@ -252,7 +252,7 @@ func (s *DockerSuite) TestImagesEnsureDanglingImageOnlyListedOnce(c *testing.T)
252 252 
 func (s *DockerSuite) TestImagesWithIncorrectFilter(c *testing.T) {
253 253 
 	out, _, err := dockerCmdWithError("images", "-f", "dangling=invalid")
254 254 
 	assert.ErrorContains(c, err, "")
255 
-	assert.Assert(c, strings.Contains(out, "Invalid filter"))
255 
+	assert.Assert(c, strings.Contains(out, "invalid filter"))
256 256 
 }
257 257
258 258 
 func (s *DockerSuite) TestImagesEnsureOnlyHeadsImagesShown(c *testing.T) {
integration-cli/docker_cli_ps_test.go
History View file @ bdb878a
... ... 
@@ -203,7 +203,7 @@ func (s *DockerSuite) TestPsListContainersFilterStatus(c *testing.T) {
203 203 
 	assert.Equal(c, RemoveOutputForExistingElements(containerOut, existingContainers), secondID)
204 204
205 205 
 	result := cli.Docker(cli.Args("ps", "-a", "-q", "--filter=status=rubbish"), cli.WithTimeout(time.Second*60))
206 
-	err := "Invalid filter 'status=rubbish'"
206 
+	err := "invalid filter 'status=rubbish'"
207 207 
 	if versions.LessThan(testEnv.DaemonAPIVersion(), "1.32") {
208 208 
 		err = "Unrecognised filter value for status: rubbish"
209 209 
 	}
integration-cli/docker_cli_search_test.go
History View file @ bdb878a
... ... 
@@ -17,19 +17,19 @@ func (s *DockerSuite) TestSearchOnCentralRegistry(c *testing.T) {
17 17 
 func (s *DockerSuite) TestSearchStarsOptionWithWrongParameter(c *testing.T) {
18 18 
 	out, _, err := dockerCmdWithError("search", "--filter", "stars=a", "busybox")
19 19 
 	assert.ErrorContains(c, err, "", out)
20 
-	assert.Assert(c, strings.Contains(out, "Invalid filter"), "couldn't find the invalid filter warning")
20 
+	assert.Assert(c, strings.Contains(out, "invalid filter"), "couldn't find the invalid filter warning")
21 21
22 22 
 	out, _, err = dockerCmdWithError("search", "-f", "stars=a", "busybox")
23 23 
 	assert.ErrorContains(c, err, "", out)
24 
-	assert.Assert(c, strings.Contains(out, "Invalid filter"), "couldn't find the invalid filter warning")
24 
+	assert.Assert(c, strings.Contains(out, "invalid filter"), "couldn't find the invalid filter warning")
25 25
26 26 
 	out, _, err = dockerCmdWithError("search", "-f", "is-automated=a", "busybox")
27 27 
 	assert.ErrorContains(c, err, "", out)
28 
-	assert.Assert(c, strings.Contains(out, "Invalid filter"), "couldn't find the invalid filter warning")
28 
+	assert.Assert(c, strings.Contains(out, "invalid filter"), "couldn't find the invalid filter warning")
29 29
30 30 
 	out, _, err = dockerCmdWithError("search", "-f", "is-official=a", "busybox")
31 31 
 	assert.ErrorContains(c, err, "", out)
32 
-	assert.Assert(c, strings.Contains(out, "Invalid filter"), "couldn't find the invalid filter warning")
32 
+	assert.Assert(c, strings.Contains(out, "invalid filter"), "couldn't find the invalid filter warning")
33 33 
 }
34 34
35 35 
 func (s *DockerSuite) TestSearchCmdOptions(c *testing.T) {
integration-cli/docker_cli_volume_test.go
History View file @ bdb878a
... ... 
@@ -166,13 +166,13 @@ func (s *DockerSuite) TestVolumeCLILsFilterDangling(c *testing.T) {
166 166 
 func (s *DockerSuite) TestVolumeCLILsErrorWithInvalidFilterName(c *testing.T) {
167 167 
 	out, _, err := dockerCmdWithError("volume", "ls", "-f", "FOO=123")
168 168 
 	assert.ErrorContains(c, err, "")
169 
-	assert.Assert(c, strings.Contains(out, "Invalid filter"))
169 
+	assert.Assert(c, strings.Contains(out, "invalid filter"))
170 170 
 }
171 171
172 172 
 func (s *DockerSuite) TestVolumeCLILsWithIncorrectFilterValue(c *testing.T) {
173 173 
 	out, _, err := dockerCmdWithError("volume", "ls", "-f", "dangling=invalid")
174 174 
 	assert.ErrorContains(c, err, "")
175 
-	assert.Assert(c, strings.Contains(out, "Invalid filter"))
175 
+	assert.Assert(c, strings.Contains(out, "invalid filter"))
176 176 
 }
177 177
178 178 
 func (s *DockerSuite) TestVolumeCLIRm(c *testing.T) {
plugin/errors.go
History View file @ bdb878a
... ... 
@@ -32,7 +32,7 @@ type invalidFilter struct {
32 32 
 }
33 33
34 34 
 func (e invalidFilter) Error() string {
35 
-	msg := "Invalid filter '" + e.filter
35 
+	msg := "invalid filter '" + e.filter
36 36 
 	if len(e.value) > 0 {
37 37 
 		msg += fmt.Sprintf("=%s", e.value)
38 38 
 	}
volume/service/errors.go
History View file @ bdb878a
... ... 
@@ -101,7 +101,7 @@ type invalidFilter struct {
101 101 
 }
102 102
103 103 
 func (e invalidFilter) Error() string {
104 
-	msg := "Invalid filter '" + e.filter
104 
+	msg := "invalid filter '" + e.filter
105 105 
 	if e.value != nil {
106 106 
 		msg += fmt.Sprintf("=%s", e.value)
107 107 
 	}