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

Remove leftover beta tests/maps/resources from GA provider. #631

Merged

Conversation

rileykarson
Copy link
Member

I don't think we can get cross-product information in a single run, so we need to do this by hand instead of magic


[all]

[terraform]

Remove beta generated resource maps from GA provider.

[terraform-beta]

Unintended changes

[ansible]

[inspec]

@rileykarson rileykarson changed the title Remove beta generated resource maps from GA provider. [WIP] Remove beta generated resource maps from GA provider. Oct 29, 2018
@modular-magician
Copy link
Collaborator

I am a robot that works on MagicModules PRs!

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

@@ -100,10 +101,14 @@ func Provider() terraform.ResourceProvider {
},

ResourcesMap: mergeResourceMaps(
<% if !version.nil? && version == 'beta' -%>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've been doing <% unless version.nil? || version == 'ga' -%> instead since then we don't have to change anything if we introduce an alpha provider.

@rileykarson rileykarson changed the title [WIP] Remove beta generated resource maps from GA provider. Remove beta generated resource maps from GA provider. Oct 29, 2018
@rileykarson
Copy link
Member Author

@danawillow: I decided that it wouldn't make sense to just knock out provider.go and leave the resources themselves (since I think they would still be tested and those tests would fail?) so this PR grew a little. I re-requested review since it's changed a lot.

@rileykarson rileykarson changed the title Remove beta generated resource maps from GA provider. Remove leftover beta tests/maps/resources from GA provider. Oct 29, 2018
@rileykarson
Copy link
Member Author

rileykarson commented Oct 29, 2018

Also failures are expected until hashicorp/terraform-provider-google#2355. I don't have a great solution here other than temporarily breaking HEAD until the MM PR can build and get merged in; it works on my machine, but this isn't a case MM handles great.

If you can review this w/o the outputs, I'll then merge hashicorp/terraform-provider-google#2355 and kick-start the magician to generate the downstreams and get reviews from you on those.

@@ -152,7 +154,8 @@ resource "google_binary_authorization_attestor" "attestor" {
note_reference = "${google_container_analysis_note.note.name}"
public_keys {
ascii_armored_pgp_public_key = <<EOF
%s
<%- # load bearing - the erb compiler will interpret the %s as ruby otherwise -%>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh that's very upsetting

rileykarson added a commit to hashicorp/terraform-provider-google that referenced this pull request Oct 30, 2018
@rileykarson rileykarson force-pushed the beta-provider branch 4 times, most recently from 1a23baf to 4f761c3 Compare October 30, 2018 16:49
@modular-magician
Copy link
Collaborator

I am (still) a robot that works on MagicModules PRs!

I just wanted to let you know that your changes (as of commit 8436d0a) have been included in your existing downstream PRs.

@modular-magician modular-magician merged commit f43b45a into GoogleCloudPlatform:master Oct 30, 2018
nat-henderson pushed a commit to hashicorp/terraform-provider-google that referenced this pull request Dec 21, 2018
nat-henderson pushed a commit to hashicorp/terraform-provider-google that referenced this pull request Dec 21, 2018
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.

4 participants