ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove retryFunc 

it's now in the communicator package
This commit is contained in:
James Bardin 2018-02-14 18:30:20 -05:00
parent 89a0ac6e89
commit d02250c2b9
1 changed files with 7 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
builtin/provisioners/file/resource_provisioner.go
View File

@ -4,9 +4,7 @@ import (
"context" "context"
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"log"
"os" "os"
"time"
"github.com/hashicorp/terraform/communicator" "github.com/hashicorp/terraform/communicator"
"github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/schema"
@ -50,6 +48,9 @@ func applyFn(ctx context.Context) error {
return err return err
} }
ctx, cancel := context.WithTimeout(ctx, comm.Timeout())
defer cancel()
// Get the source // Get the source
src, deleteSource, err := getSrc(data) src, deleteSource, err := getSrc(data)
if err != nil { if err != nil {
@ -61,21 +62,11 @@ func applyFn(ctx context.Context) error {
// Begin the file copy // Begin the file copy
dst := data.Get("destination").(string) dst := data.Get("destination").(string)
resultCh := make(chan error, 1)
go func() {
resultCh <- copyFiles(comm, src, dst)
}()
// Allow the file copy to complete unless there is an interrupt. if err := copyFiles(ctx, comm, src, dst); err != nil {
// If there is an interrupt we make no attempt to cleanly close
// the connection currently. We just abruptly exit. Because Terraform
// taints the resource, this is fine.
select {
case err := <-resultCh:
return err return err
case <-ctx.Done():
return fmt.Errorf("file transfer interrupted")
} }
return nil
} }
func validateFn(c *terraform.ResourceConfig) (ws []string, es []error) { func validateFn(c *terraform.ResourceConfig) (ws []string, es []error) {
@ -107,9 +98,9 @@ func getSrc(data *schema.ResourceData) (string, bool, error) {
} }
// copyFiles is used to copy the files from a source to a destination // copyFiles is used to copy the files from a source to a destination
func copyFiles(comm communicator.Communicator, src, dst string) error { func copyFiles(ctx context.Context, comm communicator.Communicator, src, dst string) error {
// Wait and retry until we establish the connection // Wait and retry until we establish the connection
err := retryFunc(comm.Timeout(), func() error { err := communicator.Retry(ctx, func() error {
err := comm.Connect(nil) err := comm.Connect(nil)
return err return err
}) })
@ -144,21 +135,3 @@ func copyFiles(comm communicator.Communicator, src, dst string) error {
} }
return err return err
} }
// retryFunc is used to retry a function for a given duration
func retryFunc(timeout time.Duration, f func() error) error {
finish := time.After(timeout)
for {
err := f()
if err == nil {
return nil
}
log.Printf("Retryable error: %v", err)
select {
case <-finish:
return err
case <-time.After(3 * time.Second):
}
}
}