summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPete Higgins <pete@peterhiggins.org>2020-11-03 13:14:30 -0800
committerPete Higgins <pete@peterhiggins.org>2020-12-01 16:05:17 -0800
commitd770e69d4766a9e0a19c1bfc20008e9791871a1c (patch)
treec861d6b6524956d820d715c51c310a73fe1b7462
parent7928c40c15e2405c62de4c91a733f37dd2d39b1b (diff)
downloadchef-d770e69d4766a9e0a19c1bfc20008e9791871a1c.tar.gz
Fix spellcheck violations.
Signed-off-by: Pete Higgins <pete@peterhiggins.org>
-rw-r--r--cspell.json2
-rw-r--r--lib/chef/audit/default_attributes.rb2
-rw-r--r--lib/chef/audit/reporter/automate.rb5
-rw-r--r--lib/chef/audit/runner.rb6
4 files changed, 9 insertions, 6 deletions
diff --git a/cspell.json b/cspell.json
index b63cc0f898..2c34043b30 100644
--- a/cspell.json
+++ b/cspell.json
@@ -317,6 +317,7 @@
"DBCS",
"dbresson",
"DBUS",
+ "dctoken",
"DDTHH",
"debconf",
"debianrcd",
@@ -943,6 +944,7 @@
"metafile",
"METAFILE",
"metalink",
+ "metasearch",
"Miah",
"michaellihs",
"Microarchitecture",
diff --git a/lib/chef/audit/default_attributes.rb b/lib/chef/audit/default_attributes.rb
index 05333316b7..41b450ef37 100644
--- a/lib/chef/audit/default_attributes.rb
+++ b/lib/chef/audit/default_attributes.rb
@@ -90,7 +90,7 @@ class Chef
"json_file" => {
# The location of the json-file output:
- # <chef_cache_path>/cookbooks/audit/inspec-<YYYYMMDDHHMMSS>.json
+ # <chef_cache_path>/cookbooks/audit/inspec-<timestamp>.json
# TODO: ^^ comment is wrong
# TODO: Does this path work?
"location" => File.expand_path(Time.now.utc.strftime("../../../inspec-%Y%m%d%H%M%S.json"), __dir__),
diff --git a/lib/chef/audit/reporter/automate.rb b/lib/chef/audit/reporter/automate.rb
index c6a5c0c3fb..671912a14a 100644
--- a/lib/chef/audit/reporter/automate.rb
+++ b/lib/chef/audit/reporter/automate.rb
@@ -90,7 +90,7 @@ class Chef
end
# ***************************************************************************************
- # TODO: We could likely simplify/remove alot of the extra logic we have here with a small
+ # TODO: We could likely simplify/remove some of the extra logic we have here with a small
# revamp of the Automate expected input.
# ***************************************************************************************
@@ -101,8 +101,9 @@ class Chef
# Label this content as an inspec_report
final_report[:type] = "inspec_report"
- # Ensure controls are never stored or shipped, since this was an accidential
+ # Ensure controls are never stored or shipped, since this was an accidental
# addition in InSpec and will be remove in the next inspec major release
+ # TODO: Is this comment ^^ accurate? Is this still necessary?
final_report.delete(:controls)
final_report[:node_name] = @node_name
final_report[:end_time] = @timestamp.utc.strftime("%FT%TZ")
diff --git a/lib/chef/audit/runner.rb b/lib/chef/audit/runner.rb
index 9e8b6f9fef..2dff4c2199 100644
--- a/lib/chef/audit/runner.rb
+++ b/lib/chef/audit/runner.rb
@@ -138,7 +138,7 @@ class Chef
end
# extracts relevant node data
- def gather_nodeinfo
+ def node_info
runlist_roles = node.run_list.select { |item| item.type == :role }.map(&:name)
runlist_recipes = node.run_list.select { |item| item.type == :recipe }.map(&:name)
{
@@ -173,7 +173,7 @@ class Chef
opts = {
entity_uuid: node['chef_guid'],
run_id: run_id,
- node_info: gather_nodeinfo,
+ node_info: node_info,
insecure: insecure,
run_time_limit: run_time_limit,
control_results_limit: control_results_limit,
@@ -187,7 +187,7 @@ class Chef
opts = {
entity_uuid: node['chef_guid'],
run_id: run_id,
- node_info: gather_nodeinfo,
+ node_info: node_info,
insecure: insecure,
url: url,
run_time_limit: run_time_limit,