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

Fix

This commit is contained in:
Rémy Léone 2020-10-29 11:09:04 +01:00
parent 288e29b1e0
commit adb74ba15d
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
builder/scaleway/config.go
View File

@ -130,23 +130,33 @@ func (c *Config) Prepare(raws ...interface{}) ([]string, error) {
profile := scw.MergeProfiles(activeProfile, envProfile) profile := scw.MergeProfiles(activeProfile, envProfile)
if c.AccessKey == "" { if c.AccessKey == "" {
c.AccessKey = *profile.AccessKey if profile.AccessKey != nil {
c.AccessKey = *profile.AccessKey
}
} }
if c.SecretKey == "" { if c.SecretKey == "" {
c.SecretKey = *profile.SecretKey if profile.SecretKey != nil {
c.SecretKey = *profile.SecretKey
}
} }
if c.ProjectID == "" { if c.ProjectID == "" {
c.ProjectID = *profile.DefaultProjectID if profile.DefaultProjectID != nil {
c.ProjectID = *profile.DefaultProjectID
}
} }
if c.Zone == "" { if c.Zone == "" {
c.Zone = *profile.DefaultZone if profile.DefaultZone != nil {
c.Zone = *profile.DefaultZone
}
} }
if c.APIURL == "" { if c.APIURL == "" {
c.APIURL = *profile.APIURL if profile.APIURL != nil {
c.APIURL = *profile.APIURL
}
} }
if c.SnapshotName == "" { if c.SnapshotName == "" {
@ -182,12 +192,12 @@ func (c *Config) Prepare(raws ...interface{}) ([]string, error) {
} }
if c.ProjectID == "" { if c.ProjectID == "" {
errs = packer.MultiErrorAppend( errs = packer.MultiErrorAppend(
errs, errors.New("Scaleway Project ID must be specified")) errs, errors.New("scaleway Project ID must be specified"))
} }
if c.SecretKey == "" { if c.SecretKey == "" {
errs = packer.MultiErrorAppend( errs = packer.MultiErrorAppend(
errs, errors.New("Scaleway Secret Key must be specified")) errs, errors.New("scaleway Secret Key must be specified"))
} }
if c.AccessKey == "" { if c.AccessKey == "" {
@ -197,7 +207,7 @@ func (c *Config) Prepare(raws ...interface{}) ([]string, error) {
if c.Zone == "" { if c.Zone == "" {
errs = packer.MultiErrorAppend( errs = packer.MultiErrorAppend(
errs, errors.New("Scaleway Zone is required")) errs, errors.New("scaleway Zone is required"))
} }
if c.CommercialType == "" { if c.CommercialType == "" {
@ -215,5 +225,6 @@ func (c *Config) Prepare(raws ...interface{}) ([]string, error) {
} }
packer.LogSecretFilter.Set(c.Token) packer.LogSecretFilter.Set(c.Token)
packer.LogSecretFilter.Set(c.SecretKey)
return warnings, nil return warnings, nil
} }