lib/bbc/cosmos/config/aws.rb in bbc-cosmos-config-0.1.2 vs lib/bbc/cosmos/config/aws.rb in bbc-cosmos-config-0.2.0

@@ -17,21 +17,25 @@
 
         def instance_id
           @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
           BBC::Cosmos.production? ? aws_instance : dummy_instance
         end