bora 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea4493a9644738e50bf62a8083150dfc6f1aa76e
-  data.tar.gz: c32798fe76ef04770c196b5700e406b1c6f6e1e0
+  metadata.gz: afc84ca6ace21cd7997bea10fd35850740536f13
+  data.tar.gz: 5e7df220869080122165cd28082d4c1e024320fe
 SHA512:
-  metadata.gz: 51e688533cfc524b0178efb0943e13caae0632fe4f0e38afd5006d0c8cee17e922b1ff70d5cb195a83d1a3fd17b49027decf3d116acea27ebd3e163fe1246996
-  data.tar.gz: 06f9d9b9ae1e690b02e24542107fad4c679865220cab46f394be233c56b2f02546031235957303d2bce7ba50540b8b87210a6f2937af99e6d8c0bafc823e8503
+  metadata.gz: bfbf29a13e209ddd100e88150d5e6cccf76b118fea3c4f7dcc739e83cd38c33070763d6cfe92fa0c1bda3f074a079d6570e2d5d83c5f856f438c71e893c2de73
+  data.tar.gz: 0f34aa4bf376a58b367d61c0187a206cbc197be67c2dcb4d200d374de6c5435fde0138eebf846bb8a97c9c8deb4ea23e3521987c9a679f819b990872df5652c9

data/README.md

@@ -126,6 +126,45 @@ end
 puts "Update #{result ? "succeeded" : "failed"}"
 ```
 
+### YAML Configuration - Experimental
+You can define and configure your stacks through YAML too.
+This interface is currently experimental,
+but longer term is likely to become the primary way to use this gem.
+Sample usage is shown below (subject to change).
+
+Rakefile:
+```ruby
+require "bora"
+Bora::RakeTasks.new('templates.yml')
+```
+
+templates.yml:
+```yaml
+templates:
+  app:
+    template_file: templates/test.json
+    stacks:
+      dev: {}
+      uat: {}
+
+  web:
+    # Templates ending in ".rb" are treated as cfndsl templates
+    template_file: templates/test.rb
+    capabilities: [CAPABILITY_IAM]
+    stacks:
+      dev:
+        # Set stack name explicitly (otherwise would default to "web-dev")
+        stack_name: foo-dev
+        params:
+          # Look up a value from the outputs of the "app-dev"stack
+          app_sg: ${app-dev/outputs/AppSecurityGroup}
+      uat:
+        params:
+          app_sg: foouatdev
+
+```
+
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/bora/cfn_param_resolver.rb

@@ -7,14 +7,22 @@ module Bora
     end
 
     def resolve
-      stack, section, name = @param.split("/")
-      if !stack || !section || !name || section != 'outputs'
+      stack_name, section, name = @param.split("/")
+      if !stack_name || !section || !name || section != 'outputs'
         raise "Invalid parameter substitution: #{@param}"
       end
 
-      outputs = Stack.new(stack).outputs
+      stack = Stack.new(stack_name)
+      if !stack.exists?
+        raise "Output #{name} not found in stack #{stack_name} as the stack does not exist"
+      end
+
+      outputs = stack.outputs || []
       matching_output = outputs.find { |output| output.key == name }
-      raise "Output #{name} not found in stack #{stack}" if !matching_output
+      if !matching_output
+        raise "Output #{name} not found in stack #{stack_name}"
+      end
+
       matching_output.value
     end
 

data/lib/bora/rake_tasks.rb

@@ -32,15 +32,26 @@ module Bora
 
     def define_tasks(template_file, stack_name, stack_config, stack_options)
       Bora::Tasks.new(stack_name) do |t|
-        if File.extname(template_file) == ".rb"
-          task :generate do |_, args|
-            params = extract_params(stack_config, args)
-            stack_options[:template_body] = run_cfndsl(template_file, params)
+        t.stack_options = stack_options
+
+        task :generate do |_, args|
+          params = extract_params(stack_config, args)
+          t.stack_options[:parameters] = params.map do |k,v|
+            { parameter_key: k, parameter_value: v }
+          end
+
+          if File.extname(template_file) == ".rb"
+            template_body = run_cfndsl(template_file, params)
+            template_json = JSON.parse(template_body)
+            if template_json["Parameters"]
+              cfn_params = template_json["Parameters"].keys
+              t.stack_options[:parameters].keep_if {|cfn_param| cfn_params.include?(cfn_param[:parameter_key]) }
+            end
+            t.stack_options[:template_body] = template_body
+          else
+            t.stack_options[:template_url] = template_file
           end
-        else
-          stack_options[:template_url] = template_file
         end
-        t.stack_options = stack_options
       end
     end
 
@@ -61,10 +72,10 @@ module Bora
     def extract_params(stack_config, args)
       params = stack_config['params'] || {}
       params.merge!(extract_params_from_args(args.extras))
-      params.map { |k, v| [k, process_param_value(v)] }.to_h
+      params.map { |k, v| [k, process_param_substitutions(v)] }.to_h
     end
 
-    def process_param_value(val)
+    def process_param_substitutions(val)
       old_val = nil
       while old_val != val
         old_val = val

data/lib/bora/tasks.rb

@@ -22,7 +22,7 @@ module Bora
       define_tasks
     end
 
-    attr_writer :stack_options
+    attr_accessor :stack_options
 
     def colorize=(value)
       @colorize = value

data/lib/bora/version.rb

@@ -1,3 +1,3 @@
 module Bora
-  VERSION = "0.9.2"
+  VERSION = "0.9.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bora
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Charles Blaxland