cf_light_api 1.6.7 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5afa1da4d96084a76354c0bcd8544b2c2412896
-  data.tar.gz: e9bb6e37de0d1af87e8ab9555a292e282869b473
+  metadata.gz: 3067cac56cd133c9fc4fd246f29e0874335f2998
+  data.tar.gz: 4fb42dd6f9e61ee969b6d966c15ac5bfc636cc6d
 SHA512:
-  metadata.gz: 50106d0b2aaba20a1e07d17ce2eb415954904b52479a2097583315b75451faff00706aea6c84b4b7927028a0cade97035ac8db6aa66faf6cb48931bed2190418
-  data.tar.gz: 5eace511a6f414778cdddc4db00c7ed1579c690558756dd49a77abc2d476ca92ec1d74ef566e2517fd28c30ab7ba113dcee73b8a68959ea23e79bb78b40fdb40
+  metadata.gz: 348c46fd0ae464fb196b78598a713ed1b620a989757bdb1d8dcdf61d542df19b8d7edf5bd985e921b4cd5b61ad3c05ded7831c5f49ec6c4b458c85043ea4fbf9
+  data.tar.gz: 64723974aad403fb3cff89385976ce7f7a8c2bb4214a3a5fd325f9ff65c8734a6fba658dde1496ca2f6c1e5e123c1ec3bdafa795ad208f5c54a9c2e1bc37ca97

data/lib/cf_light_api/worker.rb

@@ -114,11 +114,11 @@ end
 
 def get_org_data(cf_client)
   Parallel.map( cf_client.organizations, :in_threads=> PARALLEL_MAPS) do |org|
-    org_name = org.name
-    @logger.info "Getting org data for #{org_name}..."
+    @logger.info "Getting org data for #{org.name}..."
     # The CFoundry client returns memory_limit in MB, so we need to normalise to bytes to match the Apps.
     {
-      :name => org_name,
+      :guid => org.guid,
+      :name => org.name,
       :quota => {
         :total_services => org.quota_definition.total_services,
         :memory_limit   => org.quota_definition.memory_limit * 1024 * 1024
@@ -151,7 +151,7 @@ def format_app_data(app, org_name, space_name)
      :error     => nil
     }
   rescue => e
-    # @logger.info "  #{org_name} #{space_name}: '#{app.name}'' error: #{e.message}"
+    @logger.info "  #{org_name} #{space_name}: '#{app.name}'' error: #{e.message}"
     additional_data = {
       :running   => 'error',
       :instances => [],

data/lib/sinatra/cf_light_api.rb

@@ -5,9 +5,8 @@ module Sinatra
 
     def self.registered(app)
       app.get '/v1/apps/?:org?' do
-        all_apps = JSON.parse(REDIS.get("#{ENV['REDIS_KEY_PREFIX']}:apps"))
-
         content_type :json
+        all_apps = JSON.parse(REDIS.get("#{ENV['REDIS_KEY_PREFIX']}:apps"))
 
         if params[:org]
           return all_apps.select{|an_app| an_app['org'] == params[:org]}.to_json
@@ -16,9 +15,15 @@ module Sinatra
         return all_apps.to_json
       end
 
-      app.get '/v1/orgs/?' do
+      app.get '/v1/orgs/?:guid?' do
         content_type :json
-        REDIS.get "#{ENV['REDIS_KEY_PREFIX']}:orgs"
+        all_orgs = JSON.parse(REDIS.get("#{ENV['REDIS_KEY_PREFIX']}:orgs"))
+
+        if params[:guid]
+          return all_orgs.select{|an_org| an_org['guid'] == params[:guid]}.to_json
+        end
+
+        return all_orgs.to_json
       end
 
       app.get '/v1/last_updated' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cf_light_api
 version: !ruby/object:Gem::Version
-  version: 1.6.7
+  version: 1.7.0
 platform: ruby
 authors:
 - Springer Platform Engineering
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-04 00:00:00.000000000 Z
+date: 2016-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cfoundry