From ccf5d53a6f4fe895e03a671235525d0d8bb69537 Mon Sep 17 00:00:00 2001 From: Trey Dockendorf Date: Sat, 23 Jan 2021 17:02:48 -0500 Subject: [PATCH] Fix descriptions Fixes #1300 --- REFERENCE.md | 12 +++--------- lib/puppet/type/sensu_agent_entity_config.rb | 10 +--------- tasks/resolve_reference.json | 6 +++--- tasks/resolve_reference.rb | 5 ++--- 4 files changed, 9 insertions(+), 24 deletions(-) diff --git a/REFERENCE.md b/REFERENCE.md index 3f406cf0d9..c63933b015 100644 --- a/REFERENCE.md +++ b/REFERENCE.md @@ -4846,25 +4846,19 @@ Generate targets from Sensu Go Data type: `Optional[String[1]]` - +Namespace to pull entities from ##### `subscription` Data type: `Optional[String[1]]` - +Find entities with this subscription ##### `interface_list` Data type: `Optional[Array]` - - -##### `uri_ipaddress` - -Data type: `Optional[Boolean]` - - +Interfaces to search if more than one present ### `silenced` diff --git a/lib/puppet/type/sensu_agent_entity_config.rb b/lib/puppet/type/sensu_agent_entity_config.rb index 748a0703c7..4b284637bb 100644 --- a/lib/puppet/type/sensu_agent_entity_config.rb +++ b/lib/puppet/type/sensu_agent_entity_config.rb @@ -54,15 +54,7 @@ extend PuppetX::Sensu::Type add_autorequires() - ensurable do - newvalue(:present) do - @resource.provider.create - end - newvalue(:absent) do - @resource.provider.destroy - end - defaultto(:present) - end + ensurable newparam(:name, :namevar => true) do desc <<-EOS diff --git a/tasks/resolve_reference.json b/tasks/resolve_reference.json index 2dc5f3cb44..ebc0f382ea 100644 --- a/tasks/resolve_reference.json +++ b/tasks/resolve_reference.json @@ -3,16 +3,16 @@ "input_method": "stdin", "parameters": { "namespace": { + "description": "Namespace to pull entities from", "type": "Optional[String[1]]" }, "subscription": { + "description": "Find entities with this subscription", "type": "Optional[String[1]]" }, "interface_list": { + "description": "Interfaces to search if more than one present", "type": "Optional[Array]" - }, - "uri_ipaddress": { - "type": "Optional[Boolean]" } } } diff --git a/tasks/resolve_reference.rb b/tasks/resolve_reference.rb index e22adc12b3..380a0f26c8 100644 --- a/tasks/resolve_reference.rb +++ b/tasks/resolve_reference.rb @@ -22,7 +22,7 @@ def self.sensuctl_entities(namespace) entities end - def self.entities_to_targets(entities, interface_list, uri_ipaddress) + def self.entities_to_targets(entities, interface_list) targets = [] entities.each do |e| target = {} @@ -65,7 +65,6 @@ def self.resolve_reference(params) namespace = params['namespace'] subscription = params['subscription'] interface_list = params['interface_list'] - uri_ipaddress = params['uri_ipaddress'] entities = sensuctl_entities(namespace) @@ -73,7 +72,7 @@ def self.resolve_reference(params) entities.select! { |e| e['subscriptions'].include?(subscription) } end - targets = entities_to_targets(entities, interface_list, uri_ipaddress) + targets = entities_to_targets(entities, interface_list) targets end