cps-property-generator 0.2.8 → 0.2.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33e9da4826b7c811df4e0bdf35383788e850bb26
-  data.tar.gz: 47dec9e45bb96c348427ecbaab2a9bc045fada2e
+  metadata.gz: a92aa70bf1eb0d003090e5cb5d7d42d6e3fd2353
+  data.tar.gz: d313236d4357af37d7ceca7e4e1703cc982971ee
 SHA512:
-  metadata.gz: 2a4a98b7de3530d277542c38b1bff58d1b8a1b821eeec9bfe1e5c31222c05d7372fa38882f88f0896dff22da878f76c0427e6dbe21fd346a5b60f667835350fa
-  data.tar.gz: f135b5a38316ca0db25d998a85867749638ff897d863458b0d0168a9accb4f0b3debd82ff846f04bf29c21dbd74788eabc6fab241c4680cd86bae5253b7c8522
+  metadata.gz: 057bd3529819bdcb57760b5692b5f8be89bcd61b00ae0ebbe703030f50c80d534717029dabfea0b0d7eb5f76ae4dc3a325066b39bd0cacba02d6c76914addd4c
+  data.tar.gz: beca6f7166b0b8eaa71598433f1b0f81eae384e42ffe31d9a6524f1c3c01ef62e2cbe187d5acadc352085218c629c7848b47df0cfe9eca60332126c7f2adf06d

data/README.md

@@ -77,6 +77,21 @@ touch globals.yml
 1. Create a folder called `environments` inside your folder named after your account.
 2. Inside the `environments` folder create a yaml file named after the environment you would like to define globals for. Only environments defined in your config are supported. The environment must also be mapped in the config to the account the sharing the same name as the folder the environment global yaml file lives in. 
 3. In the newly created environment's yaml file you may define your globals.
+###### Encrypted Properties in Environment Globals
+If you would like to pass in an encrypted property to all services in a given environment, you can pass in ckrt encrypted values by having an `encrypted` block in your environment global file.
+```yaml
+property_name_1: value
+property_name_2: value
+encrypted:
+  encrypted_property_1:
+    $ssm:
+      region: region
+      encrypted: encrypted_value
+  encrypted_property_2:
+    $ssm:
+      region: region
+      encrypted: encrypted_value
+```
 
 ##### Step 3: Creating your service definitions
 Service definitions have the highest level of supersedence and will overwrite matching global definitions. 

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,20 +30,31 @@ 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']
-      out.each do |file|
-        next unless file.include?("#{upload_account}") && file.include?("#{upload_region}")
-         file_region = file.split("/")[-2]
-         PropertyGenerator.sync(upload_region, upload_account, upload_bucket, file, file_region)
+
+      upload_out = out.select { |file| file.include?("#{upload_account}") && file.include?("#{upload_region}") }
+      upload_out.each_slice(20) do |file_slice|
+        file_slice.map do |file|
+          Thread.new do
+            file_region = file.split("/")[-2]
+            PropertyGenerator.sync(upload_region, upload_account, upload_bucket, file, file_region)
+          end
+        end.each(&:join)
       end
     end
 

data/lib/generator/globals.rb

@@ -41,6 +41,11 @@ module PropertyGenerator
         @environments.each do |env|
           next unless File.exists?("#{@project_path}/globals/accounts/#{account}/environments/#{env}.yml")
           data[account][env] = YAML.load_file("#{@project_path}/globals/accounts/#{account}/environments/#{env}.yml")
+          unless data[account][env]['encrypted'].nil?
+            encrypted = data[account][env]['encrypted'].dup
+            not_encrypted = data[account][env].reject { |k,_| k == 'encrypted' }
+            data[account][env] = not_encrypted.merge(encrypted)
+          end
         end
       end
       data

data/lib/generator/service.rb

@@ -10,6 +10,8 @@ module PropertyGenerator
       @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
 
@@ -18,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

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/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

data/spec/lib/global_spec.rb

@@ -16,11 +16,11 @@ module PropertyGenerator
     end
 
     it 'should read the environment globals' do
-      expect(global.get_environment_globals).to eq({123456789012=>{'my-test-env1'=>{'my_env'=>'my-test-env1'}}})
+      expect(global.get_environment_globals).to eq({123456789012=>{'my-test-env1'=>{'my_env'=>'my-test-env1', 'test_encrypted' => { '$ssm' => { 'region' => 'region', 'encrypted' => 'encrypted_value' }}}}})
     end
 
     it 'should condense the globals accurately' do
-      expect(global.condense_globals).to eq({'my-test-env1'=>{'foo' => 'bar', 'my_account'=>123456789012, 'my_env'=>'my-test-env1'},
+      expect(global.condense_globals).to eq({'my-test-env1'=>{'foo' => 'bar', 'my_account'=>123456789012, 'my_env'=>'my-test-env1', 'test_encrypted' => { '$ssm' => { 'region' => 'region', 'encrypted' => 'encrypted_value' }}},
                                              'my-test-env2' => {'foo' => 'bar'}})
     end
 

data/spec/lib/service_spec.rb

@@ -1,18 +1,19 @@
-require 'spec_helper'
-require_relative '../../lib/generator/service'
-require_relative '../../lib/generator/globals'
-require_relative '../../lib/generator/config'
-require 'pp'
+require "spec_helper"
+require_relative "../../lib/generator/service"
+require_relative "../../lib/generator/globals"
+require_relative "../../lib/generator/config"
+require "pp"
 module PropertyGenerator
   describe Service do
     subject(:config) {PropertyGenerator::Config.new(File.expand_path("./spec/resources"))}
     subject(:globals) {PropertyGenerator::Globals.new(File.expand_path("./spec/resources"), config)}
-    subject(:service) {described_class.new(YAML.load_file('./spec/resources/services/my-microservice-1.yml'), config, globals.globals)}
+    subject(:service) {described_class.new(YAML.load_file("./spec/resources/services/my-microservice-1.yml"), config, globals.globals)}
 
-    it 'Parses and condenses a service\'s defaults and environment definitions'  do
+    it "Parses and condenses a service\"s defaults and environment definitions"  do
       expect(service.service).to eq({"my-test-env1"=> {"foo"=>"bar",
                                                        "my_account"=>123456789012,
                                                        "my_env"=>"my-test-env1",
+                                                       "test_encrypted" => { "$ssm" => { "region" => "region", "encrypted" => "encrypted_value" }},
                                                        "database.host"=>"my.database.{domain}",
                                                        "database.port"=>3306},
                                      "my-test-env2"=> {"foo"=>"bar",
@@ -20,10 +21,11 @@ module PropertyGenerator
                                                        "database.port"=>3306}})
     end
 
-    it 'Tests interpolations work for a service' do
+    it "Tests interpolations work for a service" do
       expect(service.interpolate).to eq({"my-test-env1"=> {"foo"=>"bar",
                                                            "my_account"=>123456789012,
                                                            "my_env"=>"my-test-env1",
+                                                           "test_encrypted" => { "$ssm" => { "region" => "region", "encrypted" => "encrypted_value" }},
                                                            "database.host"=>"my.database.my1.com",
                                                            "database.port"=>3306},
                                          "my-test-env2"=> {"foo"=>"bar",

data/spec/resources/globals/accounts/123456789012/environments/my-test-env1.yml

@@ -1 +1,6 @@
-my_env: 'my-test-env1'
+my_env: 'my-test-env1'
+encrypted:
+  test_encrypted:
+    $ssm:
+      region: region
+      encrypted: encrypted_value

metadata

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