summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjtimberman <joshua@chef.io>2020-01-23 16:39:46 -0700
committerjtimberman <joshua@chef.io>2020-01-23 16:39:46 -0700
commit3eb88ba7a79ac9b9f3b8a745a852f769b38523af (patch)
treeeb1e6747bc81c459fd3f9dc104eb835cfc1413ac
parentca5cf342b9d63118b9d2248d0fa516b87d9cb0a1 (diff)
downloadchef-jtimberman/policy-status.tar.gz
option to show policy name/group on status outputjtimberman/policy-status
Signed-off-by: Joshua Timberman <joshua@chef.io>
-rw-r--r--lib/chef/knife/core/status_presenter.rb10
-rw-r--r--lib/chef/knife/status.rb6
-rw-r--r--spec/unit/knife/status_spec.rb1
3 files changed, 17 insertions, 0 deletions
diff --git a/lib/chef/knife/core/status_presenter.rb b/lib/chef/knife/core/status_presenter.rb
index 9042350295..d98cb2cae0 100644
--- a/lib/chef/knife/core/status_presenter.rb
+++ b/lib/chef/knife/core/status_presenter.rb
@@ -72,6 +72,8 @@ class Chef
result["ip"] = ip if ip
result["fqdn"] = fqdn if fqdn
result["run_list"] = node.run_list if config["run_list"]
+ result["policy_name"] = node.policy_name if config["policy"]
+ result["policy_group"] = node.policy_group if config["policy"]
result["ohai_time"] = node["ohai_time"]
result["platform"] = node["platform"] if node["platform"]
result["platform_version"] = node["platform_version"] if node["platform_version"]
@@ -108,6 +110,11 @@ class Chef
end
end
+ if config[:policy]
+ policy_name = node["policy_name"]
+ policy_group = node["policy_group"]
+ end
+
line_parts = []
if node["ohai_time"]
@@ -145,6 +152,9 @@ class Chef
line_parts << platform
end
+ line_parts << policy_name if policy_name
+ line_parts << policy_group if policy_group
+
summarized = summarized + line_parts.join(", ") + ".\n"
end
summarized
diff --git a/lib/chef/knife/status.rb b/lib/chef/knife/status.rb
index 074488e003..ae8178d4cc 100644
--- a/lib/chef/knife/status.rb
+++ b/lib/chef/knife/status.rb
@@ -37,6 +37,11 @@ class Chef
long: "--run-list",
description: "Show the run list"
+ option :policy,
+ short: "-p",
+ long: "--policy",
+ description: "Show the policy name and group"
+
option :sort_reverse,
short: "-s",
long: "--sort-reverse",
@@ -60,6 +65,7 @@ class Chef
opts = { filter_result:
{ name: ["name"], ipaddress: ["ipaddress"], ohai_time: ["ohai_time"],
ec2: ["ec2"], run_list: ["run_list"], platform: ["platform"],
+ policy_name: ["policy_name"], policy_group: ["policy_group"],
platform_version: ["platform_version"], chef_environment: ["chef_environment"] } }
end
diff --git a/spec/unit/knife/status_spec.rb b/spec/unit/knife/status_spec.rb
index 8af3b3e871..709dbdccc9 100644
--- a/spec/unit/knife/status_spec.rb
+++ b/spec/unit/knife/status_spec.rb
@@ -40,6 +40,7 @@ describe Chef::Knife::Status do
{ filter_result:
{ name: ["name"], ipaddress: ["ipaddress"], ohai_time: ["ohai_time"],
ec2: ["ec2"], run_list: ["run_list"], platform: ["platform"],
+ policy_name: ["policy_name"], policy_group: ["policy_group"]
platform_version: ["platform_version"], chef_environment: ["chef_environment"] } }
end