cfndsl 0.11.12 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39c0a723b14a76e495e1e0aa7e7af38c9a34aee9
-  data.tar.gz: 32b0b32b2ad45d53168e0606b8e51f278549323e
+  metadata.gz: cb6555a75da928cfe515f8d24185ea742235c16c
+  data.tar.gz: e051814ab4bc1886548b46f8a7871949f53f0bcc
 SHA512:
-  metadata.gz: d471b2921db35d11f539c749bf48e7a1c5321a3fe8ad3ed2ed7f3e1ef17c170db46054f2b2a37e6470b6d7489b2a7f3cf6c06dc796faf26d47e54ba6d8406f73
-  data.tar.gz: bbb8988b364b7029280d9091e7d9aa653e29f8fe9bcd32a3a885aeb3c074bbb6afb567d0dd946f30314be5ae7cc1c6a2dc3322460483cc3f36947f6368961068
+  metadata.gz: fd993ac44ac9990bce1d324c59c375258e77fc631a156785264847dfe55ff6580657dbd1ebf1de4376e0bd98c81be9a1c6085529c59efdaf43164101b0f6fc83
+  data.tar.gz: 6ca5e90c4fa97aac87dbd09ff01ed51d07f66704f7b4fdfe1e470e727d5bb8502e58a074f727e11b0a793fc1cae70182a7b32c446ccf6e51d269c7bef534a152

data/lib/cfndsl/aws/types.yaml

@@ -1,4 +1,22 @@
 Resources:
+  "AWS::Serverless::API":
+    Properties:
+      StageName: String
+      DefinitionUri: String
+      CacheClusterEnabled: Boolean
+      CacheClusterSize: String
+      Variables: JSON
+  "AWS::Serverless::Function":
+    Properties:
+      Handler: String
+      Runtime: String
+      CodeUri: String
+      Description: String
+      MemorySize: Integer
+      Timeout: Integer
+      Policies: [ IAMEmbeddedPolicy ]
+      Environment: JSON
+      Events: JSON
   "AWS::ApiGateway::Account" :
     Properties:
      CloudWatchRoleArn: String

data/lib/cfndsl/orchestration_template.rb

@@ -7,7 +7,7 @@ module CfnDsl
   # Handles the overall template object
   # rubocop:disable Metrics/ClassLength
   class OrchestrationTemplate < JSONable
