cps-property-generator 0.2.3 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e042787e3f93b205ab6f01979e6005523d00976
-  data.tar.gz: 47083d9c1317d0979a22dbe0a87f658a68985c53
+  metadata.gz: 20120f86a00ba65b0baba64bb5d61da9eed6eb5d
+  data.tar.gz: 30816859903c594ad93257ad4b4e65ad3ec460ae
 SHA512:
-  metadata.gz: d166611b8b66e5e4cafb267ac05bf549e19df8b0fc3fecea94f4db05b0e558c4480372fb597c096131ab8719bb3ff737c8b225c5e4d08618df4481ffef2c2a9c
-  data.tar.gz: 18522c9a10a3254c07c29bab837771f1c0ee4421b002d4abcde010da2aab1a91b0eeeea4faf6d4beb2600f5f949e4b97330df94ca89c38bb1974d0f773611ebb
+  metadata.gz: c9fcc43c61a741fbfdceb4dc1a9054fe0d0b9d1f56c14c7e7cefe4bb18a1a5580c0f0f79dd4673a3f24d577b6a7a16edc0766753abe91ff08bed64f26820d0a4
+  data.tar.gz: 4b30b89007e03f55bfd570745111a1fb539ab485309ebce5647cfc68436e551bdee78604b733150439ec01d2cc205e075ec0eecb5c02067021e6bd869106b86c

data/README.md

@@ -24,6 +24,7 @@ In the config.yml file we need three keys set to explain our project to the gene
     * The one to one mapping or aws regions to environments.
     * The account a environment lives in.
     * Interpolations for a given environment. Interpolations will be explained in a separate section. 
+4. The `vpc` key can be added under the environment name in the environment configs if you would like to run multiple environments in the same region. If you specify a VPC in one environment then a VPC must be specified in all environments. You can only specify one VPC per environment.
     
 Here is a example config.yml
 ```yaml

data/lib/generator/generator.rb

@@ -24,6 +24,7 @@ module PropertyGenerator
     def generate
       output = []
       @service_list.each do | service, path|
+        PropertyGenerator.config_enforcer(@configs.environment_configs)
         service_instance = PropertyGenerator::Service.new(YAML.load_file(path), @configs, @globals)
         service_instance.service
         service_instance.interpolate

data/lib/generator/service.rb

@@ -26,19 +26,20 @@ module PropertyGenerator
         #get the map of config for a env
         interpolations = @environment_configs[env]['interpolations']
 
-        #interate through the properties for an environment and gsub the config
-        @service[env].each do | property_key, property_value|
-          property_value_dup = property_value.dup
-          interpolations.each do |matcher_key, matcher_value|
-            if property_value.class == String && property_value_dup.include?("{#{matcher_key}}")
-              @service[env][property_key] = property_value_dup.gsub!("{#{matcher_key}}", matcher_value)
-            end
-          end
-        end
+        # Recursively interate through the properties for an environment and gsub the config
+        # with defined interpolations.
+        interpolate_nested_properties(@service[env], interpolations)
       end
       service
     end
 
+    def interpolate_nested_properties(service_env, interpolations)
+      interpolations.each do |matcher_key, matcher_value|
+        service_env.each { |k,v|  service_env[k] = v.gsub("{#{matcher_key}}", matcher_value) if v.class == String && v.include?("{#{matcher_key}}")}
+        service_env.values.each { |v| interpolate_nested_properties(v, interpolations)  if v.class == Hash }
+      end
+    end
+
     def merge_env_default(data, environments)
       #creates a hash of the enviornments merged with the defaults
       # {service => {env1 =>  {properties},

data/lib/helpers/helpers.rb

@@ -62,8 +62,15 @@ module PropertyGenerator
         account = environmental_configs[env]["account"]
         region = environmental_configs[env]["region"]
         json = JSON.pretty_generate({"properties" => finalized[env]})
-        FileUtils.mkdir_p("#{output_path}/#{account}/#{region}/") unless Dir.exist?("#{output_path}/#{account}/#{region}/")
-        File.write("#{output_path}/#{account}/#{region}/#{service_name}.json", json)
+        #IF users are specifing a vpc then we will drop property files under the dir that corresponds to the vpc
+        if environmental_configs[env].key?("vpc") && !environmental_configs[env]["vpc"].nil?
+          vpc_dir = "#{output_path}/#{account}/#{region}/#{environmental_configs[env]["vpc"]}"
+          FileUtils.mkdir_p("#{vpc_dir}/") unless Dir.exist?(vpc_dir)
+          File.write("#{output_path}/#{account}/#{region}/#{environmental_configs[env]["vpc"]}/#{service_name}.json", json)
+        else
+          FileUtils.mkdir_p("#{output_path}/#{account}/#{region}/") unless Dir.exist?("#{output_path}/#{account}/#{region}/")
+          File.write("#{output_path}/#{account}/#{region}/#{service_name}.json", json)
+        end
         output << "#{output_path}/#{account}/#{region}/#{service_name}.json"
       end
       output
@@ -78,5 +85,17 @@ module PropertyGenerator
       obj.upload_file(file)
     end
 
+    #Force users to specify VPCs for all environments if specified for one environment.
+    #This allows us to skip having conditional logic downstream in CPS requests
+    def config_enforcer(environment_configs)
+      a_vpc_exists = false
+      environment_configs.each do |environment, config|
+        if config.key?("vpc")
+          a_vpc_exists = true
+        elsif a_vpc_exists
+          raise("If you are using VPCs then a VPC must be specified for all environments in the environment_configs")
+        end
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cps-property-generator
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.5
 platform: ruby
 authors:
 - Bryan Call