Use filepath.Base instead of path.Base

[mat007]

- What I did

I fixed some path handling code in the Kubernetes docker stack integration.

This might be related to #966 in some way, however even with the changes contained in that PR the bug fixed here is still happening.

- How I did it

Changed a couple path.Abs to filepath.Abs.

- How to verify it

With Docker on Windows with Kubernetes activated, apply the following change

diff --git a/e2e/stack/testdata/stack-with-named-resources.yml b/e2e/stack/testdata/stack-with-named-resources.yml
index f7a04b21..9835950a 100644
--- a/e2e/stack/testdata/stack-with-named-resources.yml
+++ b/e2e/stack/testdata/stack-with-named-resources.yml
@@ -4,7 +4,6 @@ services:
     image: registry:5000/alpine:3.6
     command: top
     networks: [network1, network2]
-    volumes: [volume1, volume2]
     secrets: [secret1, secret2]
     configs: [config1, config2]

as this won't work with Kubernetes (the test data come from the e2e tests running against Swarm).

Then without this PR

$ build/docker.exe stack deploy -c e2e/stack/testdata/stack-with-named-resources.yml test-stack-deploy-
with-names
ConfigMap "config1" is invalid: data[C:\dev\src\github.com\docker\cli\e2e\stack\testdata\data]: Invalid value: "C:\\dev\\src\\github.com\\docker\\cli\\e2e\\stack\\testdata\\data": a valid config key must consist of alphanumeric characters, '-', '_' or '.' (e.g. 'key.name',  or 'KEY_NAME',  or 'key-name', regex used for validation is '[-._a-zA-Z0-9]+')

whereas with this PR

$ build/docker.exe stack deploy -c e2e/stack/testdata/stack-with-named-resources.yml test-stack-deploy-
with-names
top-level network "network1" is ignored
top-level network "network2" is ignored
service "web": network "network2" is ignored
service "web": network "network1" is ignored
Waiting for the stack to be stable and running..

- Description for the changelog

Not sure if this is worth mentioning as this could be sneaked into https://github.com/docker/cli/pull/966…

• Fixed docker stack deploy on Kubernetes with compose file with relative paths in secrets and configs on Windows

- A picture of a cute animal (not mandatory but encouraged)

[thaJeztah]

Wondering; if someone runs in a Bash session on Windows, and/or uses /c/some/path notation (I think that was supported as well in some shells), would this fail?

Should we uses filepath.FromSlash() first (to normalise the input), then filepath.Base?

[mat007]

This works fine, this is what the filepath package takes care of, I believe.
I run everything from Powershell and MinGW64 indifferently and filepath has never failed me.

Given

package main

import (
	"fmt"
	"path/filepath"
)

func base(p string) {
	fmt.Println(filepath.Base(p), p)
}

func main() {
	base("/usr/local/bla")
	base(`\usr\local\bla`)
	base(`C:\usr\local\bla`)
	base("C:/usr/local/bla")
	base(`bla`)
}

Mingw64, Powershell and Cmd all print the same

bla /usr/local/bla
bla \usr\local\bla
bla C:\usr\local\bla
bla C:/usr/local/bla
bla bla

[thaJeztah]

Except, most of them should've printed bla?

If you use, for example, C:/Users/me/somefile, does it work, and is the config read from that file?

[mat007]

They all printed bla (first column).
Yes C:/Users/me/somefile yields somefile.
What config are you referring to?

[thaJeztah]

oh lol, I somehow overlooked the first column, and thought only the last example actually returned bla

What config are you referring to?

sorry, I was typing from my phone so a bit short; Ignore that part, as it's not relevant now

[cpuguy83]

I think filepath.FromSlash my be needed here, because filepath.Base is looking for os.PathSeparator. For instance, what happens if the path is /usr/local/bla/?
But I don't have Windows lying around to test this. There should likely be some tests for this.

[cpuguy83]

@thaJeztah pointed out that it's looking at os.IsPathSeparator which on Windows accepts both \\ and / as a path separator.

[thaJeztah]

LGTM

[cpuguy83]

LGTM