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

Added directions for Heimdall Lite #59

Merged
merged 7 commits into from
Oct 14, 2020

Conversation

aaronlippold
Copy link
Contributor

  • updated README to add the JSON reporter to the process
  • updated Walkthrough to create a JSON result and then load into Heimdall Lite

Signed-off-by: Aaron Lippold [email protected]

@binamov
Copy link
Member

binamov commented Sep 21, 2020

/gcbrun

Copy link
Member

@binamov binamov left a comment

Choose a reason for hiding this comment

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

@aaronlippold thank you for this! I have a small suggestion to make the walkthrough experience better. LMK if it doesn't make sense.

walkthrough.md Outdated Show resolved Hide resolved
walkthrough.md Outdated Show resolved Hide resolved
@aaronlippold
Copy link
Contributor Author

If we agree on the communication and presentation here, I will merge it into the other PRs as well. Please feel free to edit on your side if you see anything. Once merged, we can update the other profiles.

@aaronlippold aaronlippold marked this pull request as ready for review September 24, 2020 15:21
@binamov
Copy link
Member

binamov commented Sep 24, 2020

/gcbrun

inspec.yml Outdated
copyright_email: '[email protected]'
license: 'Apache-2.0'
summary: 'Inspec Google Cloud Platform Center for Internet Security Benchmark v1.1 Profile'
version: 1.1.0-17
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This will need to be bumped with the changes we have made to ensure folks profiles update

@binamov
Copy link
Member

binamov commented Oct 1, 2020

/gcbrun

@binamov
Copy link
Member

binamov commented Oct 1, 2020

@aaronlippold seems we have a problem in inspec.yml

/usr/local/bundle/gems/inspec-core-4.22.0/lib/source_readers/inspec.rb:38:in `rescue in load_metadata': Unable to parse inspec.yml: line 50, did not find expected key while parsing a block mapping (RuntimeError)
	from /usr/local/bundle/gems/inspec-core-4.22.0/lib/source_readers/inspec.rb:31:in `load_metadata'
	from /usr/local/bundle/gems/inspec-core-4.22.0/lib/source_readers/inspec.rb:23:in `initialize'
	from /usr/local/bundle/gems/inspec-core-4.22.0/lib/source_readers/inspec.rb:10:in `new'
	from /usr/local/bundle/gems/inspec-core-4.22.0/lib/source_readers/inspec.rb:10:in `resolve'
	from /usr/local/bundle/gems/inspec-core-4.22.0/lib/inspec/plugin/v1/registry.rb:14:in `block in resolve'
	from /usr/local/bundle/gems/inspec-core-4.22.0/lib/inspec/plugin/v1/registry.rb:13:in `each'
	from /usr/local/bundle/gems/inspec-core-4.22.0/lib/inspec/plugin/v1/registry.rb:13:in `resolve'
	from /usr/local/bundle/gems/inspec-core-4.22.0/lib/inspec/source_reader.rb:10:in `resolve'
	from /usr/local/bundle/gems/inspec-core-4.22.0/lib/inspec/profile.rb:56:in `for_path'
	from /usr/local/bundle/gems/inspec-core-4.22.0/lib/inspec/profile.rb:68:in `for_fetcher'
	from /usr/local/bundle/gems/inspec-core-4.22.0/lib/inspec/profile.rb:74:in `for_target'
	from /usr/local/bundle/gems/inspec-core-4.22.0/lib/inspec/profile_vendor.rb:44:in `profile'
	from /usr/local/bundle/gems/inspec-core-4.22.0/lib/inspec/profile_vendor.rb:58:in `vendor_dependencies!'
	from /usr/local/bundle/gems/inspec-core-4.22.0/lib/inspec/profile_vendor.rb:13:in `vendor!'
	from /usr/local/bundle/gems/inspec-core-4.22.0/lib/inspec/base_cli.rb:294:in `vendor_deps'
	from /usr/local/bundle/gems/inspec-core-4.22.0/lib/inspec/cli.rb:153:in `vendor'
	from /usr/local/bundle/gems/thor-1.0.1/lib/thor/command.rb:27:in `run'
	from /usr/local/bundle/gems/thor-1.0.1/lib/thor/invocation.rb:127:in `invoke_command'
	from /usr/local/bundle/gems/thor-1.0.1/lib/thor.rb:392:in `dispatch'
	from /usr/local/bundle/gems/thor-1.0.1/lib/thor/base.rb:485:in `start'
	from /usr/local/bundle/gems/inspec-core-4.22.0/lib/inspec/base_cli.rb:35:in `start'
	from /usr/local/bundle/gems/cinc-auditor-bin-4.22.0/bin/cinc-auditor:12:in `<top (required)>'
	from /usr/local/bundle/bin/cinc-auditor:23:in `load'
	from /usr/local/bundle/bin/cinc-auditor:23:in `<main>'
/usr/local/lib/ruby/2.7.0/psych.rb:456:in `parse': (<unknown>): did not find expected key while parsing a block mapping at line 50 column 3 (Psych::SyntaxError)

