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.

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

TPG 3.0.0 #2679

Merged
merged 73 commits into from
Nov 13, 2019
Merged

TPG 3.0.0 #2679

merged 73 commits into from
Nov 13, 2019

Conversation

rileykarson
Copy link
Member

@rileykarson rileykarson commented Nov 13, 2019

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.


Replaces #2470, I clicked the wrong button during the merge

nat-henderson and others added 30 commits November 13, 2019 12:37
….0. (#2352)

* cloudbuild build trigger's trigger template should be required in 3.0.0.
* deprecated-->removed event notification config

* remove singular config from tests/docs

* pluralize

* Update third_party/terraform/tests/resource_cloudiot_registry_test.go

Co-Authored-By: Riley Karson <[email protected]>
* Changing IAM audit config to be authoritative

* Remove unused code + test
* Add validation for scratch disks

* Remove source from scratch disk

* Use hardcoded image

* Add reverse logic
* Change default id format from {{name}} to self_link_uri
* Update ID fields for various MM-generated resources
* Composer environment and compute attached disk id updates

* Add compute instance

* Add instance_from_group and instance_group

* IGM id

* Instance template tests passing

* Add new id format to other calls of parseImportId in IGM

* Small refactor to memoize var

* Refactor, remove parseImportId in IGM
* Fix cloudfunction formatting, migrate RIGM id

* Update security policy resource id

* Update target pool id format

* Add new id for container cluster

* Node pool id updates

* PR feedback, using parseImportId for container resources

* Formatting
* Update datasources

* formatting
* Dataproc cluster, job, google project

* Update sql ssl cert, database instance ids

* Project id comparison include projects/
@googlebot
Copy link

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

Pull request statuses

No diff detected in terraform-provider-google-beta.
No diff detected in terraform-google-conversion.
No diff detected in terraform-provider-google.
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: ansible-collections/google.cloud#59

@nat-henderson
Copy link
Contributor

Hm, that's a suspicious outcome. @rileykarson is that what we expected?

@rileykarson
Copy link
Member Author

Alex expects it, by making non-MM changes I think. I'm just gonna close it.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.