stack_master 1.16.0 → 1.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f64b125495590bdb3890f184b5ecb67e2b57d13d7e8cc023fb785a543e825e2c
-  data.tar.gz: 0f892956233a734941107967938357400c131d3280e687a5839531aa5dbaa275
+  metadata.gz: 6ae4eccac3702f32e8c22434fb946e19d3d29a76789a68e66a18c292924c3138
+  data.tar.gz: 13f4ae0b29aaa518a584d277e9329c16860725bc0b119be5e124d6a7c47ddefe
 SHA512:
-  metadata.gz: d8fdc2f1e629e1620ef5144e5990706ff0e89f390df4cf3880671676bd6ef26091011d87adcdd55e21987311ff6c0cb8724dff58353e352e3e6531c8d915cf73
-  data.tar.gz: 026efc1dec847d78400ea70bf087d52a2601738145790b05d70cc77b6dbd5fde337872c6226fcacf52b5bd4c91f633755ff67147ff48d820ac1ed5626f8ea99f
+  metadata.gz: 18a069c5c2df3f5cece5a647dc9239926440c97aea6e2f28999bd0f725e0fca3da3144d26b21cd3dd62ac52f0208606be9423f642b85981f6de9f212f5dfc297
+  data.tar.gz: bfb4d57cad111a3a8f4519c19ac2aa6f3ece8e3d2fd4125f97cb2fc28fe2897b016d2da89f8aa92949c9b690c2ebb6cd060035664da673da8064a69781617059

data/README.md

@@ -602,10 +602,12 @@ we can use stack defined as follows:
 stacks:
   us-east-1:
     my-stack:
-      sparkle_pack_template: template_name
+      template: template_name
+      compiler: sparkle_formation
       compiler_options:
         sparkle_packs:
           - some-sparkle-pack
