Fix swagger volume type generation

This was broken by bf6a790f00ab96bb8857e3c73502909ee5e36217

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: b16b125bb4326e2eec9948fd54ca8c5d83eba36a
Component: engine

components/engine/hack/generate-swagger-api.sh

@@ -23,5 +23,5 @@ swagger generate operation -f api/swagger.yaml \
     -n ContainerUpdate \
     -n ContainerWait \
     -n ImageHistory \
-    -n VolumesCreate \
-    -n VolumesList
+    -n VolumeCreate \
+    -n VolumeList

components/engine/hack/integration-cli-on-swarm/host/volume.go

@@ -41,7 +41,7 @@ func createTar(data map[string][]byte) (io.Reader, error) {
 // which is attached to the container.
 func createVolumeWithData(cli *client.Client, volumeName string, data map[string][]byte, image string) error {
 	_, err := cli.VolumeCreate(context.Background(),
-		volume.VolumesCreateBody{
+		volume.VolumeCreateBody{
 			Driver: "local",
 			Name:   volumeName,
 		})

components/engine/hack/validate/gometalinter.json

@@ -6,6 +6,7 @@
     ".*\\.pb\\.go",
     "dockerversion/version_autogen.go",
     "api/types/container/container_.*",
+    "api/types/volume/volume_.*",
     "integration-cli/"
   ],
   "Skip": ["integration-cli/"],