@binamov
Copy link
Member

binamov commented Oct 1, 2020

/gcbrun

@binamov
Copy link
Member

binamov commented Oct 1, 2020

CI seems angry that there's no gcp_project_id

/usr/local/bundle/gems/inspec-core-4.22.0/lib/inspec/profile.rb:223:in `rescue in block in collect_tests': Failed to load source for controls/4.05-vms.rb: bad URI(is not URI?): "https://www.googleapis.com/compute/v1/projects/Input 'gcp_project_id' does not have a value. Skipping test./zones" (Inspec::Exceptions::ProfileLoadFailed)

- name: gcp_project_id
description: "The GCP project identifier."
type: String
required: true
Copy link
Member

Choose a reason for hiding this comment

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

CI is angry there's no value for this...

Copy link
Member

@binamov binamov Oct 13, 2020

Choose a reason for hiding this comment

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

CI continues to be angry about not having a value for gcp_project_id @aaronlippold, I can't push to your branch. Can you please add a commit?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

added a default dummy value - let me know if that helps. I will see about updating my PRs to ensure you all have push access.

@aaronlippold
Copy link
Contributor Author

aaronlippold commented Oct 1, 2020 via email

@binamov
Copy link
Member

binamov commented Oct 5, 2020

Yeah adding a blank or a dummy value fixes the profile evaluation issue. I tried to push a change to your branch but no permissions. I'll let you amend this PR @aaronlippold

@binamov
Copy link
Member

binamov commented Oct 5, 2020

Also needs a version bump in inspec.yml to fix merge conflict.

@aaronlippold
Copy link
Contributor Author

aaronlippold commented Oct 6, 2020 via email

@KonradSchieban
Copy link
Collaborator

/gcbrun

- name: gcp_project_id
description: "The GCP project identifier."
type: String
required: true
Copy link
Member

@binamov binamov Oct 13, 2020

Choose a reason for hiding this comment

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

CI continues to be angry about not having a value for gcp_project_id @aaronlippold, I can't push to your branch. Can you please add a commit?

@aaronlippold aaronlippold requested a review from binamov October 13, 2020 21:20
@aaronlippold aaronlippold marked this pull request as draft October 13, 2020 21:20
@aaronlippold aaronlippold marked this pull request as ready for review October 13, 2020 21:20
@binamov
Copy link
Member

binamov commented Oct 13, 2020

/gcbrun

Copy link
Member

@binamov binamov left a comment

Choose a reason for hiding this comment

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

🍒

@KonradSchieban
Copy link
Collaborator

Thank you for your contribution @aaronlippold ! Looks great! 🚀

@KonradSchieban KonradSchieban merged commit a9134fc into GoogleCloudPlatform:master Oct 14, 2020
KonradSchieban pushed a commit to KonradSchieban/inspec-gcp-cis-benchmark that referenced this pull request Jul 4, 2021
* added directions to README and Walkthough to create a json result and looad into Heimdall Lite
* added default dummy value for the project_id
* fixed indent issues in inspec.yml
* fixed markdown syntax in README
Signed-off-by: Aaron Lippold <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants