bbc-cosmos-config 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06826ade40d88f16e273cb0099ec5a580c3e6596
-  data.tar.gz: 9d05af314d0cbedf4007b584b1ad9d5abd69b7ae
+  metadata.gz: 65576a9095db870fd1b74e0b7aa89a41c888d5e4
+  data.tar.gz: 2dda163f88bb77a9ddebccbe264bca8f620ada17
 SHA512:
-  metadata.gz: 7443864e61b82887a612ff0564042aa2ccf528f75699b6a84d8df7947b1573f91db6f8f2030aa959e891f67133b927f9557222e8004415f90fab90f886c057f6
-  data.tar.gz: 67ef52b4d2807b2ff7f6e730aa6338b2ea5fbe4cb15c0cbc61652618cb36d9b3f739b5371b57a5d88fa9d73cac98eb2ae2e602c48832d6b23a5fc1e07e684e5c
+  metadata.gz: 2428006bfe08f0dd2b85c3aac40cc5bb761925d7857aa8440930901d61f7d4d6c90e69aef270b7fc241d9f303e2b9f5b2ce6b0cd6da875d202fb27c03b1f4697
+  data.tar.gz: 6247e0b3d8c74eec1e7dc3f2e9ccf21e6cdad3f02c35b9ff8d4c92e75b065c8aaf1a06f5bd4d491fd25b10bbcb80ee1f8325ca73783f11859f4f37d1371b20ba

data/lib/bbc/cosmos/config/aws.rb

@@ -19,18 +19,22 @@ module BBC
           @instance_id ||= BBC::Cosmos.production? ? aws_instance_id : "instance_id"
         end
 
-        def config(config, path)
-          @config ||= BBC::Cosmos.production? ? s3_config(config[:component_resources_bucket], path, config[:environment], config[:configuration][:commit]) : config[:configuration]
-        end
-
         private
 
         def s3_config_location
           tags['AppName']
         end
 
-        def s3_config(bucket, path, env, version)
-          JSON.parse(@s3.buckets[bucket].objects["#{path}/#{env}/config/#{version}/#{s3_config_location}.json"].read, :symbolize_names => true)
+        def s3_config(config)
+          path = [
+            config[:configuration][:config_path], 
+            config[:environment],
+            'config',
+            config[:configuration][:commit],
+            "#{s3_config_location}.json"
+          ].join('/')
+
+          JSON.parse(@s3.buckets[config[:component_resources_bucket]].objects[path].read, :symbolize_names => true)
         end
 
         def instance

data/lib/bbc/cosmos/config/cosmos.rb

@@ -23,16 +23,17 @@ module BBC
         end
 
         def component_config
-          @component_config ||= @aws_config.config(
-            parse_component_config,
-            parse_component_config[:configuration][:config_path]
-          )
+          load_config_from_s3? ? @aws_config.s3_config(parse_component_config) : parse_component_config[:configuration]
         end
 
         private
 
+        def load_config_from_s3?
+          parse_component_config[:configuration].include?(:config_path) && BBC::Cosmos.production?
+        end
+
         def parse_component_config
-          JSON.parse(app_config_string, :symbolize_names => true)
+          @parse_component_config ||= JSON.parse(app_config_string, :symbolize_names => true)
         end
 
         def app_config_string

data/lib/bbc/cosmos/config/version.rb

@@ -1,7 +1,7 @@
 module BBC
   module Cosmos
     module Config
-      VERSION = "0.1.2"
+      VERSION = "0.2.0"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bbc-cosmos-config
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Robert Kenny
@@ -206,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Config wrapper gem for Ruby apps running on Cosmos