lib/bbc/cosmos/config/aws.rb in bbc-cosmos-config-0.0.6 vs lib/bbc/cosmos/config/aws.rb in bbc-cosmos-config-0.0.7

- old
+ new

@@ -18,20 +18,20 @@ def instance_id BBC::Cosmos.production? ? aws_instance_id : "instance_id" end def config(config, path) - BBC::Cosmos.production? ? s3_config(config[:component_resources_bucket], path, config[:configuration][:commit]) : config[:configuration] + BBC::Cosmos.production? ? s3_config(config[:component_resources_bucket], path, config[:environment], config[:configuration][:commit]) : config[:configuration] end private def s3_config_location tags.to_h['Renderer'] end - def s3_config(bucket, path, version) - JSON.parse(@s3.buckets[bucket].objects["#{path}/config/#{version}/#{s3_config_location}.json"].read, :symbolize_names => true) + 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) end def instance BBC::Cosmos.production? ? aws_instance : dummy_instance end