cps-property-generator 0.2.9 → 0.2.10
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/generator/generator.rb +1 -1
- data/lib/generator/service.rb +5 -0
- data/lib/helpers/helpers.rb +6 -2
- data/lib/linter/services_linter.rb +2 -2
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: e314fd422a95671a8a8b436c13d350cf0c2eb469
|
4
|
+
data.tar.gz: 7ca938a07e15d3411b7bcd5e9aed9b13004f4b5e
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: d118ae143395ba549dade258fe38dce125a74742f4533407ed3a05e782ca6fffaee5c6791bb98c6c14771bc92a1124ec91de2e5460475572d91b5acd56a01f1d
|
7
|
+
data.tar.gz: e8720c045795c043c0f932386cf5d7694f7d50c6ef04d5ed374f1478c6f898b37d5e519cc4f5c7c7eb3b851f670cb4f434e50f045eb99c1d81f7e746f89c56cf
|
data/lib/generator/generator.rb
CHANGED
@@ -30,7 +30,7 @@ module PropertyGenerator
|
|
30
30
|
service_instance.service
|
31
31
|
service_instance.interpolate
|
32
32
|
|
33
|
-
out = PropertyGenerator.writer(service, service_instance.service, @configs, @output_path)
|
33
|
+
out = PropertyGenerator.writer(service, service_instance.service, @configs, @output_path, service_instance.configmap_name)
|
34
34
|
(output << out).flatten!
|
35
35
|
end
|
36
36
|
output
|
data/lib/generator/service.rb
CHANGED
@@ -10,6 +10,7 @@ module PropertyGenerator
|
|
10
10
|
@environments = config.environments
|
11
11
|
@globals = globals
|
12
12
|
@environment_configs = config.environment_configs
|
13
|
+
@configmapname = service_data['configname'].nil? ? nil : service_data['configname']
|
13
14
|
set_service
|
14
15
|
end
|
15
16
|
|
@@ -22,6 +23,10 @@ module PropertyGenerator
|
|
22
23
|
@service
|
23
24
|
end
|
24
25
|
|
26
|
+
def configmap_name
|
27
|
+
@configmapname
|
28
|
+
end
|
29
|
+
|
25
30
|
def interpolate
|
26
31
|
environments = @environments
|
27
32
|
#read in config
|
data/lib/helpers/helpers.rb
CHANGED
@@ -54,14 +54,18 @@ module PropertyGenerator
|
|
54
54
|
end
|
55
55
|
end
|
56
56
|
|
57
|
-
def writer(service_name, finalized, configs, output_path)
|
57
|
+
def writer(service_name, finalized, configs, output_path, configmap_name)
|
58
58
|
output = []
|
59
59
|
envs = configs.environments
|
60
60
|
environmental_configs = configs.environment_configs
|
61
61
|
envs.each do | env|
|
62
62
|
account = environmental_configs[env]["account"]
|
63
63
|
region = environmental_configs[env]["region"]
|
64
|
-
json =
|
64
|
+
json = if configmap_name
|
65
|
+
JSON.pretty_generate({"properties" => finalized[env],"configname" => configmap_name})
|
66
|
+
else
|
67
|
+
JSON.pretty_generate({"properties" => finalized[env]})
|
68
|
+
end
|
65
69
|
#IF users are specifing a vpc then we will drop property files under the dir that corresponds to the vpc
|
66
70
|
if environmental_configs[env].key?("vpc") && !environmental_configs[env]["vpc"].nil?
|
67
71
|
vpc_dir = "#{output_path}/#{account}/#{region}/#{environmental_configs[env]["vpc"]}"
|
@@ -48,7 +48,7 @@ module PropertyGenerator
|
|
48
48
|
|
49
49
|
def services_have_accepted_keys
|
50
50
|
status = {status: 'pass', error: ''}
|
51
|
-
accepted_keys = ['default', 'environments', 'encrypted']
|
51
|
+
accepted_keys = ['default', 'environments', 'encrypted', 'configname']
|
52
52
|
services_with_unacceptable_keys = []
|
53
53
|
@services.each do |path, loaded|
|
54
54
|
loaded.keys.each do |service_key|
|
@@ -59,7 +59,7 @@ module PropertyGenerator
|
|
59
59
|
end
|
60
60
|
if services_with_unacceptable_keys != []
|
61
61
|
status[:status] = 'fail'
|
62
|
-
status[:error] = "Service files: #{services_with_unacceptable_keys} have keys other than 'default', 'environments', or '
|
62
|
+
status[:error] = "Service files: #{services_with_unacceptable_keys} have keys other than 'default', 'environments', 'encrypted', or 'configname'."
|
63
63
|
end
|
64
64
|
status
|
65
65
|
end
|