summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCollin McNeese <cmcneese@chef.io>2022-02-16 08:23:32 -0600
committerCollin McNeese <cmcneese@chef.io>2022-02-16 08:23:32 -0600
commitb0f9c2bdfa91667ecaea9eb2caac4f13c9da7785 (patch)
tree319567cd3429fcdf78a720cf9c0ff3875a1d2e0c
parent0ffe471ddddee9a2660340ea905a6767f7c25528 (diff)
downloadchef-b0f9c2bdfa91667ecaea9eb2caac4f13c9da7785.tar.gz
fixes for #12589 for compliance audit-enforcer reporter
Signed-off-by: Collin McNeese <cmcneese@chef.io>
-rw-r--r--lib/chef/compliance/default_attributes.rb2
-rw-r--r--lib/chef/compliance/reporter/compliance_enforcer.rb2
-rw-r--r--lib/chef/compliance/runner.rb4
-rw-r--r--spec/unit/compliance/reporter/compliance_enforcer_spec.rb6
4 files changed, 7 insertions, 7 deletions
diff --git a/lib/chef/compliance/default_attributes.rb b/lib/chef/compliance/default_attributes.rb
index fc30716205..52cda4dc30 100644
--- a/lib/chef/compliance/default_attributes.rb
+++ b/lib/chef/compliance/default_attributes.rb
@@ -27,7 +27,7 @@ class Chef
# Controls what is done with the resulting report after the Chef InSpec run.
# Accepts a single string value or an array of multiple values.
- # Accepted values: 'chef-server-automate', 'chef-automate', 'json-file', 'audit-enforcer', 'cli'
+ # Accepted values: 'chef-server-automate', 'chef-automate', 'json-file', 'audit-enforcer', 'compliance-enforcer', 'cli'
"reporter" => nil,
# Controls if Chef InSpec profiles should be fetched from Chef Automate or Chef Infra Server
diff --git a/lib/chef/compliance/reporter/compliance_enforcer.rb b/lib/chef/compliance/reporter/compliance_enforcer.rb
index 47b3a4d2df..d682208821 100644
--- a/lib/chef/compliance/reporter/compliance_enforcer.rb
+++ b/lib/chef/compliance/reporter/compliance_enforcer.rb
@@ -1,7 +1,7 @@
class Chef
module Compliance
module Reporter
- class AuditEnforcer
+ class ComplianceEnforcer
class ControlFailure < StandardError; end
def send_report(report)
diff --git a/lib/chef/compliance/runner.rb b/lib/chef/compliance/runner.rb
index f6d3e89b15..59b60112e7 100644
--- a/lib/chef/compliance/runner.rb
+++ b/lib/chef/compliance/runner.rb
@@ -7,7 +7,7 @@ class Chef
class Runner < EventDispatch::Base
extend Forwardable
- SUPPORTED_REPORTERS = %w{chef-automate chef-server-automate json-file audit-enforcer cli}.freeze
+ SUPPORTED_REPORTERS = %w{chef-automate chef-server-automate json-file audit-enforcer compliance-enforcer cli}.freeze
SUPPORTED_FETCHERS = %w{chef-automate chef-server}.freeze
attr_accessor :run_id
@@ -300,7 +300,7 @@ class Chef
require_relative "reporter/json_file"
path = node.dig("audit", "json_file", "location")
Chef::Compliance::Reporter::JsonFile.new(file: path)
- when "audit-enforcer"
+ when "audit-enforcer", "compliance-enforcer"
require_relative "reporter/compliance_enforcer"
Chef::Compliance::Reporter::ComplianceEnforcer.new
when "cli"
diff --git a/spec/unit/compliance/reporter/compliance_enforcer_spec.rb b/spec/unit/compliance/reporter/compliance_enforcer_spec.rb
index 3f3ce6286b..f9eb1eb455 100644
--- a/spec/unit/compliance/reporter/compliance_enforcer_spec.rb
+++ b/spec/unit/compliance/reporter/compliance_enforcer_spec.rb
@@ -1,8 +1,8 @@
require "spec_helper"
require "chef/compliance/reporter/compliance_enforcer"
-describe Chef::Compliance::Reporter::AuditEnforcer do
- let(:reporter) { Chef::Compliance::Reporter::AuditEnforcer.new }
+describe Chef::Compliance::Reporter::ComplianceEnforcer do
+ let(:reporter) { Chef::Compliance::Reporter::ComplianceEnforcer.new }
it "does not raise error for a successful InSpec report" do
report = {
@@ -44,6 +44,6 @@ describe Chef::Compliance::Reporter::AuditEnforcer do
expect {
reporter.send_report(report)
- }.to raise_error(Chef::Compliance::Reporter::AuditEnforcer::ControlFailure, "Audit c2 has failed. Aborting chef-client run.")
+ }.to raise_error(Chef::Compliance::Reporter::ComplianceEnforcer::ControlFailure, "Audit c2 has failed. Aborting chef-client run.")
end
end