cf_light_api 2.4.0 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf01cf65d36b35346fbfcda8d96c1bad61b851f2
-  data.tar.gz: 150c7d313e8ee5f728a3506273433618588f0dd3
+  metadata.gz: ebbc487391ec0d46cee3d3b12dfc162c44d0a4a6
+  data.tar.gz: 9a9a92b041a9ece7bdee042bb3c7cb358a09d63a
 SHA512:
-  metadata.gz: 5f16c20c9af5525c5a3f9e981a85bd7f8d605d226962a45ea14d84c02c3c255a7e1400aa7cc269a42afb897e38a8cda84dd1905556df34b7cc04ee9f92874362
-  data.tar.gz: c80c5061a40673969d69f67861445cd06b0c9778fcc5745423ea57498c3da0feb7a8c9dc873127953027382b610ae9a4f03016f70666c7a3fc95aa9e7df4f821
+  metadata.gz: 1e7d7f2ceb29072dd7ad41dda11fe9533aadf00f15c0ec28b3418a18465f3ec80f2dc0235a70b5c0b4ff3b84466e881d347f7d5045b04d34a033a51279aba6e6
+  data.tar.gz: f4655642b2a4601bde54562809a1948762d1e903cb022faf8572337f281f21dc11d1f4b68dd7aef6258e59f69d90b868ee086de60fb63b44718f4bff45ad3c93

data/lib/cf_light_api/worker.rb

@@ -13,6 +13,8 @@ class CFLightAPIWorker
     include NewRelic::Agent::MethodTracer
   end
 
+  ENVIRONMENT_VARIABLES_WHITELIST = (ENV['ENVIRONMENT_VARIABLES_WHITELIST'] || '').split(',').collect(&:strip)
+
   def initialize
     @logger = Logger.new(STDOUT)
     @logger.formatter = proc do |severity, datetime, progname, msg|
@@ -141,6 +143,20 @@ class CFLightAPIWorker
     end
   end
 
+  def filtered_environment_variables env_vars
+
+    if ENVIRONMENT_VARIABLES_WHITELIST.any?
+      return ENVIRONMENT_VARIABLES_WHITELIST.inject({}) do |filtered, key|
+        filtered[key] = env_vars[key] if env_vars[key]
+        filtered
+      end
+
+    else
+      return env_vars
+    end
+
+  end
+
   def update_cf_data
     @cf_client = nil
     @graphite  = GraphiteAPI.new(graphite: "#{ENV['GRAPHITE_HOST']}:#{ENV['GRAPHITE_PORT']}") if ENV['GRAPHITE_HOST'] and ENV['GRAPHITE_PORT'] and ENV['CF_ENV_NAME']
@@ -154,12 +170,12 @@ class CFLightAPIWorker
 
           @cf_client = get_client() # Ensure we have a fresh auth token...
 
-          @apps      = cf_rest('/v2/apps?results-per-page=100')
-          @orgs      = cf_rest('/v2/organizations?results-per-page=100')
-          @quotas    = cf_rest('/v2/quota_definitions?results-per-page=100')
-          @spaces    = cf_rest('/v2/spaces?results-per-page=100')
-          @stacks    = cf_rest('/v2/stacks?results-per-page=100')
-          @domains   = cf_rest('/v2/domains?results-per-page=100')
+          @apps    = cf_rest('/v2/apps?results-per-page=100')
+          @orgs    = cf_rest('/v2/organizations?results-per-page=100')
+          @quotas  = cf_rest('/v2/quota_definitions?results-per-page=100')
+          @spaces  = cf_rest('/v2/spaces?results-per-page=100')
+          @stacks  = cf_rest('/v2/stacks?results-per-page=100')
+          @domains = cf_rest('/v2/domains?results-per-page=100')
 
           formatted_orgs = @orgs.map do |org|
             quota = @quotas.find{|a_quota| a_quota['metadata']['guid'] == org['entity']['quota_definition_guid']}
@@ -204,6 +220,10 @@ class CFLightAPIWorker
               :state         => app['entity']['state']
             }
 
+            if ENV['EXPOSE_ENVIRONMENT_VARIABLES'] == 'true' then
+              base_data[:environment_variables] = filtered_environment_variables( app['entity']['environment_json'] )
+            end
+
             # Add additional data, such as instance usage statistics - but this is only possible if the instances are running.
             additional_data = {}
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cf_light_api
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors:
 - Springer Platform Engineering
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-16 00:00:00.000000000 Z
+date: 2017-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cfoundry