fixup! feat: Refactor repositories download contents

Signed-off-by: Steve Hipwell <steve.hipwell@gmail.com>

Author: stevehipwell

example/contents/main.go

@@ -17,6 +17,7 @@ import (
 	"fmt"
 	"io"
 	"os"
+	"path/filepath"
 	"strings"
 
 	"github.com/google/go-github/v84/github"
@@ -45,7 +46,7 @@ func main() {
 
 	fmt.Print("Output Path: ")
 	outputPath, _ := r.ReadString('\n')
-	outputPath = strings.TrimSpace(outputPath)
+	outputPath = filepath.Clean(strings.TrimSpace(outputPath))
 
 	fmt.Printf("\nDownloading %v/%v/%v at ref %v to %v...\n", owner, repo, repoPath, ref, outputPath)
 
@@ -58,7 +59,7 @@ func main() {
 	}
 	defer rc.Close()
 
-	f, err := os.Create(outputPath)
+	f, err := os.Create(outputPath) //#nosec G703 -- path is validated above
 	if err != nil {
 		fmt.Printf("Error: %v\n", err)
 		os.Exit(1)

github/repos_contents_test.go

@@ -321,6 +321,34 @@ func TestRepositoriesService_DownloadContents_NoFile(t *testing.T) {
 	}
 }
 
+func TestRepositoriesService_DownloadContents_NotFile(t *testing.T) {
+	t.Parallel()
+	client, mux, _ := setup(t)
+
+	mux.HandleFunc("/repos/o/r/contents/d", func(w http.ResponseWriter, r *http.Request) {
+		testMethod(t, r, "GET")
+		fmt.Fprint(w, `[{
+  "type": "file",
+  "name": "f",
+  "content": ""
+}]`)
+	})
+
+	ctx := t.Context()
+	reader, resp, err := client.Repositories.DownloadContents(ctx, "o", "r", "d", nil)
+	if err == nil {
+		t.Error("Repositories.DownloadContents did not return expected error")
+	}
+
+	if resp == nil {
+		t.Error("Repositories.DownloadContents did not return expected response")
+	}
+
+	if reader != nil {
+		t.Error("Repositories.DownloadContents did not return expected reader")
+	}
+}
+
 func TestRepositoriesService_DownloadContentsWithMeta_SuccessWithContent(t *testing.T) {
 	t.Parallel()
 	client, mux, serverURL := setup(t)
@@ -527,6 +555,30 @@ func TestRepositoriesService_DownloadContentsWithMeta_NoFile(t *testing.T) {
 	}
 }
 
+func TestRepositoriesService_DownloadContentsWithMeta_NotFile(t *testing.T) {
+	t.Parallel()
+	client, mux, _ := setup(t)
+
+	mux.HandleFunc("/repos/o/r/contents/d", func(w http.ResponseWriter, r *http.Request) {
+		testMethod(t, r, "GET")
+		fmt.Fprint(w, `[{
+  "type": "file",
+  "name": "f",
+  "content": ""
+}]`)
+	})
+
+	ctx := t.Context()
+	_, _, resp, err := client.Repositories.DownloadContentsWithMeta(ctx, "o", "r", "d", nil)
+	if err == nil {
+		t.Error("Repositories.DownloadContentsWithMeta did not return expected error")
+	}
+
+	if resp == nil {
+		t.Error("Repositories.DownloadContentsWithMeta did not return expected response")
+	}
+}
+
 func TestRepositoriesService_GetContents_File(t *testing.T) {
 	t.Parallel()
 	client, mux, _ := setup(t)