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

simplify file upload for elevated powershell wrapper

Browse Source
This commit is contained in:
Megan Marsh 2017-09-14 17:00:31 -07:00
parent 92e70757bb
commit cbe1d7d854
1 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
provisioner/powershell/provisioner.go
View File

@ -469,27 +469,12 @@ func (p *Provisioner) generateElevatedRunner(command string) (uploadedPath strin
fmt.Printf("Error creating elevated template: %s", err) fmt.Printf("Error creating elevated template: %s", err)
return "", err return "", err
} }
wrapperBytes := buffer.Bytes()
tmpFile, err := ioutil.TempFile(os.TempDir(), "packer-elevated-shell.ps1") wrapperReader := bytes.NewReader(wrapperBytes)
writer := bufio.NewWriter(tmpFile)
if _, err := writer.WriteString(string(buffer.Bytes())); err != nil {
return "", fmt.Errorf("Error preparing elevated powershell script: %s", err)
}
if err := writer.Flush(); err != nil {
return "", fmt.Errorf("Error preparing elevated powershell script: %s", err)
}
tmpFile.Close()
f, err := os.Open(tmpFile.Name())
if err != nil {
return "", fmt.Errorf("Error opening temporary elevated powershell script: %s", err)
}
defer f.Close()
uuid := uuid.TimeOrderedUUID() uuid := uuid.TimeOrderedUUID()
path := fmt.Sprintf(`${env:TEMP}\packer-elevated-shell-%s.ps1`, uuid) path := fmt.Sprintf(`${env:TEMP}\packer-elevated-shell-%s.ps1`, uuid)
log.Printf("Uploading elevated shell wrapper for command [%s] to [%s] from [%s]", command, path, tmpFile.Name()) log.Printf("Uploading elevated shell wrapper for command [%s] to [%s]", command, path)
err = p.communicator.Upload(path, f, nil) err = p.communicator.Upload(path, wrapperReader, nil)
if err != nil { if err != nil {
return "", fmt.Errorf("Error preparing elevated powershell script: %s", err) return "", fmt.Errorf("Error preparing elevated powershell script: %s", err)
} }