Skip to content

Commit

Permalink
Identity V3: Fix panic within the domain scope (#851)
Browse files Browse the repository at this point in the history
  • Loading branch information
kayrus authored and ozerovandrei committed Sep 6, 2019
1 parent 0dcefd0 commit ed9ddba
Showing 1 changed file with 11 additions and 4 deletions.
15 changes: 11 additions & 4 deletions openstack/data_source_openstack_identity_auth_scope_v3.go
Original file line number Diff line number Diff line change
Expand Up @@ -114,10 +114,17 @@ func dataSourceIdentityAuthScopeV3Read(d *schema.ResourceData, meta interface{})
return err
}

d.Set("project_name", project.Name)
d.Set("project_id", project.ID)
d.Set("project_domain_name", project.Domain.Name)
d.Set("project_domain_id", project.Domain.ID)
if project != nil {
d.Set("project_name", project.Name)
d.Set("project_id", project.ID)
d.Set("project_domain_name", project.Domain.Name)
d.Set("project_domain_id", project.Domain.ID)
} else {
d.Set("project_name", "")
d.Set("project_id", "")
d.Set("project_domain_name", "")
d.Set("project_domain_id", "")
}

roles, err := result.ExtractRoles()
if err != nil {
Expand Down

0 comments on commit ed9ddba

Please sign in to comment.