helper/ssh: add random number to script [GH-1545]

helper/ssh/provisioner.go

@@ -5,8 +5,11 @@ import (
  "fmt"
  "io/ioutil"
  "log"
+ "math/rand"
  "net"
  "os"
+ "strconv"
+ "strings"
  "time"
 
  "github.com/hashicorp/terraform/terraform"
@@ -25,7 +28,7 @@ const (
 
  // DefaultScriptPath is used as the path to copy the file to
  // for remote execution if not provided otherwise.
- DefaultScriptPath = "/tmp/script.sh"
+ DefaultScriptPath = "/tmp/script_%RAND%.sh"
 
  // DefaultTimeout is used if there is no timeout given
  DefaultTimeout = 5 * time.Minute
@@ -46,6 +49,12 @@ type SSHConfig struct {
  TimeoutVal time.Duration `mapstructure:"-"`
 }
 
+func (c *SSHConfig) RemotePath() string {
+ return strings.Replace(
+ c.ScriptPath, "%RAND%",
+ strconv.FormatInt(int64(rand.Int31()), 10), -1)
+}
+
 // VerifySSH is used to verify the ConnInfo is usable by remote-exec
 func VerifySSH(s *terraform.InstanceState) error {
  connType := s.Ephemeral.ConnInfo["type"]

helper/ssh/provisioner_test.go

@@ -1,11 +1,41 @@
 package ssh
 
 import (
+ "regexp"
  "testing"
 
  "github.com/hashicorp/terraform/terraform"
 )
 
+func TestSSHConfig_RemotePath(t *testing.T) {
+ cases := []struct {
+ Input string
+ Pattern string
+ }{
+ {
+ "/tmp/script.sh",
+ `^/tmp/script\.sh$`,
+ },
+ {
+ "/tmp/script_%RAND%.sh",
+ `^/tmp/script_(\d+)\.sh$`,
+ },
+ }
+
+ for _, tc := range cases {
+ config := &SSHConfig{ScriptPath: tc.Input}
+ output := config.RemotePath()
+
+ match, err := regexp.Match(tc.Pattern, []byte(output))
+ if err != nil {
+ t.Fatalf("bad: %s\n\nerr: %s", tc.Input, err)
+ }
+ if !match {
+ t.Fatalf("bad: %s\n\n%s", tc.Input, output)
+ }
+ }
+}
+
 func TestResourceProvider_verifySSH(t *testing.T) {
  r := &terraform.InstanceState{
  Ephemeral: terraform.EphemeralState{