Skip to content

Commit

Permalink
Ignore members with "deleted:" prefix in bigquery IAM member (#4388) (#…
Browse files Browse the repository at this point in the history
…8231)

* Trim "deleted:" prefix from bigquery IAM member parsing

* Ignore deleted members

Signed-off-by: Modular Magician <magic-modules@google.com>
  • Loading branch information
modular-magician committed Jan 15, 2021
1 parent d937ce4 commit 0f980ae
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 0 deletions.
3 changes: 3 additions & 0 deletions .changelog/4388.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
bigquery: fixed an issue in `bigquery_dataset_iam_member` where deleted members were not handled correctly
```
8 changes: 8 additions & 0 deletions google/iam_bigquery_dataset.go
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,10 @@ func policyToAccess(policy *cloudresourcemanager.Policy) ([]map[string]interface
return nil, fmt.Errorf("BigQuery Dataset legacy role %s is not allowed when using google_bigquery_dataset_iam resources. Please use the full form: %s", binding.Role, fullRole)
}
for _, member := range binding.Members {
// Do not append any deleted members
if strings.HasPrefix(member, "deleted:") {
continue
}
access := map[string]interface{}{
"role": binding.Role,
}
Expand All @@ -190,6 +194,10 @@ func policyToAccess(policy *cloudresourcemanager.Policy) ([]map[string]interface
// Dataset access uses different member types to identify groups, domains, etc.
// these types are used as keys in the access JSON payload
func iamMemberToAccess(member string) (string, string, error) {
if strings.HasPrefix(member, "deleted:") {
return "", "", fmt.Errorf("BigQuery Dataset IAM member is deleted: %s", member)
}

pieces := strings.SplitN(member, ":", 2)
if len(pieces) > 1 {
switch pieces[0] {
Expand Down

0 comments on commit 0f980ae

Please sign in to comment.