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

Added additional error message if we failed to parse token

This commit is contained in:
Hariharan Jayaraman 2018-05-21 22:20:36 -07:00
parent 1bd7aa534e
commit a13a2511f9
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
builder/azure/arm/builder.go
View File

@ -92,7 +92,7 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
return nil, err return nil, err
} }
if b.config.ObjectID == "" { if b.config.ObjectID == "" {
b.config.ObjectID = getObjectIdFromToken(spnCloud) b.config.ObjectID = getObjectIdFromToken(ui, spnCloud)
} else { } else {
ui.Message("You have provided Object_ID which is no longer needed, azure packer builder determines this dynamically from the authentication token") ui.Message("You have provided Object_ID which is no longer needed, azure packer builder determines this dynamically from the authentication token")
} }
@ -423,7 +423,7 @@ func (b *Builder) getServicePrincipalTokens(say func(string)) (*adal.ServicePrin
return servicePrincipalToken, servicePrincipalTokenVault, nil return servicePrincipalToken, servicePrincipalTokenVault, nil
} }
func getObjectIdFromToken(token *adal.ServicePrincipalToken) string { func getObjectIdFromToken(ui packer.Ui, token *adal.ServicePrincipalToken) string {
claims := jwt.MapClaims{} claims := jwt.MapClaims{}
var p jwt.Parser var p jwt.Parser
@ -432,6 +432,7 @@ func getObjectIdFromToken(token *adal.ServicePrincipalToken) string {
_, _, err = p.ParseUnverified(token.OAuthToken(), claims) _, _, err = p.ParseUnverified(token.OAuthToken(), claims)
if err != nil { if err != nil {
ui.Error(fmt.Sprintf("Failed to parse the token,Error: %s", err.Error()))
return "" return ""
} }
return claims["oid"].(string) return claims["oid"].(string)