+        sparkle_pack_template: true
 ```
 
 ## Allowed accounts

data/lib/stack_master/stack.rb

@@ -65,7 +65,7 @@ module StackMaster
       parameter_hash = ParameterLoader.load(stack_definition.parameter_files)
       template_parameters = ParameterResolver.resolve(config, stack_definition, parameter_hash[:template_parameters])
       compile_time_parameters = ParameterResolver.resolve(config, stack_definition, parameter_hash[:compile_time_parameters])
-      template_body = TemplateCompiler.compile(config, stack_definition.template_dir, stack_definition.template_file_path, stack_definition.sparkle_pack_template, compile_time_parameters, stack_definition.compiler_options)
+      template_body = TemplateCompiler.compile(config, stack_definition.compiler, stack_definition.template_dir, stack_definition.template, compile_time_parameters, stack_definition.compiler_options)
       template_format = TemplateUtils.identify_template_format(template_body)
       stack_policy_body = if stack_definition.stack_policy_file_path
                             File.read(stack_definition.stack_policy_file_path)

data/lib/stack_master/stack_definition.rb

@@ -3,7 +3,6 @@ module StackMaster
     attr_accessor :region,
                   :stack_name,
                   :template,
-                  :sparkle_pack_template,
                   :tags,
                   :role_arn,
                   :allowed_accounts,
@@ -20,6 +19,8 @@ module StackMaster
                   :files,
                   :compiler_options
 
+    attr_reader :compiler
+
     include Utils::Initializable
 
     def initialize(attributes = {})
@@ -30,6 +31,7 @@ module StackMaster
       @files = []
       @allowed_accounts = nil
       @ejson_file_kms = true
+      @compiler = nil
       super
       @template_dir ||= File.join(@base_dir, 'templates')
       @allowed_accounts = Array(@allowed_accounts)
@@ -40,7 +42,6 @@ module StackMaster
         @region == other.region &&
         @stack_name == other.stack_name &&
         @template == other.template &&
-        @sparkle_pack_template == other.sparkle_pack_template &&
         @tags == other.tags &&
         @role_arn == other.role_arn &&
         @allowed_accounts == other.allowed_accounts &&
@@ -53,9 +54,14 @@ module StackMaster
         @stack_policy_file == other.stack_policy_file &&
         @additional_parameter_lookup_dirs == other.additional_parameter_lookup_dirs &&
         @s3 == other.s3 &&
+        @compiler == other.compiler &&
         @compiler_options == other.compiler_options
     end
 
+    def compiler=(compiler)
+      @compiler = compiler.&to_sym
+    end
+
     def template_file_path
       return unless template
       File.expand_path(File.join(template_dir, template))

data/lib/stack_master/template_compiler.rb

@@ -2,12 +2,16 @@ module StackMaster
   class TemplateCompiler
     TemplateCompilationFailed = Class.new(RuntimeError)
 
-    def self.compile(config, template_dir, template_file_path, sparkle_pack_template, compile_time_parameters, compiler_options = {})
-      compiler = template_compiler_for_stack(template_file_path, sparkle_pack_template, config)
+    def self.compile(config, template_compiler, template_dir, template, compile_time_parameters, compiler_options = {})
+      compiler = if template_compiler
+                   find_compiler(template_compiler)
+                 else
+                   template_compiler_for_stack(template, config)
+                 end
       compiler.require_dependencies
-      compiler.compile(template_dir, template_file_path, sparkle_pack_template, compile_time_parameters, compiler_options)
+      compiler.compile(template_dir, template, compile_time_parameters, compiler_options)
     rescue StandardError => e
-      raise TemplateCompilationFailed.new("Failed to compile #{template_file_path || sparkle_pack_template} with error #{e}.\n#{e.backtrace}")
+      raise TemplateCompilationFailed.new("Failed to compile #{template} with error #{e}.\n#{e.backtrace}")
     end
 
     def self.register(name, klass)
@@ -16,20 +20,22 @@ module StackMaster
     end
 
     # private
-    def self.template_compiler_for_stack(template_file_path, sparkle_pack_template, config)
-      ext = if sparkle_pack_template
-        :rb
-      else
-        file_ext(template_file_path)
-      end
+    def self.template_compiler_for_stack(template, config)
+      ext = file_ext(template)
       compiler_name = config.template_compilers.fetch(ext)
-      @compilers.fetch(compiler_name)
+      find_compiler(compiler_name)
     end
     private_class_method :template_compiler_for_stack
 
-    def self.file_ext(template_file_path)
-      File.extname(template_file_path).gsub('.', '').to_sym
+    def self.file_ext(template)
+      File.extname(template).gsub('.', '').to_sym
     end
     private_class_method :file_ext
+
+    def self.find_compiler(name)
+      @compilers.fetch(name.to_sym) do
+        raise "Unknown compiler #{name.inspect}"
+      end
+    end
   end
 end

data/lib/stack_master/template_compilers/cfndsl.rb

@@ -4,10 +4,11 @@ module StackMaster::TemplateCompilers
       require 'cfndsl'
     end
 
-    def self.compile(_template_dir, template_file_path, _sparkle_pack_template, compile_time_parameters, _compiler_options = {})
+    def self.compile(template_dir, template, compile_time_parameters, _compiler_options = {})
       CfnDsl.disable_binding
       CfnDsl::ExternalParameters.defaults.clear # Ensure there's no leakage across invocations
       CfnDsl::ExternalParameters.defaults(compile_time_parameters.symbolize_keys)
+      template_file_path = File.join(template_dir, template)
       ::CfnDsl.eval_file_with_extras(template_file_path).to_json
     end
 

data/lib/stack_master/template_compilers/json.rb

@@ -7,7 +7,8 @@ module StackMaster::TemplateCompilers
       require 'json'
     end
 
-    def self.compile(_template_dir, template_file_path, _sparkle_pack_template, _compile_time_parameters, _compiler_options = {})
+    def self.compile(template_dir, template, _compile_time_parameters, _compiler_options = {})
+      template_file_path = File.join(template_dir, template)
       template_body = File.read(template_file_path)
       if template_body.size > MAX_TEMPLATE_SIZE
         # Parse the json and rewrite compressed

data/lib/stack_master/template_compilers/sparkle_formation.rb

@@ -12,8 +12,8 @@ module StackMaster::TemplateCompilers
       require 'stack_master/sparkle_formation/template_file'
     end
 
-    def self.compile(template_dir, template_file_path, sparkle_pack_template, compile_time_parameters, compiler_options = {})
-      sparkle_template = compile_sparkle_template(template_dir, template_file_path, sparkle_pack_template, compiler_options)
+    def self.compile(template_dir, template, compile_time_parameters, compiler_options = {})
+      sparkle_template = compile_sparkle_template(template_dir, template, compiler_options)
       definitions = sparkle_template.parameters
       validate_definitions(definitions)
       validate_parameters(definitions, compile_time_parameters)
@@ -27,7 +27,7 @@ module StackMaster::TemplateCompilers
 
     private
 
-    def self.compile_sparkle_template(template_dir, template_file_path, sparkle_pack_template, compiler_options)
+    def self.compile_sparkle_template(template_dir, template, compiler_options)
       sparkle_path = if compiler_options['sparkle_path']
         File.expand_path(compiler_options['sparkle_path'])
       else
@@ -47,9 +47,11 @@ module StackMaster::TemplateCompilers
         end
       end
 
-      if sparkle_pack_template
-        raise ArgumentError.new("Template #{sparkle_pack_template} not found in any sparkle pack") unless collection.templates['aws'].include? sparkle_pack_template
-        template_file_path = collection.templates['aws'][sparkle_pack_template].top['path']
+      if compiler_options['sparkle_pack_template']
+        raise ArgumentError.new("Template #{template.inspect} not found in any sparkle pack") unless collection.templates['aws'].include? template
+        template_file_path = collection.templates['aws'][template].top['path']
+      else
+        template_file_path = File.join(template_dir, template)
       end
 
       sparkle_template = compile_template_with_sparkle_path(template_file_path, sparkle_path)

data/lib/stack_master/template_compilers/yaml.rb

@@ -5,7 +5,8 @@ module StackMaster::TemplateCompilers
       require 'json'
     end
 
-    def self.compile(_template_dir, template_file_path, _sparkle_pack_template, _compile_time_parameters, _compiler_options = {})
+    def self.compile(template_dir, template, _compile_time_parameters, _compiler_options = {})
+      template_file_path = File.join(template_dir, template)
       File.read(template_file_path)
     end
 

data/lib/stack_master/validator.rb

@@ -14,7 +14,7 @@ module StackMaster
       compile_time_parameters = ParameterResolver.resolve(@config, @stack_definition, parameter_hash[:compile_time_parameters])
 
       StackMaster.stdout.print "#{@stack_definition.stack_name}: "
-      template_body = TemplateCompiler.compile(@config, @stack_definition.template_dir, @stack_definition.template_file_path, @stack_definition.sparkle_pack_template, compile_time_parameters, @stack_definition.compiler_options)
+      template_body = TemplateCompiler.compile(@config, @stack_definition.compiler, @stack_definition.template_dir, @stack_definition.template, compile_time_parameters, @stack_definition.compiler_options)
       cf.validate_template(template_body: TemplateUtils.maybe_compressed_template_body(template_body))
       StackMaster.stdout.puts "valid"
       true
@@ -28,6 +28,5 @@ module StackMaster
     def cf
       @cf ||= StackMaster.cloud_formation_driver
     end
-
   end
 end

data/lib/stack_master/version.rb

@@ -1,3 +1,3 @@
 module StackMaster
-  VERSION = "1.16.0"
+  VERSION = "1.17.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stack_master
 version: !ruby/object:Gem::Version
-  version: 1.16.0
+  version: 1.17.0
 platform: ruby
 authors:
 - Steve Hodgkiss
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-16 00:00:00.000000000 Z
+date: 2019-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -529,8 +529,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: StackMaster is a sure-footed way of creating, updating and keeping track