cps-property-generator 0.2.10 → 0.2.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e314fd422a95671a8a8b436c13d350cf0c2eb469
-  data.tar.gz: 7ca938a07e15d3411b7bcd5e9aed9b13004f4b5e
+  metadata.gz: 84b92342668cccfdeb1e097c19fdd1641fef1589
+  data.tar.gz: d4c5c0bf42cbbec4a3a2203a4fbdd990f88a9a97
 SHA512:
-  metadata.gz: d118ae143395ba549dade258fe38dce125a74742f4533407ed3a05e782ca6fffaee5c6791bb98c6c14771bc92a1124ec91de2e5460475572d91b5acd56a01f1d
-  data.tar.gz: e8720c045795c043c0f932386cf5d7694f7d50c6ef04d5ed374f1478c6f898b37d5e519cc4f5c7c7eb3b851f670cb4f434e50f045eb99c1d81f7e746f89c56cf
+  metadata.gz: 4883e4c5fef3a9ea680b6401c9b3629371f16b967ab634a9fb2c041ee60940cab2e16c5469a2191a7964ee947fc80a6b190862aa3b0193caeb22c87be29849ba
+  data.tar.gz: 9381609f8a882ade931cb10c438b0fb6b9ad3619e4620d80929b8d52693bb2fdd6d245e65e68ebe805a5108ba444225976c565d82152d18c3eca9c5b5193b0de

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/lib/generator/generator.rb

@@ -30,7 +30,7 @@ module PropertyGenerator
         service_instance.service
         service_instance.interpolate
 
-        out = PropertyGenerator.writer(service, service_instance.service, @configs, @output_path, service_instance.configmap_name)
+        out = PropertyGenerator.writer(service, service_instance.service, @configs, @output_path, service_instance.additional_options)
         (output << out).flatten!
       end
       output
@@ -46,10 +46,15 @@ module PropertyGenerator
       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

@@ -11,6 +11,7 @@ module PropertyGenerator
       @globals = globals
       @environment_configs = config.environment_configs
       @configmapname = service_data['configname'].nil? ? nil : service_data['configname']
+      set_additional_options
       set_service
     end
 
@@ -19,6 +20,18 @@ 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

data/lib/helpers/helpers.rb

@@ -54,18 +54,18 @@ module PropertyGenerator
       end
     end
 
-    def writer(service_name, finalized, configs, output_path, configmap_name)
+    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 = if configmap_name
-          JSON.pretty_generate({"properties" => finalized[env],"configname" => configmap_name})
-        else
-          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/globals_linter.rb

@@ -14,7 +14,6 @@ module PropertyGenerator
 
     def run_globals_tests
       tests = ['globals_load_as_hashes',
-               'globals_have_no_hashes_as_values',
                'globals_are_defined_for_valid_environemnts',
                ]
       results = PropertyGenerator.test_runner(self, tests)

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', 'configname']
+      accepted_keys = ['default', 'environments', 'encrypted', 'configname', 'stringdata', 'configlabels', 'secretlabels', 'label']
       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', 'encrypted', or 'configname'."
+        status[:error] = "Service files: #{services_with_unacceptable_keys} have keys other than 'default', 'environments', 'encrypted', 'configname', 'stringdata', 'configlabels', 'secretlabels' or 'label'"
       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.10
+  version: 0.2.16
 platform: ruby
 authors:
 - Bryan Call