cfn-model 0.1.23 → 0.1.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: edcac88b6f93ad1e0729a170e85518462a57656f
-  data.tar.gz: ac9c68a9634fae326f2d2dae42556d1280a0a20c
+  metadata.gz: 99ae976c5f51a3dd20649127f9cf9f121d14b013
+  data.tar.gz: 47484978c5fe38df5cf003472a83013c27d7cba1
 SHA512:
-  metadata.gz: e14b30d51f4b1038e1d26abb12d1b4694cdce1039fdbba5e8d0f173b7aaea673435722c6371b67da619b6a016629b7f7062b46f36c1b7acd7f9135aca43dc9c8
-  data.tar.gz: fc64546206181cb40fdd697647d2fa2c5643a34209a7666e0a2602bda10b897841634fcf74059995c7636c9e1ebe960a4a7c1a0e8a73fafb53402c0e1c467165
+  metadata.gz: c5015a2a0e92b54cf8a6aeb4d25787e9f71ea4135dd906913f5c72d4169196a0c8a57bef1e78638f053c556ae8b6f2dba471690b0e2d9169d9ee58a3aaf12b9d
+  data.tar.gz: 8f1f04480fd6e462423fa9bf4b5099b282d0348cf3aa358225e9ea10a4cd993240e875c3638d9b567c9ecf69487f1cf7d70a194a870d7673514ef1fe8e54a243

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

@@ -1,5 +1,6 @@
 require 'yaml'
 require 'json'
+require 'cfn-model/parser/transform_registry'
 require 'cfn-model/validator/cloudformation_validator'
 require 'cfn-model/validator/reference_validator'
 require_relative 'parser_registry'
@@ -31,7 +32,15 @@ class CfnParser
   # Given raw json/yml CloudFormation template, returns a CfnModel object
   # or raise ParserErrors if something is amiss with the format
   def parse(cloudformation_yml, parameter_values_json=nil)
-    cfn_hash = pre_validate_model cloudformation_yml
+    pre_validate_model cloudformation_yml
+
+    cfn_hash = YAML.load cloudformation_yml
+
+    # Transform raw resources in template as performed by
+    # transforms
+    CfnModel::TransformRegistry.instance.perform_transforms cfn_hash
+
+    validate_references cfn_hash
 
     cfn_model = CfnModel.new
     cfn_model.raw_model = cfn_hash
@@ -125,14 +134,13 @@ class CfnParser
     if !errors.nil? && !errors.empty?
       raise ParserError.new('Basic CloudFormation syntax error', errors)
     end
+  end
 
-    cfn_hash = YAML.load cloudformation_yml
-
+  def validate_references(cfn_hash)
     unresolved_refs = ReferenceValidator.new.unresolved_references(cfn_hash)
     unless unresolved_refs.empty?
       raise ParserError.new("Unresolved logical resource ids: #{unresolved_refs.to_a}")
     end
-    cfn_hash
   end
 
   def assign_fields_based_upon_properties(resource_object, resource)

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

@@ -1,3 +1,4 @@
+# Parser for EC2 instances
 class Ec2InstanceParser
   def parse(cfn_model:, resource:)
     ec2_instance = resource

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

@@ -0,0 +1,33 @@
+Dir["#{__dir__}/../transforms/*.rb"].each do |transform|
+  require "cfn-model/transforms/#{File.basename(transform, '.rb')}"
+end
+
+class CfnModel
+  # TransformRegistry provides a registry of CloudFormation transforms
+  # available for templates
+  class TransformRegistry
+    attr_reader :registry
+
+    def initialize
+      @registry = {
+        'AWS::Serverless-2016-10-31' => CfnModel::Transforms::Serverless
+      }
+    end
+
+    def perform_transforms(cfn_hash)
+      transform_name = cfn_hash['Transform']
+      return unless transform_name
+      @registry[transform_name].instance.perform_transform cfn_hash
+    end
+
+    def self.instance
+      @instance ||= TransformRegistry.new
+      @instance
+    end
+  end
+end
+
+class CfnModel
+  class Transforms
+  end
+end

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

