Merge pull request #767 from zappy-shu/APP-345-validate-fails-trailing-slash

Clean path before validating app

Author: rumpl

internal/names.go

@@ -95,7 +95,7 @@ func AppNameFromDir(dirName string) string {
 // DirNameFromAppName takes an application name and returns the
 // corresponding directory name
 func DirNameFromAppName(appName string) string {
-	if strings.HasSuffix(strings.TrimSuffix(appName, "/"), AppExtension) {
+	if strings.HasSuffix(filepath.Clean(appName), AppExtension) {
 		return appName
 	}
 	return appName + AppExtension

internal/names_test.go

@@ -37,6 +37,7 @@ func TestDirNameFromAppName(t *testing.T) {
 		{name: "", expected: ".dockerapp"},
 		{name: "foo/bar", expected: "foo/bar.dockerapp"},
 		{name: "foo/bar.dockerapp", expected: "foo/bar.dockerapp"},
+		{name: "foo/bar.dockerapp/", expected: "foo/bar.dockerapp/"},
 		// FIXME(vdemeester) we should fail here
 		{name: "foo/bar/", expected: "foo/bar/.dockerapp"},
 		{name: "/foo/bar.dockerapp", expected: "/foo/bar.dockerapp"},