upstream/packer
1
0
Fork 0
mirror of https://github.com/hashicorp/packer.git synced 2026-06-08 16:22:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

remove errant change in amazon builder

Browse source
This commit is contained in:
Megan Marsh 2018-01-26 08:43:51 -08:00
parent 4622bb4585
commit de2e5edf2e
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
builder/amazon/common/step_key_pair.go
View file

@ -6,7 +6,6 @@ import (
"io/ioutil"
"os"
"runtime"
"strings"
"github.com/aws/aws-sdk-go/service/ec2"
"github.com/hashicorp/packer/helper/multistep"
@ -37,7 +36,7 @@ func (s *StepKeyPair) Run(_ context.Context, state multistep.StateBag) multistep
}
state.Put("keyPair", s.KeyPairName)
state.Put("privateKey", strings.TrimSpace(string(privateKeyBytes)))
state.Put("privateKey", string(privateKeyBytes))
return multistep.ActionContinue
}

3
builder/oracle/classic/builder.go
View file

@ -35,8 +35,7 @@ func (b *Builder) Prepare(rawConfig ...interface{}) ([]string, error) {
}
func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packer.Artifact, error) {
loggingEnabled := os.Getenv("PACKER_OCI_CLASSIC_LOGGING")) != ""
loggingEnabled := os.Getenv("PACKER_OCI_CLASSIC_LOGGING") != ""
httpClient := cleanhttp.DefaultClient()
config := &opc.Config{
Username: opc.String(b.config.Username),