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

ran gofmt removed required, added IF

This commit is contained in:
Joshua Seidel 2015-07-09 09:05:12 -04:00
parent 61f47d440d
commit 4070805fcd
4 changed files with 66 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
builtin/provisioners/chef/linux_provisioner_test.go
View File

@ -20,7 +20,7 @@ func TestResourceProvider_linuxInstallChefClient(t *testing.T) {
"server_url": "https://chef.local",
"validation_client_name": "validator",
"validation_key_path": "validator.pem",
"secret_key_path": "encrypted_data_bag_secret",
"secret_key_path": "encrypted_data_bag_secret",
}),
Commands: map[string]bool{
@ -38,7 +38,7 @@ func TestResourceProvider_linuxInstallChefClient(t *testing.T) {
"server_url": "https://chef.local",
"validation_client_name": "validator",
"validation_key_path": "validator.pem",
"secret_key_path": "encrypted_data_bag_secret",
"secret_key_path": "encrypted_data_bag_secret",
}),
Commands: map[string]bool{
@ -57,7 +57,7 @@ func TestResourceProvider_linuxInstallChefClient(t *testing.T) {
"server_url": "https://chef.local",
"validation_client_name": "validator",
"validation_key_path": "validator.pem",
"secret_key_path": "encrypted_data_bag_secret",
"secret_key_path": "encrypted_data_bag_secret",
}),
Commands: map[string]bool{
@ -76,7 +76,7 @@ func TestResourceProvider_linuxInstallChefClient(t *testing.T) {
"server_url": "https://chef.local",
"validation_client_name": "validator",
"validation_key_path": "validator.pem",
"secret_key_path": "encrypted_data_bag_secret",
"secret_key_path": "encrypted_data_bag_secret",
}),
Commands: map[string]bool{
@ -96,7 +96,7 @@ func TestResourceProvider_linuxInstallChefClient(t *testing.T) {
"server_url": "https://chef.local",
"validation_client_name": "validator",
"validation_key_path": "validator.pem",
"secret_key_path": "encrypted_data_bag_secret",
"secret_key_path": "encrypted_data_bag_secret",
}),
Commands: map[string]bool{
@ -117,7 +117,7 @@ func TestResourceProvider_linuxInstallChefClient(t *testing.T) {
"server_url": "https://chef.local",
"validation_client_name": "validator",
"validation_key_path": "validator.pem",
"secret_key_path": "encrypted_data_bag_secret",
"secret_key_path": "encrypted_data_bag_secret",
"version": "11.18.6",
}),
@ -164,7 +164,7 @@ func TestResourceProvider_linuxCreateConfigFiles(t *testing.T) {
"server_url": "https://chef.local",
"validation_client_name": "validator",
"validation_key_path": "test-fixtures/validator.pem",
"secret_key_path": "test-fixtures/encrypted_data_bag_secret",
"secret_key_path": "test-fixtures/encrypted_data_bag_secret",
}),
Commands: map[string]bool{
@ -176,11 +176,11 @@ func TestResourceProvider_linuxCreateConfigFiles(t *testing.T) {
},
Uploads: map[string]string{
linuxConfDir + "/validation.pem": "VALIDATOR-PEM-FILE",
linuxConfDir + "/encrypted_data_bag_secret":"SECRET-KEY-FILE",
linuxConfDir + "/ohai/hints/ohaihint.json": "OHAI-HINT-FILE",
linuxConfDir + "/client.rb": defaultLinuxClientConf,
linuxConfDir + "/first-boot.json": `{"run_list":["cookbook::recipe"]}`,
linuxConfDir + "/validation.pem": "VALIDATOR-PEM-FILE",
linuxConfDir + "/encrypted_data_bag_secret": "SECRET-KEY-FILE",
linuxConfDir + "/ohai/hints/ohaihint.json": "OHAI-HINT-FILE",
linuxConfDir + "/client.rb": defaultLinuxClientConf,
linuxConfDir + "/first-boot.json": `{"run_list":["cookbook::recipe"]}`,
},
},
@ -192,7 +192,7 @@ func TestResourceProvider_linuxCreateConfigFiles(t *testing.T) {
"server_url": "https://chef.local",
"validation_client_name": "validator",
"validation_key_path": "test-fixtures/validator.pem",
"secret_key_path": "test-fixtures/encrypted_data_bag_secret",
"secret_key_path": "test-fixtures/encrypted_data_bag_secret",
}),
Commands: map[string]bool{
@ -200,10 +200,10 @@ func TestResourceProvider_linuxCreateConfigFiles(t *testing.T) {
},
Uploads: map[string]string{
linuxConfDir + "/validation.pem": "VALIDATOR-PEM-FILE",
linuxConfDir + "/encrypted_data_bag_secret":"SECRET-KEY-FILE",
linuxConfDir + "/client.rb": defaultLinuxClientConf,
linuxConfDir + "/first-boot.json": `{"run_list":["cookbook::recipe"]}`,
linuxConfDir + "/validation.pem": "VALIDATOR-PEM-FILE",
linuxConfDir + "/encrypted_data_bag_secret": "SECRET-KEY-FILE",
linuxConfDir + "/client.rb": defaultLinuxClientConf,
linuxConfDir + "/first-boot.json": `{"run_list":["cookbook::recipe"]}`,
},
},
@ -218,7 +218,7 @@ func TestResourceProvider_linuxCreateConfigFiles(t *testing.T) {
"server_url": "https://chef.local",
"validation_client_name": "validator",
"validation_key_path": "test-fixtures/validator.pem",
"secret_key_path": "test-fixtures/encrypted_data_bag_secret",
"secret_key_path": "test-fixtures/encrypted_data_bag_secret",
}),
Commands: map[string]bool{
@ -226,10 +226,10 @@ func TestResourceProvider_linuxCreateConfigFiles(t *testing.T) {
},
Uploads: map[string]string{
linuxConfDir + "/validation.pem": "VALIDATOR-PEM-FILE",
linuxConfDir + "/encrypted_data_bag_secret":"SECRET-KEY-FILE",
linuxConfDir + "/client.rb": proxyLinuxClientConf,
linuxConfDir + "/first-boot.json": `{"run_list":["cookbook::recipe"]}`,
linuxConfDir + "/validation.pem": "VALIDATOR-PEM-FILE",
linuxConfDir + "/encrypted_data_bag_secret": "SECRET-KEY-FILE",
linuxConfDir + "/client.rb": proxyLinuxClientConf,
linuxConfDir + "/first-boot.json": `{"run_list":["cookbook::recipe"]}`,
},
},
@ -262,7 +262,7 @@ func TestResourceProvider_linuxCreateConfigFiles(t *testing.T) {
"server_url": "https://chef.local",
"validation_client_name": "validator",
"validation_key_path": "test-fixtures/validator.pem",
"secret_key_path": "test-fixtures/encrypted_data_bag_secret",
"secret_key_path": "test-fixtures/encrypted_data_bag_secret",
}),
Commands: map[string]bool{
@ -270,9 +270,9 @@ func TestResourceProvider_linuxCreateConfigFiles(t *testing.T) {
},
Uploads: map[string]string{
linuxConfDir + "/validation.pem": "VALIDATOR-PEM-FILE",
linuxConfDir + "/validation.pem": "VALIDATOR-PEM-FILE",
linuxConfDir + "/encrypted_data_bag_secret": "SECRET-KEY-FILE",
linuxConfDir + "/client.rb": defaultLinuxClientConf,
linuxConfDir + "/client.rb": defaultLinuxClientConf,
linuxConfDir + "/first-boot.json": `{"key1":{"subkey1":{"subkey2a":["val1","val2","val3"],` +
`"subkey2b":{"subkey3":"value3"}}},"key2":"value2","run_list":["cookbook::recipe"]}`,
},

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

@ -68,7 +68,7 @@ type Provisioner struct {
OSType string `mapstructure:"os_type"`
PreventSudo bool `mapstructure:"prevent_sudo"`
RunList []string `mapstructure:"run_list"`
SecretKeyPath string `mapstructure:"secret_key_path"`
SecretKeyPath string `mapstructure:"secret_key_path"`
ServerURL string `mapstructure:"server_url"`
SkipInstall bool `mapstructure:"skip_install"`
SSLVerifyMode string `mapstructure:"ssl_verify_mode"`
@ -175,9 +175,6 @@ func (r *ResourceProvisioner) Validate(c *terraform.ResourceConfig) (ws []string
if p.ServerURL == "" {
es = append(es, fmt.Errorf("Key not found: server_url"))
}
if p.SecretKeyPath == "" {
es = append(es, fmt.Errorf("Key not found: secret_key_path"))
}
if p.ValidationClientName == "" {
es = append(es, fmt.Errorf("Key not found: validation_client_name"))
}
@ -233,13 +230,13 @@ func (r *ResourceProvisioner) decodeConfig(c *terraform.ResourceConfig) (*Provis
}
p.ValidationKeyPath = vkeyPath
}
if p.SecretKeyPath != "" {
skeyPath, err := homedir.Expand(p.SecretKeyPath)
if err != nil {
return nil, fmt.Errorf("Error expanding the secret key path: %v", err)
}
p.SecretKeyPath = skeyPath
}
if p.SecretKeyPath != "" {
skeyPath, err := homedir.Expand(p.SecretKeyPath)
if err != nil {
return nil, fmt.Errorf("Error expanding the secret key path: %v", err)
}
p.SecretKeyPath = skeyPath
}
if attrs, ok := c.Config["attributes"]; ok {
p.Attributes, err = rawToJSON(attrs)
if err != nil {
@ -357,16 +354,18 @@ func (p *Provisioner) deployConfigFiles(
return fmt.Errorf("Uploading %s failed: %v", validationKey, err)
}
// Open the secret key file
s, err := os.Open(p.SecretKeyPath)
if err != nil {
return err
}
defer s.Close()
if p.SecretKeyPath != "" {
// Open the secret key file
s, err := os.Open(p.SecretKeyPath)
if err != nil {
return err
}
defer s.Close()
// Copy the secret key to the new instance
if err := comm.Upload(path.Join(confDir, secretKey), s); err != nil {
return fmt.Errorf("Uploading %s failed: %v", secretKey, err)
// Copy the secret key to the new instance
if err := comm.Upload(path.Join(confDir, secretKey), s); err != nil {
return fmt.Errorf("Uploading %s failed: %v", secretKey, err)
}
}
// Make strings.Join available for use within the template

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

@ -21,7 +21,7 @@ func TestResourceProvider_Validate_good(t *testing.T) {
"server_url": "https://chef.local",
"validation_client_name": "validator",
"validation_key_path": "validator.pem",
"secret_key_path": "encrypted_data_bag_secret",
"secret_key_path": "encrypted_data_bag_secret",
})
r := new(ResourceProvisioner)
warn, errs := r.Validate(c)
@ -69,7 +69,7 @@ func TestResourceProvider_runChefClient(t *testing.T) {
"server_url": "https://chef.local",
"validation_client_name": "validator",
"validation_key_path": "test-fixtures/validator.pem",
"secret_key_path": "test-fixtures/encrypted_data_bag_secret",
"secret_key_path": "test-fixtures/encrypted_data_bag_secret",
}),
ConfDir: linuxConfDir,
@ -87,7 +87,7 @@ func TestResourceProvider_runChefClient(t *testing.T) {
"server_url": "https://chef.local",
"validation_client_name": "validator",
"validation_key_path": "test-fixtures/validator.pem",
"secret_key_path": "test-fixtures/encrypted_data_bag_secret",
"secret_key_path": "test-fixtures/encrypted_data_bag_secret",
}),
ConfDir: linuxConfDir,
@ -106,7 +106,7 @@ func TestResourceProvider_runChefClient(t *testing.T) {
"server_url": "https://chef.local",
"validation_client_name": "validator",
"validation_key_path": "test-fixtures/validator.pem",
"secret_key_path": "test-fixtures/encrypted_data_bag_secret",
"secret_key_path": "test-fixtures/encrypted_data_bag_secret",
}),
ConfDir: windowsConfDir,

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

@ -22,7 +22,7 @@ func TestResourceProvider_windowsInstallChefClient(t *testing.T) {
"server_url": "https://chef.local",
"validation_client_name": "validator",
"validation_key_path": "validator.pem",
"secret_key_path": "encrypted_data_bag_secret",
"secret_key_path": "encrypted_data_bag_secret",
}),
Commands: map[string]bool{
@ -43,7 +43,7 @@ func TestResourceProvider_windowsInstallChefClient(t *testing.T) {
"server_url": "https://chef.local",
"validation_client_name": "validator",
"validation_key_path": "validator.pem",
"secret_key_path": "encrypted_data_bag_secret",
"secret_key_path": "encrypted_data_bag_secret",
}),
Commands: map[string]bool{
@ -62,7 +62,7 @@ func TestResourceProvider_windowsInstallChefClient(t *testing.T) {
"server_url": "https://chef.local",
"validation_client_name": "validator",
"validation_key_path": "validator.pem",
"secret_key_path": "encrypted_data_bag_secret",
"secret_key_path": "encrypted_data_bag_secret",
"version": "11.18.6",
}),
@ -112,7 +112,7 @@ func TestResourceProvider_windowsCreateConfigFiles(t *testing.T) {
"server_url": "https://chef.local",
"validation_client_name": "validator",
"validation_key_path": "test-fixtures/validator.pem",
"secret_key_path": "test-fixtures/encrypted_data_bag_secret",
"secret_key_path": "test-fixtures/encrypted_data_bag_secret",
}),
Commands: map[string]bool{
@ -123,11 +123,11 @@ func TestResourceProvider_windowsCreateConfigFiles(t *testing.T) {
},
Uploads: map[string]string{
windowsConfDir + "/validation.pem": "VALIDATOR-PEM-FILE",
windowsConfDir + "/encrypted_data_bag_secret":"SECRET-KEY-FILE",
windowsConfDir + "/ohai/hints/ohaihint.json": "OHAI-HINT-FILE",
windowsConfDir + "/client.rb": defaultWindowsClientConf,
windowsConfDir + "/first-boot.json": `{"run_list":["cookbook::recipe"]}`,
windowsConfDir + "/validation.pem": "VALIDATOR-PEM-FILE",
windowsConfDir + "/encrypted_data_bag_secret": "SECRET-KEY-FILE",
windowsConfDir + "/ohai/hints/ohaihint.json": "OHAI-HINT-FILE",
windowsConfDir + "/client.rb": defaultWindowsClientConf,
windowsConfDir + "/first-boot.json": `{"run_list":["cookbook::recipe"]}`,
},
},
@ -141,7 +141,7 @@ func TestResourceProvider_windowsCreateConfigFiles(t *testing.T) {
"server_url": "https://chef.local",
"validation_client_name": "validator",
"validation_key_path": "test-fixtures/validator.pem",
"secret_key_path": "test-fixtures/encrypted_data_bag_secret",
"secret_key_path": "test-fixtures/encrypted_data_bag_secret",
}),
Commands: map[string]bool{
@ -149,10 +149,10 @@ func TestResourceProvider_windowsCreateConfigFiles(t *testing.T) {
},
Uploads: map[string]string{
windowsConfDir + "/validation.pem": "VALIDATOR-PEM-FILE",
windowsConfDir + "/encrypted_data_bag_secret":"SECRET-KEY-FILE",
windowsConfDir + "/client.rb": proxyWindowsClientConf,
windowsConfDir + "/first-boot.json": `{"run_list":["cookbook::recipe"]}`,
windowsConfDir + "/validation.pem": "VALIDATOR-PEM-FILE",
windowsConfDir + "/encrypted_data_bag_secret": "SECRET-KEY-FILE",
windowsConfDir + "/client.rb": proxyWindowsClientConf,
windowsConfDir + "/first-boot.json": `{"run_list":["cookbook::recipe"]}`,
},
},
@ -184,7 +184,7 @@ func TestResourceProvider_windowsCreateConfigFiles(t *testing.T) {
"server_url": "https://chef.local",
"validation_client_name": "validator",
"validation_key_path": "test-fixtures/validator.pem",
"secret_key_path": "test-fixtures/encrypted_data_bag_secret",
"secret_key_path": "test-fixtures/encrypted_data_bag_secret",
}),
Commands: map[string]bool{
@ -192,9 +192,9 @@ func TestResourceProvider_windowsCreateConfigFiles(t *testing.T) {
},
Uploads: map[string]string{
windowsConfDir + "/validation.pem": "VALIDATOR-PEM-FILE",
windowsConfDir + "/encrypted_data_bag_secret":"SECRET-KEY-FILE",
windowsConfDir + "/client.rb": defaultWindowsClientConf,
windowsConfDir + "/validation.pem": "VALIDATOR-PEM-FILE",
windowsConfDir + "/encrypted_data_bag_secret": "SECRET-KEY-FILE",
windowsConfDir + "/client.rb": defaultWindowsClientConf,
windowsConfDir + "/first-boot.json": `{"key1":{"subkey1":{"subkey2a":["val1","val2","val3"],` +
`"subkey2b":{"subkey3":"value3"}}},"key2":"value2","run_list":["cookbook::recipe"]}`,
},