-    dsl_attr_setter :AWSTemplateFormatVersion, :Description, :Metadata
+    dsl_attr_setter :AWSTemplateFormatVersion, :Description, :Metadata, :Transform
     dsl_content_object :Condition, :Parameter, :Output, :Resource, :Mapping
 
     GlobalRefs = {

data/lib/cfndsl/version.rb

@@ -1,3 +1,3 @@
 module CfnDsl
-  VERSION = '0.11.12'.freeze
+  VERSION = '0.12.0'.freeze
 end

data/spec/aws/serverless_spec.rb

@@ -0,0 +1,46 @@
+require 'spec_helper'
+
+def read_json_fixture(filename)
+  spec_dir = File.dirname(__dir__)
+  filename = File.join(spec_dir, 'fixtures', filename)
+  JSON.parse(File.read(filename))
+end
+
+describe CfnDsl::CloudFormationTemplate do
+  subject(:template) { described_class.new }
+
+  it 'Serverless_Function' do
+    template.Serverless_Function(:Test) do
+      Handler 'fn.handler'
+      Runtime 'python2.7'
+      CodeUri 's3://my-code-bucket/my-function.zip'
+      Description 'Creates thumbnails of uploaded images'
+      MemorySize 1024
+      Timeout 15
+      Policies 'AmazonS3FullAccess'
+      Environment(
+        Variables: { TABLE_NAME: 'my-table' }
+      )
+      Events(
+        PhotoUpload: {
+          Type: 'S3',
+          Properties: { Bucket: 'my-photo-bucket' }
+        }
+      )
+    end
+    # File.open('/tmp/dump', 'w') { |f| f.write(template.to_json) }
+    expect(JSON.parse(template.to_json)).to eq(read_json_fixture('serverless-function.json'))
+  end
+
+  it 'Serverless_Api' do
+    template.Serverless_API(:Test) do
+      StageName 'prod'
+      DefinitionUri 'swagger.yml'
+      CacheClusterEnabled false
+      CacheClusterSize '512M'
+      Variables(Var1: 'value1')
+    end
+    File.open('/tmp/dump', 'w') { |f| f.write(template.to_json) }
+    expect(JSON.parse(template.to_json)).to eq(read_json_fixture('serverless-api.json'))
+  end
+end

data/spec/fixtures/serverless-api.json

@@ -0,0 +1 @@
+{"AWSTemplateFormatVersion":"2010-09-09","Resources":{"Test":{"Properties":{"StageName":"prod","DefinitionUri":"swagger.yml","CacheClusterEnabled":false,"CacheClusterSize":"512M","Variables":{"Var1":"value1"}},"Type":"AWS::Serverless::API"}}}

data/spec/fixtures/serverless-function.json

@@ -0,0 +1 @@
+{"AWSTemplateFormatVersion":"2010-09-09","Resources":{"Test":{"Properties":{"Handler":"fn.handler","Runtime":"python2.7","CodeUri":"s3://my-code-bucket/my-function.zip","Description":"Creates thumbnails of uploaded images","MemorySize":1024,"Timeout":15,"Policies":"AmazonS3FullAccess","Environment":{"Variables":{"TABLE_NAME":"my-table"}},"Events":{"PhotoUpload":{"Type":"S3","Properties":{"Bucket":"my-photo-bucket"}}}},"Type":"AWS::Serverless::Function"}}}

data/spec/transform_spec.rb

@@ -0,0 +1,10 @@
+require 'spec_helper'
+
+describe 'Transform' do
+  let(:template) { CfnDsl::OrchestrationTemplate.new }
+
+  it 'is settable for a template' do
+    template.Transform('AWS::Serverless-2016-10-31')
+    expect(template.to_json).to match(/"Transform":"AWS::Serverless-2016-10-31"/)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cfndsl
 version: !ruby/object:Gem::Version
-  version: 0.11.12
+  version: 0.12.0
 platform: ruby
 authors:
 - Steven Jack
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-20 00:00:00.000000000 Z
+date: 2017-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -91,11 +91,14 @@ files:
 - spec/aws/kms_alias_spec.rb
 - spec/aws/logs_log_group_spec.rb
 - spec/aws/rds_db_instance_spec.rb
+- spec/aws/serverless_spec.rb
 - spec/cfndsl_spec.rb
 - spec/cli_spec.rb
 - spec/cloud_formation_template_spec.rb
 - spec/external_parameters_spec.rb
 - spec/fixtures/heattest.rb
+- spec/fixtures/serverless-api.json
+- spec/fixtures/serverless-function.json
 - spec/fixtures/test.rb
 - spec/heat_template_spec.rb
 - spec/jsonable_spec.rb
@@ -106,6 +109,7 @@ files:
 - spec/resources_spec.rb
 - spec/spec_helper.rb
 - spec/support/shared_examples/orchestration_template.rb
+- spec/transform_spec.rb
 homepage: https://github.com/stevenjack/cfndsl
 licenses:
 - MIT
@@ -136,11 +140,14 @@ test_files:
 - spec/aws/kms_alias_spec.rb
 - spec/aws/logs_log_group_spec.rb
 - spec/aws/rds_db_instance_spec.rb
+- spec/aws/serverless_spec.rb
 - spec/cfndsl_spec.rb
 - spec/cli_spec.rb
 - spec/cloud_formation_template_spec.rb
 - spec/external_parameters_spec.rb
 - spec/fixtures/heattest.rb
+- spec/fixtures/serverless-api.json
+- spec/fixtures/serverless-function.json
 - spec/fixtures/test.rb
 - spec/heat_template_spec.rb
 - spec/jsonable_spec.rb
@@ -151,3 +158,4 @@ test_files:
 - spec/resources_spec.rb
 - spec/spec_helper.rb
 - spec/support/shared_examples/orchestration_template.rb
+- spec/transform_spec.rb