cps-property-generator 0.2.3 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e042787e3f93b205ab6f01979e6005523d00976
-  data.tar.gz: 47083d9c1317d0979a22dbe0a87f658a68985c53
+  metadata.gz: 7fed7d34a4ba2506161886daa161deea7189afdf
+  data.tar.gz: 4a0fc3a7f7ec689e8b4fa6471b94ab4858bd29aa
 SHA512:
-  metadata.gz: d166611b8b66e5e4cafb267ac05bf549e19df8b0fc3fecea94f4db05b0e558c4480372fb597c096131ab8719bb3ff737c8b225c5e4d08618df4481ffef2c2a9c
-  data.tar.gz: 18522c9a10a3254c07c29bab837771f1c0ee4421b002d4abcde010da2aab1a91b0eeeea4faf6d4beb2600f5f949e4b97330df94ca89c38bb1974d0f773611ebb
+  metadata.gz: c1f0f0c82351be0c09c9c6aeffee78c78ab6d2aacfbed0adbd4603cf3e9ab0a1910897b8e1dedd8c99dcf4837d9f01d8bd7ce1225b12add1d9fed39b07bd36d2
+  data.tar.gz: 1dc74865f74328811d78feb315630ac3747f954a7c8de041011b3c493c1ed10acdfa4e518172900e3d25021c7433650bceb4d4e201aece24331ddcff1eaf7083

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/bin/cps-property-generator

@@ -24,7 +24,6 @@ class GeneratorCLI < ::Thor
       else
         generator.upload(out, options)
       end
-
     end
   end
 

data/lib/generator/generator.rb

@@ -15,15 +15,17 @@ module PropertyGenerator
       @configs = PropertyGenerator::Config.new(project_path)
       @globals = PropertyGenerator::Globals.new(project_path, @configs)
       @globals = @globals.globals
+      @accounts = @configs.accounts
+
       @output_path =  "#{File.expand_path(options['output'])}/properties/#{SecureRandom.hex}"
       puts "Properties will be output here #{@output_path}"
       @service_list = PropertyGenerator.read_services(project_path)
-
     end
 
     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
@@ -35,6 +37,12 @@ module PropertyGenerator
     end
 
     def upload(out, config)
+      account = config['upload_account']
+
+      if !@accounts.include?(account.to_i)
+        abort("The specified account (#{account}) is not configured, please add it to config/config.yml")
+      end
+
       upload_account = config['upload_account']
       upload_region = config['upload_region']
       upload_bucket = config['upload_bucket']

data/lib/generator/service.rb

@@ -1,6 +1,10 @@
 module PropertyGenerator
+
   class Service
+    require 'active_support/core_ext/hash'
+
     attr_accessor :service
+
     def initialize(service_data, config, globals)
       @service_data = service_data
       @environments = config.environments
@@ -26,19 +30,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},
@@ -56,7 +61,7 @@ module PropertyGenerator
         environment_data = data['environments'][env].dup
         if data['encrypted']
           encrypted = data['encrypted'][env].dup unless data['encrypted'][env].nil?
-          environment_data = data['environments'][env].merge(encrypted) unless encrypted.nil?
+          environment_data = data['environments'][env].deep_merge(encrypted) unless encrypted.nil?
         end
         if default_clone.nil?
           merged = environment_data
@@ -84,6 +89,6 @@ module PropertyGenerator
       output
     end
 
-
   end
+
 end

data/lib/helpers/helpers.rb

@@ -62,9 +62,17 @@ 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)
-        output << "#{output_path}/#{account}/#{region}/#{service_name}.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)
+          output << "#{output_path}/#{account}/#{region}/#{environmental_configs[env]["vpc"]}/#{service_name}.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)
+          output << "#{output_path}/#{account}/#{region}/#{service_name}.json"
+        end
       end
       output
     end
@@ -78,5 +86,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

data/lib/linter/config_linter.rb

@@ -14,7 +14,7 @@ module PropertyGenerator
       else
         tests = ['config_has_correct_keys',
                  'environment_configs_match_environments_list',
-                 'environment_configs_have_matching_region_and_account_values',
+                 'environment_configs_have_valid_region_and_account_values',
                  'environment_configs_have_well_formatted_interpolations',
                  'config_file_is_present']
       end
@@ -61,12 +61,12 @@ module PropertyGenerator
       status
     end
 
-    def environment_configs_have_matching_region_and_account_values
+    def environment_configs_have_valid_region_and_account_values
       status = {status: 'pass', error: ''}
       environments_missmatch_values = []
       any_missmatches = false
       @configs['environment_configs'].keys.each do |environment|
-        unless @configs['environments'].include?(@configs['environment_configs'][environment]['region']) && @configs['accounts'].include?(@configs['environment_configs'][environment]['account'])
+        unless (@configs['environment_configs'][environment].key?('region')) && @configs['accounts'].include?(@configs['environment_configs'][environment]['account'])
           environments_missmatch_values << environment
           any_missmatches = true
         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.9
 platform: ruby
 authors:
 - Bryan Call
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.2.11.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.2.11.1
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement