cf_light_api 2.5.0 → 2.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ebbc487391ec0d46cee3d3b12dfc162c44d0a4a6
-  data.tar.gz: 9a9a92b041a9ece7bdee042bb3c7cb358a09d63a
+  metadata.gz: 18df9e343201fa390b2e742b91d088e41d78b922
+  data.tar.gz: 3312d769e6a5fec35b40e3cd1753823c17119205
 SHA512:
-  metadata.gz: 1e7d7f2ceb29072dd7ad41dda11fe9533aadf00f15c0ec28b3418a18465f3ec80f2dc0235a70b5c0b4ff3b84466e881d347f7d5045b04d34a033a51279aba6e6
-  data.tar.gz: f4655642b2a4601bde54562809a1948762d1e903cb022faf8572337f281f21dc11d1f4b68dd7aef6258e59f69d90b868ee086de60fb63b44718f4bff45ad3c93
+  metadata.gz: fd5a3218fb2a0e54962c396a65a56f73738ad8b897742375189b02ae13166f5e52468e425bd0ae50fb88afef8b1ae52980755a19120960e7c7556b7e18b8aef8
+  data.tar.gz: e8c6a23ca2bd1127970a0d11a7adc31ee5a49c5e09e5b79aaf26866a6755438e2c59a42be227f948b41d43e4eeabac4dac2b007daf5ede9496bda2a2b5e39789

data/lib/cf_light_api/worker.rb

@@ -176,6 +176,7 @@ class CFLightAPIWorker
           @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')
+          cf_info  = cf_rest('/v2/info').first
 
           formatted_orgs = @orgs.map do |org|
             quota = @quotas.find{|a_quota| a_quota['metadata']['guid'] == org['entity']['quota_definition_guid']}
@@ -200,7 +201,6 @@ class CFLightAPIWorker
             space  = @spaces.find{|a_space| a_space['metadata']['guid'] == app['entity']['space_guid']}
             org    = @orgs.find{|an_org|     an_org['metadata']['guid'] == space['entity']['organization_guid']}
             stack  = @stacks.find{|a_stack| a_stack['metadata']['guid'] == app['entity']['stack_guid']}
-            routes = format_routes_for_app(app)
 
             running = (app['entity']['state'] == "STARTED")
 
@@ -214,7 +214,6 @@ class CFLightAPIWorker
               :last_uploaded => app['metadata']['updated_at'] ? DateTime.parse(app['metadata']['updated_at']).strftime('%Y-%m-%d %T %z') : nil,
               :name          => app['entity']['name'],
               :org           => org['entity']['name'],
-              :routes        => routes,
               :space         => space['entity']['name'],
               :stack         => stack['entity']['name'],
               :state         => app['entity']['state']
@@ -239,9 +238,12 @@ class CFLightAPIWorker
                 end
               end
 
+              routes = format_routes_for_app(app)
+
               additional_data = {
                :running   => running,
                :instances => instance_stats,
+               :routes    => routes,
                :error     => nil
               }
 
@@ -253,6 +255,7 @@ class CFLightAPIWorker
               additional_data = {
                 :running   => 'error',
                 :instances => [],
+                :routes    => [],
                 :error     => e.message
               }
             end
@@ -260,6 +263,7 @@ class CFLightAPIWorker
             base_data.merge additional_data
           end
 
+          put_in_redis "#{ENV['REDIS_KEY_PREFIX']}:info", cf_info
           put_in_redis "#{ENV['REDIS_KEY_PREFIX']}:orgs", formatted_orgs
           put_in_redis "#{ENV['REDIS_KEY_PREFIX']}:apps", formatted_apps
           put_in_redis "#{ENV['REDIS_KEY_PREFIX']}:last_updated", {:last_updated => Time.now}

data/lib/sinatra/cf_light_api.rb

@@ -42,6 +42,12 @@ module Sinatra
         status 503 if seconds_since_update >= (ENV['DATA_AGE_VALIDITY'] || '600'.to_i)
         return updated_json
       end
+
+      app.get '/v1/info' do
+        content_type :json
+        return REDIS.get("#{ENV['REDIS_KEY_PREFIX']}:info")
+      end
+
     end
 
   end

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: cf_light_api
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.5.1
 platform: ruby
 authors:
 - Springer Platform Engineering
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-19 00:00:00.000000000 Z
+date: 2017-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cfoundry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.7.1
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.2.1
 - !ruby/object:Gem::Dependency
   name: rufus-scheduler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.9
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.5
 - !ruby/object:Gem::Dependency
   name: redlock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: graphite-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.6
 - !ruby/object:Gem::Dependency
   name: newrelic_rpm
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.17.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.17.1
 description: A super lightweight API for reading App and Org data from CloudFoundry,
@@ -116,9 +116,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ./lib/sinatra/cf_light_api.rb
-- ./lib/cf_light_api/redis.rb
-- ./lib/cf_light_api/worker.rb
+- "./lib/cf_light_api/redis.rb"
+- "./lib/cf_light_api/worker.rb"
+- "./lib/sinatra/cf_light_api.rb"
 - bin/cf_light_api
 homepage: https://github.com/springerpe/cf-light-api
 licenses:
@@ -130,17 +130,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A super lightweight API for reading App and Org data from CloudFoundry, cached