cfndsl 0.11.3 → 0.11.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDEyMTg0ZmVkZjIxYjk2MjAxOGM0MDZiM2E2MDhlMTViYWYyOTMxZg==
+    N2UzMWFmNmYxM2E2MTQ4M2U1NmM2MDk3NGFkNzUwMzI5ZjJmZmI4ZQ==
   data.tar.gz: !binary |-
-    ZTY2MjdlMjY4N2VjMjMyNmYwNTk3NDM2ZjljY2MwN2MzMTliZjQ3MA==
+    YmYyNzZlM2RkNzRmNzE2YmYwOGI2OWVlMTM4MGZhYzE2Yjk4ODFlYw==
 SHA512:
   metadata.gz: !binary |-
-    OWZiZDEzZGUyNWQ3MzdmZGIyZWUwODc5MmM1OTdhNjJiNjI4YWE4YTgwNTE0
-    OTIyY2EwYjllNjgyMDJmMWY1ZWY2NmI5NmNlMThlNGZhMjlhYzQxYzUxM2I4
-    YmUwZjczZjBkYzNhZTYyYWU1ZmVjMzY2MDVhOTJiN2ZkNzE0ODU=
+    MzY3ZjVjZDU4NGQ3ZTNlMTdmNmM1N2RkYmMzZjIwZmYxZGRkZjM3NTIwNGEx
+    OGFkMTJmZTViZWQ5MTEzNGU3MjAxYzQyYjNmZDVlN2JkNmVhMGM2YTBjOTEy
+    MTI0M2U1MDRhZDVjMjc3ZDVkN2FmMGFmZTA1ZjhiMWJjNGNkMDE=
   data.tar.gz: !binary |-
-    MTI5Mjk2OTJmMDRiZGVjY2E3YmFiNmEzNDFkZDUxNzhiNjBiZTFlNTllZDhl
-    NmZiN2Q1MjI1NTVhNWMxNDkwMzNlNDBjZTgxNWUzNDYxYjJiOTRkNDgwZjIy
-    ZDNkOTZkYTFmOTE2N2MxNzJkZjFlOGMwMjIxNTkyMTJiNzA2YjI=
+    YTVhZTA1NTIxODg2ZmM5NjJlNzZhZWViNTg2NjAwZWJmMDFlNzlhOTYzMzM1
+    NGU0NzdlNDBlMDMwZDllODRmMDlmOTZiZTU0MmZiZTdkZjhkY2ZkMjk0MjFm
+    ZjBhNzFjY2RjYTQwN2FmOTYyNmU0ZDFjMmUxMThhMzFjZjdlOWU=

data/README.md

@@ -324,7 +324,7 @@ end
 
 ### Resource Types
 
