Merge branch 'master' into golang-al2

Author: Skn0tt

CHANGELOG.md

@@ -7,6 +7,25 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+## [2.23.0](https://github.com/netlify/open-api/compare/v2.22.0...v2.23.0) (2023-09-28)
+
+
+### Features
+
+* add build data ([9a3da54](https://github.com/netlify/open-api/commit/9a3da54945cc9523eaeb705dcfb360417c696578))
+
+
+### Bug Fixes
+
+* generate go client ([9a785e8](https://github.com/netlify/open-api/commit/9a785e8a15f6ea4d1b2f8feedba188ea1375f712))
+
+## [2.22.0](https://github.com/netlify/open-api/compare/v2.21.1...v2.22.0) (2023-09-22)
+
+
+### Features
+
+* **go-client:** add poll for processed ([#491](https://github.com/netlify/open-api/issues/491)) ([288f331](https://github.com/netlify/open-api/commit/288f3311da509282172ba41f8c8200736744fea3))
+
 ## [2.21.1](https://github.com/netlify/open-api/compare/v2.21.0...v2.21.1) (2023-09-07)
 
 

go/models/create_env_vars_params_body_items.go

@@ -84,7 +84,8 @@ type DeployOptions struct {
 	BuildDir          string
 	LargeMediaEnabled bool
 
-	IsDraft bool
+	IsDraft   bool
+	SkipRetry bool
 
 	Title             string
 	Branch            string
@@ -350,12 +351,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
+
+	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, skipRetry); err != nil {
 			return nil, err
 		}
 	}
@@ -402,12 +405,17 @@ func (n *Netlify) WaitUntilDeployReady(ctx context.Context, d *models.Deploy) (*
 	return n.waitForState(ctx, d, "prepared", "ready")
 }
 
-// WaitUntilDeployLive blocks until the deploy is in the "ready" state. At this point, the deploy is ready to recieve traffic.
+// WaitUntilDeployLive blocks until the deploy is in the "ready" state. At this point, the deploy is ready to receive traffic to all of its URLs.
 func (n *Netlify) WaitUntilDeployLive(ctx context.Context, d *models.Deploy) (*models.Deploy, error) {
 	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 {
+// WaitUntilDeployProcessed blocks until the deploy is in the "processed" state. At this point, the deploy is ready to receive traffic via its permalink.
+func (n *Netlify) WaitUntilDeployProcessed(ctx context.Context, d *models.Deploy) (*models.Deploy, error) {
+	return n.waitForState(ctx, d, "processed")
+}
+
+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{}
@@ -437,7 +445,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")
@@ -457,7 +465,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,10 +553,16 @@ func (n *Netlify) uploadFile(ctx context.Context, d *models.Deploy, f *FileBundl
 			context.GetLogger(ctx).WithError(operationError).Errorf("Failed to upload file %v", f.Name)
 			apiErr, ok := operationError.(deployApiError)
 
-			if ok && apiErr.Code() == 401 {
-				sharedErr.mutex.Lock()
-				sharedErr.err = operationError
-				sharedErr.mutex.Unlock()
+			if ok {
+				if apiErr.Code() == 401 {
+					sharedErr.mutex.Lock()
+					sharedErr.err = operationError
+					sharedErr.mutex.Unlock()
+				}
+
+				if skipRetry && (apiErr.Code() == 400 || apiErr.Code() == 422) {
+					operationError = backoff.Permanent(operationError)
+				}
 			}
 		}
 
@@ -809,11 +823,12 @@ func bundleFromManifest(ctx context.Context, manifestFile *os.File, observer Dep
 			}
 		}
 
-		if function.DisplayName != "" || function.Generator != "" || len(routes) > 0 {
+		if function.DisplayName != "" || function.Generator != "" || len(routes) > 0 || len(function.BuildData) > 0 {
 			functionsConfig[file.Name] = models.FunctionConfig{
 				DisplayName: function.DisplayName,
 				Generator:   function.Generator,
 				Routes:      routes,
+				BuildData:   function.BuildData,
 			}
 		}