cfhighlander 0.12.4 → 0.12.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 604f8f52d76f55b9bd84c22054f03298c4fe27a462843d4a24799bf2913ecf71
-  data.tar.gz: d5934fff23883b7f1726db24de1d62dc501d86e03e1748410bcb277881a27244
+  metadata.gz: d2dfe3eb66664ba5c592e060c0c2257f890fa8ed03f7583d396857a8d1b789cd
+  data.tar.gz: 0577fcd3991f9e5fbb4b146c705c791a678523c04a025203255375ab1b264e98
 SHA512:
-  metadata.gz: 78787af0a8c18c824e9af82c29c1db585965246a8175438ff9f50242999bbe3ace19694f6c8f03995d87d62a414569263db06dac9b52ee5da8460afd817ebf22
-  data.tar.gz: be064150b8f28d1d13e79593ce8e5a268c1c7ea87a602906c2592c8fd1005097e63f3f48e4f0e0823c3c4879cfbaf33f1f34f9901babb70a418c148e7aa98985
+  metadata.gz: ea89979f91b1a001a87c0779b57d7e6efad18a1897b0bc4ca8bcf69c0132694a4131c2d312d1451aa8cc0a8cd0cafa6abb44458097f69650e84a7ecd7026eae9
+  data.tar.gz: e7ab34cb43ad010ad12ae0dd4193c0cf247d24878bd07f2a4701d07d0fed419bc573c7ba649350b0d2e264a23864c63d9427fefa80184abdf915600ac85dcc5d

