cps-property-generator 0.2.6 → 0.2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c31e3fada8f2c72f084530355f4e90890603365
-  data.tar.gz: 552763cf891e7aabfb280c7e43cb95b0ef0fe8ec
+  metadata.gz: a336b0ce14011377bc50c3c669993f436fd8e31d
+  data.tar.gz: e9d5899eae6a9b456e3d53c97d588c7757013503
 SHA512:
-  metadata.gz: 588cc805729bbd8968579b8324aaaf33987ef3e19c0ed9bfb220d1892cfdf5b116aa04c244a2aa92d8d0475907725c5ad68526f2e8400257c42801680bf1b3a6
-  data.tar.gz: 6a2cabd3dcdce3ceac2a88f4f6bf5829946509a9804cb85a4142b8d0cecdb663b4a885d73970516d9143cb297d9f96ebbddd587e8cb805042d3353c4303582b3
+  metadata.gz: 2a38fe0b448efba004406062b8bdd8736fc44195d94351b07bf1b859e327dcad44b07d194ba778784eeb7f4eee6bc592f6082628abc926a48a5d41357b360868
+  data.tar.gz: 914944ab88f0e717a9e4231f40ce0eb8806f27de29f7b4d1c61e79eceb05ab5a87c8869e167135ac317052b71cfbe8fa4707b3867bd92c92c80887d55f975282

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.additional_options)
         (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,17 @@
 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_additional_options
       set_service
     end
 
@@ -14,10 +20,26 @@ module PropertyGenerator
       @service = merge_service_with_globals(@globals, service_data, @environments)
     end
 
+    def set_additional_options
+      @additional_options = {}
+      @additional_options['configname'] = @service_data['configname'].nil? ? nil : @service_data['configname']
+      @additional_options['stringdata'] = @service_data['stringdata'].nil? ? nil : @service_data['stringdata']
+      @additional_options['configlabels'] = @service_data['configlabels'].nil? ? nil : @service_data['configlabels']
+      @additional_options['secretlabels'] = @service_data['secretlabels'].nil? ? nil : @service_data['secretlabels']
+    end
+
+    def additional_options
+      @additional_options
+    end
+
     def service
       @service
     end
 
+    def configmap_name
+      @configmapname
+    end
+
     def interpolate
       environments = @environments
       #read in config
@@ -57,7 +79,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 +107,6 @@ module PropertyGenerator
       output
     end
 
-
   end
+
 end

data/lib/helpers/helpers.rb

@@ -54,14 +54,18 @@ module PropertyGenerator
       end
     end
 
-    def writer(service_name, finalized, configs, output_path)
+    def writer(service_name, finalized, configs, output_path, additional_options)
       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]})
+        hash = { "properties" => finalized[env] }
+        ['configname', 'stringdata', 'configlabels', 'secretlabels'].each do |setting|
+          hash[setting] = additional_options[setting] if [setting] unless additional_options[setting].nil?
+        end
+        json = JSON.pretty_generate(hash)
         #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"]}"

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', 'stringdata', 'configlabels', 'secretlabels']
       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', 'configname', 'stringdata' 'configlabels' or 'secretlabels'"
       end
       status
     end

metadata

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