Merge pull request #9 from hashicorp/fix-hcl-support

Fix HCL support for ProfitBricks plugin
hashicorp · Jun 14, 2021 · 2555234 · 2555234
2 parents c213882 + a2d4233
commit 2555234
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 10 deletions.
diff --git a/builder/profitbricks/config.go b/builder/profitbricks/config.go
@@ -24,7 +24,6 @@ type Config struct {
 
 	Region       string `mapstructure:"location"`
 	Image        string `mapstructure:"image"`
-	SSHKey       string
 	SnapshotName string `mapstructure:"snapshot_name"`
 	DiskSize     int    `mapstructure:"disk_size"`
 	DiskType     string `mapstructure:"disk_type"`
@@ -37,7 +36,7 @@ type Config struct {
 func (c *Config) Prepare(raws ...interface{}) ([]string, error) {
 
 	var md mapstructure.Metadata
-	err := config.Decode(&c, &config.DecodeOpts{
+	err := config.Decode(c, &config.DecodeOpts{
 		Metadata:           &md,
 		Interpolate:        true,
 		InterpolateContext: &c.ctx,

diff --git a/builder/profitbricks/config.hcl2spec.go b/builder/profitbricks/config.hcl2spec.go
diff --git a/builder/profitbricks/step_create_server.go b/builder/profitbricks/step_create_server.go
@@ -22,9 +22,7 @@ func (s *stepCreateServer) Run(ctx context.Context, state multistep.StateBag) mu
 
 	profitbricks.SetAuth(c.PBUsername, c.PBPassword)
 	profitbricks.SetDepth("5")
-	if c.Comm.SSHPublicKey != nil {
-		c.SSHKey = string(c.Comm.SSHPublicKey)
-	} else {
+	if c.Comm.SSHPublicKey == nil {
 		ui.Error("No ssh private key set; ssh authentication won't be possible. Please specify your private key in the ssh_private_key_file configuration key.")
 		return multistep.ActionHalt
 	}
@@ -63,9 +61,7 @@ func (s *stepCreateServer) Run(ctx context.Context, state multistep.StateBag) mu
 			},
 		},
 	}
-	if c.SSHKey != "" {
-		server.Entities.Volumes.Items[0].Properties.SshKeys = []string{c.SSHKey}
-	}
+	server.Entities.Volumes.Items[0].Properties.SshKeys = []string{string(c.Comm.SSHPublicKey)}
 
 	if c.Comm.SSHPassword != "" {
 		server.Entities.Volumes.Items[0].Properties.ImagePassword = c.Comm.SSHPassword