bora 1.1.0 → 1.1.1

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 97bb5e174fb739e5d972f9e5de97fb3cace2719c
4
- data.tar.gz: 680167b8916dc55560d6ad7558529bf036dd4d06
3
+ metadata.gz: ac9d90b2d54df77a725e4a46b058487d8d9f7b8a
4
+ data.tar.gz: fae956da14fb179a49272ac1bdbcb38819c16126
5
5
  SHA512:
6
- metadata.gz: 47ec7127e767d1c7f6a95df782b9ee8b62021e7843076852523324d1950f3cab0a60e2ea6e9eefa486dd0ed49a7376241dcba7756f1e279523a1257ff3fae6b9
7
- data.tar.gz: e420921e96864718b6826e720fff544af5868b132032c5bc9ec74f0535f45a4e74326abcf88a12c6e950b4ced2c60889960a00c8297d0f646a78ef6abf07d847
6
+ metadata.gz: 7197598d07836d355d9f3b26686bcb282585ea31597c77da5d6a60e4d6fc2cec353211c95e150866131a93fedf346b2574e0ef894e5c04176ad7dcdf39032fa6
7
+ data.tar.gz: a0bcdd446b1107014fc8f17e12c4d03b227ed3a57856fc54d18d55711b7b8e10dc135cc4fad7f1653d823bc1b0ff99827c455db44e887a4845e423986b739ae9
data/lib/bora/stack.rb CHANGED
@@ -27,7 +27,7 @@ class Bora
27
27
  @resolver = ParameterResolver.new(self)
28
28
  end
29
29
 
30
- attr_reader :stack_name, :stack_config, :region
30
+ attr_reader :stack_name, :stack_config, :region, :template_file
31
31
 
32
32
  def rake_tasks
33
33
  StackTasks.new(self)
@@ -111,11 +111,17 @@ class Bora
111
111
  is_valid
112
112
  end
113
113
 
114
+ def resolved_params(override_params = {})
115
+ params = @stack_config['params'] || {}
116
+ params.merge!(override_params)
117
+ @resolver.resolve(params)
118
+ end
119
+
114
120
 
115
121
  protected
116
122
 
117
123
  def generate(override_params = {}, pretty_json = false)
118
- params = process_params(override_params)
124
+ params = resolved_params(override_params)
119
125
  if File.extname(@template_file) == ".rb"
120
126
  template_body = run_cfndsl(@template_file, params, pretty_json)
121
127
  template_json = JSON.parse(template_body)
data/lib/bora/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  class Bora
2
- VERSION = "1.1.0"
2
+ VERSION = "1.1.1"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bora
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.0
4
+ version: 1.1.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Charles Blaxland
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2016-09-27 00:00:00.000000000 Z
11
+ date: 2016-10-12 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: aws-sdk