Skip to content

Commit

Permalink
Revert access.role field in bigquery dataset to optional (#4891)
Browse files Browse the repository at this point in the history
Signed-off-by: Modular Magician <magic-modules@google.com>
  • Loading branch information
modular-magician authored and Ty Larrabee committed Nov 14, 2019
1 parent b35c14f commit 64c716c
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 19 deletions.
20 changes: 10 additions & 10 deletions google/resource_big_query_dataset.go
Original file line number Diff line number Diff line change
Expand Up @@ -224,16 +224,6 @@ milliseconds since the epoch.`,
func bigqueryDatasetAccessSchema() *schema.Resource {
return &schema.Resource{
Schema: map[string]*schema.Schema{
"role": {
Type: schema.TypeString,
Required: true,
Description: `Describes the rights granted to the user specified by the other
member of the access object. Primitive, Predefined and custom
roles are supported. Predefined roles that have equivalent
primitive roles are swapped by the API to their Primitive
counterparts, and will show a diff post-create. See
[official docs](https://cloud.google.com/bigquery/docs/access-control).`,
},
"domain": {
Type: schema.TypeString,
Optional: true,
Expand All @@ -245,6 +235,16 @@ domain specified will be granted the specified access`,
Optional: true,
Description: `An email address of a Google Group to grant access to.`,
},
"role": {
Type: schema.TypeString,
Optional: true,
Description: `Describes the rights granted to the user specified by the other
member of the access object. Primitive, Predefined and custom
roles are supported. Predefined roles that have equivalent
primitive roles are swapped by the API to their Primitive
counterparts, and will show a diff post-create. See
[official docs](https://cloud.google.com/bigquery/docs/access-control).`,
},
"special_group": {
Type: schema.TypeString,
Optional: true,
Expand Down
8 changes: 0 additions & 8 deletions website/docs/guides/version_3_upgrade.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ so Terraform knows to manage them.
- [Resource: `google_app_engine_application`](#resource-google_app_engine_application)
- [Resource: `google_app_engine_domain_mapping`](#resource-google_app_engine_domain_mapping)
- [Resource: `google_app_engine_standard_app_version`](#resource-google_app_engine_standard_app_version)
- [Resource: `google_bigquery_dataset`](#resource-google_bigquery_dataset)
- [Resource: `google_bigquery_table`](#resource-google_bigquery_table)
- [Resource: `google_bigtable_app_profile`](#resource-google_bigtable_app_profile)
- [Resource: `google_binary_authorization_policy`](#resource-google_binary_authorization_policy)
Expand Down Expand Up @@ -254,13 +253,6 @@ required on the `handlers.script` block.
In an attempt to avoid allowing empty blocks in config files, `shell` is now
required on the `deployment.files` and `deployment.zip` blocks.

## Resource: `google_bigquery_dataset`

### `role` is now required on `google_bigquery_dataset.access`

In an attempt to avoid allowing empty blocks in config files, `role` is now
required on the `access` block.

## Resource: `google_bigquery_table`

### At least one of `range` or `skip_leading_rows` is now required on `external_data_configuration.google_sheets_options`
Expand Down
2 changes: 1 addition & 1 deletion website/docs/r/bigquery_dataset.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ The `access` block supports:
An email address of a Google Group to grant access to.

* `role` -
(Required)
(Optional)
Describes the rights granted to the user specified by the other
member of the access object. Primitive, Predefined and custom
roles are supported. Predefined roles that have equivalent
Expand Down

0 comments on commit 64c716c

Please sign in to comment.