cfn-model 0.1.32 → 0.1.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82a2ad87afed68b9eee1deb1084a18812a2433cb8dbfbb041c805b84ea9e3d55
-  data.tar.gz: 89aa11931767791f101933cf9c19e0c7cd91830695c9129852b20f6a709793ee
+  metadata.gz: a9079fef39b645007961bf5837699e02f76b86a587c79f74faf390165a8dcf56
+  data.tar.gz: 6b3563c7239a31ad68ddd705649d8ca38b6db1adc061632de39faea256bc77b6
 SHA512:
-  metadata.gz: 17d77fa70360798f4a62abf45d22b9615d5ef9c948ccfcff3240c43898127075f669d18294db41e85219039f0710390e1aec24a151a251eddc0c385598a5d39e
-  data.tar.gz: d2aa19b4049b8fa73b4b6dd2c9ae786e693e8394e6daa23d0b5255283e8997de205854093575cd816ab9225e9d11424ce8faf693c4eaed38674422410b5284ff
+  metadata.gz: 0e38f76f6f5b2d6bddad02c994b492ab7a98211e5049dc62840540acd4435af501fbedb08978d558d76fbfc03757cd3e2253eabd3cbcbbfc41fc4d2b3a6bf270
+  data.tar.gz: 434fc11caf6c25f449ad4dcf6bd2c6b63c9ad9bb86ffe1a1a01bdea53a2e3df98763695d98d632940441d755512592a88be634e4fb23645f3c69bdb7baa59a08

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

@@ -29,35 +29,75 @@ class CfnModel
         uri.split('/')[3..-1].join('/')
       end
 
-      # Is a URL a S3 URL
-      def is_s3_uri?(uri)
-        uri[0..4].eql? 's3://'
+      def s3_uri?(uri)
+        if uri.is_a? String
+          uri[0..4].eql? 's3://'
+        else
+          false
+        end
       end
 
-      # rubocop:disable Metrics/AbcSize
-      # rubocop:disable Metrics/MethodLength
+      def resolve_globals_function_property(cfn_hash, property_name)
+        cfn_hash['Globals']['Function'][property_name]
+      end
 
-      def replace_serverless_function(cfn_hash, resource_name)
-        resource = cfn_hash['Resources'][resource_name]
-        code_uri = resource['Properties']['CodeUri']
+      def serverless_function_property(serverless_function, cfn_hash, property_name)
+        serverless_function['Properties'][property_name] || \
+          resolve_globals_function_property(cfn_hash, property_name)
+      end
 
-        lambda_fn_params = {
-          handler: resource['Properties']['Handler'],
-          runtime: resource['Properties']['Runtime']
-        }
-        if is_s3_uri? code_uri
+      # i question whether we need to carry out the transform this far given cfn_nag
+      # likely won't ever opine on bucket names or object keys
+      def transform_code_uri(lambda_fn_params, code_uri)
+        puts code_uri
+        if 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
+        elsif code_uri.is_a? Hash
+          lambda_fn_params[:code_bucket] = code_uri['Bucket']
+          lambda_fn_params[:code_key] = code_uri['Key']
         end
-        cfn_hash['Resources'][resource_name] = \
-          lambda_function lambda_fn_params
+        lambda_fn_params
+      end
+
+      def serverless_function_properties(cfn_hash, serverless_function)
+        code_uri = serverless_function_property(serverless_function, cfn_hash, 'CodeUri')
+
+        lambda_fn_params = {
+          handler: serverless_function_property(serverless_function, cfn_hash, 'Handler'),
+          runtime: serverless_function_property(serverless_function, cfn_hash, 'Runtime')
+        }
+
+        lambda_fn_params = transform_code_uri(
+          lambda_fn_params,
+          code_uri
+        )
+
+        lambda_fn_params
+      end
+
+      def replace_serverless_function(cfn_hash, resource_name)
+        serverless_function = cfn_hash['Resources'][resource_name]
+
+        lambda_fn_params = serverless_function_properties(cfn_hash, serverless_function)
+
+        cfn_hash['Resources'][resource_name] = lambda_function lambda_fn_params
 
         cfn_hash['Resources']['FunctionNameRole'] = function_name_role
       end
-      # rubocop:enable Metrics/AbcSize
-      # rubocop:enable Metrics/MethodLength
 
-      # rubocop:disable Metrics/MethodLength
+      def lambda_service_can_assume_role
+        {
+          'Version' => '2012-10-17',
+          'Statement' => [
+            {
+              'Action' => ['sts:AssumeRole'],
+              'Effect' => 'Allow',
+              'Principal' => { 'Service' => ['lambda.amazonaws.com'] }
+            }
+          ]
+        }
+      end
 
       # Return the hash structure of the 'FunctionNameRole'
       # AWS::IAM::Role resource as created by Serverless transform
@@ -65,20 +105,23 @@ class CfnModel
         {
           'Type' => 'AWS::IAM::Role',
           'Properties' => {
-            'ManagedPolicyArns' =>
-            ['arn:aws:iam::aws:policy/service-role/' \
-              'AWSLambdaBasicExecutionRole'],
-            'AssumeRolePolicyDocument' => {
-              'Version' => '2012-10-17',
-              'Statement' => [{
-                'Action' => ['sts:AssumeRole'], 'Effect' => 'Allow',
-                'Principal' => { 'Service' => ['lambda.amazonaws.com'] }
-              }]
-            }
+            'ManagedPolicyArns' => [
+              'arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole'
+            ],
+            'AssumeRolePolicyDocument' => lambda_service_can_assume_role
           }
         }
       end
-      # rubocop:enable Metrics/MethodLength
+
+      def lambda_function_code(fn_resource, code_bucket, code_key)
+        if code_bucket && code_key
+          fn_resource['Properties']['Code'] = {
+            'S3Bucket' => code_bucket,
+            'S3Key' => code_key
+          }
+        end
+        fn_resource
+      end
 
       # Return the hash structure of a AWS::Lambda::Function as created
       # by Serverless transform
@@ -86,20 +129,15 @@ class CfnModel
                           code_bucket: nil,
                           code_key: nil,
                           runtime:)
-        fn_resource = \
-        { 'Type' => 'AWS::Lambda::Function',
+        fn_resource = {
+          'Type' => 'AWS::Lambda::Function',
           'Properties' => {
             'Handler' => handler,
             '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
+        }
+        lambda_function_code(fn_resource, code_bucket, code_key)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cfn-model
 version: !ruby/object:Gem::Version
-  version: 0.1.32
+  version: 0.1.33
 platform: ruby
 authors:
 - Eric Kascic