fix(sidekick): Tests and commands run in Windows (#1954)

Author: amanda-tarafa

internal/sidekick/downloads_cache.go

@@ -119,33 +119,30 @@ func downloadAttempt(target, source, expectedSha256 string) error {
 	if err != nil {
 		return err
 	}
-	defer os.Remove(tempFile.Name())
+	defer func() {
+		tempFile.Close()
+		os.Remove(tempFile.Name())
+	}()
+
+	hasher := sha256.New()
+	writer := io.MultiWriter(tempFile, hasher)
 
 	response, err := http.Get(source)
 	if err != nil {
 		return err
 	}
+	defer response.Body.Close()
 	if response.StatusCode >= 300 {
 		return fmt.Errorf("http error in download %s", response.Status)
 	}
 
-	if _, err := io.Copy(tempFile, response.Body); err != nil {
+	if _, err := io.Copy(writer, response.Body); err != nil {
 		return err
 	}
 	if err := tempFile.Close(); err != nil {
 		return err
 	}
-	if err := response.Body.Close(); err != nil {
-		return err
-	}
-	file, err := os.Open(tempFile.Name())
-	if err != nil {
-		return err
-	}
-	hasher := sha256.New()
-	if _, err := io.Copy(hasher, file); err != nil {
-		return err
-	}
+
 	got := fmt.Sprintf("%x", hasher.Sum(nil))
 	if expectedSha256 != got {
 		return fmt.Errorf("mismatched hash on download, expected=%s, got=%s", expectedSha256, got)

internal/sidekick/internal/dart/generate.go

@@ -47,6 +47,7 @@ func Generate(model *api.API, outdir string, config *config.Config) error {
 
 func templatesProvider() language.TemplateProvider {
 	return func(name string) (string, error) {
+		name = filepath.ToSlash(name)
 		contents, err := dartTemplates.ReadFile(name)
 		if err != nil {
 			return "", err

internal/sidekick/internal/gcloud/command_test.go

@@ -49,6 +49,8 @@ func TestCommandYAML(t *testing.T) {
 			if err != nil {
 				t.Fatalf("failed to read file: %v", err)
 			}
+			data = bytes.ReplaceAll(data, []byte("\r\n"), []byte("\n"))
+
 			if strings.Contains(string(data), "_PARTIALS_") {
 				return
 			}

internal/sidekick/internal/language/walk_templates_dir_test.go

@@ -15,6 +15,7 @@
 package language
 
 import (
+	"path/filepath"
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
@@ -26,11 +27,11 @@ func TestWalkDir(t *testing.T) {
 	want := []GeneratedFile{
 		{
 			TemplatePath: "testTemplates/README.md.mustache",
-			OutputPath:   "/README.md",
+			OutputPath:   filepath.FromSlash("/README.md"),
 		},
 		{
 			TemplatePath: "testTemplates/test001.txt.mustache",
-			OutputPath:   "/test001.txt",
+			OutputPath:   filepath.FromSlash("/test001.txt"),
 		},
 	}
 	if diff := cmp.Diff(want, got); len(diff) != 0 {

internal/sidekick/internal/protobuf/input_files.go

@@ -95,7 +95,7 @@ func applyIncludeList(files map[string]bool, sourceDirectory string, options map
 	// Ignore any discovered paths, only the paths from the include list apply.
 	clear(files)
 	for _, p := range strings.Split(list, ",") {
-		files[path.Join(sourceDirectory, p)] = true
+		files[filepath.ToSlash(path.Join(sourceDirectory, p))] = true
 	}
 }
 
@@ -105,6 +105,6 @@ func applyExcludeList(files map[string]bool, sourceDirectory string, options map
 		return
 	}
 	for _, p := range strings.Split(list, ",") {
-		delete(files, path.Join(sourceDirectory, p))
+		delete(files, filepath.ToSlash(path.Join(sourceDirectory, p)))
 	}
 }

internal/sidekick/internal/protobuf/input_files_test.go

@@ -39,9 +39,12 @@ func TestBasic(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
+	for i := range got {
+		got[i] = filepath.ToSlash(got[i])
+	}
 	want := []string{
-		path.Join(testdataDir, source, "resources.proto"),
-		path.Join(testdataDir, source, "service.proto"),
+		filepath.ToSlash(path.Join(testdataDir, source, "resources.proto")),
+		filepath.ToSlash(path.Join(testdataDir, source, "service.proto")),
 	}
 	if diff := cmp.Diff(want, got); len(diff) != 0 {
 		t.Errorf("mismatched merged config (-want, +got):\n%s", diff)
@@ -71,8 +74,11 @@ func TestIncludeList(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
+	for i := range got {
+		got[i] = filepath.ToSlash(got[i])
+	}
 	want := []string{
-		path.Join(testdataDir, source, "resources.proto"),
+		filepath.ToSlash(path.Join(testdataDir, source, "resources.proto")),
 	}
 	if diff := cmp.Diff(want, got); len(diff) != 0 {
 		t.Errorf("mismatched merged config (-want, +got):\n%s", diff)
@@ -89,8 +95,11 @@ func TestExcludeList(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
+	for i := range got {
+		got[i] = filepath.ToSlash(got[i])
+	}
 	want := []string{
-		path.Join(testdataDir, source, "service.proto"),
+		filepath.ToSlash(path.Join(testdataDir, source, "service.proto")),
 	}
 	if diff := cmp.Diff(want, got); len(diff) != 0 {
 		t.Errorf("mismatched merged config (-want, +got):\n%s", diff)

internal/sidekick/refreshall.go

@@ -129,6 +129,7 @@ func findAllDirectories(config *config.Config) ([]string, error) {
 }
 
 func isInPath(dir, path string) bool {
+	path = filepath.FromSlash(path)
 	components := strings.Split(path, string(filepath.Separator))
 	return slices.Contains(components, dir)
 }