The add service command introduces backslashes in kustomize.yaml (#12…

…12) (#260)

Signed-off-by: Keith Chong <[email protected]>

pkg/pipelines/environments/environments.go

@@ -227,7 +227,8 @@ func ListFiles(fs afero.Fs, base string) (StringSet, error) {
 		if info.IsDir() {
 			return nil
 		}
-		filename := strings.TrimPrefix(path, base+"/")
+		// Convert backslashes on Windows to forward slashes, and trim the 'base' prefix so it is a relative path.
+		filename := strings.TrimPrefix(filepath.ToSlash(path), filepath.ToSlash(base)+"/")
 		if filename == kustomization {
 			return nil
 		}

pkg/pipelines/environments/environments_test.go

@@ -2,6 +2,7 @@ package environments
 
 import (
 	"os"
+	"runtime"
 	"sort"
 	"testing"
 
@@ -209,6 +210,50 @@ func TestBuildEnvironmentFilesWithNoCICDEnv(t *testing.T) {
 	}
 }
 
+func TestListFiles(t *testing.T) {
+	var appFs = ioutils.NewMemoryFilesystem()
+	var envPath = "environments/test-dev"
+	var basePath = "environments/test-dev/base"
+	err := appFs.MkdirAll(basePath, 0755)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if runtime.GOOS == "windows" {
+		envPath = "environments\\test-dev"
+		basePath = "environments\\test-dev\\base"
+		mustWriteFile(t, appFs, "environments\\test-dev\\base\\01-namespaces\\cicd-environment.yaml", []byte(`this is a file`), 0644)
+		mustWriteFile(t, appFs, "environments\\test-dev\\base\\02-rolebindings\\argocd-admin.yaml", []byte(`this is a file`), 0644)
+		mustWriteFile(t, appFs, "environments\\test-dev\\base\\03-tasks\\deploy-from-source-task.yaml", []byte(`this is a file`), 0644)
+		mustWriteFile(t, appFs, "environments\\test-dev\\base\\04-pipelines\\app-ci-pipeline.yaml", []byte(`this is a file`), 0644)
+		mustWriteFile(t, appFs, "environments\\test-dev\\base\\08-routes\\gitops-webhook-event-listener.yaml", []byte(`this is a file`), 0644)
+	} else {
+		mustWriteFile(t, appFs, "environments/test-dev/base/01-namespaces/cicd-environment.yaml", []byte(`this is a file`), 0644)
+		mustWriteFile(t, appFs, "environments/test-dev/base/02-rolebindings/argocd-admin.yaml", []byte(`this is a file`), 0644)
+		mustWriteFile(t, appFs, "environments/test-dev/base/03-tasks/deploy-from-source-task.yaml", []byte(`this is a file`), 0644)
+		mustWriteFile(t, appFs, "environments/test-dev/base/04-pipelines/app-ci-pipeline.yaml", []byte(`this is a file`), 0644)
+		mustWriteFile(t, appFs, "environments/test-dev/base/08-routes/gitops-webhook-event-listener.yaml", []byte(`this is a file`), 0644)
+	}
+	exists, err := appFs.DirExists(envPath)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if !exists {
+		t.Fatal("Folder does not exist")
+	}
+	// This will strip the prefix base from the list of files
+	listFiles, err := ListFiles(appFs, basePath)
+	want := StringSet{
+		"01-namespaces/cicd-environment.yaml":          true,
+		"02-rolebindings/argocd-admin.yaml":            true,
+		"03-tasks/deploy-from-source-task.yaml":        true,
+		"04-pipelines/app-ci-pipeline.yaml":            true,
+		"08-routes/gitops-webhook-event-listener.yaml": true,
+	}
+	if diff := cmp.Diff(want, listFiles); diff != "" {
+		t.Fatalf("files didn't match: %s\n", diff)
+	}
+}
+
 func filesFromResources(r res.Resources) []string {
 	names := []string{}
 	for k := range r {