Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add iamMember to access for BigQuery dataset #16322

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changelog/9288.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
```release-note:enhancement
bigquery: added support for `iam_member` to `google_bigquery_dataset.access`
```
```release-note:bug
bigquery: fixed a bug when updating a `google_bigquery_dataset` that contained an `iamMember` access rule added out of band with Terraform
```
22 changes: 22 additions & 0 deletions google/services/bigquery/resource_bigquery_dataset.go
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,12 @@ domain specified will be granted the specified access`,
Optional: true,
Description: `An email address of a Google Group to grant access to.`,
},
"iam_member": {
Type: schema.TypeString,
Optional: true,
Description: `Some other type of member that appears in the IAM Policy but isn't a user,
group, domain, or special group. For example: 'allUsers'`,
},
"role": {
Type: schema.TypeString,
Optional: true,
Expand Down Expand Up @@ -906,6 +912,7 @@ func flattenBigQueryDatasetAccess(v interface{}, d *schema.ResourceData, config
"group_by_email": flattenBigQueryDatasetAccessGroupByEmail(original["groupByEmail"], d, config),
"role": flattenBigQueryDatasetAccessRole(original["role"], d, config),
"special_group": flattenBigQueryDatasetAccessSpecialGroup(original["specialGroup"], d, config),
"iam_member": flattenBigQueryDatasetAccessIamMember(original["iamMember"], d, config),
"user_by_email": flattenBigQueryDatasetAccessUserByEmail(original["userByEmail"], d, config),
"view": flattenBigQueryDatasetAccessView(original["view"], d, config),
"dataset": flattenBigQueryDatasetAccessDataset(original["dataset"], d, config),
Expand All @@ -930,6 +937,10 @@ func flattenBigQueryDatasetAccessSpecialGroup(v interface{}, d *schema.ResourceD
return v
}

func flattenBigQueryDatasetAccessIamMember(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
return v
}

func flattenBigQueryDatasetAccessUserByEmail(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
return v
}
Expand Down Expand Up @@ -1247,6 +1258,13 @@ func expandBigQueryDatasetAccess(v interface{}, d tpgresource.TerraformResourceD
transformed["specialGroup"] = transformedSpecialGroup
}

transformedIamMember, err := expandBigQueryDatasetAccessIamMember(original["iam_member"], d, config)
if err != nil {
return nil, err
} else if val := reflect.ValueOf(transformedIamMember); val.IsValid() && !tpgresource.IsEmptyValue(val) {
transformed["iamMember"] = transformedIamMember
}

transformedUserByEmail, err := expandBigQueryDatasetAccessUserByEmail(original["user_by_email"], d, config)
if err != nil {
return nil, err
Expand Down Expand Up @@ -1296,6 +1314,10 @@ func expandBigQueryDatasetAccessSpecialGroup(v interface{}, d tpgresource.Terraf
return v, nil
}

func expandBigQueryDatasetAccessIamMember(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
return v, nil
}

func expandBigQueryDatasetAccessUserByEmail(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
return v, nil
}
Expand Down
8 changes: 6 additions & 2 deletions google/services/bigquery/resource_bigquery_dataset_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ func TestAccBigQueryDataset_access(t *testing.T) {
ImportStateVerifyIgnore: []string{"labels", "terraform_labels"},
},
{
Config: testAccBigQueryDatasetWithTwoAccess(datasetID),
Config: testAccBigQueryDatasetWithThreeAccess(datasetID),
},
{
ResourceName: "google_bigquery_dataset.access_test",
Expand Down Expand Up @@ -506,7 +506,7 @@ resource "google_bigquery_dataset" "access_test" {
`, datasetID)
}

func testAccBigQueryDatasetWithTwoAccess(datasetID string) string {
func testAccBigQueryDatasetWithThreeAccess(datasetID string) string {
return fmt.Sprintf(`
resource "google_bigquery_dataset" "access_test" {
dataset_id = "%s"
Expand All @@ -519,6 +519,10 @@ resource "google_bigquery_dataset" "access_test" {
role = "READER"
domain = "hashicorp.com"
}
access {
role = "READER"
iam_member = "allUsers"
}

labels = {
env = "foo"
Expand Down
5 changes: 5 additions & 0 deletions website/docs/r/bigquery_dataset.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -360,6 +360,11 @@ destroying the resource will fail if tables are present.

* `allAuthenticatedUsers`: All authenticated BigQuery users.

* `iam_member` -
(Optional)
Some other type of member that appears in the IAM Policy but isn't a user,
group, domain, or special group. For example: `allUsers`

* `user_by_email` -
(Optional)
An email address of a user to grant access to. For example:
Expand Down