-When using the generic `Resource` method, rather than the dsl methods, specify the type of resource using `Type` amd the properties using `Property`. See [Template Resources](#template-resources) for an example.
+When using the generic `Resource` method, rather than the dsl methods, specify the type of resource using `Type` and the properties using `Property`. See [Template Resources](#template-resources) for an example.
 
 ### Resource Conditions
 

data/bin/cfndsl

@@ -33,6 +33,11 @@ optparse = OptionParser.new do |opts|
     options[:pretty] = true
   end
 
+  opts.on('-f', '--format FORMAT', 'Specify the output format (JSON default)') do |format|
+    raise "Format #{format} not supported" unless format == 'json' || format == 'yaml'
+    options[:outformat] = format
+  end
+
   opts.on('-D', '--define "VARIABLE=VALUE"', 'Directly set local VARIABLE as VALUE') do |file|
     options[:extras].push([:raw, file])
   end
@@ -83,4 +88,9 @@ elsif verbose
   verbose.puts('Writing to STDOUT')
 end
 
-output.puts options[:pretty] ? JSON.pretty_generate(model) : model.to_json
+if options[:outformat] == 'yaml'
+  data = model.to_json
+  output.puts JSON.parse(data).to_yaml
+else
+  output.puts options[:pretty] ? JSON.pretty_generate(model) : model.to_json
+end

data/lib/cfndsl/aws/types.yaml

@@ -1015,7 +1015,8 @@ Resources:
       Name: String
       XssMatchTuples: [ XssMatchTuple ]
   "AWS::ECS::Cluster" :
-   Properties: {}
+   Properties:
+    ClusterName: String
   "AWS::ECS::Service" :
    Properties:
     Cluster: String

data/lib/cfndsl/jsonable.rb

@@ -76,6 +76,11 @@ module CfnDsl
       Fn.new('Select', [index, array])
     end
 
+    # Equivalent to the CloudFormation template built in function Fn::ImportValue
+    def FnImportValue(value)
+      Fn.new('ImportValue', value)
+    end
+
     # Usage
     #  FnFormat('This is a %0. It is 100%% %1', 'test', 'effective')
     # or

data/lib/cfndsl/outputs.rb

@@ -5,6 +5,10 @@ module CfnDsl
   class OutputDefinition < JSONable
     dsl_attr_setter :Value, :Description, :Condition
 
+    def Export(value)
+      @Export = { 'Name' => value } if value
+    end
+
     def initialize(value = nil)
       @Value = value if value
     end

data/lib/cfndsl/version.rb

@@ -1,3 +1,3 @@
 module CfnDsl
-  VERSION = '0.11.3'.freeze
+  VERSION = '0.11.4'.freeze
 end

data/sample/export.rb

@@ -0,0 +1,24 @@
+CloudFormation do
+  EC2_SecurityGroup(:webSecurityGroup) do
+    GroupDescription 'Allow incoming HTTP traffic from anywhere'
+    SecurityGroupIngress [
+      {
+        'CidrIp'     => '0.0.0.0/0',
+        'IpProtocol' => 'tcp',
+        'FromPort'   => 80,
+        'ToPort'     => 80
+      }
+    ]
+  end
+
+  EC2_Instance(:webInstance) do
+    ImageId      'ami-59e8964e'
+    InstanceType 'm3.large'
+    SecurityGroups [Ref(:webSecurityGroup)]
+  end
+
+  Output(:securityGroupId) do
+    Value FnGetAtt(:webSecurityGroup, :GroupId)
+    Export :webSecurityGroupId
+  end
+end

data/sample/import.rb

@@ -0,0 +1,19 @@
+CloudFormation do
+  EC2_SecurityGroup(:databaseSecurityGroup) do
+    GroupDescription 'Allow access from only web instances'
+    SecurityGroupIngress [
+      {
+        'SourceSecurityGroupId' => FnImportValue(:webSecurityGroupId),
+        'IpProtocol' => 'tcp',
+        'FromPort'   => 7777,
+        'ToPort'     => 7777
+      }
+    ]
+  end
+
+  EC2_Instance(:databaseInstance) do
+    ImageId        'ami-59e8964e'
+    InstanceType   'm3.large'
+    SecurityGroups [Ref(:databaseSecurityGroup)]
+  end
+end

data/spec/cfndsl_spec.rb

@@ -154,6 +154,13 @@ describe CfnDsl::CloudFormationTemplate do
       expect(func.to_json).to eq('{"Fn::GetAZs":"reg"}')
     end
 
+    context 'FnImportValue' do
+      it 'formats correctly' do
+        func = subject.FnImportValue 'ExternalResource'
+        expect(func.to_json).to eq('{"Fn::ImportValue":"ExternalResource"}')
+      end
+    end
+
     context 'FnNot', 'Array' do
       it 'FnNot' do
         func = subject.FnNot(['foo'])

data/spec/cli_spec.rb

@@ -9,6 +9,7 @@ describe 'cfndsl', type: :aruba do
           -r, --ruby FILE                  Evaluate ruby file before template
           -j, --json FILE                  Import json file as local variables
           -p, --pretty                     Pretty-format output JSON
+          -f, --format FORMAT              Specify the output format (JSON default)
           -D, --define "VARIABLE=VALUE"    Directly set local VARIABLE as VALUE
           -v, --verbose                    Turn on verbose ouptut
           -b, --disable-binding            Disable binding configuration

data/spec/output_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe CfnDsl::OutputDefinition do
+  let(:template) { CfnDsl::OrchestrationTemplate.new }
+
+  context '#Export' do
+    it 'formats correctly' do
+      output = template.Output(:testOutput) do
+        Value 'stuff'
+        Export 'publishedValue'
+      end
+      expect(output.to_json).to eq('{"Value":"stuff","Export":{"Name":"publishedValue"}}')
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cfndsl
 version: !ruby/object:Gem::Version
-  version: 0.11.3
+  version: 0.11.4
 platform: ruby
 authors:
 - Steven Jack
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-20 00:00:00.000000000 Z
+date: 2016-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -78,7 +78,9 @@ files:
 - sample/codedeploy.rb
 - sample/config_service.rb
 - sample/ecs.rb
+- sample/export.rb
 - sample/iam_policies.rb
+- sample/import.rb
 - sample/lambda.rb
 - sample/s3.rb
 - sample/t1.rb
@@ -95,6 +97,7 @@ files:
 - spec/jsonable_spec.rb
 - spec/metadata_spec.rb
 - spec/names_spec.rb
+- spec/output_spec.rb
 - spec/plurals_spec.rb
 - spec/resources_spec.rb
 - spec/spec_helper.rb
@@ -135,6 +138,7 @@ test_files:
 - spec/jsonable_spec.rb
 - spec/metadata_spec.rb
 - spec/names_spec.rb
+- spec/output_spec.rb
 - spec/plurals_spec.rb
 - spec/resources_spec.rb
 - spec/spec_helper.rb