make it a deploy option, not a client one

Author: rybit

go/porcelain/deploy.go

@@ -30,6 +30,8 @@ import (
 const (
 	jsRuntime = "js"
 	goRuntime = "go"
+
+	preProcessingTimeout = time.Minute * 5
 )
 
 type uploadType int
@@ -62,10 +64,11 @@ type DeployOptions struct {
 
 	IsDraft bool
 
-	Title         string
-	Branch        string
-	CommitRef     string
-	UploadTimeout time.Duration
+	Title             string
+	Branch            string
+	CommitRef         string
+	UploadTimeout     time.Duration
+	PreProcessTimeout time.Duration
 
 	Observer DeployObserver
 
@@ -237,7 +240,7 @@ func (n *Netlify) DoDeploy(ctx context.Context, options *DeployOptions, deploy *
 
 	if n.overCommitted(options.files) {
 		var err error
-		deploy, err = n.WaitUntilDeployReady(ctx, deploy)
+		deploy, err = n.WaitUntilDeployReady(ctx, deploy, options.PreProcessTimeout)
 		if err != nil {
 			if options.Observer != nil {
 				options.Observer.OnFailedDelta(deployFiles)
@@ -269,11 +272,15 @@ func (n *Netlify) DoDeploy(ctx context.Context, options *DeployOptions, deploy *
 	return deploy, nil
 }
 
-func (n *Netlify) WaitUntilDeployReady(ctx context.Context, d *models.Deploy) (*models.Deploy, error) {
+func (n *Netlify) WaitUntilDeployReady(ctx context.Context, d *models.Deploy, timeout time.Duration) (*models.Deploy, error) {
 	authInfo := context.GetAuthInfo(ctx)
 	ticker := time.NewTicker(2 * time.Second)
 	defer ticker.Stop()
 
+	if timeout <= 0 {
+		timeout = preProcessingTimeout
+	}
+
 	params := operations.NewGetSiteDeployParams().WithSiteID(d.SiteID).WithDeployID(d.ID)
 	start := time.Now()
 	for t := range ticker.C {
@@ -295,7 +302,7 @@ func (n *Netlify) WaitUntilDeployReady(ctx context.Context, d *models.Deploy) (*
 			return nil, fmt.Errorf("Error: preprocessing deploy failed")
 		}
 
-		if t.Sub(start) > n.preProcessingTimeout {
+		if t.Sub(start) > timeout {
 			return nil, fmt.Errorf("Error: preprocessing deploy timed out")
 		}
 	}

go/porcelain/netlify_client.go

@@ -1,8 +1,6 @@
 package porcelain
 
 import (
-	"time"
-
 	"github.com/go-openapi/runtime"
 	httptransport "github.com/go-openapi/runtime/client"
 	"github.com/go-openapi/strfmt"
@@ -13,7 +11,6 @@ import (
 const DefaultSyncFileLimit = 7000
 const DefaultConcurrentUploadLimit = 10
 const DefaultRetryAttempts = 3
-const DefaultPreProcessingTimeout = time.Minute * 5
 
 // Default netlify HTTP client.
 var Default = NewHTTPClient(nil)
@@ -44,19 +41,17 @@ func NewRetryable(transport runtime.ClientTransport, formats strfmt.Registry, at
 func New(transport runtime.ClientTransport, formats strfmt.Registry) *Netlify {
 	n := plumbing.New(transport, formats)
 	return &Netlify{
-		Netlify:              n,
-		syncFileLimit:        DefaultSyncFileLimit,
-		uploadLimit:          DefaultConcurrentUploadLimit,
-		preProcessingTimeout: DefaultPreProcessingTimeout,
+		Netlify:       n,
+		syncFileLimit: DefaultSyncFileLimit,
+		uploadLimit:   DefaultConcurrentUploadLimit,
 	}
 }
 
 // Netlify is a client for netlify
 type Netlify struct {
 	*plumbing.Netlify
-	syncFileLimit        int
-	uploadLimit          int
-	preProcessingTimeout time.Duration
+	syncFileLimit int
+	uploadLimit   int
 }
 
 func (n *Netlify) SetSyncFileLimit(limit int) {
@@ -68,9 +63,3 @@ func (n *Netlify) SetConcurrentUploadLimit(limit int) {
 		n.uploadLimit = limit
 	}
 }
-
-func (n *Netlify) SetPreProcessingTimeout(dur time.Duration) {
-	if dur > 0 {
-		n.preProcessingTimeout = dur
-	}
-}