cps-property-generator 0.2.5 → 0.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 20120f86a00ba65b0baba64bb5d61da9eed6eb5d
-  data.tar.gz: 30816859903c594ad93257ad4b4e65ad3ec460ae
+  metadata.gz: e314fd422a95671a8a8b436c13d350cf0c2eb469
+  data.tar.gz: 7ca938a07e15d3411b7bcd5e9aed9b13004f4b5e
 SHA512:
-  metadata.gz: c9fcc43c61a741fbfdceb4dc1a9054fe0d0b9d1f56c14c7e7cefe4bb18a1a5580c0f0f79dd4673a3f24d577b6a7a16edc0766753abe91ff08bed64f26820d0a4
-  data.tar.gz: 4b30b89007e03f55bfd570745111a1fb539ab485309ebce5647cfc68436e551bdee78604b733150439ec01d2cc205e075ec0eecb5c02067021e6bd869106b86c
+  metadata.gz: d118ae143395ba549dade258fe38dce125a74742f4533407ed3a05e782ca6fffaee5c6791bb98c6c14771bc92a1124ec91de2e5460475572d91b5acd56a01f1d
+  data.tar.gz: e8720c045795c043c0f932386cf5d7694f7d50c6ef04d5ed374f1478c6f898b37d5e519cc4f5c7c7eb3b851f670cb4f434e50f045eb99c1d81f7e746f89c56cf

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,10 +15,11 @@ 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
@@ -29,13 +30,19 @@ module PropertyGenerator
         service_instance.service
         service_instance.interpolate
 
-        out = PropertyGenerator.writer(service, service_instance.service, @configs, @output_path)
+        out = PropertyGenerator.writer(service, service_instance.service, @configs, @output_path, service_instance.configmap_name)
         (output << out).flatten!
       end
       output
     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,11 +1,16 @@
 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
       @globals = globals
       @environment_configs = config.environment_configs
+      @configmapname = service_data['configname'].nil? ? nil : service_data['configname']
       set_service
     end
 
@@ -18,6 +23,10 @@ module PropertyGenerator
       @service
     end
 
+    def configmap_name
+      @configmapname
+    end
+
     def interpolate
       environments = @environments
       #read in config
@@ -57,7 +66,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
@@ -85,6 +94,6 @@ module PropertyGenerator
       output
     end
 
-
   end
+
 end

data/lib/helpers/helpers.rb

@@ -54,24 +54,29 @@ module PropertyGenerator
       end
     end
 
-    def writer(service_name, finalized, configs, output_path)
+    def writer(service_name, finalized, configs, output_path, configmap_name)
       output = []
       envs = configs.environments
       environmental_configs =  configs.environment_configs
       envs.each do | env|
         account = environmental_configs[env]["account"]
         region = environmental_configs[env]["region"]
-        json = JSON.pretty_generate({"properties" => finalized[env]})
+        json = if configmap_name
+          JSON.pretty_generate({"properties" => finalized[env],"configname" => configmap_name})
+        else
+          JSON.pretty_generate({"properties" => finalized[env]})
+        end
         #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
-        output << "#{output_path}/#{account}/#{region}/#{service_name}.json"
       end
       output
     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

data/lib/linter/services_linter.rb

@@ -48,7 +48,7 @@ module PropertyGenerator
 
     def services_have_accepted_keys
       status = {status: 'pass', error: ''}
-      accepted_keys = ['default', 'environments', 'encrypted']
+      accepted_keys = ['default', 'environments', 'encrypted', 'configname']
       services_with_unacceptable_keys = []
       @services.each do |path, loaded|
         loaded.keys.each do |service_key|
@@ -59,7 +59,7 @@ module PropertyGenerator
       end
       if services_with_unacceptable_keys != []
         status[:status] = 'fail'
-        status[:error] = "Service files: #{services_with_unacceptable_keys} have keys other than 'default', 'environments', or 'encrypted'."
+        status[:error] = "Service files: #{services_with_unacceptable_keys} have keys other than 'default', 'environments', 'encrypted', or 'configname'."
       end
       status
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cps-property-generator
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.10
 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