add SkipRetry ff to options struct

Author: jenae-janzen

go/porcelain/deploy.go

@@ -83,7 +83,8 @@ type DeployOptions struct {
 	BuildDir          string
 	LargeMediaEnabled bool
 
-	IsDraft bool
+	IsDraft   bool
+	SkipRetry bool
 
 	Title             string
 	Branch            string
@@ -344,12 +345,14 @@ func (n *Netlify) DoDeploy(ctx context.Context, options *DeployOptions, deploy *
 		return deploy, nil
 	}
 
-	if err := n.uploadFiles(ctx, deploy, options.files, options.Observer, fileUpload, options.UploadTimeout); err != nil {
+	skipRetry := options.SkipRetry || false
+
+	if err := n.uploadFiles(ctx, deploy, options.files, options.Observer, fileUpload, options.UploadTimeout, skipRetry); err != nil {
 		return nil, err
 	}
 
 	if options.functions != nil {
-		if err := n.uploadFiles(ctx, deploy, options.functions, options.Observer, functionUpload, options.UploadTimeout); err != nil {
+		if err := n.uploadFiles(ctx, deploy, options.functions, options.Observer, functionUpload, options.UploadTimeout, options.SkipRetry); err != nil {
 			return nil, err
 		}
 	}
@@ -401,7 +404,7 @@ func (n *Netlify) WaitUntilDeployLive(ctx context.Context, d *models.Deploy) (*m
 	return n.waitForState(ctx, d, "ready")
 }
 
-func (n *Netlify) uploadFiles(ctx context.Context, d *models.Deploy, files *deployFiles, observer DeployObserver, t uploadType, timeout time.Duration) error {
+func (n *Netlify) uploadFiles(ctx context.Context, d *models.Deploy, files *deployFiles, observer DeployObserver, t uploadType, timeout time.Duration, skipRetry bool) error {
 	sharedErr := &uploadError{err: nil, mutex: &sync.Mutex{}}
 	sem := make(chan int, n.uploadLimit)
 	wg := &sync.WaitGroup{}
@@ -431,7 +434,7 @@ func (n *Netlify) uploadFiles(ctx context.Context, d *models.Deploy, files *depl
 			select {
 			case sem <- 1:
 				wg.Add(1)
-				go n.uploadFile(ctx, d, file, observer, t, timeout, wg, sem, sharedErr)
+				go n.uploadFile(ctx, d, file, observer, t, timeout, wg, sem, sharedErr, skipRetry)
 			case <-ctx.Done():
 				log.Info("Context terminated, aborting file upload")
 				return errors.Wrap(ctx.Err(), "aborted file upload early")
@@ -451,7 +454,7 @@ func (n *Netlify) uploadFiles(ctx context.Context, d *models.Deploy, files *depl
 	return sharedErr.err
 }
 
-func (n *Netlify) uploadFile(ctx context.Context, d *models.Deploy, f *FileBundle, c DeployObserver, t uploadType, timeout time.Duration, wg *sync.WaitGroup, sem chan int, sharedErr *uploadError) {
+func (n *Netlify) uploadFile(ctx context.Context, d *models.Deploy, f *FileBundle, c DeployObserver, t uploadType, timeout time.Duration, wg *sync.WaitGroup, sem chan int, sharedErr *uploadError, skipRetry bool) {
 	defer func() {
 		wg.Done()
 		<-sem
@@ -545,7 +548,7 @@ func (n *Netlify) uploadFile(ctx context.Context, d *models.Deploy, f *FileBundl
 					sharedErr.mutex.Unlock()
 				}
 
-				if apiErr.Code() == 400 || apiErr.Code() == 422 {
+				if skipRetry && (apiErr.Code() == 400 || apiErr.Code() == 422) {
 					sharedErr.mutex.Lock()
 					sharedErr.err = operationError
 					sharedErr.mutex.Unlock()

go/porcelain/deploy_test.go

@@ -287,7 +287,7 @@ func TestUploadFiles_Cancelation(t *testing.T) {
 	for _, bundle := range files.Files {
 		d.Required = append(d.Required, bundle.Sum)
 	}
-	err = client.uploadFiles(ctx, d, files, nil, fileUpload, time.Minute)
+	err = client.uploadFiles(ctx, d, files, nil, fileUpload, time.Minute, false)
 	require.ErrorIs(t, err, gocontext.Canceled)
 }
 
@@ -317,7 +317,7 @@ func TestUploadFiles_Errors(t *testing.T) {
 	for _, bundle := range files.Files {
 		d.Required = append(d.Required, bundle.Sum)
 	}
-	err = client.uploadFiles(ctx, d, files, nil, fileUpload, time.Minute)
+	err = client.uploadFiles(ctx, d, files, nil, fileUpload, time.Minute, false)
 	require.Equal(t, err.Error(), "[PUT /deploys/{deploy_id}/files/{path}][500] uploadDeployFile default  &{Code:0 Message:}")
 }
 
@@ -377,11 +377,11 @@ func TestUploadFiles_SkipEqualFiles(t *testing.T) {
 	d.Required = []string{files.Sums["a.html"]}
 	d.RequiredFunctions = []string{functions.Sums["a"]}
 
-	err = client.uploadFiles(ctx, d, files, nil, fileUpload, time.Minute)
+	err = client.uploadFiles(ctx, d, files, nil, fileUpload, time.Minute, false)
 	require.NoError(t, err)
 	assert.Equal(t, 1, serverRequests)
 
-	err = client.uploadFiles(ctx, d, functions, nil, functionUpload, time.Minute)
+	err = client.uploadFiles(ctx, d, functions, nil, functionUpload, time.Minute, false)
 	require.NoError(t, err)
 	assert.Equal(t, 2, serverRequests)
 }
@@ -437,7 +437,7 @@ func TestUploadFunctions_RetryCountHeader(t *testing.T) {
 		d.RequiredFunctions = append(d.RequiredFunctions, bundle.Sum)
 	}
 
-	require.NoError(t, client.uploadFiles(apiCtx, d, files, nil, functionUpload, time.Minute))
+	require.NoError(t, client.uploadFiles(apiCtx, d, files, nil, functionUpload, time.Minute, false))
 }
 
 func TestBundle(t *testing.T) {