ncedit 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af182264e160a6970386cf7c82f89d633562e83b
-  data.tar.gz: de7185420068f8de02cc2eb5eb1aafe57f52d939
+  metadata.gz: 10ab95a17f8d56d2402fcaed7806eb747d188ac9
+  data.tar.gz: cd3418a0471e0182176afab8a84b04dc5cb2fa85
 SHA512:
-  metadata.gz: a8f5623802fd951fc3da86d6613ded5c934af43fdd6fdf01697abe2a5f237d65092ebf4e0520edc7aeb5e6fe12439a16357332c564cea2547205d5db2058b8fb
-  data.tar.gz: 1a7e2ca2245765be503c10572da54a7b59e0d5e1b17857637cbda2df93aee58bc33b40d19cfe88560b5fdac681cba1d84f5a7b7cb66f057c8a29bf26bd719471
+  metadata.gz: 724f3a28bf6580603125026f92b98cc04f110d20485a48c3df1b6e02c8345321b5f2e6cded1599a4777afd069f6333f15cf79ab0608c750ad835f9d5266aaf87
+  data.tar.gz: 8e1aeee6e7c1fd300954540fca8b2ae3eebe7bc9dc7adf5a06206c8d9501d792e46ed7f66d67e46365b839ae41fe23ac8cde70ae000470e41d36f597bac2af87

data/README.md

@@ -5,7 +5,7 @@ ncedit is a small utility program that lets you edit the Puppet Enterprise Node
 
 Why would you want to do this given that we have the excellent [node_manager](https://forge.puppet.com/WhatsARanjit/node_manager) module already on the forge?  Well... lots of reasons.  First off, using puppet code to drive the Node Classifier means that you have to have the `node_manager` module alread installed, which means that you must already have your [classification rules](https://docs.puppet.com/pe/latest/console_classes_groups_getting_started.html) in to reference the module through [Code Manager](https://docs.puppet.com/pe/latest/code_mgr.html).  You could in-theory use Puppet Enterprise's new idempotent installer (just reinstall puppet over the top of itself) to fix this exact issue but then you still have the problem of how to classify your master in order to activate any other new rules (eg node-ttl) you want to use, which are associated with a new [role](https://docs.puppet.com/pe/latest/r_n_p_intro.html) for the Puppet Master.
 
-That's where this tool comes in since all you need is root shell on the Puppet Master and a YAML or JSON file with the changes you want to make...
+That's where this tool comes in since all you need is root shell on the Puppet Master.
 
 ## Features
 You can:
@@ -16,7 +16,7 @@ You can:
 
 ...All from the convenience of the CLI.  This also allows this tool to be called from scripts and other systems in order to setup Puppet Enterprise the way you want and with the minimum of effort.
 
-For the moment, the edits to be carried out need to be placed into either a JSON or YAML file for bulk processing.  If there is interest, the tool will be enhanced to allow the above operations to be specified individually on the command line so to avoid the need to write YAML/JSON.
+You have a choice of running `ncedit` for each change you wish to make or collecting all of your edits into either a JSON or YAML file for bulk processing.
 
 ## Installation
 Install this tool on your Puppet Master (Master-of-Masters)
@@ -49,7 +49,7 @@ In each case the file needs to be ordered as follows:
       "OPTIONAL_PARAM_NAME": "VALUE_TO_SET"
   # Array of classes to delete
   "delete_classes":
-      - "CLASS_TO_DELETE"
+    - "CLASS_TO_DELETE"
   # Hash classes + Array of parameter names to delete
   "delete_params":
     "CLASS_TO_PROCESS":
@@ -97,7 +97,7 @@ In each case the file needs to be ordered as follows:
 * [Worked example](doc/example/batch.json)
 
 #### Ensuring changes
-* ncedit is idempotent so you may run the command as often as you like
+* `ncedit` is idempotent so you may run the command as often as you like
 
 ##### YAML
 ```shell

data/exe/ncedit

@@ -88,4 +88,12 @@ Escort::App.create do |app|
       NCEdit::Cmd::batch(yaml_file: yaml_file, json_file: json_file)
     end
   end
+
+  app.command :update_classes do |command|
+    command.summary "Refresh the classes available in the console"
+    command.description "Invalidate class cache and ask puppet to re-scan classes"
+    command.action do |options, arguments|
+      NCEdit::Cmd::update_classes()
+    end
+  end
 end

data/lib/ncedit/cmd.rb

@@ -2,6 +2,7 @@ require 'puppetclassify'
 require 'yaml'
 require 'json'
 require 'escort'
+require 'puppet_https'
 
 module NCEdit
   module Cmd
@@ -16,9 +17,12 @@ module NCEdit
         hostname = %x(facter fqdn).strip.downcase
         port = 4433
 
+
         # Define the url to the classifier API - we can't just do localhost because
         # the name has to match the SSL certificate
-        rest_api_url = "https://#{hostname}:#{port}/classifier-api"
+        base_url = "https://#{hostname}:"
+        @puppet_url = "#{base_url}8140"
+        @rest_api_url = "#{base_url}#{port}/classifier-api"
 
         # We need to authenticate against the REST API using a certificate
         # that is whitelisted in /etc/puppetlabs/console-services/rbac-certificate-whitelist.
@@ -54,7 +58,10 @@ module NCEdit
           end
         end
 
-        @puppetclassify = PuppetClassify.new(rest_api_url, auth_info)
+        @puppetclassify = PuppetClassify.new(@rest_api_url, auth_info)
+
+        # borrow the cool HTTPS requester built into puppetclassify
+        @puppet_https = PuppetHttps.new(auth_info)
       end
     end
 
@@ -486,5 +493,13 @@ module NCEdit
         Escort::Logger.output.puts "Already up-to-date"
       end
     end
+
+    def self.update_classes
+      if ! @puppetclassify
+        init
+      end
+      @puppet_https.delete("#{@puppet_url}/puppet-admin-api/v1/environment-cache")
+      @puppet_https.post("#{@rest_api_url}/v1/update-classes")
+    end
   end
 end

data/lib/ncedit/version.rb

@@ -1,3 +1,3 @@
 module NCEdit
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ncedit
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Geoff Williams
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-17 00:00:00.000000000 Z
+date: 2017-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler