pps_commons 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07ca7454ee3eff8b88fd6b5a67b597266cf82747
-  data.tar.gz: 3fc38ebff0d36611fd2e23c413a6c96844e1e60d
+  metadata.gz: 077733f6f45fe8fc48e1d23a95c0ebc33084bd64
+  data.tar.gz: 2d30fbe452ba517f4325938771bd5ac22956f41d
 SHA512:
-  metadata.gz: e939763cddf4a468169044430563e54bd971cca417fda63e26a89eb55d52b612db26f212d829918acab30fedd89308d88bf26effec5c1d3678d559c843876239
-  data.tar.gz: db8feab551602a99dbc0fbdf529b74cdef02b4a4662a9451a7959653eb009df6592acd2a5d1dda71f436314738b41449e7178a09b88789ad213c13b1861a5ee3
+  metadata.gz: 37f56ac8aa318d4fcc2c333108c489da8c2939ddba89ea64e1df8a054e8c06834737f05062ef0de0aef57055724181a69fa3f5866e188ad55333bf624649dd00
+  data.tar.gz: 866b6f852eababaee476435be68765897357e5d4018695562868e81494a9688a17e6c105857a4fe225d47ee5e52a390b3a1e96a45aa98db92e2eb30fa93cad08

data/lib/pps_commons.rb

@@ -1,18 +1,13 @@
 require 'rest-client'
 require 'json'
+require 'logger'
 
 module WGU
   module PPSCommons
     def self.included(base)
       base.send :include, InstanceMethods
     end
-    # this tells EventMachine how many threads it can use.  There is a lot of Deferrals
-    # in this project so it helps to run a higher number.
-    # EM defaults to '20', PPS defaults to '40'
-    def PPSCommons.unleash_the_fury_level
-      found = ENV['PPS_THREAD_COUNT'].to_i
-      found.eql?(0) ? 40 : found.to_i
-    end
+
     # search through a hash's nested keys for crap
     def PPSCommons.deep_find(key, object=self, found=nil)
       if object.respond_to?(:key?) && object.key?(key)
@@ -23,12 +18,18 @@ module WGU
       end
     end
 
+    # this tells EventMachine how many threads it can use.  There is a lot of Deferrals
+    # in this project so it helps to run a higher number.
+    # EM defaults to '20', PPS defaults to '40'
+    def PPSCommons.unleash_the_fury_level
+      found = ENV['PPS_THREAD_COUNT'].to_i
+      found.eql?(0) ? 40 : found.to_i
+    end
+
     # Common instance methods
     module InstanceMethods
       def logger(file = ENV['PPS_COMMONS_DEFAULT_LOG_LOCATION'])
         if @logger.nil?
-          file ||= File.join('logs', 'log.log')
-          puts "PPSCommons created a log file at #{file}"
           log = ::File.expand_path(file)
           unless ::File.exist?(log)
             log_dir = File.dirname(log)

data/lib/pps_commons/chef_comms.rb

@@ -25,14 +25,21 @@ module WGU
     end
 
     private
+      def self.cache_client
+        @cache_client ||= Aws::S3::Client.new(
+          access_key_id:      ENV['ACCESS_KEY_ID'],
+          secret_access_key:  ENV['SECRET_ACCESS_KEY']
+        )
+      end
+
       def self.client(config)
         client = ChefAPI::Connection.new(
-            client:   ENV['CM_CHEF_API_CLIENT'],
-            endpoint: config[:endpoint],
-            key:      config[:key]
-          )
+          client:   ENV['CM_CHEF_API_CLIENT'],
+          endpoint: config[:endpoint],
+          key:      config[:key]
+        )
 
-          block_given? ? yield(client) : client
+        block_given? ? yield(client) : client
       end
 
       def self.clients
@@ -46,8 +53,15 @@ module WGU
 
         endpoints.map do |endpoint|
           chef_env = endpoint.gsub(/CM_CHEF_API_ENDPOINT_(\w+)$/, '\1')
-          key_file = ENV["CM_CHEF_API_KEY_#{chef_env}"]
-          { endpoint: ENV[endpoint], key: ::File.expand_path(key_file) }
+          key = self.cache_client.get_object(
+            bucket: ENV['PPS_PASS_CACHE'],
+            key: ENV["CM_CHEF_API_KEY_#{chef_env}"]
+          )
+
+          {
+            endpoint: ENV[endpoint],
+            key: key
+          }
         end
       end
   end

data/lib/pps_commons/delegation_agent.rb

@@ -82,17 +82,11 @@ module WGU
     # Send a message to the appropriate receiver.
     def send_response_to(recipient, results = @results)
       msg = results.kind_of?(WGU::Sentence) ? results.log_entry : "#{results.to_s.strip}\n"
-      msg
       logger.info(
         "#{requester.agent_name.capitalize} sending message: \"#{msg}\" to -> #{recipient}"
       )
 
-      if @requester.agent_name.eql? :broker
-        @connections[recipient].receive_data(msg)
-      else
-        requester.send_data(msg)
-      end
-
+      @connections[recipient].receive_data(msg)
       self
     end
 

data/lib/pps_commons/thycotic_comms.rb

@@ -39,7 +39,7 @@ module WGU
 
     # find a good way to remove this hardcoding of 545 parent folder id
     def self.folder_lookup(*args)
-      base_folder_id = 545
+      base_folder_id = ENV['SECRET_STORE_BASE_FOLDER']
       return base_folder_id if args.empty?
       query = args[0] || base_folder_id
       parent_folder_query = args[1]
@@ -126,7 +126,7 @@ module WGU
           begin
             bucket.versioning.suspend
           rescue Exception => e
-            retry_count_for_suspend +=1
+            retry_count_for_suspend += 1
             sleep 3
             retry unless retry_count_for_suspend > 3
             raise e
@@ -171,11 +171,19 @@ module WGU
       end
 
       def self.get_new_key
+        user = self.cache_client.get_object(
+            bucket: ENV['PPS_PASS_CACHE'],
+            key: ENV['SECRET_STORE_USERNAME']
+        )
+        pass = self.cache_client.get_object(
+          bucket: ENV['PPS_PASS_CACHE'],
+          key: ENV['SECRET_STORE_PASSWORD']
+        )
         res = RestClient.post(
           self.ss_url(URI(ENV['SECRET_STORE_TOKEN'])),
           {
-            'username' => ENV['SECRET_STORE_USERNAME'],
-            'password' => ENV['SECRET_STORE_PASSWORD'],
+            'username' => user,
+            'password' => pass,
             'grant_type' => 'password'
           },
           {

data/lib/pps_commons/version.rb

@@ -1,3 +1,3 @@
 module PPSCommons
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pps_commons
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Adam Phillipps
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-24 00:00:00.000000000 Z
+date: 2017-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3