TPG 3.0.0 #2470

rileykarson · 2019-10-15T17:36:24Z

Actually merged as #2679 after a force push, I accidentally squashed this one.

If you're looking at this in Git history, sorry!

For a monthish or so, we ran a 3.0.0 branch parallel to master in this repo. Breaking changes were staged here, and we rebased intermittently to avoid the changes getting too hard to manage.

However, that means that downstream changes aren't associated with specific PRs. Each commit here- generally a PR, sometimes minor fixups post-rebase- will be preserved in master post-merge. You can git blame on this repo and find the real change that was made on a downstream.

We merged this back using a "rebase merge" while the base of this branch was the same as the HEAD of master. That means the branch was fast-forwarded preserving history, as if the commits were applied 1-by-1 to master. Unfortunately, the Magician will only have ran on the end, generating one massive downstreams.

Original body:

Using this branch to generate downstreams; it'll work for a limited time before there's a conflict but seeing what old-Magician generates will be interesting. Also, it lets us run acctests on the branch.

googlebot · 2019-10-15T17:36:31Z

All (the pull request submitter and all commit authors) CLAs are signed, but one or more commits were authored or co-authored by someone other than the pull request submitter.

We need to confirm that all authors are ok with their commits being contributed to this project. Please have them confirm that by leaving a comment that contains only @googlebot I consent. in this pull request.

Note to project maintainer: There may be cases where the author cannot leave a comment, or the comment is not properly detected as consent. In those cases, you can manually confirm consent of the commit author(s), and set the cla label to yes (if enabled on your project).

ℹ️ Googlers: Go here for more info.

modular-magician · 2019-10-15T17:45:53Z

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, e227c21.

Pull request statuses

WARNING: The following files changed in commit e227c21 may need corresponding changes in third_party/validator:

third_party/terraform/resources/resource_google_project.go

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#1266
depends: GoogleCloudPlatform/terraform-google-conversion#230
depends: hashicorp/terraform-provider-google#4680
depends: ansible-collections/google.cloud#25

modular-magician · 2019-10-15T21:52:38Z

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, 369633b.

Pull request statuses

terraform-provider-google-beta already has an open PR.
terraform-google-conversion already has an open PR.
terraform-provider-google already has an open PR.
Ansible already has an open PR.
No diff detected in Inspec.

New Pull Requests

I didn't open any new pull requests because of this PR.

modular-magician · 2019-10-25T18:53:11Z

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, 1c26baa.

Pull request statuses

terraform-provider-google-beta already has an open PR.
terraform-google-conversion already has an open PR.
terraform-provider-google already has an open PR.
Ansible already has an open PR.

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: modular-magician/inspec-gcp#242

modular-magician · 2019-10-25T20:34:39Z

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, b03d66b.

Pull request statuses

terraform-provider-google-beta already has an open PR.
terraform-google-conversion already has an open PR.
terraform-provider-google already has an open PR.
Ansible already has an open PR.
InSpec already has an open PR.

New Pull Requests

I didn't open any new pull requests because of this PR.

modular-magician · 2019-10-25T22:22:05Z

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, 3e997ca.

Pull request statuses

terraform-provider-google-beta already has an open PR.
terraform-google-conversion already has an open PR.
terraform-provider-google already has an open PR.
Ansible already has an open PR.
InSpec already has an open PR.

New Pull Requests

I didn't open any new pull requests because of this PR.

modular-magician · 2019-10-28T17:10:07Z

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, 26c797d.

Pull request statuses

terraform-provider-google-beta already has an open PR.
terraform-google-conversion already has an open PR.
terraform-provider-google already has an open PR.
Ansible already has an open PR.
InSpec already has an open PR.

New Pull Requests

I didn't open any new pull requests because of this PR.

modular-magician · 2019-10-28T17:28:20Z

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, cdfac5f.

Pull request statuses

