cps-property-generator 0.1.3 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9fce8ef7e8df921058c7b72092dc89348196599b
-  data.tar.gz: 157741d0aad0f3c2899c00eaedcf2bd6de191a80
+  metadata.gz: b281f19cf05a8397f807f73458ff117d2bc35d64
+  data.tar.gz: 3c01770ee1b94756cbceaff6d2eaf7d4fa5f5e7a
 SHA512:
-  metadata.gz: fa0ec62cb6bbc64ce80a9d19def8851d6e8587b6e7ccf17d455e95577d9daab69285c5cd1e2883c5cb25cb52a11c647b275f62ccfd9bf385ef4366a2760550ae
-  data.tar.gz: 225a82358e08c2df7136def8ac3a8fefaacc1260b97ec1a1c74c2f90323f3e06adfaa6d6dfeb16f7a36afe2a782f5896ed5e93dcdf47317746e2a5801bfaaf67
+  metadata.gz: 9299a43fc3dab393cce28dae5a20559ea49c0b2bb04afef73bb4a6fb3eed5fdc503dc70a6c942154876235ede20b28276e676d0db8988e8fb360d0a117407073
+  data.tar.gz: 8f45f15755f98347eb5e7f3dee8537ea19eedf15a7bfca5d7720f2bc710a56cf3b6de3bf12f97d942fbe26e9edc0b83c243018e346069be36f07834368f6d06e

data/README.md

@@ -108,8 +108,10 @@ encrypted:
 ###### Adding interpolations
 An interpolation is a  value that will be dynamically substituted during generation with the correct value for the environment being generated. Interpolations are declared in the config for a given environment. Once declared an interpolation can be used in a property definition by referencing it in braces. If we were to reference the domain interpolation from the example config above we would use `{domain}`.
 
+Note: values that start with an interpolation must be placed in quotes (ex. "{xxx}.xxx.xxx.{xxx}"). 
+
 ##### Step 4: Generating Your Properties (Using the CLI)
 The bin directory contains the generator.rb cli. An example of running the cli is below. The `project_path` argument specifies the path to the properties repo we are generating a uploading properties from. You must be able to create a session with s3 to upload.
 ```sh
 ./generator.rb generate --project_path "~/projects/project-properties" --upload true --upload_account "123456789012" --upload_region "us-east-1" --upload_bucket "propertiesbucket.my-cloud.com"
-```
+```

data/lib/linter/report.rb

@@ -41,6 +41,9 @@ module PropertyGenerator
       end
       table = Terminal::Table.new :headings => ['Files'], :title => 'Files Failing to Load', :rows => rows, :style => {:width => 200}
       puts table
+      puts "*****************"
+      puts "Check for property values that start with an interpolated value \nIf the first character of the value is a bracket yaml will fail to load \nPlace the value in quotes"
+      puts "*****************"
     end
 
     def make_pass_table

data/lib/linter/services_linter.rb

@@ -14,6 +14,7 @@ module PropertyGenerator
 
     def run_services_tests
       tests = ['services_have_accepted_keys',
+               'service_environments_are_not_empty',
                'service_defaults_have_no_hashes_as_values',
                'service_environments_match_config_environments',
                'service_environments_have_no_hashes_as_values',
@@ -24,6 +25,25 @@ module PropertyGenerator
       results
     end
 
+    def service_environments_are_not_empty
+      status = {status: 'pass', error: ''}
+      services_empty_environments = []
+      @services.each do |path, loaded|
+        unless loaded['environments'] == nil
+          loaded['environments'].each do |environments, properties|
+            if properties == nil
+              services_empty_environments << {path => environments}
+            end
+          end
+        end
+      end
+      if services_empty_environments != []
+        status[:status] = 'fail'
+        status[:error] = "Service files #{services_empty_environments} have empty environments, these should be omitted."
+      end
+      status
+    end
+
     def services_have_accepted_keys
       status = {status: 'pass', error: ''}
       accepted_keys = ['default', 'environments', 'encrypted']
@@ -91,9 +111,11 @@ module PropertyGenerator
       @services.each do |path, loaded|
         unless loaded['environments'] == nil
           loaded['environments'].each do |environments, properties|
-            properties.each do |key, value|
-              if value.class == Hash
-                services_with_hashes_in_environments << {path => {environments => key}}
+            unless properties == nil
+              properties.each do |key, value|
+                if value.class == Hash
+                  services_with_hashes_in_environments << {path => {environments => key}}
+                end
               end
             end
           end
@@ -136,11 +158,17 @@ module PropertyGenerator
       services_with_unacceptable_keys = []
       @services.each do |path, loaded|
         if loaded['encrypted'] != nil
-          loaded['encrypted'].each do |environment, property|
-            if loaded['encrypted'][environment][property] != nil
-              loaded['encrypted'][environment][property].each do |ssm, keys|
-                unless loaded['encrypted'][environment][property]['$ssm'][keys].keys == accepted_keys
-                  services_with_unacceptable_keys << {path => {environment => property}}
+          loaded['encrypted'].each do |environment, properties|
+            properties.each do |property, value|
+              if value == nil
+                services_with_unacceptable_keys << {path => {environment => property}}
+              else
+                if value['$ssm'] != nil
+                  value['$ssm'].keys.each do |key|
+                    unless accepted_keys.include?(key)
+                      services_with_unacceptable_keys << {path => {environment => property}}
+                    end
+                  end
                 end
               end
             end
@@ -149,7 +177,7 @@ module PropertyGenerator
       end
       if services_with_unacceptable_keys != []
         status[:status] = 'fail'
-        status[:error] = "Service files: #{services_with_unacceptable_keys} have encrypted properties with 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' and 'encrypted'."
       end
       status
     end

metadata

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