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

Fixes #2676 by prefixing all Windows commands 

By prefixing them with `cmd /c` it will work with both `winner` and
`ssh` connection types.

This PR also reverts some bad stringer changes made in PR #2673
This commit is contained in:
Sander van Harmelen 2015-07-10 12:56:27 +02:00
parent 7c03b0dedc
commit 4a8ef78d33
9 changed files with 36 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
builtin/provisioners/chef/resource_provisioner.go
View File

@ -27,9 +27,11 @@ const (
defaultEnv = "_default" defaultEnv = "_default"
firstBoot = "first-boot.json" firstBoot = "first-boot.json"
logfileDir = "logfiles" logfileDir = "logfiles"
linuxChefCmd = "chef-client"
linuxConfDir = "/etc/chef" linuxConfDir = "/etc/chef"
secretKey = "encrypted_data_bag_secret" secretKey = "encrypted_data_bag_secret"
validationKey = "validation.pem" validationKey = "validation.pem"
windowsChefCmd = "cmd /c chef-client"
windowsConfDir = "C:/chef" windowsConfDir = "C:/chef"
) )
@ -112,12 +114,12 @@ func (r *ResourceProvisioner) Apply(
case "linux": case "linux":
p.installChefClient = p.linuxInstallChefClient p.installChefClient = p.linuxInstallChefClient
p.createConfigFiles = p.linuxCreateConfigFiles p.createConfigFiles = p.linuxCreateConfigFiles
p.runChefClient = p.runChefClientFunc(linuxConfDir) p.runChefClient = p.runChefClientFunc(linuxChefCmd, linuxConfDir)
p.useSudo = !p.PreventSudo && s.Ephemeral.ConnInfo["user"] != "root" p.useSudo = !p.PreventSudo && s.Ephemeral.ConnInfo["user"] != "root"
case "windows": case "windows":
p.installChefClient = p.windowsInstallChefClient p.installChefClient = p.windowsInstallChefClient
p.createConfigFiles = p.windowsCreateConfigFiles p.createConfigFiles = p.windowsCreateConfigFiles
p.runChefClient = p.runChefClientFunc(windowsConfDir) p.runChefClient = p.runChefClientFunc(windowsChefCmd, windowsConfDir)
p.useSudo = false p.useSudo = false
default: default:
return fmt.Errorf("Unsupported os type: %s", p.OSType) return fmt.Errorf("Unsupported os type: %s", p.OSType)
@ -289,10 +291,11 @@ func retryFunc(timeout time.Duration, f func() error) error {
} }
func (p *Provisioner) runChefClientFunc( func (p *Provisioner) runChefClientFunc(
chefCmd string,
confDir string) func(terraform.UIOutput, communicator.Communicator) error { confDir string) func(terraform.UIOutput, communicator.Communicator) error {
return func(o terraform.UIOutput, comm communicator.Communicator) error { return func(o terraform.UIOutput, comm communicator.Communicator) error {
fb := path.Join(confDir, firstBoot) fb := path.Join(confDir, firstBoot)
cmd := fmt.Sprintf("chef-client -j %q -E %q", fb, p.Environment) cmd := fmt.Sprintf("%s -j %q -E %q", chefCmd, fb, p.Environment)
if p.LogToFile { if p.LogToFile {
if err := os.MkdirAll(logfileDir, 0755); err != nil { if err := os.MkdirAll(logfileDir, 0755); err != nil {

23
builtin/provisioners/chef/resource_provisioner_test.go
View File

@ -1,6 +1,8 @@
package chef package chef
import ( import (
"fmt"
"path"
"testing" "testing"
"github.com/hashicorp/terraform/communicator" "github.com/hashicorp/terraform/communicator"
@ -58,6 +60,7 @@ func testConfig(t *testing.T, c map[string]interface{}) *terraform.ResourceConfi
func TestResourceProvider_runChefClient(t *testing.T) { func TestResourceProvider_runChefClient(t *testing.T) {
cases := map[string]struct { cases := map[string]struct {
Config *terraform.ResourceConfig Config *terraform.ResourceConfig
ChefCmd string
ConfDir string ConfDir string
Commands map[string]bool Commands map[string]bool
}{ }{
@ -70,10 +73,14 @@ func TestResourceProvider_runChefClient(t *testing.T) {
"validation_key_path": "test-fixtures/validator.pem", "validation_key_path": "test-fixtures/validator.pem",
}), }),
ChefCmd: linuxChefCmd,
ConfDir: linuxConfDir, ConfDir: linuxConfDir,
Commands: map[string]bool{ Commands: map[string]bool{
`sudo chef-client -j "/etc/chef/first-boot.json" -E "_default"`: true, fmt.Sprintf(`sudo %s -j %q -E "_default"`,
linuxChefCmd,
path.Join(linuxConfDir, "first-boot.json")): true,
}, },
}, },
@ -87,10 +94,14 @@ func TestResourceProvider_runChefClient(t *testing.T) {
"validation_key_path": "test-fixtures/validator.pem", "validation_key_path": "test-fixtures/validator.pem",
}), }),
ChefCmd: linuxChefCmd,
ConfDir: linuxConfDir, ConfDir: linuxConfDir,
Commands: map[string]bool{ Commands: map[string]bool{
`chef-client -j "/etc/chef/first-boot.json" -E "_default"`: true, fmt.Sprintf(`%s -j %q -E "_default"`,
linuxChefCmd,
path.Join(linuxConfDir, "first-boot.json")): true,
}, },
}, },
@ -105,10 +116,14 @@ func TestResourceProvider_runChefClient(t *testing.T) {
"validation_key_path": "test-fixtures/validator.pem", "validation_key_path": "test-fixtures/validator.pem",
}), }),
ChefCmd: windowsChefCmd,
ConfDir: windowsConfDir, ConfDir: windowsConfDir,
Commands: map[string]bool{ Commands: map[string]bool{
`chef-client -j "C:/chef/first-boot.json" -E "production"`: true, fmt.Sprintf(`%s -j %q -E "production"`,
windowsChefCmd,
path.Join(windowsConfDir, "first-boot.json")): true,
}, },
}, },
} }
@ -125,7 +140,7 @@ func TestResourceProvider_runChefClient(t *testing.T) {
t.Fatalf("Error: %v", err) t.Fatalf("Error: %v", err)
} }
p.runChefClient = p.runChefClientFunc(tc.ConfDir) p.runChefClient = p.runChefClientFunc(tc.ChefCmd, tc.ConfDir)
p.useSudo = !p.PreventSudo p.useSudo = !p.PreventSudo
err = p.runChefClient(o, c) err = p.runChefClient(o, c)

