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

Refined logging and return scope

This commit is contained in:
seventieskid 2021-01-11 23:04:36 +00:00
parent f525e884ed
commit 707d2d8236
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
builder/googlecompute/driver_gce.go
View File

@ -136,8 +136,6 @@ func NewClientOptionGoogle(account *ServiceAccount, vaultOauth string, impersona
func NewDriverGCE(config GCEDriverConfig) (Driver, error) { func NewDriverGCE(config GCEDriverConfig) (Driver, error) {
var thisGCEUser string
opts, err := NewClientOptionGoogle(config.Account, config.VaultOauthEngineName, config.ImpersonateServiceAccountName) opts, err := NewClientOptionGoogle(config.Account, config.VaultOauthEngineName, config.ImpersonateServiceAccountName)
if err != nil { if err != nil {
return nil, err return nil, err
@ -149,7 +147,7 @@ func NewDriverGCE(config GCEDriverConfig) (Driver, error) {
return nil, err return nil, err
} }
thisGCEUser = getGCEUser() thisGCEUser := getGCEUser()
log.Printf("[INFO] Instantiating OS Login client...") log.Printf("[INFO] Instantiating OS Login client...")
osLoginService, err := oslogin.NewService(context.TODO(), opts) osLoginService, err := oslogin.NewService(context.TODO(), opts)
@ -798,8 +796,6 @@ func (d *driverGCE) AddToInstanceMetadata(zone string, name string, metadata map
// It makes little sense to run packer on GCP in this way, however, we defensively timeout in those cases, rather than abort. // It makes little sense to run packer on GCP in this way, however, we defensively timeout in those cases, rather than abort.
func getGCEUser() string { func getGCEUser() string {
var thisGCEUser string
metadataCheckTimeout := 5 * time.Second metadataCheckTimeout := 5 * time.Second
metadataCheckChl := make(chan string, 1) metadataCheckChl := make(chan string, 1)
@ -813,10 +809,10 @@ func getGCEUser() string {
select { select {
case thisGCEUser := <-metadataCheckChl: case thisGCEUser := <-metadataCheckChl:
fmt.Printf("[INFO] GCE service account %s will be used for OSLogin", thisGCEUser) log.Printf("[INFO] GCE service account %s will be used for OSLogin", thisGCEUser)
return thisGCEUser
case <-time.After(metadataCheckTimeout): case <-time.After(metadataCheckTimeout):
fmt.Printf("[INFO] Timeout after %s whilst waiting for google metadata server.", metadataCheckTimeout) log.Printf("[INFO] Timeout after %s whilst waiting for google metadata server.", metadataCheckTimeout)
return ""
} }
return thisGCEUser
} }