data/README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/theonestack/cfhighlander.svg?branch=develop)](https://travis-ci.org/theonestack/cfhighlander) [![Join the chat at https://gitter.im/theonestack/cfhighlander](https://badges.gitter.im/theonestack/cfhighlander.svg)](https://gitter.im/theonestack/cfhighlander?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+![Build Status](https://github.com/theonestack/cfhighlander/actions/workflows/build-gem.yml/badge.svg) [![Join the chat at https://gitter.im/theonestack/cfhighlander](https://badges.gitter.im/theonestack/cfhighlander.svg)](https://gitter.im/theonestack/cfhighlander?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 # Intro
 
@@ -863,6 +863,27 @@ end
 
 ```
 
+### Publishing Additonal Artifacts
+
+If you need to publish additonal files along with your cloudformation templates you can use the following DSL:
+
+```ruby
+CfhighlanderTemplate do
+    Name 'my_app'
+    PublishArtifact file: "my-apigateway-spec.yaml"
+end
+```
+
+This will upload the file `my-apigateway-spec.yaml` to the s3 destnation/distribution bucket using the default s3 prefix. If you want to override the s3 key you can use
+
+```ruby
+CfhighlanderTemplate do
+    Name 'my_app'
+    PublishArtifact file: "my-apigateway-spec.yaml", key: '/my-custom-path/my-custom-file.yaml'
+end
+```
+
+
 ## Finding templates and creating components
 
 
@@ -1038,3 +1059,4 @@ Test Highlander component with test case config
 ### Reports
 
 By default test will print the output to stdout. You can output to a file with a format of xml or json using the `-r` option
+

data/cfndsl_ext/lambda_helper.rb

@@ -30,6 +30,7 @@ def render_lambda_functions(cfndsl, lambdas, lambda_metadata, distribution)
           S3Bucket: distribution['bucket'],
           S3Key: "#{distribution['prefix']}/#{distribution['version']}/#{lambda_metadata['path'][key]}"
       })
+      Layers lambda_config['layers'] unless lambda_config['layers'].nil?
 
       Environment(Variables: Hash[environment.collect { |k, v| [k, v] }])
 

data/lib/cfhighlander.dsl.subcomponent.rb

@@ -155,7 +155,7 @@ module Cfhighlander
           param_ovr[:minLength] = minLength unless minLength.nil?
           param_ovr[:minValue] = minValue unless minValue.nil?
           @component_loaded.highlander_dsl.Parameters do
-            ComponentParam name, value, param_ovr
+            ComponentParam name, value, **param_ovr
           end
         else
           parameter.default_value = defaultValue unless defaultValue.nil?

data/lib/cfhighlander.dsl.template.rb

@@ -37,7 +37,8 @@ module Cfhighlander
           :lambda_functions_keys,
           :description,
           :dependson_components,
-          :template_dir
+          :template_dir,
+          :publish_artifacts
 
       attr_reader :conditions,
           :subcomponents,
@@ -63,6 +64,7 @@ module Cfhighlander
         # execution blocks for subcomponents
         @subcomponents_exec = {}
         @template_dir = nil
+        @publish_artifacts = []
       end
 
       # DSL statements
@@ -207,6 +209,11 @@ module Cfhighlander
         @lambda_functions_keys << config_key
       end
 
+      def PublishArtifact(file: nil, key: key=nil)
+        puts "INFO: adding artifact #{file} to publishing list"
+        @publish_artifacts << {file: file, key: key}
+      end
+
       # Internal and interface functions
 
       def loadComponents
@@ -467,11 +474,11 @@ def CfhighlanderTemplate(&block)
 
   if @parent_dsl.nil?
     instance = Cfhighlander::Dsl::HighlanderTemplate.new
-    puts "Processing higlander component #{@name}\n\tLocation:#{@highlander_dsl_path}" +
+    puts "Processing highlander component #{@name}\n\tLocation:#{@highlander_dsl_path}" +
         "\n\tConfig:#{@config}"
   else
     instance = @parent_dsl
-    puts "Processing higlander component #{@name}\n\tLocation:#{@highlander_dsl_path}" +
+    puts "Processing highlander component #{@name}\n\tLocation:#{@highlander_dsl_path}" +
         "\n\tConfig:#{@config}\n\tParent: #{@parent_template}"
   end
 

data/lib/cfhighlander.error.rb

@@ -0,0 +1,3 @@
+module Cfhighlander
+    class Error < StandardError; end
+end

data/lib/cfhighlander.model.component.rb

@@ -153,7 +153,7 @@ module Cfhighlander
 
 
         # evaluate template file and load parent if defined
-        evaluateHiglanderTemplate
+        evaluateHighlanderTemplate
 
         # set version if not defined
         @highlander_dsl.ComponentVersion(@version) unless @version.nil?
@@ -223,7 +223,7 @@ module Cfhighlander
         end
       end
 
-      def evaluateHiglanderTemplate
+      def evaluateHighlanderTemplate
         loadCfndslContent
 
         cfhl_script = ''

data/lib/cfhighlander.publisher.rb

@@ -1,6 +1,6 @@
 require_relative './cfhighlander.compiler'
 require 'aws-sdk-s3'
-require 'uri'
+
 module Cfhighlander
 
   module Publisher
@@ -53,7 +53,7 @@ module Cfhighlander
         template_url = getTemplateUrl
         region = s3_bucket_region(@component.highlander_dsl.distribution_bucket)
         return "https://console.aws.amazon.com/cloudformation/home?region=#{region}#/stacks/create/review?filter=active&templateURL=" +
-            "#{URI::encode(template_url)}&stackName=#{@component.name}"
+            "#{CGI::escape(template_url)}&stackName=#{@component.name}"
       end
 
       def publishFiles(file_list)
@@ -83,6 +83,16 @@ module Cfhighlander
         end
         print "\n"
 
+        @component.highlander_dsl.publish_artifacts.each do |artifact|
+          s3_key = artifact[:key].nil? ? "#{prefix}/#{version}/#{artifact[:file]}" : artifact[:key]
+          print "\nPublishing artifact: #{artifact[:file]} to s3://#{bucket}/#{s3_key} ..."
+          s3.put_object({
+            body: File.read(artifact[:file]),
+            bucket: bucket,
+            key: s3_key
+          })
+          print ' [OK] '
+        end
       end
 
     end

data/lib/cfhighlander.version.rb

@@ -1,3 +1,3 @@
 module Cfhighlander
-  VERSION="0.12.4".freeze
+  VERSION="0.12.7".freeze
 end

data/lib/util/cloudformation.util.rb

@@ -1,4 +1,5 @@
 require_relative '../cfhighlander.model.component'
+require_relative '../cfhighlander.error'
 require_relative './debug.util'
 require 'duplicate'
 
@@ -57,7 +58,6 @@ module Cfhighlander
         template.subcomponents.each do |sub_component|
           next unless sub_component.inlined
           model = sub_component.component_loaded.cfn_model_raw
-
           model[element_type].keys.each do |key|
             if keys_taken.include? key
               candidate = "#{sub_component.component_loaded.name}#{key}"
@@ -109,6 +109,16 @@ module Cfhighlander
           next unless sub_component.inlined
           model = sub_component.component_loaded.cfn_model_raw
           model[element_name].each do |resource, value|
+            if sub_component.conditional
+              # If the resource already has a conditon we need to combine it with the stack condition
+              if element_name == 'Conditions'
+                value = { "Fn::And" => [{"Condtion" => sub_component.condition}, value]}
+              end
+              # Adds the condition to the inlined resource if it doesn't already have a condition
+              if element_name == 'Resources'
+                value['Condition'] = sub_component.condition unless value.has_key?('Condition')
+              end
+            end
             # effective extraction of child resource into parent
             # allows for line components to use - or _ in the component name
             # and still generate valid references
@@ -295,6 +305,11 @@ module Cfhighlander
               outval_refs.each do |out_ref|
                 component_name = out_ref[:component]
                 ref_sub_component = template.subcomponents.find {|sc| sc.name == component_name}
+
+                if ref_sub_component.nil?
+                  raise Cfhighlander::Error, "unable to find outputs from component #{component_name} reference by parameters in component #{sub_component.name}"
+                end
+
                 if ref_sub_component.inlined
                   # out refs here need to be replaced with actual values
                   replacement = output_values[out_ref[:component]][out_ref[:outputName]]

data/templates/cfndsl.component.template.erb

@@ -42,7 +42,11 @@ CloudFormation do
 <% for @param in dsl.parameters.param_list %>
     Parameter('<%= @param.name %>') do
       Type '<%= @param.type %>'
+      <%- if ['Number', 'List<Number>'].include?(@param.type) -%>
+      Default <%= @param.default_value %>
+      <%- else -%>
       Default '<%= @param.default_value %>'
+      <%- end -%>
 <%- unless @param.no_echo.nil? -%>
       NoEcho <%= @param.no_echo %>
 <%- end -%>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cfhighlander
 version: !ruby/object:Gem::Version
-  version: 0.12.4
+  version: 0.12.7
 platform: ruby
 authors:
 - Nikola Tosic
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-26 00:00:00.000000000 Z
+date: 2022-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -247,6 +247,7 @@ files:
 - lib/cfhighlander.dsl.params.rb
 - lib/cfhighlander.dsl.subcomponent.rb
 - lib/cfhighlander.dsl.template.rb
+- lib/cfhighlander.error.rb
 - lib/cfhighlander.factory.rb
 - lib/cfhighlander.factory.templatefinder.rb
 - lib/cfhighlander.helper.rb
@@ -281,7 +282,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: DSL on top of cfndsl. Manage libraries of cloudformation components