terraform-provider-google-beta already has an open PR.
terraform-google-conversion already has an open PR.
terraform-provider-google already has an open PR.
Ansible already has an open PR.
InSpec already has an open PR.

New Pull Requests

I didn't open any new pull requests because of this PR.

modular-magician · 2019-11-06T20:24:47Z

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, d71e7ad.

Pull request statuses

terraform-provider-google-beta already has an open PR.
terraform-google-conversion already has an open PR.
terraform-provider-google already has an open PR.
Ansible already has an open PR.
InSpec already has an open PR.

New Pull Requests

I didn't open any new pull requests because of this PR.

modular-magician · 2019-11-06T22:46:39Z

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, a4321fd.

Pull request statuses

terraform-provider-google-beta already has an open PR.
terraform-google-conversion already has an open PR.
terraform-provider-google already has an open PR.
Ansible already has an open PR.
InSpec already has an open PR.

New Pull Requests

I didn't open any new pull requests because of this PR.

modular-magician · 2019-11-06T22:55:39Z

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, 1a04350.

Pull request statuses

terraform-provider-google-beta already has an open PR.
terraform-google-conversion already has an open PR.
terraform-provider-google already has an open PR.
Ansible already has an open PR.
InSpec already has an open PR.

New Pull Requests

I didn't open any new pull requests because of this PR.

modular-magician · 2019-11-07T00:44:00Z

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, 8540fe2.

Pull request statuses

terraform-provider-google-beta already has an open PR.
terraform-google-conversion already has an open PR.
terraform-provider-google already has an open PR.
Ansible already has an open PR.
InSpec already has an open PR.

New Pull Requests

I didn't open any new pull requests because of this PR.

modular-magician · 2019-11-07T19:03:30Z

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, 476353e.

Pull request statuses

terraform-provider-google-beta already has an open PR.
terraform-google-conversion already has an open PR.
terraform-provider-google already has an open PR.
Ansible already has an open PR.
InSpec already has an open PR.

New Pull Requests

I didn't open any new pull requests because of this PR.

modular-magician · 2019-11-07T22:21:42Z

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, 179f05f.

Pull request statuses

WARNING: The following files changed in commit 179f05f may need corresponding changes in third_party/validator:

third_party/terraform/resources/resource_compute_instance.go
third_party/terraform/resources/resource_container_cluster.go.erb
third_party/terraform/resources/resource_storage_bucket.go

terraform-provider-google-beta already has an open PR.
terraform-google-conversion already has an open PR.
terraform-provider-google already has an open PR.
Ansible already has an open PR.
InSpec already has an open PR.

New Pull Requests

I didn't open any new pull requests because of this PR.

modular-magician · 2019-11-07T23:42:03Z

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, 83be027.

Pull request statuses

terraform-provider-google-beta already has an open PR.
terraform-google-conversion already has an open PR.
terraform-provider-google already has an open PR.
Ansible already has an open PR.
InSpec already has an open PR.

New Pull Requests

I didn't open any new pull requests because of this PR.

modular-magician · 2019-11-08T01:00:24Z

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, 06cae48.

Pull request statuses

terraform-provider-google-beta already has an open PR.
terraform-google-conversion already has an open PR.
terraform-provider-google already has an open PR.
Ansible already has an open PR.
InSpec already has an open PR.

New Pull Requests

I didn't open any new pull requests because of this PR.

modular-magician · 2019-11-08T18:12:06Z

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, f84f8e2.

Pull request statuses

WARNING: The following files changed in commit f84f8e2 may need corresponding changes in third_party/validator:

third_party/terraform/resources/resource_container_cluster.go.erb

terraform-provider-google-beta already has an open PR.
terraform-google-conversion already has an open PR.
terraform-provider-google already has an open PR.
Ansible already has an open PR.
InSpec already has an open PR.

New Pull Requests

I didn't open any new pull requests because of this PR.

modular-magician · 2019-11-08T18:35:59Z

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, 22503b3.

Pull request statuses