4
builtin/provisioners/chef/windows_provisioner.go
View File

@ -66,7 +66,7 @@ func (p *Provisioner) windowsCreateConfigFiles(
o terraform.UIOutput, o terraform.UIOutput,
comm communicator.Communicator) error { comm communicator.Communicator) error {
// Make sure the config directory exists // Make sure the config directory exists
cmd := fmt.Sprintf("if not exist %q mkdir %q", windowsConfDir, windowsConfDir) cmd := fmt.Sprintf("cmd /c if not exist %q mkdir %q", windowsConfDir, windowsConfDir)
if err := p.runCommand(o, comm, cmd); err != nil { if err := p.runCommand(o, comm, cmd); err != nil {
return err return err
} }
@ -74,7 +74,7 @@ func (p *Provisioner) windowsCreateConfigFiles(
if len(p.OhaiHints) > 0 { if len(p.OhaiHints) > 0 {
// Make sure the hits directory exists // Make sure the hits directory exists
hintsDir := path.Join(windowsConfDir, "ohai/hints") hintsDir := path.Join(windowsConfDir, "ohai/hints")
cmd := fmt.Sprintf("if not exist %q mkdir %q", hintsDir, hintsDir) cmd := fmt.Sprintf("cmd /c if not exist %q mkdir %q", hintsDir, hintsDir)
if err := p.runCommand(o, comm, cmd); err != nil { if err := p.runCommand(o, comm, cmd); err != nil {
return err return err
} }

8
builtin/provisioners/chef/windows_provisioner_test.go
View File

@ -113,8 +113,8 @@ func TestResourceProvider_windowsCreateConfigFiles(t *testing.T) {
}), }),
Commands: map[string]bool{ Commands: map[string]bool{
fmt.Sprintf("if not exist %q mkdir %q", windowsConfDir, windowsConfDir): true, fmt.Sprintf("cmd /c if not exist %q mkdir %q", windowsConfDir, windowsConfDir): true,
fmt.Sprintf("if not exist %q mkdir %q", fmt.Sprintf("cmd /c if not exist %q mkdir %q",
path.Join(windowsConfDir, "ohai/hints"), path.Join(windowsConfDir, "ohai/hints"),
path.Join(windowsConfDir, "ohai/hints")): true, path.Join(windowsConfDir, "ohai/hints")): true,
}, },
@ -142,7 +142,7 @@ func TestResourceProvider_windowsCreateConfigFiles(t *testing.T) {
}), }),
Commands: map[string]bool{ Commands: map[string]bool{
fmt.Sprintf("if not exist %q mkdir %q", windowsConfDir, windowsConfDir): true, fmt.Sprintf("cmd /c if not exist %q mkdir %q", windowsConfDir, windowsConfDir): true,
}, },
Uploads: map[string]string{ Uploads: map[string]string{
@ -185,7 +185,7 @@ func TestResourceProvider_windowsCreateConfigFiles(t *testing.T) {
}), }),
Commands: map[string]bool{ Commands: map[string]bool{
fmt.Sprintf("if not exist %q mkdir %q", windowsConfDir, windowsConfDir): true, fmt.Sprintf("cmd /c if not exist %q mkdir %q", windowsConfDir, windowsConfDir): true,
}, },
Uploads: map[string]string{ Uploads: map[string]string{

2
command/counthookaction_string.go
View File

@ -9,7 +9,7 @@ const _countHookAction_name = "countHookActionAddcountHookActionChangecountHookA
var _countHookAction_index = [...]uint8{0, 18, 39, 60} var _countHookAction_index = [...]uint8{0, 18, 39, 60}
func (i countHookAction) String() string { func (i countHookAction) String() string {
if i+1 >= countHookAction(len(_countHookAction_index)) { if i >= countHookAction(len(_countHookAction_index)-1) {
return fmt.Sprintf("countHookAction(%d)", i) return fmt.Sprintf("countHookAction(%d)", i)
} }
return _countHookAction_name[_countHookAction_index[i]:_countHookAction_index[i+1]] return _countHookAction_name[_countHookAction_index[i]:_countHookAction_index[i+1]]

2
helper/schema/valuetype_string.go
View File

@ -9,7 +9,7 @@ const _ValueType_name = "TypeInvalidTypeBoolTypeIntTypeFloatTypeStringTypeListTy
var _ValueType_index = [...]uint8{0, 11, 19, 26, 35, 45, 53, 60, 67, 77} var _ValueType_index = [...]uint8{0, 11, 19, 26, 35, 45, 53, 60, 67, 77}
func (i ValueType) String() string { func (i ValueType) String() string {
if i < 0 || i+1 >= ValueType(len(_ValueType_index)) { if i < 0 || i >= ValueType(len(_ValueType_index)-1) {
return fmt.Sprintf("ValueType(%d)", i) return fmt.Sprintf("ValueType(%d)", i)
} }
return _ValueType_name[_ValueType_index[i]:_ValueType_index[i+1]] return _ValueType_name[_ValueType_index[i]:_ValueType_index[i+1]]

2
terraform/graphnodeconfigtype_string.go
View File

@ -9,7 +9,7 @@ const _GraphNodeConfigType_name = "GraphNodeConfigTypeInvalidGraphNodeConfigType
var _GraphNodeConfigType_index = [...]uint8{0, 26, 53, 80, 105, 130, 157} var _GraphNodeConfigType_index = [...]uint8{0, 26, 53, 80, 105, 130, 157}
func (i GraphNodeConfigType) String() string { func (i GraphNodeConfigType) String() string {
if i < 0 || i+1 >= GraphNodeConfigType(len(_GraphNodeConfigType_index)) { if i < 0 || i >= GraphNodeConfigType(len(_GraphNodeConfigType_index)-1) {
return fmt.Sprintf("GraphNodeConfigType(%d)", i) return fmt.Sprintf("GraphNodeConfigType(%d)", i)
} }
return _GraphNodeConfigType_name[_GraphNodeConfigType_index[i]:_GraphNodeConfigType_index[i+1]] return _GraphNodeConfigType_name[_GraphNodeConfigType_index[i]:_GraphNodeConfigType_index[i+1]]

2
terraform/instancetype_string.go
View File

@ -9,7 +9,7 @@ const _InstanceType_name = "TypeInvalidTypePrimaryTypeTaintedTypeDeposed"
var _InstanceType_index = [...]uint8{0, 11, 22, 33, 44} var _InstanceType_index = [...]uint8{0, 11, 22, 33, 44}
func (i InstanceType) String() string { func (i InstanceType) String() string {
if i < 0 || i+1 >= InstanceType(len(_InstanceType_index)) { if i < 0 || i >= InstanceType(len(_InstanceType_index)-1) {
return fmt.Sprintf("InstanceType(%d)", i) return fmt.Sprintf("InstanceType(%d)", i)
} }
return _InstanceType_name[_InstanceType_index[i]:_InstanceType_index[i+1]] return _InstanceType_name[_InstanceType_index[i]:_InstanceType_index[i+1]]

2
terraform/walkoperation_string.go
View File

@ -9,7 +9,7 @@ const _walkOperation_name = "walkInvalidwalkInputwalkApplywalkPlanwalkPlanDestro
var _walkOperation_index = [...]uint8{0, 11, 20, 29, 37, 52, 63, 75} var _walkOperation_index = [...]uint8{0, 11, 20, 29, 37, 52, 63, 75}
func (i walkOperation) String() string { func (i walkOperation) String() string {
if i+1 >= walkOperation(len(_walkOperation_index)) { if i >= walkOperation(len(_walkOperation_index)-1) {
return fmt.Sprintf("walkOperation(%d)", i) return fmt.Sprintf("walkOperation(%d)", i)
} }
return _walkOperation_name[_walkOperation_index[i]:_walkOperation_index[i+1]] return _walkOperation_name[_walkOperation_index[i]:_walkOperation_index[i+1]]