cfndsl 0.11.0 → 0.11.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    N2U4ZWRiYzQ2MTQ2OTAzMGFlNzM0YmY3N2Q2YWVmNDEzNDk3M2JiOQ==
+    N2M3MmIxMWQyMTcxZjhhODJhYmYzZWM1OTdjZGM0ZmM3MGRlNzMyMQ==
   data.tar.gz: !binary |-
-    MzczODNhYWYzOWZkNjMyZTYyZDQyNTExMmE4OGY3NDk3YTk1ZDVhOA==
+    MDU1ODE0NTk4OWM2NjIzZWZjMGQ4NDczN2NkOWZhMDUzMjkxNWZkYQ==
 SHA512:
   metadata.gz: !binary |-
-    ODc4ODAyNjQ2NDYzMTBjMWIzYjk5NTMzYWJjMWRlZTI2MjcxN2UzMzNmZTVh
-    NmE5ZjY3MzI2NmUxMGZhZjE0ZTZhOTM4NDZjZmM1NGI5ZTFiMjdkY2E4MWVm
-    ZDU0MWE3MzhkZjU2ZWZjMTA2MWM1ZTM4NjM4NGIxN2EwMTNkNmU=
+    MzEwMGE0Y2RmZmMyNzhkNjM2MjVkMGQ3MjkxNDcyMDQyZmNlMThhZjIyYjkz
+    MzBlZWVjYzllMTRjNDNkYmIzOWU5OTViNjI2ZjI5NWI4M2FhYTg0ZGM1MWEz
+    MTAyY2ViYjI4MDMyZDYzMzdkZWZkZDRkZTgxYmJlMjBhN2RkNmY=
   data.tar.gz: !binary |-
-    MDI2OThlM2M4NDQ3Njg4NmQ0ZjY2ODZlYjgxMTUzYzA3MGNmZjgzNWE4YjNk
-    MjczOTQwOGI4MjBjYTUyN2IyYTIyNDhlZGE0NTVmNDViNjRmZDA1NjhhY2Ix
-    ZTUyMzM5MjdmYzg1NWRlOTZjNTdkMmVjNWYyMTBhODk1MWM4MjE=
+    MDc3MTRiOWZkNzk0MDFiYzQ5YmU0YjBjNmVjYzYwZGRjNTIxZDUxOWY0ZTUx
+    NzA1NjNlN2ZmMjgzY2JjYjY0NGEwN2VmMGExZmUwYjNhNmE1OWVmNzJiZjU1
+    MWFjOGU4N2E2NTg5Y2FmOWM3YWJiNjk1YTZmZmEzOGExZDBmMDI=

data/.gitignore

@@ -2,3 +2,4 @@
 *~
 Gemfile.lock
 tmp/
+coverage/

data/Gemfile

@@ -13,4 +13,5 @@ group :test do
   gem 'aruba'
   gem 'rake'
   gem 'rspec'
+  gem 'simplecov'
 end

data/Rakefile

@@ -7,6 +7,12 @@ require 'yamllint/rake_task'
 RSpec::Core::RakeTask.new
 RuboCop::RakeTask.new
 