terraform-provider-google-beta already has an open PR.
terraform-google-conversion already has an open PR.
terraform-provider-google already has an open PR.
Ansible already has an open PR.
InSpec already has an open PR.

New Pull Requests

I didn't open any new pull requests because of this PR.

* Convert old import formats (using non-/) to use /.

* Add upgrade note for IoT registry event_notification_configs (#2390) (#2651) Merged PR #2651. * sort upgrade guide; change wording in a few places

Update docs to be accurate for 3.0

modular-magician · 2019-11-13T21:09:05Z

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, 4797f26.

Pull request statuses

terraform-provider-google-beta already has an open PR.
terraform-google-conversion already has an open PR.
terraform-provider-google already has an open PR.
Ansible already has an open PR.
InSpec already has an open PR.

New Pull Requests

I didn't open any new pull requests because of this PR.

modular-magician · 2019-11-13T21:10:18Z

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, cae5354.

Pull request statuses

terraform-provider-google-beta already has an open PR.
terraform-google-conversion already has an open PR.
terraform-provider-google already has an open PR.
Ansible already has an open PR.
InSpec already has an open PR.

New Pull Requests

I didn't open any new pull requests because of this PR.

rileykarson · 2019-11-13T21:31:32Z

There's a failing unit test we'll fix up after merging this.

paddycarver

Let it land. :D :D :D

This reverts commit c18533c.

googlebot · 2019-11-13T21:56:57Z

A Googler has manually verified that the CLAs look good.

(Googler, please make sure the reason for overriding the CLA status is clearly documented in these comments.)

ℹ️ Googlers: Go here for more info.

rileykarson added the changelog: no-release-note label Oct 15, 2019

googlebot added the cla: no label Oct 15, 2019

modular-magician added downstream-generated ansible terraform-google-conversion terraform-provider-google-beta terraform-provider-google labels Oct 15, 2019

rileykarson force-pushed the 3.0.0 branch from 0413e95 to 1c26baa Compare October 24, 2019 20:43

modular-magician added the inspec label Oct 25, 2019

rileykarson force-pushed the 3.0.0 branch from 9718f70 to cc980e5 Compare November 6, 2019 19:25

slevenick force-pushed the 3.0.0 branch from d71e7ad to a4321fd Compare November 6, 2019 22:35

slevenick force-pushed the 3.0.0 branch from c08e870 to 476353e Compare November 7, 2019 18:52

paddycarver and others added 11 commits November 13, 2019 12:50

Add upgrade guide notes. (#2663)

1f85129

Add upgrade guide for forwarding rule validation (#2666)

9ee652e

Convert old import formats (using non-/) to use /. (#2638)

9381806

* Convert old import formats (using non-/) to use /.

Upgrade proofreading (#2668)

2136b06

* Add upgrade note for IoT registry event_notification_configs (#2390) (#2651) Merged PR #2651. * sort upgrade guide; change wording in a few places

Password is not actually required. (#2670)

2843f2b

Add improved for_each non-module variant to project service upg… (#2671)

c7756ac

Update bigtable import & tests to 3.0 (#2673)

176cdff

update upgrade guide (#2665)

7a51a89

update formatting for upgrade doc (#2674)

fb040de

Add rigm to upgrade guide (#2667)

26cf915

Update docs to be accurate for 3.0

proofreading changes (#2676)

4797f26

rileykarson force-pushed the 3.0.0 branch from 55d0822 to 4797f26 Compare November 13, 2019 20:58

Add back lost newlines

cae5354

rileykarson changed the title ~~[DO NOT MERGE] 3.0.0 staging branch~~ TPG 3.0.0 Nov 13, 2019

rileykarson mentioned this pull request Nov 13, 2019

Sync terraform-google-conversion with 3.0.0 hashicorp/terraform-provider-google#4843

Closed

rileykarson requested a review from paddycarver November 13, 2019 21:30

emilymye self-requested a review November 13, 2019 21:53

emilymye approved these changes Nov 13, 2019

View reviewed changes

paddycarver approved these changes Nov 13, 2019

View reviewed changes

rileykarson added cla: yes and removed cla: no labels Nov 13, 2019

rileykarson merged commit c18533c into master Nov 13, 2019

rileykarson added a commit that referenced this pull request Nov 13, 2019

Revert "TPG 3.0.0 (#2470)"

2c938fe

This reverts commit c18533c.

rileykarson mentioned this pull request Nov 13, 2019

TPG 3.0.0 #2679

Merged

modular-magician mentioned this pull request Nov 14, 2019

Bug fixes for GCP (as of 2019-11-13T07:04:50+00:00) ansible/ansible#64822

Closed

rileykarson deleted the 3.0.0 branch March 25, 2024 22:18

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

TPG 3.0.0 #2470

TPG 3.0.0 #2470

rileykarson commented Oct 15, 2019 •

edited

Loading

googlebot commented Oct 15, 2019

modular-magician commented Oct 15, 2019

modular-magician commented Oct 15, 2019

modular-magician commented Oct 25, 2019

modular-magician commented Oct 25, 2019

modular-magician commented Oct 25, 2019

modular-magician commented Oct 28, 2019

modular-magician commented Oct 28, 2019

modular-magician commented Nov 6, 2019

modular-magician commented Nov 6, 2019

modular-magician commented Nov 6, 2019

modular-magician commented Nov 7, 2019

modular-magician commented Nov 7, 2019

modular-magician commented Nov 7, 2019

modular-magician commented Nov 7, 2019

modular-magician commented Nov 8, 2019

modular-magician commented Nov 8, 2019

modular-magician commented Nov 8, 2019

modular-magician commented Nov 13, 2019

modular-magician commented Nov 13, 2019

rileykarson commented Nov 13, 2019

paddycarver left a comment

googlebot commented Nov 13, 2019

TPG 3.0.0 #2470

TPG 3.0.0 #2470

Conversation

rileykarson commented Oct 15, 2019 • edited Loading

googlebot commented Oct 15, 2019

modular-magician commented Oct 15, 2019

Pull request statuses

New Pull Requests

modular-magician commented Oct 15, 2019

Pull request statuses

New Pull Requests

modular-magician commented Oct 25, 2019

Pull request statuses

New Pull Requests

modular-magician commented Oct 25, 2019

Pull request statuses

New Pull Requests

modular-magician commented Oct 25, 2019

Pull request statuses

New Pull Requests

modular-magician commented Oct 28, 2019

Pull request statuses

New Pull Requests

modular-magician commented Oct 28, 2019

Pull request statuses

New Pull Requests

modular-magician commented Nov 6, 2019

Pull request statuses

New Pull Requests

modular-magician commented Nov 6, 2019

Pull request statuses

New Pull Requests

modular-magician commented Nov 6, 2019

Pull request statuses

New Pull Requests

modular-magician commented Nov 7, 2019

Pull request statuses

New Pull Requests

modular-magician commented Nov 7, 2019

Pull request statuses

New Pull Requests

modular-magician commented Nov 7, 2019

Pull request statuses

New Pull Requests

modular-magician commented Nov 7, 2019

Pull request statuses

New Pull Requests

modular-magician commented Nov 8, 2019

Pull request statuses

New Pull Requests

modular-magician commented Nov 8, 2019

Pull request statuses

New Pull Requests

modular-magician commented Nov 8, 2019

Pull request statuses

New Pull Requests

modular-magician commented Nov 13, 2019

Pull request statuses

New Pull Requests

modular-magician commented Nov 13, 2019

Pull request statuses

New Pull Requests

rileykarson commented Nov 13, 2019

paddycarver left a comment

Choose a reason for hiding this comment

googlebot commented Nov 13, 2019

rileykarson commented Oct 15, 2019 •

edited

Loading