Merge pull request #934 from Vafilor/fix/s3.files

Vafilor · web-flow · commit 023fb50046b9 · 2021-07-20T13:18:13.000-07:00
fix: s3 not listing files in file browser
diff --git a/pkg/workflow_execution.go b/pkg/workflow_execution.go
@@ -1745,13 +1745,16 @@ func (c *Client) ListFiles(namespace, key string) (files []*File, err error) {
 
 	files = make([]*File, 0)
 
-	if key == "/" {
-		key = ""
-	} else if len(key) > 0 {
+	if len(key) > 0 && strings.HasPrefix(key, "/") {
+		key = key[1:]
+	}
+
+	if len(key) > 0 {
 		if string(key[len(key)-1]) != "/" {
 			key += "/"
 		}
 	}
+
 	switch {
 	case config.ArtifactRepository.S3 != nil:
 		{

Original file line number	Diff line number	Diff line change
`@@ -1745,13 +1745,16 @@ func (c Client) ListFiles(namespace, key string) (files []File, err error) {`
`1745`	`1745`
`1746`	`1746`	`files = make([]*File, 0)`
`1747`	`1747`
`1748`		`- if key == "/" {`
`1749`		`- key = ""`
`1750`		`- } else if len(key) > 0 {`
	`1748`	`+ if len(key) > 0 && strings.HasPrefix(key, "/") {`
	`1749`	`+ key = key[1:]`
	`1750`	`+ }`
	`1751`	`+`
	`1752`	`+ if len(key) > 0 {`
`1751`	`1753`	`if string(key[len(key)-1]) != "/" {`
`1752`	`1754`	`key += "/"`
`1753`	`1755`	`}`
`1754`	`1756`	`}`
	`1757`	`+`
`1755`	`1758`	`switch {`
`1756`	`1759`	`case config.ArtifactRepository.S3 != nil:`
`1757`	`1760`	`{`