From ca8099a3b9c9c0d98ea4497f3ff43fdbe4b825bb Mon Sep 17 00:00:00 2001 From: The Magician Date: Tue, 27 Aug 2019 16:19:42 -0700 Subject: [PATCH] Add legacy_name to TF resource override, autogen warning for IAM (#1088) Signed-off-by: Modular Magician --- google-beta/iam_pubsub_topic.go | 13 +++++++++++++ google-beta/iam_source_repo_repository.go | 13 +++++++++++++ website/docs/r/pubsub_topic_iam.html.markdown | 6 ++++-- .../docs/r/source_repo_repository_iam.html.markdown | 6 ++++-- 4 files changed, 34 insertions(+), 4 deletions(-) diff --git a/google-beta/iam_pubsub_topic.go b/google-beta/iam_pubsub_topic.go index 79c8670df49..3243e6f5725 100644 --- a/google-beta/iam_pubsub_topic.go +++ b/google-beta/iam_pubsub_topic.go @@ -1,3 +1,16 @@ +// ---------------------------------------------------------------------------- +// +// *** AUTO GENERATED CODE *** AUTO GENERATED CODE *** +// +// ---------------------------------------------------------------------------- +// +// This file is automatically generated by Magic Modules and manual +// changes will be clobbered when the file is regenerated. +// +// Please read more about how to change this file in +// .github/CONTRIBUTING.md. +// +// ---------------------------------------------------------------------------- package google import ( diff --git a/google-beta/iam_source_repo_repository.go b/google-beta/iam_source_repo_repository.go index 5a9a488276d..44b233d3bf4 100644 --- a/google-beta/iam_source_repo_repository.go +++ b/google-beta/iam_source_repo_repository.go @@ -1,3 +1,16 @@ +// ---------------------------------------------------------------------------- +// +// *** AUTO GENERATED CODE *** AUTO GENERATED CODE *** +// +// ---------------------------------------------------------------------------- +// +// This file is automatically generated by Magic Modules and manual +// changes will be clobbered when the file is regenerated. +// +// Please read more about how to change this file in +// .github/CONTRIBUTING.md. +// +// ---------------------------------------------------------------------------- package google import ( diff --git a/website/docs/r/pubsub_topic_iam.html.markdown b/website/docs/r/pubsub_topic_iam.html.markdown index 4aad1098a6a..f5fdef77edc 100644 --- a/website/docs/r/pubsub_topic_iam.html.markdown +++ b/website/docs/r/pubsub_topic_iam.html.markdown @@ -45,7 +45,7 @@ data "google_iam_policy" "admin" { } resource "google_pubsub_topic_iam_policy" "editor" { - topic = "projects/{{project}}/topics/{{topic}}" + topic = "projects/{{project}}/topics/{{topic}}" policy_data = "${data.google_iam_policy.admin.policy_data}" } ``` @@ -54,7 +54,8 @@ resource "google_pubsub_topic_iam_policy" "editor" { ```hcl resource "google_pubsub_topic_iam_binding" "editor" { - topic = "projects/{{project}}/topics/{{topic}}" + topic = "projects/{{project}}/topics/{{topic}}" + role = "roles/editor" members = [ "user:jane@example.com", @@ -67,6 +68,7 @@ resource "google_pubsub_topic_iam_binding" "editor" { ```hcl resource "google_pubsub_topic_iam_member" "editor" { topic = "projects/{{project}}/topics/{{topic}}" + role = "roles/editor" member = "user:jane@example.com" } diff --git a/website/docs/r/source_repo_repository_iam.html.markdown b/website/docs/r/source_repo_repository_iam.html.markdown index 7bdf5ff9e78..9fddd88aca8 100644 --- a/website/docs/r/source_repo_repository_iam.html.markdown +++ b/website/docs/r/source_repo_repository_iam.html.markdown @@ -45,7 +45,7 @@ data "google_iam_policy" "admin" { } resource "google_sourcerepo_repository_iam_policy" "editor" { - repository = "{{project}}/{{repository}}" + repository = "{{project}}/{{repository}}" policy_data = "${data.google_iam_policy.admin.policy_data}" } ``` @@ -54,7 +54,8 @@ resource "google_sourcerepo_repository_iam_policy" "editor" { ```hcl resource "google_sourcerepo_repository_iam_binding" "editor" { - repository = "{{project}}/{{repository}}" + repository = "{{project}}/{{repository}}" + role = "roles/editor" members = [ "user:jane@example.com", @@ -67,6 +68,7 @@ resource "google_sourcerepo_repository_iam_binding" "editor" { ```hcl resource "google_sourcerepo_repository_iam_member" "editor" { repository = "{{project}}/{{repository}}" + role = "roles/editor" member = "user:jane@example.com" }