cfndsl 0.0.12 → 0.0.13

data/lib/cfndsl/Plurals.rb

@@ -7,9 +7,12 @@ module CfnDsl
     @@plurals = { 
       "Metadata" => "Metadata", 
       "Property" => "Properties",
-      "Policy" => "Policies"
+      "Policy" => "Policies",
+      "SecurityGroupIngress" => "SecurityGroupIngress",
+      "SecurityGroupEgress" => "SecurityGroupEgress",
+      "DBSecurityGroupIngress" => "DBSecurityGroupIngress"
     }
-
+    
     @@singles = {}
     @@plurals.each_pair { |key,val| @@singles[val] = key }
 

data/lib/cfndsl/aws_types.yaml

@@ -115,11 +115,25 @@ Resources:
     PublicDnsName: String
     PrivateIp: String
     PublicIp: String
+  "AWS::EC2::InternetGateway" :
+   Properties:
+    Tags: [ EC2Tag ]
+  "AWS::EC2::Route" :
+   Properties:
+    DestinationCidrBlock: String
+    GatewayId: String
+    InstanceId: String
+    NetworkInterfaceId: String
+    RouteTableId: String
+  "AWS::EC2::RouteTable" :
+   Properties:
+    VpcId: String
+    Tags: [ EC2Tag ]
   "AWS::EC2::SecurityGroup" :
     Properties: 
      GroupDescription: String
-     SecurityGroupIngress: EC2SecurityGroupRule
-     SecurityGroupEgress: EC2SecurityGroupRule
+     SecurityGroupIngress: [ EC2SecurityGroupRule ]
+     SecurityGroupEgress: [ EC2SecurityGroupRule ]
      VpcId: String
   "AWS::EC2::SecurityGroupEgress" :
    Properties:
@@ -140,6 +154,16 @@ Resources:
     SourceSecurityGroupOwnerId: String
     FromPort: Number
     ToPort: Number
+  "AWS::EC2::Subnet" :
+   Properties:
+    AvailabilityZone: String
+    VpcId: String
+    CidrBlock: String
+    Tags: [ EC2Tag ]
+  "AWS::EC2::SubnetRouteTableAssociation" :
+   Properties:
+    SubnetId: String
+    RouteTableId: String
   "AWS::EC2::Volume" :
    Properties:
     AvailabilityZone: String
@@ -151,6 +175,16 @@ Resources:
     InstanceId: String
     VolumeId: String
     Device: String
+  "AWS::EC2::VPC" :
+   Properties:
+    CidrBlock: String
+    InstanceTenancy: String
+    Tags: [ EC2Tag ]
+  "AWS::EC2::VPCGatewayAttachment" :
+   Properties:
+    InternetGatewayId: String
+    VpcId: String
+    VpnGatewayId: String
   "AWS::ElastiCache::CacheCluster" :
    Properties:
     AutoMinorVersionUpgrade: Boolean
@@ -257,23 +291,28 @@ Resources:
      PreferredBackupWindow: String
      PreferredMaintenanceWindow: String
      MultiAZ: Boolean
+     Tags: [ EC2Tag ]
+     VPCSecurityGroups: [ String ]
     Attributes:
      DBInstanceIdentifier: String
      Endpoint.Address: String
      Endpoint.Port: String
   "AWS::RDS::DBSecurityGroup" :
    Properties:
-    DBSubnetGroupDescription: String
-    SubnetIds: [ String ]
-  "AWS::RDS::SecurityGroup" :
-   Properties:
-    DBSecurityGroupIngress: RDSSecurityGroupRule
     EC2VpcId: String
+    DBSecurityGroupIngress: [ RDSSecurityGroupRule ]
     GroupDescription: String
-  "AWS::RDS::SecurityGroupIngress" :
+    SubnetIds: [ String ]
+  "AWS::RDS::DBSubnetGroup" :
+   Properties:
+    DBSubnetGroupDescription: String
+    SubnetIds: [ String ]
+  "AWS::RDS::DBSecurityGroupIngress" :
    Properties:
     CIDRIR: String
+    DBSecurityGroupName: String
     EC2SecurityGroupId: String
+    EC2SecurityGroupName: String
     EC2SecurityGroupOwnerId: String
   "AWS::Route53::RecordSet" :
    Properties:
@@ -282,7 +321,7 @@ Resources:
     Name: String
     Type: String
     TTL: String
-    ResoureRecords: [ String ]
+    ResourceRecords: [ String ]
     Weight: Integer
     SetIdentifier: String
     AliasTarget: String
@@ -439,4 +478,4 @@ Types:
  
   
  
- 
+ 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cfndsl
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-13 00:00:00.000000000 Z
+date: 2013-05-16 00:00:00.000000000 Z
 dependencies: []
 description: DSL for creating AWS Cloudformation templates
 email: chris@howeville.com
@@ -55,7 +55,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: AWS Cloudformation DSL