Merge in The Magician #15
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This sets up the CI system by which changes can flow from MagicModules down to Terraform. In its current form it only does Terraform, but a major goal is to extend it to all generated repositories. The code here refers to a handful of docker containers I had to create - one of them has its Dockerfile checked in here, but the rest are built from other, existing repositories. Still working to get my changes to those upstream repos merged, but in the meantime I've built my own versions and am using those. This isn't all the way done: I've commented out "trigger: true" in a few places here because I don't think this is ready to be fully automated yet. It also currently does all the work in a user's own forks rather than the main repos. I want to review it as-is (since it's approximately the minimum viable proof-of-concept), and I'll try to make smaller changes from here on in.
PR resource maintainer doesn't want to add 'create' to the PRs, so we'll need to manage them ourselves. It's okay - doesn't really reduce usability, and the hub CLI only requires the token (which is already present in the config).
nat-henderson
requested review from
nelsonjr,
danawillow,
rosbo and
rambleraptor
rosbo
approved these changes
Mar 7, 2018
|
Thanks! I'm going to wait til at least the end of the day, so if anyone here knows of any reason these two repos should not be merged, speak today or forever hold your peace? :) |
danawillow
approved these changes
Mar 7, 2018
nelsonjr
approved these changes
Mar 7, 2018
chrisst
pushed a commit
to chrisst/magic-modules
that referenced
this pull request
Oct 26, 2018
* Data source for retrieving GCE service account * Added project id for service account lookups (GoogleCloudPlatform#15) * Renaming attribute project_id -> project
mirobertod
pushed a commit
to mirobertod/magic-modules
that referenced
this pull request
May 31, 2022
fix ports in notes.txt
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR merges in the full history of the
terraform-provider-google-cirepo into a new.cifolder.terraform-provider-google-cirecently evolved to be The Magician, a system for managing downstream pull requests on Magic Modules. It's getting to be time to start managing that as part of this repository instead of separately.This PR is a pure merge - it doesn't change the workflow to depend on
magic-modulesinstead ofterraform-provider-google-cior make any of the other minor changes which will be necessary - those will come in a followup, once the transition is all done.All the code in here has undergone review, (this is
terraform-provider-google-ci/master), so you don't need to review the code. The request is to review the merge instead.I'd like this to be merged in with a merge strategy instead of a squash-and-merge. First, the history is likely to be useful for future development. Second, I've done a subtree merge here, so the few remaining PRs open against
terraform-provider-google-cican be resolved there and then merged into this repo, in parallel with new development being done here. A merge instead of squash-and-merge makes that transition possible. Third, the usual reason for doing a squash-and-merge, easy rollbacks, doesn't apply here because this code has no interactions with the existing code.