public/terraform-provider-google
0
0
Fork 0
mirror of https://github.com/letic/terraform-provider-google.git synced 2024-07-09 11:38:29 +00:00
Code Issues Projects Releases Wiki Activity

Add logging statements, update : to / in IDs.

Browse Source 
Update member IDs to use / instead of :.

Make sure we're logging any time we remove something from state.
This commit is contained in:
Paddy 2017-07-27 14:01:47 -07:00
parent f94c3872af
commit 78545359bd
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
google/resource_google_project_iam_binding.go
View File

@ -91,6 +91,7 @@ func resourceGoogleProjectIamBindingRead(d *schema.ResourceData, meta interface{
break break
} }
if binding == nil { if binding == nil {
log.Printf("[DEBUG]: Binding for role %q not found in policy for %q, removing from state file.\n", eBinding.Role, pid)
d.SetId("") d.SetId("")
return nil return nil
} }

6
google/resource_google_project_iam_member.go
View File

@ -75,7 +75,7 @@ func resourceGoogleProjectIamMemberCreate(d *schema.ResourceData, meta interface
if err != nil { if err != nil {
return err return err
} }
d.SetId(pid + ":" + p.Role + ":" + p.Members[0]) d.SetId(pid + "/" + p.Role + "/" + p.Members[0])
return resourceGoogleProjectIamMemberRead(d, meta) return resourceGoogleProjectIamMemberRead(d, meta)
} }
@ -104,6 +104,7 @@ func resourceGoogleProjectIamMemberRead(d *schema.ResourceData, meta interface{}
break break
} }
if binding == nil { if binding == nil {
log.Printf("[DEBUG]: Binding for role %q does not exist in policy of project %q, removing member %q from state.", eMember.Role, pid, eMember.Members[0])
d.SetId("") d.SetId("")
return nil return nil
} }
@ -114,6 +115,7 @@ func resourceGoogleProjectIamMemberRead(d *schema.ResourceData, meta interface{}
} }
} }
if member == "" { if member == "" {
log.Printf("[DEBUG]: Member %q for binding for role %q does not exist in policy of project %q, removing from state.", eMember.Members[0], eMember.Role, pid)
d.SetId("") d.SetId("")
return nil return nil
} }
@ -156,6 +158,8 @@ func resourceGoogleProjectIamMemberDelete(d *schema.ResourceData, meta interface
break break
} }
if memberToRemove < 0 { if memberToRemove < 0 {
log.Printf("[DEBUG]: Member %q for binding for role %q does not exist in policy of project %q, removing from state.", member.Members[0], member.Role, pid)
d.SetId("")
return nil return nil
} }
binding.Members = append(binding.Members[:memberToRemove], binding.Members[memberToRemove+1:]...) binding.Members = append(binding.Members[:memberToRemove], binding.Members[memberToRemove+1:]...)