Merge branch 'main' into tenantIdFunc

pkg/languages/defaults/python_test.go

@@ -54,15 +54,15 @@ func TestPythonExtractor_ReadDefaults(t *testing.T) {
 		{
 			name: "extract first python file as entrypoint",
 			args: args{
-				r: reporeader.FakeRepoReader{
+				r: reporeader.FakeRepoReader{ // maps order isn't defined but FakeRepoReader sorts the keys
 					Files: map[string][]byte{
-						"foo.py": []byte("print('hello world')"),
 						"bar.py": []byte("print('hello world')"),
+						"foo.py": []byte("print('hello world')"),
 					},
 				},
 			},
 			want: map[string]string{
-				"ENTRYPOINT": "foo.py",
+				"ENTRYPOINT": "bar.py",
 			},
 			wantErr: false,
 		},

pkg/providers/azure.go

@@ -193,7 +193,7 @@ func (sc *SetUpCmd) getTenantId(ctx context.Context) error {
 	if len(tenants) > 1 {
 		return errors.New("multiple tenants found")
 	}
-	sc.tenantId = fmt.Sprint(&tenants[0])
+	sc.tenantId = *tenants[0].TenantID
 
 	return nil
 }

pkg/reporeader/reporeader.go

@@ -2,6 +2,7 @@ package reporeader
 
 import (
 	"path/filepath"
+	"sort"
 	"strings"
 )
 
@@ -55,15 +56,23 @@ func (r FakeRepoReader) FindFiles(path string, patterns []string, maxDepth int)
 	if r.Files == nil {
 		return files, nil
 	}
+
+	// sort files because map iteration order is undefined. lets us control test behavior
+	sortedFiles := make([]string, 0, len(r.Files))
 	for k := range r.Files {
+		sortedFiles = append(sortedFiles, k)
+	}
+	sort.Strings(sortedFiles)
+
+	for _, file := range sortedFiles {
 		for _, pattern := range patterns {
-			if matched, err := filepath.Match(pattern, filepath.Base(k)); err != nil {
+			if matched, err := filepath.Match(pattern, filepath.Base(file)); err != nil {
 				return nil, err
 			} else if matched {
-				splitPath := strings.Split(k, string(filepath.Separator))
+				splitPath := strings.Split(file, string(filepath.Separator))
 				fileDepth := len(splitPath) - 1
 				if fileDepth <= maxDepth {
-					files = append(files, k)
+					files = append(files, file)
 				}
 			}
 		}