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.

Sign up for GitHub

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

Jump to bottom

Update google_folder import description #2924

Merged
merged 3 commits into from
Jan 6, 2020
Merged

Update google_folder import description #2924

merged 3 commits into from
Jan 6, 2020

Conversation

danawillow
Copy link
Contributor

Upstreams hashicorp/terraform-provider-google#4149

Release Note Template for Downstream PRs (will be copied)

@googlebot
Copy link

We found a Contributor License Agreement for you (the sender of this pull request), but were unable to find agreements for all the commit author(s) or Co-authors. If you authored these, maybe you used a different email address in the git commits than was used to sign the CLA (login here to double check)? If these were authored by someone else, then they will need to sign a CLA as well, and confirm that they're okay with these being contributed to Google.
In order to pass this check, please resolve this problem and then comment @googlebot I fixed it.. If the bot doesn't comment, it means it doesn't think anything has changed.

ℹ️ Googlers: Go here for more info.

@modular-magician
Copy link
Collaborator

Hi! I'm the modular magician, I work on Magic Modules.
I see that this PR has already had some downstream PRs generated. Any open downstreams are already updated to your most recent commit, 01dd942.

Pull request statuses

No diff detected in terraform-google-conversion.
No diff detected in Ansible.
No diff detected in Inspec.

New Pull Requests

I built this PR into one or more new PRs on other repositories, and when those are closed, this PR will also be merged and closed.
depends: hashicorp/terraform-provider-google-beta#1592
depends: hashicorp/terraform-provider-google#5322

marinkovicpetar and others added 3 commits January 6, 2020 23:57
@marinkovicpetar @modular-magician
Updated google_folder.html
7733acb 
The page in the first example shows that you should use organization_id with value of 1234567. In the Import example, it's not clear whether organization_id is user, or folder_id is used. API call behind this import command is only accepting folder_id (can be checked when setting TF_LOG to trace and viewing the API call)
@marinkovicpetar @danawillow @modular-magician
Update website/docs/r/google_folder.html.markdown
b3e3bfc 
Co-Authored-By: Dana Hoffman <[email protected]>
@modular-magician
Update tracked submodules -> HEAD on Mon Jan 6 23:57:44 UTC 2020
0faeef0 
Tracked submodules are build/terraform-beta build/terraform-mapper build/terraform build/ansible build/inspec.
@modular-magician modular-magician merged commit 388eb67 into GoogleCloudPlatform:master Jan 6, 2020
@danawillow danawillow deleted the tf-4149 branch January 7, 2020 00:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@c2thorn c2thorn c2thorn approved these changes

Assignees
No one assigned
Labels
automerged cla: no downstream-generated terraform-provider-google terraform-provider-google-beta
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@danawillow @googlebot @modular-magician @c2thorn @marinkovicpetar