From cbeedfca35c5101e68a9ace0cd17922b16d2ee77 Mon Sep 17 00:00:00 2001
From: Alex Harvey <alexharv074@gmail.com>
Date: Fri, 18 Oct 2019 02:46:55 +1100
Subject: [PATCH] provisioner/puppet: fix bug when connection type was not set
 in config (#23057)

Before this, the Terraform Puppet provisioner would error out in a
confusing way if the type attribute in a connection block was not given.

Apparently an omitted type leads to type having a value "" which must be
then assumed to mean "ssh".

Fixes #23004
---
 .../puppet/resource_provisioner.go            | 22 +++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/builtin/provisioners/puppet/resource_provisioner.go b/builtin/provisioners/puppet/resource_provisioner.go
index 35c7dd2a3..767b352af 100644
--- a/builtin/provisioners/puppet/resource_provisioner.go
+++ b/builtin/provisioners/puppet/resource_provisioner.go
@@ -128,7 +128,7 @@ func applyFn(ctx context.Context) error {
 
 	if p.OSType == "" {
 		switch connType := state.Ephemeral.ConnInfo["type"]; connType {
-		case "ssh", "":
+		case "ssh", "": // The default connection type is ssh, so if the type is empty assume ssh
 			p.OSType = "linux"
 		case "winrm":
 			p.OSType = "windows"
@@ -259,16 +259,30 @@ func (p *provisioner) generateAutosignToken(certname string) (string, error) {
 }
 
 func (p *provisioner) installPuppetAgentOpenSource() error {
+	task := "puppet_agent::install"
+
+	connType := p.instanceState.Ephemeral.ConnInfo["type"]
+	if connType == "" {
+		connType = "ssh"
+	}
+
+	agentConnInfo := map[string]string{
+		"type":     connType,
+		"host":     p.instanceState.Ephemeral.ConnInfo["host"],
+		"user":     p.instanceState.Ephemeral.ConnInfo["user"],
+		"password": p.instanceState.Ephemeral.ConnInfo["password"], // Required on Windows only
+	}
+
 	result, err := bolt.Task(
-		p.instanceState.Ephemeral.ConnInfo,
+		agentConnInfo,
 		p.BoltTimeout,
 		p.UseSudo,
-		"puppet_agent::install",
+		task,
 		nil,
 	)
 
 	if err != nil || result.Items[0].Status != "success" {
-		return fmt.Errorf("puppet_agent::install failed: %s\n%+v", err, result)
+		return fmt.Errorf("%s failed: %s\n%+v", task, err, result)
 	}
 
 	return nil