+desc 'Run RSpec with SimpleCov'
+task :cov do
+  ENV['CFNDSL_COV'] = 'true'
+  Rake::Task[:spec].execute
+end
+
 YamlLint::RakeTask.new do |t|
   t.paths = %w(
     lib/cfndsl/aws/types.yaml

data/lib/cfndsl/aws/types.yaml

@@ -249,7 +249,7 @@ Resources:
     Properties :
       BgpAsn : Number
       IpAddress : String
-      Tags :  [ EC2Tag ]
+      Tags :  [ ResourceTag ]
       Type : String
   "AWS::EC2::EIP" :
     Properties:
@@ -297,7 +297,7 @@ Resources:
     SourceDestCheck: Boolean
     SsmAssociations: [ SsmAssociation ]
     SubnetId: String
-    Tags: [ EC2Tag ]
+    Tags: [ ResourceTag ]
     Tenancy: String
     UserData: String
     Volumes: [ EC2MountPoint ]
@@ -309,10 +309,10 @@ Resources:
     PublicIp: String
   "AWS::EC2::InternetGateway" :
    Properties:
-    Tags: [ EC2Tag ]
+    Tags: [ ResourceTag ]
   "AWS::EC2::NetworkAclEntry" :
     Properties:
-     Tags: [ EC2Tag ]
+     Tags: [ ResourceTag ]
      CidrBlock: String
      Egress: Boolean
      Icmp: EC2Icmp
@@ -323,7 +323,7 @@ Resources:
      Protocol: Integer
   "AWS::EC2::NetworkInterface" :
     Properties:
-     Tags: [ EC2Tag ]
+     Tags: [ ResourceTag ]
      GroupSet: [ String ]
      SubnetId: String
      PrivateIpAddress: String
@@ -341,14 +341,14 @@ Resources:
   "AWS::EC2::RouteTable" :
    Properties:
     VpcId: String
-    Tags: [ EC2Tag ]
+    Tags: [ ResourceTag ]
   "AWS::EC2::SecurityGroup" :
     Properties:
      GroupDescription: String
      SecurityGroupIngress: [ EC2SecurityGroupRule ]
      SecurityGroupEgress: [ EC2SecurityGroupRule ]
      VpcId: String
-     Tags : [ EC2Tag ]
+     Tags : [ ResourceTag ]
   "AWS::EC2::SecurityGroupEgress" :
    Properties:
     GroupId: String
@@ -373,7 +373,7 @@ Resources:
     AvailabilityZone: String
     VpcId: String
     CidrBlock: String
-    Tags: [ EC2Tag ]
+    Tags: [ ResourceTag ]
     MapPublicIpOnLaunch: Boolean
   "AWS::EC2::SubnetRouteTableAssociation" :
    Properties:
@@ -388,7 +388,7 @@ Resources:
     AvailabilityZone: String
     Size: String
     SnapshotId: String
-    Tags: [ EC2Tag ]
+    Tags: [ ResourceTag ]
     Encrypted: Boolean
     Iops: Number
     VolumeType: String
@@ -401,7 +401,7 @@ Resources:
    Properties:
     CidrBlock: String
     InstanceTenancy: String
-    Tags: [ EC2Tag ]
+    Tags: [ ResourceTag ]
     EnableDnsSupport: Boolean
     EnableDnsHostnames: Boolean
   "AWS::EC2::DHCPOptions" :
@@ -411,7 +411,7 @@ Resources:
     NetbiosNameServers : [ String ]
     NetbiosNodeType : Number
     NtpServers : [ String ]
-    Tags : [ EC2Tag ]
+    Tags : [ ResourceTag ]
   "AWS::EC2::VPCDHCPOptionsAssociation" :
    Properties:
     DhcpOptionsId: String
@@ -425,7 +425,7 @@ Resources:
   "AWS::EC2::NetworkAcl" :
    Properties:
     VpcId: String
-    Tags : [ EC2Tag ]
+    Tags : [ ResourceTag ]
   "AWS::EC2::VPCGatewayAttachment" :
    Properties:
     InternetGatewayId: String
@@ -434,25 +434,25 @@ Resources:
   "AWS::EC2::VPCPeeringConnection" :
    Properties:
     PeerVpcId : String
-    Tags : [ EC2Tag ]
+    Tags : [ ResourceTag ]
     VpcId : String
   "AWS::EC2::VPNGateway" :
    Properties:
     Type : String
-    Tags : [ EC2Tag ]
+    Tags : [ ResourceTag ]
   "AWS::EC2::VPNGatewayConnection" :
    Properties:
     Type : String
     CustomerGatewayId : String
     StaticRoutesOnly : Boolean
-    Tags : [ EC2Tag ]
+    Tags : [ ResourceTag ]
     VpnGatewayId : String
   "AWS::EC2::VPNConnection" :
    Properties:
     Type : String
     CustomerGatewayId : String
     StaticRoutesOnly : Boolean
-    Tags : [ EC2Tag ]
+    Tags : [ ResourceTag ]
     VpnGatewayId : String
   "AWS::EC2::VPNConnectionRoute" :
    Properties:
@@ -487,7 +487,7 @@ Resources:
     SnapshotName : String
     SnapshotRetentionLimit : Integer
     SnapshotWindow : String
-    Tags: [ EC2Tag ]
+    Tags: [ ResourceTag ]
     VpcSecurityGroupIds : [String]
   "AWS::ElastiCache::ReplicationGroup" :
    Properties:
@@ -558,7 +558,7 @@ Resources:
     ConnectionSettings: ConnectionSettings
     LoadBalancerName: String
     Policies: [ ElasticLoadBalancingPolicy ]
-    Tags: [ EC2Tag ]
+    Tags: [ ResourceTag ]
    Attributes:
     CanonicalHostedZoneName: String
     CanonicalGostedZoneNameID: String
@@ -572,7 +572,7 @@ Resources:
      Scheme: String
      SecurityGroups: [ String ]
      Subnets: [ String ]
-     Tags: [ EC2Tag ]
+     Tags: [ ResourceTag ]
   "AWS::ElasticLoadBalancingV2::Listener" :
     Properties:
      Certificates: [ LBCertificate ]
@@ -599,7 +599,7 @@ Resources:
      Name: String
      Port: String
      Protocol: String
-     Tags: [ EC2Tag ]
+     Tags: [ ResourceTag ]
      TargetGroupAttributes: [ TargetGroupAttribute ]
      Targets: [ TargetDescription ]
      UnhealthyThresholdCount: Integer
@@ -612,7 +612,7 @@ Resources:
     EBSOptions: EBSOptions
     ElasticsearchClusterConfig: ElasticsearchClusterConfig
     SnapshotOptions: SnapshotOptions
-    Tags: [ EC2Tag ]
+    Tags: [ ResourceTag ]
   "AWS::Events::Rule":
    Properties:
     Description: String
@@ -679,6 +679,13 @@ Resources:
     Policies: [ IAMEmbeddedPolicy ]
    Attributes:
     Arn: String
+  "AWS::Kinesis::Stream" :
+    Properties:
+      Name: String
+      ShardCount: Integer
+      Tags: [ ResourceTag ]
+    Attributes:
+     Arn: String
   "AWS::KMS::Key" :
     Properties:
       Description: String
@@ -772,14 +779,14 @@ Resources:
       PreferredBackupWindow: String
       PreferredMaintenanceWindow: String
       SnapshotIdentifier: String
-      Tags: JSON
+      Tags: [ ResourceTag ]
       VpcSecurityGroupIds: [ String ]
   "AWS::RDS::DBClusterParameterGroup" :
     Properties:
       Description: String
       Family: String
       Parameters: JSON
-      Tags: JSON
+      Tags: [ ResourceTag ]
   "AWS::RDS::DBInstance" :
     Properties:
       AllocatedStorage: String
@@ -812,7 +819,7 @@ Resources:
       SourceDBInstanceIdentifier: String
       StorageEncrypted: Boolean
       StorageType: String
-      Tags: [ EC2Tag ]
+      Tags: [ ResourceTag ]
       VPCSecurityGroups: [ String ]
     Attributes:
       DBInstanceIdentifier: String
@@ -823,14 +830,14 @@ Resources:
       Description: String
       Family: String
       Parameters: JSON
-      Tags: JSON
+      Tags: [ ResourceTag ]
   "AWS::RDS::OptionGroup":
     Properties:
       EngineName: String
       MajorEngineVersion: String
       OptionGroupDescription: String
       OptionConfigurations: JSON
-      Tags: JSON
+      Tags: [ ResourceTag ]
   "AWS::RDS::DBSecurityGroup" :
     Properties:
       EC2VpcId: String
@@ -841,7 +848,7 @@ Resources:
     Properties:
       DBSubnetGroupDescription: String
       SubnetIds: [ String ]
-      Tags: [ EC2Tag ]
+      Tags: [ ResourceTag ]
   "AWS::RDS::EventSubscription" :
     Properties:
       Enabled: Boolean
@@ -936,7 +943,7 @@ Resources:
     NotificationConfiguration: S3NotificationConfiguration
     VersioningConfiguration: JSON
     WebsiteConfiguration: JSON
-    Tags: [ EC2Tag ]
+    Tags: [ ResourceTag ]
    Attributes:
     DomainName: String
     WebsiteUrl: String
@@ -1122,7 +1129,7 @@ Types:
   SourceSecurityGroupOwnerId: String
   FromPort: String
   ToPort: String
- EC2Tag:
+ ResourceTag:
   Key: String
   Value: String
  ApplicationVersion:

data/lib/cfndsl/version.rb

@@ -1,3 +1,3 @@
 module CfnDsl
-  VERSION = '0.11.0'.freeze
+  VERSION = '0.11.1'.freeze
 end

data/spec/spec_helper.rb

@@ -1,6 +1,16 @@
-require 'cfndsl'
 require 'aruba/rspec'
 
+if ENV['CFNDSL_COV']
+  require 'simplecov'
+
+  SimpleCov.start do
+    add_group 'Code', 'lib'
+    add_group 'Test', 'spec'
+  end
+end
+
+require 'cfndsl'
+
 bindir = File.expand_path('../../bin', __FILE__)
 ENV['PATH'] = [ENV['PATH'], bindir].join(':')
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cfndsl
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.1
 platform: ruby
 authors:
 - Steven Jack
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-25 00:00:00.000000000 Z
+date: 2016-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler