cfhighlander 0.3.3 → 0.4.0.alpha.1531468125

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 05f4776ad4b7fdda865a75512c7510d8afbc399af0d7bee1e057d2b4eba2fa70
-  data.tar.gz: 41768db26a4ddab7f0e4f8ef9f6f0eb7a1556ec17758d1b0c8e2cb764786da54
+  metadata.gz: 1b7f58f63b43165d981517f1889394622596a4bb29310603cace6a499a97eae0
+  data.tar.gz: 036e82c1936b723258a06d1629925090f683072220c767a3abf6f0bd18631f71
 SHA512:
-  metadata.gz: 607cf05d6e3db3bfb3654724b1094955441fdc8645ddb0bbbfe7d0f564b49f80e1f3ea2e6148802448c32f20c9491899f931306c267326fc9eac5d2f684b139b
-  data.tar.gz: 078d9cfd9d16cd1db1deaa36d86ceacd08d412c99417b84ca1257ac91a270a43167abc94b4ec606b13b4fc46e9ad572ec4f5e3e18db6034fba1f202c8d8174ea
+  metadata.gz: c1a9d52b0cfb141b626c3ed80a9538195722be9c89fdbbcf61c370729e7acebafea26ff286c0f06492854a78a9099e7c3d830529e7ffb7b43fc839b4843c779a
+  data.tar.gz: 862f7dccfe02cd336f6606acc12b2fd4e5a22c2eaec135e41e73520eb507b1c6b1a2f5fb63da7c5d0770d82b22a7b884e9e21c84a43058e3055dc74fc65ddb58

data/cfndsl_ext/lambda_helper.rb

@@ -61,9 +61,6 @@ def render_lambda_functions(cfndsl, lambdas, lambda_metadata, distribution)
           FunctionName(Ref(name))
           Action('lambda:InvokeFunction')
           Principal(source['principal'])
-          if source.key? 'source_arn'
-            SourceArn source['source_arn']
-          end
         end
         i += 1
       end

data/lib/cfhighlander.compiler.rb

@@ -50,7 +50,7 @@ module Cfhighlander
 
         if @@global_extensions_paths.empty?
           global_extensions_folder = "#{File.dirname(__FILE__)}/../cfndsl_ext"
-          Dir["#{global_extensions_folder}/*.rb"].each {|f| @@global_extensions_paths << f}
+          Dir["#{global_extensions_folder}/*.rb"].each { |f| @@global_extensions_paths << f }
         end
 
         @component.highlander_dsl.subcomponents.each do |sub_component|
@@ -62,12 +62,12 @@ module Cfhighlander
 
       def process_lambdas=(value)
         @process_lambdas = value
-        @sub_components.each {|scc| scc.process_lambdas = value}
+        @sub_components.each { |scc| scc.process_lambdas=value }
       end
 
       def silent_mode=(value)
         @silent_mode = value
-        @sub_components.each {|scc| scc.silent_mode = value}
+        @sub_components.each { |scc| scc.silent_mode=value }
       end
 
       def compileCfnDsl(out_format)
@@ -76,7 +76,7 @@ module Cfhighlander
         dsl = @component.highlander_dsl
         component_cfndsl = @component.cfndsl_content
 
-        @component.highlander_dsl.subcomponents.each {|sc|
+        @component.highlander_dsl.subcomponents.each { |sc|
           sc.distribution_format = out_format
         }
 
@@ -89,7 +89,7 @@ module Cfhighlander
             'dsl' => dsl,
             'component_cfndsl' => component_cfndsl,
             'component_requires' => (@@global_extensions_paths + @component.cfndsl_ext_files)
-        }).instance_eval {binding})
+        }).instance_eval { binding })
 
         # write to output file
         output_dir = "#{@workdir}/out/cfndsl"
@@ -100,7 +100,7 @@ module Cfhighlander
         puts "cfndsl template for #{dsl.name} written to #{output_path}"
         @cfndsl_compiled_path = output_path
 
