cps-property-generator 0.2.10 → 0.2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e314fd422a95671a8a8b436c13d350cf0c2eb469
-  data.tar.gz: 7ca938a07e15d3411b7bcd5e9aed9b13004f4b5e
+  metadata.gz: a336b0ce14011377bc50c3c669993f436fd8e31d
+  data.tar.gz: e9d5899eae6a9b456e3d53c97d588c7757013503
 SHA512:
-  metadata.gz: d118ae143395ba549dade258fe38dce125a74742f4533407ed3a05e782ca6fffaee5c6791bb98c6c14771bc92a1124ec91de2e5460475572d91b5acd56a01f1d
-  data.tar.gz: e8720c045795c043c0f932386cf5d7694f7d50c6ef04d5ed374f1478c6f898b37d5e519cc4f5c7c7eb3b851f670cb4f434e50f045eb99c1d81f7e746f89c56cf
+  metadata.gz: 2a38fe0b448efba004406062b8bdd8736fc44195d94351b07bf1b859e327dcad44b07d194ba778784eeb7f4eee6bc592f6082628abc926a48a5d41357b360868
+  data.tar.gz: 914944ab88f0e717a9e4231f40ce0eb8806f27de29f7b4d1c61e79eceb05ab5a87c8869e167135ac317052b71cfbe8fa4707b3867bd92c92c80887d55f975282

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

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/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']
       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' 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.10
+  version: 0.2.11
 platform: ruby
 authors:
 - Bryan Call