cfhighlander 0.3.0.alpha.1531198720 → 0.3.0.alpha.1531270316

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b686f58eba35660bb5220c67f1a9486e141b5835422f7750bcc49445b60d7e4
-  data.tar.gz: 045635c52efbfb8c6c55053f576e463206a8ca2383827aafe110bddab6d7ed67
+  metadata.gz: e24583ffb52dd7b67178ec79684808d14fd0219a9ca6a03aa3a42fc249971fe7
+  data.tar.gz: 7f42b19cb4f05b087bdcf31593a53c04db7008d5c2670273d4b00134aa2007ce
 SHA512:
-  metadata.gz: e6637bcbbd443d95eb32ecbe5a68b88f5d6b5210dfd305a8a9878e2add6c3a01a40069edb1808058165b437caf46b1dfd1f04540af975f344c838c55e90c1dc4
-  data.tar.gz: f3c160205f24825ff5d53530bb9bee25061a9ff5744b44a662e8b58c2ee46090f01b8cad8cb053ad7faa05939f7b00858c194e7da671538b9adaa7c8a34a127f
+  metadata.gz: b237aebd3bbd2084945f494d41ef9599f73e5d91f18263fc8434fb061ebc65c61ebde430c9de0fa76833fa7324fcbc12efa308ebcbc8ae8c9427a4a4480b356b
+  data.tar.gz: 64712d1386bf517399b47aadb51f53fc11177737386201e7c2e25ed26888039ab59dc056c2c48fe2e41b94d9d5aff72a19c11cbc104e7632dc62ceefa07049f8

data/lib/cfhighlander.dsl.subcomponent.rb

@@ -152,7 +152,7 @@ module Cfhighlander
     class SubcomponentParamValueResolver
       def self.resolveValue(component, sub_component, param, available_outputs)
 
-        print("INFO Resolving parameter #{component.name} -> #{sub_component.name}.#{param.name}: ")
+        puts("INFO Resolving parameter #{component.name} -> #{sub_component.name}.#{param.name}: ")
 
         # rule 0: this rule is here for legacy reasons and OutputParam. It should be deprecated
         # once all hl-components- repos remove any references to OutputParam

data/lib/cfhighlander.dsl.template.rb

@@ -39,7 +39,8 @@ module Cfhighlander
 
       attr_reader :conditions,
           :subcomponents,
-          :config_overrides
+          :config_overrides,
+          :extended_template
 
       def initialize
         @mappings = []
@@ -55,7 +56,8 @@ module Cfhighlander
         @dependson_components_templates = []
         @dependson_components = []
         @conditions = []
-        @config_overrides = {}
+        @config_overrides = {},
+        @extended_template = nil
       end
 
       # DSL statements
@@ -98,6 +100,9 @@ module Cfhighlander
         @dependson_components_templates << template
       end
 