-        @sub_components.each {|subcomponent_compiler|
+        @sub_components.each { |subcomponent_compiler|
           puts "Rendering sub-component cfndsl: #{subcomponent_compiler.component_name}"
           subcomponent_compiler.compileCfnDsl out_format
         }
@@ -232,16 +232,8 @@ module Cfhighlander
           file_name = "#{name}.#{@component.name}.#{@component.version}.#{timestamp}.zip"
           @metadata['path'][name] = file_name
           full_destination_path = "#{out_folder}#{file_name}"
-          info_path = "#{out_folder}#{file_name}.info.yaml"
           archive_paths << full_destination_path
           FileUtils.mkdir_p out_folder
-          File.write(info_path, {
-              'component' => @component.name,
-              'function' => name,
-              'packagedAt' => timestamp,
-              'config' => lambda_config
-          }.to_yaml)
-
           # clear destination if already there
           FileUtils.remove full_destination_path if File.exist? full_destination_path
 
@@ -271,25 +263,14 @@ module Cfhighlander
             end
           else
             # zip local code
-            component = @component
-            component_dir = component.template.template_location
-            full_path = "#{component_dir}/lambdas/#{lambda_config['code']}"
-
-            until (File.exist? full_path or component_dir.nil?)
-              parent_exists = (not component.extended_component.nil?)
-              component = component.extended_component if parent_exists
-              component_dir = component.template.template_location if parent_exists
-              full_path = "#{component_dir}/lambdas/#{lambda_config['code']}" if parent_exists
-              component_dir = nil unless parent_exists
-            end
-            if component_dir.nil?
-              STDERR.puts "ERROR: Could not find source code directory for lambda function #{name} in component #{@component.name}"
-              exit -9
-            end
+            zip_options = ''
+            full_path = "#{@component_dir}/lambdas/#{lambda_config['code']}"
 
             # lambda source can be either path to file or directory within that file
             # optionally, lambda source code
             lambda_source_dir = File.dirname(full_path)
+            lambda_source_file = File.basename(full_path)
+            lambda_source_file = '.' if Pathname.new(full_path).directory?
             lambda_source_dir = full_path if Pathname.new(full_path).directory?
 
             # executing package command can generate files. We DO NOT want this file in source directory,
@@ -321,10 +302,7 @@ module Cfhighlander
             zip_generator.write
 
           end
-          # add version information to avoid same package ever deployed 2 times
-          Zip::File.open(full_destination_path) do |zipfile|
-            zipfile.add 'hlpackage_info.txt', info_path
-          end
+
           sha256 = Digest::SHA256.file full_destination_path
           sha256 = sha256.base64digest
           puts "Created zip package #{full_destination_path} for lambda #{name} with digest #{sha256}"

data/lib/cfhighlander.dsl.base.rb

@@ -5,7 +5,6 @@ module Cfhighlander
 
       attr_accessor :config
 
-      # intrinsic functions
 
       def GetAtt(resource, property)
         return FnGetAtt(resource, property)
@@ -17,94 +16,6 @@ module Cfhighlander
         }
       end
 
-      def FnImportValue(value)
-        return {
-            'Fn::ImportValue' => value
-        }
-      end
-
-      def FnSub(string, replacementMap = nil)
-        if replacementMap.nil?
-          return { 'Fn::Sub' => string }
-        else
-          return { 'Fn::Sub' => [string, replacementMap] }
-        end
-      end
-
-      def FnSplit(delimiter, source)
-        return { 'Fn::Split' => [delimiter, source] }
-      end
-
-      def FnSelect(index, list)
-        return { 'Fn::Select' => [index, list] }
-      end
-
-      def FnGetAZs(region = nil)
-        if region.nil?
-          region = AWSStackRegion()
-        end
-        return { 'Fn::GetAZs' => region }
-      end
-
-      def FnCidr(ip_block, count, sizeMask)
-        return { 'Fn::Cidr' => [ip_block, count, sizeMask] }
-      end
-
-      def FnBase64(value)
-        return { 'Fn::Base64' => value }
-      end
-
-      # pseudo reference
-      def AWSStackRegion
-        return Ref('AWS::Region')
-      end
-
-      def AWSStackName
-        return Ref('AWS::StackName')
-      end
-
-      def AWSAccountId
-        return Ref('AWS::AccountId')
-      end
-
-      def AWSURLSuffix
-        return Ref('AWS::URLSuffix')
-      end
-
-      def AWSPartition
-        return Ref('AWS::Partition')
-      end
-
-      def AWSNoValue
-        return Ref('AWS::NoValue')
-      end
-
-      def AWSNotificationARNs
-        return Ref('AWS::NotificationARNs')
-      end
-
-      # logic intrinsic functions
-      def FnIf(condition, true_branch, false_branch)
-        return { 'Fn::If' => [condition, true_branch, false_branch] }
-      end
-
-      def FnAnd(*args)
-        return { 'Fn::And' => args }
-      end
-
-      def FnEquals(val1, val2)
-        return { 'Fn::Equals' => [val1, val2] }
-      end
-
-      def FnNot(condition)
-        return { 'Fn::Not' => [condition] }
-      end
-
-      def FnOr(*args)
-        return { 'Fn::Or' => args }
-      end
-
-
       def Ref(resource)
         return {
             'Ref' => resource

data/lib/cfhighlander.model.component.rb

@@ -174,7 +174,7 @@ module Cfhighlander
         if not @parent_template.nil?
           extended_component = @factory.loadComponentFromTemplate(@parent_template)
           extended_component.is_parent_component = true
-          extended_component.load(@config)
+          extended_component.load()
 
           @config = extended_component.config.extend(@config)
           @mappings = extended_component.mappings.extend(@mappings)

metadata

@@ -1,16 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: cfhighlander
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0.alpha.1531468125
 platform: ruby
 authors:
 - Nikola Tosic
 - Aaron Walker
-- Angus Vine
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-17 00:00:00.000000000 Z
+date: 2018-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -278,9 +277,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.7