iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Removed escaped quotes in non-elevated powershell invocation" 

This reverts commit 1b186f1613.
This commit is contained in:
Rickard von Essen 2016-10-26 21:12:11 +02:00
parent d3e3889559
commit f17bd30070
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
provisioner/powershell/provisioner.go
View File

@ -112,7 +112,7 @@ func (p *Provisioner) Prepare(raws ...interface{}) error {
} }
if p.config.EnvVarFormat == "" { if p.config.EnvVarFormat == "" {
p.config.EnvVarFormat = `$env:%s="%s"; ` p.config.EnvVarFormat = `$env:%s=\"%s\"; `
} }
if p.config.ElevatedEnvVarFormat == "" { if p.config.ElevatedEnvVarFormat == "" {

16
provisioner/powershell/provisioner_test.go
View File

@ -389,7 +389,7 @@ func TestProvisionerProvision_Inline(t *testing.T) {
t.Fatal("should not have error") t.Fatal("should not have error")
} }
expectedCommand := `powershell "& { $env:PACKER_BUILDER_TYPE="iso"; $env:PACKER_BUILD_NAME="vmware"; c:/Windows/Temp/inlineScript.bat; exit $LastExitCode}"` expectedCommand := `powershell "& { $env:PACKER_BUILDER_TYPE=\"iso\"; $env:PACKER_BUILD_NAME=\"vmware\"; c:/Windows/Temp/inlineScript.bat; exit $LastExitCode}"`
// Should run the command without alteration // Should run the command without alteration
if comm.StartCmd.Command != expectedCommand { if comm.StartCmd.Command != expectedCommand {
@ -408,7 +408,7 @@ func TestProvisionerProvision_Inline(t *testing.T) {
t.Fatal("should not have error") t.Fatal("should not have error")
} }
expectedCommand = `powershell "& { $env:BAR="BAZ"; $env:FOO="BAR"; $env:PACKER_BUILDER_TYPE="iso"; $env:PACKER_BUILD_NAME="vmware"; c:/Windows/Temp/inlineScript.bat; exit $LastExitCode}"` expectedCommand = `powershell "& { $env:BAR=\"BAZ\"; $env:FOO=\"BAR\"; $env:PACKER_BUILDER_TYPE=\"iso\"; $env:PACKER_BUILD_NAME=\"vmware\"; c:/Windows/Temp/inlineScript.bat; exit $LastExitCode}"`
// Should run the command without alteration // Should run the command without alteration
if comm.StartCmd.Command != expectedCommand { if comm.StartCmd.Command != expectedCommand {
@ -435,7 +435,7 @@ func TestProvisionerProvision_Scripts(t *testing.T) {
} }
//powershell -Command "$env:PACKER_BUILDER_TYPE=''"; powershell -Command "$env:PACKER_BUILD_NAME='foobuild'"; powershell -Command c:/Windows/Temp/script.ps1 //powershell -Command "$env:PACKER_BUILDER_TYPE=''"; powershell -Command "$env:PACKER_BUILD_NAME='foobuild'"; powershell -Command c:/Windows/Temp/script.ps1
expectedCommand := `powershell "& { $env:PACKER_BUILDER_TYPE="footype"; $env:PACKER_BUILD_NAME="foobuild"; c:/Windows/Temp/script.ps1; exit $LastExitCode}"` expectedCommand := `powershell "& { $env:PACKER_BUILDER_TYPE=\"footype\"; $env:PACKER_BUILD_NAME=\"foobuild\"; c:/Windows/Temp/script.ps1; exit $LastExitCode}"`
// Should run the command without alteration // Should run the command without alteration
if comm.StartCmd.Command != expectedCommand { if comm.StartCmd.Command != expectedCommand {
@ -468,7 +468,7 @@ func TestProvisionerProvision_ScriptsWithEnvVars(t *testing.T) {
t.Fatal("should not have error") t.Fatal("should not have error")
} }
expectedCommand := `powershell "& { $env:BAR="BAZ"; $env:FOO="BAR"; $env:PACKER_BUILDER_TYPE="footype"; $env:PACKER_BUILD_NAME="foobuild"; c:/Windows/Temp/script.ps1; exit $LastExitCode}"` expectedCommand := `powershell "& { $env:BAR=\"BAZ\"; $env:FOO=\"BAR\"; $env:PACKER_BUILDER_TYPE=\"footype\"; $env:PACKER_BUILD_NAME=\"foobuild\"; c:/Windows/Temp/script.ps1; exit $LastExitCode}"`
// Should run the command without alteration // Should run the command without alteration
if comm.StartCmd.Command != expectedCommand { if comm.StartCmd.Command != expectedCommand {
@ -545,7 +545,7 @@ func TestProvisioner_createFlattenedEnvVars_windows(t *testing.T) {
if err != nil { if err != nil {
t.Fatalf("should not have error creating flattened env vars: %s", err) t.Fatalf("should not have error creating flattened env vars: %s", err)
} }
if flattenedEnvVars != "$env:PACKER_BUILDER_TYPE=\"iso\"; $env:PACKER_BUILD_NAME=\"vmware\"; " { if flattenedEnvVars != "$env:PACKER_BUILDER_TYPE=\\\"iso\\\"; $env:PACKER_BUILD_NAME=\\\"vmware\\\"; " {
t.Fatalf("unexpected flattened env vars: %s", flattenedEnvVars) t.Fatalf("unexpected flattened env vars: %s", flattenedEnvVars)
} }
@ -556,7 +556,7 @@ func TestProvisioner_createFlattenedEnvVars_windows(t *testing.T) {
if err != nil { if err != nil {
t.Fatalf("should not have error creating flattened env vars: %s", err) t.Fatalf("should not have error creating flattened env vars: %s", err)
} }
if flattenedEnvVars != "$env:FOO=\"bar\"; $env:PACKER_BUILDER_TYPE=\"iso\"; $env:PACKER_BUILD_NAME=\"vmware\"; " { if flattenedEnvVars != "$env:FOO=\\\"bar\\\"; $env:PACKER_BUILDER_TYPE=\\\"iso\\\"; $env:PACKER_BUILD_NAME=\\\"vmware\\\"; " {
t.Fatalf("unexpected flattened env vars: %s", flattenedEnvVars) t.Fatalf("unexpected flattened env vars: %s", flattenedEnvVars)
} }
@ -567,7 +567,7 @@ func TestProvisioner_createFlattenedEnvVars_windows(t *testing.T) {
if err != nil { if err != nil {
t.Fatalf("should not have error creating flattened env vars: %s", err) t.Fatalf("should not have error creating flattened env vars: %s", err)
} }
if flattenedEnvVars != "$env:BAZ=\"qux\"; $env:FOO=\"bar\"; $env:PACKER_BUILDER_TYPE=\"iso\"; $env:PACKER_BUILD_NAME=\"vmware\"; " { if flattenedEnvVars != "$env:BAZ=\\\"qux\\\"; $env:FOO=\\\"bar\\\"; $env:PACKER_BUILDER_TYPE=\\\"iso\\\"; $env:PACKER_BUILD_NAME=\\\"vmware\\\"; " {
t.Fatalf("unexpected flattened env vars: %s", flattenedEnvVars) t.Fatalf("unexpected flattened env vars: %s", flattenedEnvVars)
} }
} }
@ -582,7 +582,7 @@ func TestProvision_createCommandText(t *testing.T) {
// Non-elevated // Non-elevated
cmd, _ := p.createCommandText() cmd, _ := p.createCommandText()
if cmd != "powershell \"& { $env:PACKER_BUILDER_TYPE=\"\"; $env:PACKER_BUILD_NAME=\"\"; c:/Windows/Temp/script.ps1; exit $LastExitCode}\"" { if cmd != "powershell \"& { $env:PACKER_BUILDER_TYPE=\\\"\\\"; $env:PACKER_BUILD_NAME=\\\"\\\"; c:/Windows/Temp/script.ps1; exit $LastExitCode}\"" {
t.Fatalf("Got unexpected non-elevated command: %s", cmd) t.Fatalf("Got unexpected non-elevated command: %s", cmd)
} }