From c6014d9204542c932eada40911c9f4f3ffa23d5b Mon Sep 17 00:00:00 2001 From: Matthew Frahry Date: Fri, 3 Feb 2017 09:09:03 -0700 Subject: [PATCH 1/2] Update storage_bucket_acl.html.markdown Removing `default_acl` since Terraform doesn't manage it anymore --- .../providers/google/r/storage_bucket_acl.html.markdown | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/website/source/docs/providers/google/r/storage_bucket_acl.html.markdown b/website/source/docs/providers/google/r/storage_bucket_acl.html.markdown index 17967ead3..1ff06e566 100644 --- a/website/source/docs/providers/google/r/storage_bucket_acl.html.markdown +++ b/website/source/docs/providers/google/r/storage_bucket_acl.html.markdown @@ -36,11 +36,9 @@ resource "google_storage_bucket_acl" "image-store-acl" { - - - -* `default_acl` - (Optional) The [canned GCS ACL](https://cloud.google.com/storage/docs/access-control#predefined-acl) to apply to future buckets. Must be set both `role_entity` and `predefined_acl` are not. +* `predefined_acl` - (Optional) The [canned GCS ACL](https://cloud.google.com/storage/docs/access-control#predefined-acl) to apply. Must be set if `role_entity` is not. -* `predefined_acl` - (Optional) The [canned GCS ACL](https://cloud.google.com/storage/docs/access-control#predefined-acl) to apply. Must be set if both `role_entity` and `default_acl` are not. - -* `role_entity` - (Optional) List of role/entity pairs in the form `ROLE:entity`. See [GCS Bucket ACL documentation](https://cloud.google.com/storage/docs/json_api/v1/bucketAccessControls) for more details. Must be set if both `predefined_acl` and `default_acl` are not. +* `role_entity` - (Optional) List of role/entity pairs in the form `ROLE:entity`. See [GCS Bucket ACL documentation](https://cloud.google.com/storage/docs/json_api/v1/bucketAccessControls) for more details. Must be set if `predefined_acl` is not. ## Attributes Reference From 2aa41ba10d69e6b1fdf08f260506112d6879623b Mon Sep 17 00:00:00 2001 From: Matthew Frahry Date: Fri, 3 Feb 2017 09:26:39 -0700 Subject: [PATCH 2/2] Update storage_bucket_acl.html.markdown --- .../docs/providers/google/r/storage_bucket_acl.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/source/docs/providers/google/r/storage_bucket_acl.html.markdown b/website/source/docs/providers/google/r/storage_bucket_acl.html.markdown index 1ff06e566..5e5117557 100644 --- a/website/source/docs/providers/google/r/storage_bucket_acl.html.markdown +++ b/website/source/docs/providers/google/r/storage_bucket_acl.html.markdown @@ -21,7 +21,7 @@ resource "google_storage_bucket" "image-store" { } resource "google_storage_bucket_acl" "image-store-acl" { - bucket = "${google_storage_bucket.image_store.name}" + bucket = "${google_storage_bucket.image-store.name}" role_entity = [ "OWNER:user-my.email@gmail.com",