upstream/packer
1
0
Fork 0
mirror of https://github.com/hashicorp/packer.git synced 2026-02-19 02:28:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

powershell enviornment variables for script config fix

Browse source
This commit is contained in:
karthik P 2025-06-03 17:39:32 +05:30
parent d0a4108ba4
commit 4e62b58c88
2 changed files with 32 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
provisioner/powershell/provisioner.go
View file

@ -267,7 +267,7 @@ func (p *Provisioner) Prepare(raws ...interface{}) error {
}
func extractScript(p *Provisioner, script string) (string, error) {
temp, err := tmp.File(script)
temp, err := tmp.File("powershell-provisioner-script")
if err != nil {
return "", err
}
@ -280,7 +280,7 @@ func extractScript(p *Provisioner, script string) (string, error) {
if p.config.DebugMode != 0 {
baseString += fmt.Sprintf(`Set-PsDebug -Trace %d;`, p.config.DebugMode)
}
baseString += p.createFlattenedEnvVars(p.config.ElevatedUser != "")
if _, err := temp.WriteString(baseString); err != nil {
return "", fmt.Errorf("Error writing PowerShell script: %w", err)
}
@ -343,8 +343,7 @@ func (p *Provisioner) Provision(ctx context.Context, ui packersdk.Ui, comm packe
p.communicator = comm
p.generatedData = generatedData
scripts := make([]string, len(p.config.Scripts))
//copy(scripts, p.config.Scripts)
var scripts []string
if p.config.Inline != nil {
temp, err := extractInlineScript(p)
@ -355,27 +354,30 @@ func (p *Provisioner) Provision(ctx context.Context, ui packersdk.Ui, comm packe
// Remove temp script containing the inline commands when done
defer os.Remove(temp)
}
// maps temp script paths to original script paths
tempToOriginalScriptMap := make(map[string]string, len(p.config.Scripts))
if len(p.config.Scripts) > 0 {
log.Printf("RUNNING THE FOR LOOP FOR SCRIPTS")
for _, script := range p.config.Scripts {
temp, err := extractScript(p, script)
log.Printf("EXTRACTED SCRIPT: %s", temp)
tempToOriginalScriptMap[temp] = script
if err != nil {
ui.Error(fmt.Sprintf("Unable to extract script into a file: %s", err))
}
scripts = append(scripts, temp)
// Remove temp script containing the inline commands when done
// Defer removal until the function exits
defer os.Remove(temp)
}
}
// every provisioner run will only have one env var script file so lets add it first
uploadedScripts := []string{p.config.RemoteEnvVarPath}
for _, path := range scripts {
ui.Say(fmt.Sprintf("Provisioning with powershell script: %s", path))
ui.Say(fmt.Sprintf("Provisioning with powershell script: %s", tempToOriginalScriptMap[path]))
log.Printf("Opening %s for reading", path)
log.Printf("Opening %s for reading", tempToOriginalScriptMap[path])
fi, err := os.Stat(path)
if err != nil {
return fmt.Errorf("Error stating powershell script: %s", err)

21
provisioner/powershell/provisioner_acc_test.go
View file

@ -9,6 +9,7 @@ import (
"os"
"os/exec"
"path/filepath"
"regexp"
"runtime"
"testing"
@ -82,6 +83,16 @@ func TestAccPowershellProvisioner_Inline(t *testing.T) {
return fmt.Errorf("Bad exit code. Logfile: %s", logfile)
}
}
out, err := os.ReadFile(logfile)
if err != nil {
return err
}
output := string(out)
regexMatchString := "test_env_var: TestValue"
if !regexp.MustCompile(regexp.QuoteMeta(regexMatchString)).MatchString(output) {
t.Errorf("expected env string %q in logs:\n%s", regexMatchString, output)
}
return nil
},
}
@ -105,6 +116,16 @@ func TestAccPowershellProvisioner_Script(t *testing.T) {
return fmt.Errorf("Bad exit code. Logfile: %s", logfile)
}
}
out, err := os.ReadFile(logfile)
if err != nil {
return err
}
output := string(out)
regexMatchString := "likewise, var2 is A`Backtick"
if !regexp.MustCompile(regexp.QuoteMeta(regexMatchString)).MatchString(output) {
t.Errorf("expected env string %q in logs:\n%s", regexMatchString, output)
}
return nil
},
}