Merge pull request #140 from fetzerms/add_delete_action

Add delete action

Author: david22swan

spec/acceptance/init_spec.rb

@@ -4,29 +4,36 @@
 
 describe 'puppet_conf task' do
   describe 'puppet_conf' do
-    it 'set/get a puppet configuration' do
+    it 'set/get/delete a puppet configuration' do
       result = run_bolt_task('puppet_conf', 'action' => 'set', 'setting' => 'vardir', 'value' => '/tmp/bla')
       expect(result.exit_code).to eq(0)
       expect(result['result']['status']).to match %r{.*/tmp/bla}
       expect(result['result']).to include 'setting' => 'vardir', 'section' => 'main'
 
       result = run_bolt_task('puppet_conf', 'action' => 'get', 'setting' => 'vardir')
-
       expect(result.exit_code).to eq(0)
       expect(result['result']['status']).to match %r{.*/tmp/bla}
       expect(result['result']).to include 'setting' => 'vardir', 'section' => 'main'
+
+      result = run_bolt_task('puppet_conf', 'action' => 'delete', 'setting' => 'vardir')
+      expect(result.exit_code).to eq(0)
+      expect(result['result']['status']).to match %r{.*Deleted.*/tmp/bla}
+      expect(result['result']).to include 'setting' => 'vardir', 'section' => 'main'
     end
 
-    it 'set/get a puppet configuration with section' do
+    it 'set/get/delete a puppet configuration with section' do
       result = run_bolt_task('puppet_conf', 'action' => 'set', 'setting' => 'storeconfigs', 'value' => 'false', 'section' => 'server')
-
       expect(result.exit_code).to eq(0)
       expect(result['result']).to include 'status' => 'false', 'setting' => 'storeconfigs', 'section' => 'server'
 
       result = run_bolt_task('puppet_conf', 'action' => 'get', 'setting' => 'storeconfigs', 'section' => 'server')
-
       expect(result.exit_code).to eq(0)
       expect(result['result']).to include 'status' => 'false', 'setting' => 'storeconfigs', 'section' => 'server'
+
+      result = run_bolt_task('puppet_conf', 'action' => 'delete', 'setting' => 'storeconfigs', 'section' => 'server')
+      expect(result.exit_code).to eq(0)
+      expect(result['result']['status']).to match %r{.*Deleted.*storeconfigs.*}
+      expect(result['result']).to include 'setting' => 'storeconfigs', 'section' => 'server'
     end
   end
 end

tasks/init.json

@@ -3,8 +3,8 @@
   "input_method": "stdin",
   "parameters": {
     "action": {
-      "description": "The operation (get, set) to perform on the configuration setting",
-      "type": "Enum[get, set]"
+      "description": "The operation (get, set, delete) to perform on the configuration setting",
+      "type": "Enum[get, set, delete]"
     },
     "section": {
       "description": "The section of the config file. Defaults to main",

tasks/init.rb

@@ -60,6 +60,15 @@ def get(setting, section, _value)
   { status: stdout.strip, setting: setting, section: section }
 end
 
+def delete(setting, section, _value)
+  cmd = [puppet_cmd, 'config', 'delete']
+  cmd += ['--section', section]
+  cmd += [setting]
+  stdout, stderr, status = Open3.capture3(*cmd)
+  raise Puppet::Error, stderr if status != 0
+  { status: stdout.strip, setting: setting, section: section }
+end
+
 params = JSON.parse(STDIN.read)
 action = params['action']
 setting = params['setting']
@@ -70,6 +79,8 @@ def get(setting, section, _value)
 begin
   result = if action == 'get'
              get(setting, section, value)
+           elsif action == 'delete'
+             delete(setting, section, value)
            else
              raise Puppet::Error, 'You must pass a value argument' if value.nil?
              set(setting, section, value)