cfn-model 0.1.24 → 0.1.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99ae976c5f51a3dd20649127f9cf9f121d14b013
-  data.tar.gz: 47484978c5fe38df5cf003472a83013c27d7cba1
+  metadata.gz: 10958dfafdaa000fa3e7de361a28f31bdcc16436
+  data.tar.gz: f0871cea3dbddc961834402690da91f95cfbd5cc
 SHA512:
-  metadata.gz: c5015a2a0e92b54cf8a6aeb4d25787e9f71ea4135dd906913f5c72d4169196a0c8a57bef1e78638f053c556ae8b6f2dba471690b0e2d9169d9ee58a3aaf12b9d
-  data.tar.gz: 8f1f04480fd6e462423fa9bf4b5099b282d0348cf3aa358225e9ea10a4cd993240e875c3638d9b567c9ecf69487f1cf7d70a194a870d7673514ef1fe8e54a243
+  metadata.gz: 3656ead12b0ddc08c62f837456ffdd90ef633f57bb7a04ee23a39d4fdae06e4fa0a7d0eb0bf306890249b334d84f6095aabf8fa1df0a2b1589572f210721627f
+  data.tar.gz: b3b2f02377d312540fcd8ae1beb13b642b437785621658dd2b46d2bdcfcba8eef63acf1c94938f05079b19a066d27f0c72fcad0d787fe2a6d585cde80d38bdd5

data/lib/cfn-model/parser/transform_registry.rb

@@ -16,7 +16,7 @@ class CfnModel
 
     def perform_transforms(cfn_hash)
       transform_name = cfn_hash['Transform']
-      return unless transform_name
+      return unless transform_name && @registry[transform_name]
       @registry[transform_name].instance.perform_transform cfn_hash
     end
 

data/lib/cfn-model/transforms/serverless.rb

@@ -29,22 +29,28 @@ class CfnModel
         uri.split('/')[3..-1].join('/')
       end
 
+      # Is a URL a S3 URL
+      def is_s3_uri?(uri)
+        uri[0..4].eql? 's3://'
+      end
+
       # rubocop:disable Metrics/AbcSize
       # rubocop:disable Metrics/MethodLength
 
       def replace_serverless_function(cfn_hash, resource_name)
         resource = cfn_hash['Resources'][resource_name]
+        code_uri = resource['Properties']['CodeUri']
 
-        code_bucket = bucket_from_uri resource['Properties']['CodeUri']
-        code_key = object_key_from_uri resource['Properties']['CodeUri']
-
+        lambda_fn_params = {
+          handler: resource['Properties']['Handler'],
+          runtime: resource['Properties']['Runtime']
+        }
+        if is_s3_uri? code_uri
+          lambda_fn_params[:code_bucket] = bucket_from_uri code_uri
+          lambda_fn_params[:code_key] = object_key_from_uri code_uri
+        end
         cfn_hash['Resources'][resource_name] = \
-          lambda_function(
-            handler: resource['Properties']['Handler'],
-            code_bucket: code_bucket,
-            code_key: code_key,
-            runtime: resource['Properties']['Runtime']
-          )
+          lambda_function lambda_fn_params
 
         cfn_hash['Resources']['FunctionNameRole'] = function_name_role
       end
@@ -76,15 +82,24 @@ class CfnModel
 
       # Return the hash structure of a AWS::Lambda::Function as created
       # by Serverless transform
-      def lambda_function(handler:, code_bucket:, code_key:, runtime:)
+      def lambda_function(handler:,
+                          code_bucket: nil,
+                          code_key: nil,
+                          runtime:)
+        fn_resource = \
         { 'Type' => 'AWS::Lambda::Function',
           'Properties' => {
             'Handler' => handler,
-            'Code' => { 'S3Bucket' => code_bucket,
-                        'S3Key' => code_key },
             'Role' => { 'Fn::GetAtt' => %w[FunctionNameRole Arn] },
             'Runtime' => runtime
           } }
+        if code_bucket && code_key
+          fn_resource['Properties']['Code'] = {
+            'S3Bucket' => code_bucket,
+            'S3Key' => code_key
+          }
+        end
+        fn_resource
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cfn-model
 version: !ruby/object:Gem::Version
-  version: 0.1.24
+  version: 0.1.25
 platform: ruby
 authors:
 - Eric Kascic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-25 00:00:00.000000000 Z
+date: 2018-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop