mirror of
https://github.com/letic/terraform-provider-google.git
synced 2024-10-04 17:51:11 +00:00
Add logging statements, update : to / in IDs.
Update member IDs to use / instead of :. Make sure we're logging any time we remove something from state.
This commit is contained in:
parent
f94c3872af
commit
78545359bd
@ -91,6 +91,7 @@ func resourceGoogleProjectIamBindingRead(d *schema.ResourceData, meta interface{
|
||||
break
|
||||
}
|
||||
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("")
|
||||
return nil
|
||||
}
|
||||
|
@ -75,7 +75,7 @@ func resourceGoogleProjectIamMemberCreate(d *schema.ResourceData, meta interface
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
d.SetId(pid + ":" + p.Role + ":" + p.Members[0])
|
||||
d.SetId(pid + "/" + p.Role + "/" + p.Members[0])
|
||||
return resourceGoogleProjectIamMemberRead(d, meta)
|
||||
}
|
||||
|
||||
@ -104,6 +104,7 @@ func resourceGoogleProjectIamMemberRead(d *schema.ResourceData, meta interface{}
|
||||
break
|
||||
}
|
||||
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("")
|
||||
return nil
|
||||
}
|
||||
@ -114,6 +115,7 @@ func resourceGoogleProjectIamMemberRead(d *schema.ResourceData, meta interface{}
|
||||
}
|
||||
}
|
||||
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("")
|
||||
return nil
|
||||
}
|
||||
@ -156,6 +158,8 @@ func resourceGoogleProjectIamMemberDelete(d *schema.ResourceData, meta interface
|
||||
break
|
||||
}
|
||||
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
|
||||
}
|
||||
binding.Members = append(binding.Members[:memberToRemove], binding.Members[memberToRemove+1:]...)
|
||||
|
Loading…
Reference in New Issue
Block a user