cfndsl 0.11.11 → 0.11.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9fe2866f496f8f44ae197c5aa7dbb83e4267417
-  data.tar.gz: a6d2080549ddc35aa792c836c3aa02e57031e0e5
+  metadata.gz: 39c0a723b14a76e495e1e0aa7e7af38c9a34aee9
+  data.tar.gz: 32b0b32b2ad45d53168e0606b8e51f278549323e
 SHA512:
-  metadata.gz: df5d2810d3f9eb7d346f84555084d8407709933f5459a6af0526842d8a9a842c8a85f4212b23a5dac64369319e8230cb742a3952bef7513ef3ab2830e07e9f4c
-  data.tar.gz: e303078ccaa30e4f268f6ecc23b22d4d3709102741b30e1394e737b2f6ff1188f1efbd2c36be0c7704cd188c932360a626716b063679810fcde053cd532f4c76
+  metadata.gz: d471b2921db35d11f539c749bf48e7a1c5321a3fe8ad3ed2ed7f3e1ef17c170db46054f2b2a37e6470b6d7489b2a7f3cf6c06dc796faf26d47e54ba6d8406f73
+  data.tar.gz: bbb8988b364b7029280d9091e7d9aa653e29f8fe9bcd32a3a885aeb3c074bbb6afb567d0dd946f30314be5ae7cc1c6a2dc3322460483cc3f36947f6368961068

data/lib/cfndsl/aws/types.yaml

@@ -1108,6 +1108,9 @@ Resources:
       EventSourceArn: String
       FunctionName: String
       StartingPosition: String
+  "AWS::EC2::SpotFleet" :
+    Properties:
+      SpotFleetRequestConfigData: SpotFleetRequestConfigData
 
 Types:
  String:  String
@@ -1115,6 +1118,36 @@ Types:
  JSON:    JSON
  Integer: Integer
  Number:  Number
+ Placement:
+  AvailabilityZone: String
+  GroupName: String
+ LaunchSpecifications:
+  BlockDeviceMappings: [ BlockDeviceMapping ]
+  EbsOptimized: Boolean
+  IamInstanceProfile: String
+  ImageId: String
+  InstanceType: String
+  KernelId: String
+  KeyName: String
+  Monitoring: Boolean
+  NetworkInterfaces: [ NetworkInterfaceType ]
+  Placement: Placement
+  RamdiskId: String
+  SecurityGroups: [ String ]
+  SpotPrice: String
+  SubnetId: String
+  UserData: String
+  WeightedCapacity: Number
+ SpotFleetRequestConfigData:
+  AllocationStrategy: String
+  ExcessCapacityTerminationPolicy: String
+  IamFleetRole: String
+  LaunchSpecifications: LaunchSpecifications
+  SpotPrice: String
+  TargetCapacity: Integer
+  TerminateInstancesWithExpiration: Boolean
+  ValidFrom: String
+  ValidUntil: String
  BlockDeviceMapping:
   DeviceName: String
   VirtualName: String
@@ -1298,6 +1331,8 @@ Types:
   Description: String
   DeviceIndex: String
   GroupSet: [ String ]
+  Ipv6AddressCount: Integer
+  Ipv6Addresses: [ String ]
   NetworkInterfaceId: String
   PrivateIpAddress: String
   PrivateIpAddresses: [ PrivateIpAddressSpecification ]

data/lib/cfndsl/generate_types.rb

@@ -12,7 +12,7 @@ module CfnDsl
 
     # rubocop:disable Metrics/MethodLength, Metrics/AbcSize, Metrics/PerceivedComplexity, Metrics/CyclomaticComplexity
     def generate_types(filename)
-      types = YAML.load(File.open(filename))
+      types = YAML.safe_load(File.open(filename))
       const_set('Types_Internal', types)
 
       validate_types(types)

data/lib/cfndsl/jsonable.rb

@@ -36,6 +36,11 @@ module CfnDsl
       Fn.new('Join', [string, array])
     end
 
+    # Equivalent to the CloudFormation template built in function Fn::Split
+    def FnSplit(string, array)
+      Fn.new('Split', [string, array])
+    end
+
     # Equivalent to the CloudFormation template built in function Fn::And
     def FnAnd(array)
       if !array || array.count < 2 || array.count > 10

data/lib/cfndsl/types.rb

@@ -5,11 +5,12 @@ require 'cfndsl/names'
 require 'cfndsl/types'
 
 module CfnDsl
+  # Types helper
   # rubocop:disable Metrics/ModuleLength
   module Types
     # rubocop:disable Metrics/MethodLength, Metrics/AbcSize, Metrics/PerceivedComplexity, Metrics/CyclomaticComplexity
     def self.included(type_def)
-      types_list = YAML.load(File.open("#{File.dirname(__FILE__)}/#{type_def::TYPE_PREFIX}/types.yaml"))
+      types_list = YAML.safe_load(File.open("#{File.dirname(__FILE__)}/#{type_def::TYPE_PREFIX}/types.yaml"))
       type_def.const_set('Types_Internal', types_list)
 
       # Do a little sanity checking - all of the types referenced in Resources

data/lib/cfndsl/version.rb

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

data/spec/cfndsl_spec.rb

@@ -132,6 +132,11 @@ describe CfnDsl::CloudFormationTemplate do
       expect(func.to_json).to eq('{"Fn::Join":["A",["B","C"]]}')
     end
 
+    it 'FnSplit' do
+      func = subject.FnSplit('|', 'a|b|c')
+      expect(func.to_json).to eq('{"Fn::Split":["|","a|b|c"]}')
+    end
+
     it 'Ref' do
       ref = subject.Ref 'X'
       expect(ref.to_json).to eq('{"Ref":"X"}')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cfndsl
 version: !ruby/object:Gem::Version
-  version: 0.11.11
+  version: 0.11.12
 platform: ruby
 authors:
 - Steven Jack
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-04 00:00:00.000000000 Z
+date: 2017-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler