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

Inspec 1 #2906

Merged
merged 20 commits into from
Jan 3, 2020
Merged

Inspec 1 #2906

merged 20 commits into from
Jan 3, 2020

Conversation

slevenick
Copy link
Contributor

Move several handwritten resources to MM generated resources. This is in preparation for releasing a 1.0 version of inspec-gcp

Release Note Template for Downstream PRs (will be copied)

@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, 8b64b0e.

Pull request statuses

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#1574
depends: GoogleCloudPlatform/terraform-google-conversion#306
depends: hashicorp/terraform-provider-google#5294
depends: ansible-collections/google.cloud#120
depends: modular-magician/inspec-gcp#292

@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, a1ca729.

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
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, 76318c1.

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

@slevenick slevenick requested a review from rambleraptor January 2, 2020 23:04
rambleraptor
rambleraptor approved these changes Jan 2, 2020
View reviewed changes
Copy link
Contributor

@rambleraptor rambleraptor left a comment

Choose a reason for hiding this comment

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

There's a lot here, but this looks fine. Couple questions (one stylistic, one logistical)

products/bigquery/inspec.yaml Outdated
@@ -31,7 +31,7 @@ overrides: !ruby/object:Overrides::ResourceOverrides
lastModifiedTime: !ruby/object:Overrides::Inspec::PropertyOverride
exclude_plural: true
additional_functions: |
<%= lines(indent(compile('templates/inspec/custom_functions/bigquery_dataset_name.rb'), 6)) -%>
<%= lines(indent(compile('third_party/inspec/custom_functions/bigquery_dataset_name.erb'), 6)) -%>
Copy link
Contributor

Choose a reason for hiding this comment

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

Why do these live in third_party?

products/compute/inspec.yaml Outdated
@@ -37,22 +49,42 @@ overrides: !ruby/object:Overrides::ResourceOverrides
Image: !ruby/object:Overrides::Inspec::ResourceOverride
exclude: true
Instance: !ruby/object:Overrides::Inspec::ResourceOverride
exclude: true
additional_functions: |
Copy link
Contributor

Choose a reason for hiding this comment

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

What do you think about additional_functions taking in a template name like singular_extra_examples?

@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, 9dce841.

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

slevenick added 16 commits January 3, 2020 23:43
@slevenick @modular-magician
Converting firewall to mm generated
8f4bab5
@slevenick @modular-magician
Update to 3.0, add firewall generated tests
3c73f19
@slevenick @modular-magician
Convert address
5584e8b
@slevenick @modular-magician
Convert instance group
dcc4746
@slevenick @modular-magician
Fixing up some new field, tests
24092a0
@slevenick @modular-magician
Add network, instance conversions
5a59c4c
@slevenick @modular-magician
Add subnetwork to MM
26c5462
@slevenick @modular-magician
Add rigm support, fixes for failing tests
6c83eb9
@slevenick @modular-magician
Fixes for rigm, rename region container resources to be general resou…
eadff8a 
…rces with location
@slevenick @modular-magician
Add autohealing policies to rigm, remove tests on fields that return …
6b03de5 
…only * characters (secrets)
@slevenick @modular-magician
Move custom functions, docs in inspec to third_party
9a6916f
@slevenick @modular-magician
.rb -> erb in third_party inspec
d12ae9e
@slevenick @modular-magician
Exclude rigm from ansible/terraform generation
3cd1d7b
@slevenick @modular-magician
Exclude ansible resource as well
a7063d1
@slevenick @modular-magician
Fix terraform override
30ca897
@slevenick @modular-magician
Enable logging with api name override is needed
58af54b
slevenick and others added 2 commits January 3, 2020 23:43
@slevenick @modular-magician
Compile additional_functions in the resource.erb rather than yaml
aac3038
@modular-magician
Update tracked submodules -> HEAD on Fri Jan 3 23:43:46 UTC 2020
8d8f84f 
Tracked submodules are build/terraform-beta build/terraform-mapper build/terraform build/ansible build/inspec.
@modular-magician modular-magician merged commit 33ab3f6 into GoogleCloudPlatform:master Jan 3, 2020
This was referenced Jan 29, 2020
Closed
Closed
Closed
Closed
Closed
This was referenced Feb 12, 2020
Closed
Closed
Closed
@modular-magician modular-magician mentioned this pull request Mar 4, 2020
Closed
This was referenced Mar 18, 2020
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rambleraptor rambleraptor rambleraptor approved these changes

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

Successfully merging this pull request may close these issues.
4 participants
@slevenick @modular-magician @rambleraptor @googlebot