@@ -0,0 +1,91 @@
+class CfnModel
+  class Transforms
+    # Handle transformation of model elements performed by the
+    # Serverless trasnform, see
+    # https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/transform-aws-serverless.html
+    class Serverless
+      def perform_transform(cfn_hash)
+        resources = cfn_hash['Resources'].clone
+        resources.each do |resource_name, resource|
+          next unless resource['Type'].eql? 'AWS::Serverless::Function'
+          replace_serverless_function cfn_hash, resource_name
+        end
+      end
+
+      def self.instance
+        @instance ||= Serverless.new
+        @instance
+      end
+
+      private
+
+      # Bucket is 3rd element of an S3 URI split on '/'
+      def bucket_from_uri(uri)
+        uri.split('/')[2]
+      end
+
+      # Object key is 4th element to end of an S3 URI split on '/'
+      def object_key_from_uri(uri)
+        uri.split('/')[3..-1].join('/')
+      end
+
+      # rubocop:disable Metrics/AbcSize
+      # rubocop:disable Metrics/MethodLength
+
+      def replace_serverless_function(cfn_hash, resource_name)
+        resource = cfn_hash['Resources'][resource_name]
+
+        code_bucket = bucket_from_uri resource['Properties']['CodeUri']
+        code_key = object_key_from_uri resource['Properties']['CodeUri']
+
+        cfn_hash['Resources'][resource_name] = \
+          lambda_function(
+            handler: resource['Properties']['Handler'],
+            code_bucket: code_bucket,
+            code_key: code_key,
+            runtime: resource['Properties']['Runtime']
+          )
+
+        cfn_hash['Resources']['FunctionNameRole'] = function_name_role
+      end
+      # rubocop:enable Metrics/AbcSize
+      # rubocop:enable Metrics/MethodLength
+
+      # rubocop:disable Metrics/MethodLength
+
+      # Return the hash structure of the 'FunctionNameRole'
+      # AWS::IAM::Role resource as created by Serverless transform
+      def function_name_role
+        {
+          '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'] }
+              }]
+            }
+          }
+        }
+      end
+      # rubocop:enable Metrics/MethodLength
+
+      # Return the hash structure of a AWS::Lambda::Function as created
+      # by Serverless transform
+      def lambda_function(handler:, code_bucket:, code_key:, runtime:)
+        { 'Type' => 'AWS::Lambda::Function',
+          'Properties' => {
+            'Handler' => handler,
+            'Code' => { 'S3Bucket' => code_bucket,
+                        'S3Key' => code_key },
+            'Role' => { 'Fn::GetAtt' => %w[FunctionNameRole Arn] },
+            'Runtime' => runtime
+          } }
+      end
+    end
+  end
+end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: cfn-model
 version: !ruby/object:Gem::Version
-  version: 0.1.23
+  version: 0.1.24
 platform: ruby
 authors:
 - Eric Kascic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-30 00:00:00.000000000 Z
+date: 2018-05-25 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: kwalify
   requirement: !ruby/object:Gem::Requirement
@@ -68,6 +82,7 @@ files:
 - lib/cfn-model/parser/parser_registry.rb
 - lib/cfn-model/parser/policy_document_parser.rb
 - lib/cfn-model/parser/security_group_parser.rb
+- lib/cfn-model/parser/transform_registry.rb
 - lib/cfn-model/parser/with_policy_document_parser.rb
 - lib/cfn-model/schema/AWS_CloudFront_Distribution.yml
 - lib/cfn-model/schema/AWS_EC2_Instance.yml
@@ -89,6 +104,7 @@ files:
 - lib/cfn-model/schema/AWS_SNS_TopicPolicy.yml
 - lib/cfn-model/schema/AWS_SQS_QueuePolicy.yml
 - lib/cfn-model/schema/schema.yml.erb
+- lib/cfn-model/transforms/serverless.rb
 - lib/cfn-model/validator/cloudformation_validator.rb
 - lib/cfn-model/validator/reference_validator.rb
 - lib/cfn-model/validator/resource_type_validator.rb