fix: upload a single file per sha (#425)

* uploaded a single file per sha

* Test skipping files with the same SHA

* test number of server requests, and pass corret `Required` array to the function call

* fix typo

* chore: simplify file sum fixture logic

* chore: remove log assertions in test

* chore: add flag and test for function bundle uploads

* chore: missing comment

* chore: drop the option used for release candidate release

---------

Co-authored-by: JGAntunes <[email protected]>

Author: 4xposed

go/porcelain/deploy.go

@@ -412,14 +412,21 @@ func (n *Netlify) uploadFiles(ctx context.Context, d *models.Deploy, files *depl
 
 	for _, sha := range required {
 		if files, exist := files.Hashed[sha]; exist {
-			for _, file := range files {
-				select {
-				case sem <- 1:
-					wg.Add(1)
-					go n.uploadFile(ctx, d, file, observer, t, timeout, wg, sem, sharedErr)
-				case <-ctx.Done():
-					log.Info("Context terminated, aborting file upload")
-					return errors.Wrap(ctx.Err(), "aborted file upload early")
+			file := files[0]
+
+			select {
+			case sem <- 1:
+				wg.Add(1)
+				go n.uploadFile(ctx, d, file, observer, t, timeout, wg, sem, sharedErr)
+			case <-ctx.Done():
+				log.Info("Context terminated, aborting file upload")
+				return errors.Wrap(ctx.Err(), "aborted file upload early")
+			}
+
+			if len(files) > 1 {
+				skippedFiles := files[1:]
+				for _, file := range skippedFiles {
+					log.Infof("Skipping file with content already uploaded: %s", file.Name)
 				}
 			}
 		}

go/porcelain/deploy_test.go

@@ -262,6 +262,71 @@ func TestUploadFiles_Cancelation(t *testing.T) {
 	require.ErrorIs(t, err, gocontext.Canceled)
 }
 
+func TestUploadFiles_SkipEqualFiles(t *testing.T) {
+	ctx := gocontext.Background()
+
+	serverRequests := 0
+
+	server := httptest.NewServer(http.HandlerFunc(func(rw http.ResponseWriter, req *http.Request) {
+		serverRequests++
+
+		rw.Header().Set("Content-Type", "application/json; charset=utf-8")
+		rw.Write([]byte(`{}`))
+	}))
+	defer server.Close()
+
+	hu, _ := url.Parse(server.URL)
+	tr := apiClient.NewWithClient(hu.Host, "/api/v1", []string{"http"}, http.DefaultClient)
+	client := NewRetryable(tr, strfmt.Default, 1)
+	client.uploadLimit = 1
+	ctx = context.WithAuthInfo(ctx, apiClient.BearerToken("token"))
+
+	// Create some files to deploy
+	dir, err := ioutil.TempDir("", "deploy")
+	require.NoError(t, err)
+	defer os.RemoveAll(dir)
+
+	fileBody := []byte("Hello")
+
+	require.NoError(t, ioutil.WriteFile(filepath.Join(dir, "a.html"), fileBody, 0644))
+	require.NoError(t, ioutil.WriteFile(filepath.Join(dir, "b.html"), fileBody, 0644))
+
+	files, err := walk(dir, nil, false, false)
+	require.NoError(t, err)
+
+	// Create some fake function bundles to deploy
+	functionsDir, err := ioutil.TempDir("", "deploy-functions")
+	require.NoError(t, err)
+	defer os.RemoveAll(functionsDir)
+
+	// Get the JS function bundle
+	cwd, _ := os.Getwd()
+	basePath := path.Join(filepath.Dir(cwd), "internal", "data")
+	jsFunctionPath := strings.Replace(filepath.Join(basePath, "hello-js-function-test.zip"), "\\", "/", -1)
+	bundleBody, err := ioutil.ReadFile(jsFunctionPath)
+	require.NoError(t, err)
+
+	require.NoError(t, ioutil.WriteFile(filepath.Join(functionsDir, "a.zip"), bundleBody, 0644))
+	require.NoError(t, ioutil.WriteFile(filepath.Join(functionsDir, "b.zip"), bundleBody, 0644))
+
+	functions, _, _, err := bundle(ctx, functionsDir, mockObserver{})
+	require.NoError(t, err)
+
+	d := &models.Deploy{}
+	// uploadFiles relies on the fact that the list of sums is an array of unique values, as both
+	// the files and bundles have the same SHA we only need one of them for the Required array
+	d.Required = []string{files.Sums["a.html"]}
+	d.RequiredFunctions = []string{functions.Sums["a"]}
+
+	err = client.uploadFiles(ctx, d, files, nil, fileUpload, time.Minute)
+	require.NoError(t, err)
+	assert.Equal(t, 1, serverRequests)
+
+	err = client.uploadFiles(ctx, d, functions, nil, functionUpload, time.Minute)
+	require.NoError(t, err)
+	assert.Equal(t, 2, serverRequests)
+}
+
 func TestUploadFunctions_RetryCountHeader(t *testing.T) {
 	attempts := 0
 	ctx, cancel := gocontext.WithCancel(gocontext.Background())