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

Re-added tests for FillParamters

This commit is contained in:
Paul Meyer 2019-09-25 17:30:58 +00:00
parent 094a8840d8
commit c72a612b44
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
builder/azure/common/client/config.go
View File

@ -280,14 +280,6 @@ func (c *Config) FillParameters() error {
c.SubscriptionID = subscriptionID
}
if c.TenantID == "" {
tenantID, err := common.FindTenantID(*c.CloudEnvironment, c.SubscriptionID)
if err != nil {
return err
}
c.TenantID = tenantID
}
if c.CloudEnvironment == nil {
err := c.setCloudEnvironment()
if err != nil {
@ -295,6 +287,14 @@ func (c *Config) FillParameters() error {
}
}
if c.TenantID == "" {
tenantID, err := findTenantID(*c.CloudEnvironment, c.SubscriptionID)
if err != nil {
return err
}
c.TenantID = tenantID
}
return nil
}