cps-property-generator 0.2.11 → 0.2.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a336b0ce14011377bc50c3c669993f436fd8e31d
-  data.tar.gz: e9d5899eae6a9b456e3d53c97d588c7757013503
+  metadata.gz: 637bbf0eb6973d4e0a9ba99f1e746e17aa833f3b
+  data.tar.gz: 885746737e416ed9c89652e252d82c23efb6aa71
 SHA512:
-  metadata.gz: 2a38fe0b448efba004406062b8bdd8736fc44195d94351b07bf1b859e327dcad44b07d194ba778784eeb7f4eee6bc592f6082628abc926a48a5d41357b360868
-  data.tar.gz: 914944ab88f0e717a9e4231f40ce0eb8806f27de29f7b4d1c61e79eceb05ab5a87c8869e167135ac317052b71cfbe8fa4707b3867bd92c92c80887d55f975282
+  metadata.gz: 3e60bf3523a4f77a662d61cf7f18ae941264c2ae6e3ff2f1e19e86f347ccaedabe08fbd05c22df8f0c5768f29b1b34cc44eb7504a6a63a5be71b30bcc355b30c
+  data.tar.gz: 20879ea40f9b458f538bde77b9d19703b571cc1bee0aec595909f1aeea5e69cc862adf49221576d8f7b68a2b41d7fd3bd7c7aa5989c54f66fccdddec8168d62d

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

@@ -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/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', 'stringdata', 'configlabels', 'secretlabels']
+      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', 'configname', 'stringdata' 'configlabels' or 'secretlabels'"
+        status[:error] = "Service files: #{services_with_unacceptable_keys} have keys other than 'default', 'environments', 'encrypted', 'configname', 'stringdata', 'configlabels', 'secretlabels' or 'label'"
       end
       status
     end
@@ -156,7 +156,7 @@ module PropertyGenerator
 
     def service_encrypted_fields_are_correct
       status = {status: 'pass', error: ''}
-      accepted_keys = ['region', 'encrypted', 'service']
+      accepted_keys = ['region', 'encrypted', 'service', 'label']
       services_with_unacceptable_keys = []
       @services.each do |path, loaded|
         if loaded['encrypted'] != nil
@@ -181,7 +181,7 @@ module PropertyGenerator
       end
       if services_with_unacceptable_keys != []
         status[:status] = 'fail'
-        status[:error] = "Service files: #{services_with_unacceptable_keys} have encrypted properties with bad indentation or keys other than 'region' and 'encrypted'."
+        status[:error] = "Service files: #{services_with_unacceptable_keys} have encrypted properties with bad indentation or keys other than 'region', 'encrypted' 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.11
+  version: 0.2.17
 platform: ruby
 authors:
 - Bryan Call