refactor(config): s/SSH_Authorized_Keys/SSHAuthorizedKeys/g
This commit is contained in:
parent
f466231fdc
commit
6386b4830a
@ -10,7 +10,7 @@ import (
|
|||||||
const DefaultSSHKeyName = "coreos-cloudinit"
|
const DefaultSSHKeyName = "coreos-cloudinit"
|
||||||
|
|
||||||
type CloudConfig struct {
|
type CloudConfig struct {
|
||||||
SSH_Authorized_Keys []string
|
SSHAuthorizedKeys []string `yaml:"ssh_authorized_keys"`
|
||||||
Coreos struct {
|
Coreos struct {
|
||||||
Etcd struct{ Discovery_URL string }
|
Etcd struct{ Discovery_URL string }
|
||||||
Fleet struct{ Autostart bool }
|
Fleet struct{ Autostart bool }
|
||||||
@ -46,8 +46,8 @@ func ApplyCloudConfig(cfg CloudConfig, sshKeyName string) error {
|
|||||||
log.Printf("Set hostname to %s", cfg.Hostname)
|
log.Printf("Set hostname to %s", cfg.Hostname)
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(cfg.SSH_Authorized_Keys) > 0 {
|
if len(cfg.SSHAuthorizedKeys) > 0 {
|
||||||
err := AuthorizeSSHKeys(sshKeyName, cfg.SSH_Authorized_Keys)
|
err := AuthorizeSSHKeys(sshKeyName, cfg.SSHAuthorizedKeys)
|
||||||
if err == nil {
|
if err == nil {
|
||||||
log.Printf("Authorized SSH keys for core user")
|
log.Printf("Authorized SSH keys for core user")
|
||||||
} else {
|
} else {
|
||||||
|
@ -12,7 +12,7 @@ func TestCloudConfigEmpty(t *testing.T) {
|
|||||||
t.Fatalf("Encountered unexpected error :%v", err)
|
t.Fatalf("Encountered unexpected error :%v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
keys := cfg.SSH_Authorized_Keys
|
keys := cfg.SSHAuthorizedKeys
|
||||||
if len(keys) != 0 {
|
if len(keys) != 0 {
|
||||||
t.Error("Parsed incorrect number of SSH keys")
|
t.Error("Parsed incorrect number of SSH keys")
|
||||||
}
|
}
|
||||||
@ -72,7 +72,7 @@ hostname: trontastic
|
|||||||
t.Fatalf("Encountered unexpected error :%v", err)
|
t.Fatalf("Encountered unexpected error :%v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
keys := cfg.SSH_Authorized_Keys
|
keys := cfg.SSHAuthorizedKeys
|
||||||
if len(keys) != 2 {
|
if len(keys) != 2 {
|
||||||
t.Error("Parsed incorrect number of SSH keys")
|
t.Error("Parsed incorrect number of SSH keys")
|
||||||
} else if keys[0] != "foobar" {
|
} else if keys[0] != "foobar" {
|
||||||
@ -150,7 +150,7 @@ ssh_authorized_keys:
|
|||||||
t.Fatalf("Encountered unexpected error :%v", err)
|
t.Fatalf("Encountered unexpected error :%v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
keys := cfg.SSH_Authorized_Keys
|
keys := cfg.SSHAuthorizedKeys
|
||||||
if len(keys) != 0 {
|
if len(keys) != 0 {
|
||||||
t.Error("Parsed incorrect number of SSH keys")
|
t.Error("Parsed incorrect number of SSH keys")
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user