+      def Extends(template)
+        @extended_template = template
+      end
 
       def Component(template_arg = nil, template: nil,
           name: template,
@@ -435,11 +440,16 @@ module Cfhighlander
 end
 
 def CfhighlanderTemplate(&block)
-  instance = Cfhighlander::Dsl::HighlanderTemplate.new
-
-  puts "Processing cfhighlander component #{@name}\n\tLocation:#{@highlander_dsl_path}" +
-      "\n\tConfig:#{@config}"
 
+  if @parent_dsl.nil?
+    instance = Cfhighlander::Dsl::HighlanderTemplate.new
+    puts "Processing higlander component #{@name}\n\tLocation:#{@highlander_dsl_path}" +
+        "\n\tConfig:#{@config}"
+  else
+    instance = @parent_dsl
+    puts "Processing higlander component #{@name}\n\tLocation:#{@highlander_dsl_path}" +
+        "\n\tConfig:#{@config}\n\tParent: #{@parent_template}"
+  end
 
   instance.config = @config
 

data/lib/cfhighlander.factory.rb

@@ -34,7 +34,10 @@ module Cfhighlander
 
 
       def buildComponentFromLocation(template_meta, component_name)
-        component = Model::Component.new(template_meta, component_name)
+        component = Model::Component.new(template_meta,
+            component_name,
+            self)
+        component.factory = self
         component.load_config
         return component
       end

data/lib/cfhighlander.model.component.rb

@@ -20,13 +20,21 @@ module Cfhighlander
           :distribution_prefix,
           :component_files,
           :cfndsl_ext_files,
-          :lambda_src_files
+          :lambda_src_files,
+          :parent_template,
+          :template_finder,
+          :factory,
+          :extended_component,
+          :is_parent_component
 
       attr_reader :cfn_model,
           :outputs,
+          :factory,
+          :extended_component,
           :potential_subcomponent_overrides
 
-      def initialize(template_meta, component_name)
+
+      def initialize(template_meta, component_name, factory)
         @template = template_meta
         @name = component_name
         @component_dir = template_meta.template_location
@@ -37,7 +45,11 @@ module Cfhighlander
         @component_files = []
         @cfndsl_ext_files = []
         @lambda_src_files = []
+        @factory = factory
+        @extended_component = nil
+        @parent_dsl = nil
         @potential_subcomponent_overrides = {}
+        @is_parent_component = false
       end
 
       def distribution_bucket=(value)
@@ -65,7 +77,7 @@ module Cfhighlander
             @component_files << config_file
           end
           fname = File.basename(config_file)
-          potential_component_name = fname.gsub('.config.yaml','')
+          potential_component_name = fname.gsub('.config.yaml', '')
           @potential_subcomponent_overrides[potential_component_name] = partial_config
         end
       end
@@ -99,7 +111,7 @@ module Cfhighlander
         candidate_dynamic_mappings_path = "#{@component_dir}/#{@template.template_name}.mappings.rb"
 
         @cfndsl_ext_files += Dir["#{@component_dir}/ext/cfndsl/*.rb"]
-        @lambda_src_files += Dir["#{@component_dir}/lambdas/**/*"].find_all {|p| not File.directory? p}
+        @lambda_src_files += Dir["#{@component_dir}/lambdas/**/*"].find_all { |p| not File.directory? p }
         @component_files += @cfndsl_ext_files
         @component_files += @lambda_src_files
 
@@ -125,16 +137,11 @@ module Cfhighlander
           @component_files << candidate_dynamic_mappings_path
         end
 
-        # 1st pass - parse the file
         @component_files << @highlander_dsl_path
 
-        cfhl_script = ''
-        @config.each do |key, val|
-          cfhl_script += ("\n#{key} = #{val.inspect}\n")
-        end
-        cfhl_script += File.read(@highlander_dsl_path)
 
-        @highlander_dsl = eval(cfhl_script, binding)
+        # evaluate template file and load parent if defined
+        evaluateHiglanderTemplate
 
         # set version if not defined
         @highlander_dsl.ComponentVersion(@version) unless @version.nil?
@@ -149,12 +156,39 @@ module Cfhighlander
           end
 
           @highlander_dsl.Description(description)
-        end
+        end unless @is_parent_component
 
         # set (override) distribution options
         @highlander_dsl.DistributionBucket(@distribution_bucket) unless @distribution_bucket.nil?
         @highlander_dsl.DistributionPrefix(@distribution_prefix) unless @distribution_prefix.nil?
 
+
+        loadDepandantExt()
+      end
+
+      def inheritParentTemplate
+        if not @parent_template.nil?
+          extended_component = @factory.loadComponentFromTemplate(@parent_template)
+          extended_component.is_parent_component = true
+          extended_component.load()
+
+          @config = extended_component.config.extend(@config)
+          @mappings = extended_component.mappings.extend(@mappings)
+          @cfndsl_ext_files += extended_component.cfndsl_ext_files
+          @lambda_src_files += extended_component.lambda_src_files
+          @extended_component = extended_component
+
+          # extend cfndsl, first comes parent, than child
+          # this allows for child component to shadow parent component
+          # defined resources
+          @cfndsl_content = extended_component.cfndsl_content + @cfndsl_content
+
+          @parent_dsl = extended_component.highlander_dsl
+
+        end
+      end
+
+      def loadCfndslContent
         if File.exist? @cfndsl_path
           @component_files << @cfndsl_path
           @cfndsl_content = File.read(@cfndsl_path)
@@ -169,8 +203,27 @@ module Cfhighlander
         else
           @cfndsl_content = ''
         end
+      end
 
-        loadDepandantExt()
+      def evaluateHiglanderTemplate
+        loadCfndslContent
+
+        cfhl_script = ''
+        @config.each do |key, val|
+          cfhl_script += ("\n#{key} = #{val.inspect}\n")
+        end
+        cfhl_script += File.read(@highlander_dsl_path)
+
+        cfhl_dsl = eval(cfhl_script, binding)
+        if not cfhl_dsl.extended_template.nil?
+          @parent_template = cfhl_dsl.extended_template
+          inheritParentTemplate
+          puts "INFO: #{@template} extends #{@parent_template}, loading parent definition..."
+          # 2nd pass, template instance is already created from parent
+          @highlander_dsl = eval(cfhl_script, binding)
+        else
+          @highlander_dsl = cfhl_dsl
+        end
       end
 
       # evaluates cfndsl with current config
@@ -183,7 +236,7 @@ module Cfhighlander
         @outputs = (
         if @cfn_model.key? 'Outputs'
         then
-          @cfn_model['Outputs'].map {|k, v| ComponentOutput.new self, k, v}
+          @cfn_model['Outputs'].map { |k, v| ComponentOutput.new self, k, v }
         else
           []
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cfhighlander
 version: !ruby/object:Gem::Version
-  version: 0.3.0.alpha.1531198720
+  version: 0.3.0.alpha.1531270316
 platform: ruby
 authors:
 - Nikola Tosic
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-10 00:00:00.000000000 Z
+date: 2018-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline