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

Addressed PR feedback

This commit is contained in:
Hariharan Jayaraman 2018-05-21 21:38:41 -07:00
parent 8a3e599cad
commit 1bd7aa534e
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -91,11 +91,14 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
if err := resolver.Resolve(b.config); err != nil { if err := resolver.Resolve(b.config); err != nil {
return nil, err return nil, err
} }
if b.config.ObjectID == "" {
b.config.ObjectID = getObjectIdFromToken(spnCloud) b.config.ObjectID = getObjectIdFromToken(spnCloud)
} else {
ui.Message("You have provided Object_ID which is no longer needed, azure packer builder determines this dynamically from the authentication token")
}
if b.config.ObjectID == "" && b.config.OSType != constants.Target_Linux { if b.config.ObjectID == "" && b.config.OSType != constants.Target_Linux {
return nil, fmt.Errorf("could not determined the ObjectID for the user, which is required for Windows builds") return nil, fmt.Errorf("could not determine the ObjectID for the user, which is required for Windows builds")
} }
if b.config.isManagedImage() { if b.config.isManagedImage() {