fog-aws 0.8.1 → 0.9.0

data/lib/fog/aws/parsers/rds/create_db_cluster_snapshot.rb

@@ -0,0 +1,33 @@
+module Fog
+  module Parsers
+    module AWS
+      module RDS
+        require 'fog/aws/parsers/rds/db_cluster_snapshot_parser'
+
+        class CreateDBClusterSnapshot < Fog::Parsers::AWS::RDS::DBClusterSnapshotParser
+          def reset
+            @response = { 'CreateDBClusterSnapshotResult' => {}, 'ResponseMetadata' => {} }
+            super
+          end
+
+          def start_element(name, attrs = [])
+            super
+          end
+
+          def end_element(name)
+            case name
+
+            when 'DBClusterSnapshot'
+              @response['CreateDBClusterSnapshotResult']['DBClusterSnapshot'] = @db_cluster_snapshot
+              @db_cluster_snapshot = fresh_snapshot
+            when 'RequestId'
+              @response['ResponseMetadata'][name] = value
+            else
+              super
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/parsers/rds/db_cluster_parser.rb

@@ -0,0 +1,71 @@
+module Fog
+  module Parsers
+    module AWS
+      module RDS
+        class DbClusterParser < Fog::Parsers::Base
+          def reset
+            @db_cluster = fresh_cluster
+          end
+
+          def fresh_cluster
+            {'AvailabilityZones' => [], 'VpcSecurityGroups' => []}
+          end
+
+          def start_element(name, attrs=[])
+            super
+            case name
+            when 'AvailabilityZones'
+              @in_availability_zones = true
+            when 'DBClusterMembers'
+              @in_db_cluster_members = true
+              @db_cluster_members = []
+            when 'DBClusterMember'
+              @db_cluster_member = {}
+            when 'VpcSecurityGroupMembership'
+              @vpc_security_group = {}
+            when 'VpcSecurityGroups'
+              @in_vpc_security_groups = true
+              @vpc_security_groups = []
+            end
+          end
+
+          def end_element(name)
+            case name
+            when 'Port', 'Engine', 'Status', 'BackupRetentionPeriod', 'DBSubnetGroup', 'EngineVersion', 'Endpoint', 'DBClusterParameterGroup', 'DBClusterIdentifier', 'PreferredBackupWindow', 'PreferredMaintenanceWindow', 'AllocatedStorage', 'MasterUsername'
+              @db_cluster[name] = value
+            when 'VpcSecurityGroups'
+              @in_vpc_security_groups = false
+              @db_cluster['VpcSecurityGroups'] = @vpc_security_groups
+            when 'VpcSecurityGroupMembership'
+              @vpc_security_groups << @vpc_security_group
+              @vpc_security_group = {}
+            when 'VpcSecurityGroupId'
+              @vpc_security_group[name] = value
+            when 'Status'
+              # Unfortunately, status is used in VpcSecurityGroupMemebership and
+              # DBSecurityGroups
+              if @in_db_security_groups
+                @db_security_group[name]=value
+              end
+              if @in_vpc_security_groups
+                @vpc_security_group[name] = value
+              end
+            when 'DBClusterMembers'
+              @in_db_cluster_members = false
+              @db_cluster['DBClusterMembers'] = @db_cluster_members
+            when 'DBClusterMember'
+              @db_cluster_members << @db_cluster_member
+              @db_cluster_member = {}
+            when 'IsClusterWriter'
+              @db_cluster_member['master'] = value == "true"
+            when 'DBInstanceIdentifier'
+              @db_cluster_member[name] = value
+            when 'DBCluster'
+              @db_cluster = fresh_cluster
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/parsers/rds/db_cluster_snapshot_parser.rb

@@ -0,0 +1,32 @@
+module Fog
+  module Parsers
+    module AWS
+      module RDS
+        class DBClusterSnapshotParser < Fog::Parsers::Base
+          def reset
+            @db_cluster_snapshot = fresh_snapshot
+          end
+
+          def fresh_snapshot
+            {}
+          end
+
+          def start_element(name, attrs=[])
+            super
+          end
+
+          def end_element(name)
+            case name
+            when 'Port', 'PercentProgress', 'AllocatedStorage'
+              @db_cluster_snapshot[name] = value.to_i
+            when 'SnapshotCreateTime', 'ClusterCreateTime'
+              @db_cluster_snapshot[name] = Time.parse(value)
+            else
+              @db_cluster_snapshot[name] = value
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/parsers/rds/db_parameter_parser.rb

@@ -0,0 +1,30 @@
+module Fog
+  module Parsers
+    module AWS
+      module RDS
+        class DBParameterParser < Fog::Parsers::Base
+          def reset
+            @db_parameter = new_db_parameter
+          end
+
+          def new_db_parameter
+            {}
+          end
+
+          def start_element(name, attrs = [])
+            super
+          end
+
+          def end_element(name)
+            case name
+            when 'IsModifiable'
+              @value == "true" ? true : false
+            else
+              @db_parameter[name] = @value.strip
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/parsers/rds/db_parser.rb

@@ -48,7 +48,8 @@ module Fog
               'AvailabilityZone', 'MasterUsername', 'DBName', 'LicenseModel',
               'DBSubnetGroupName', 'StorageType', 'KmsKeyId', 'TdeCredentialArn',
               'SecondaryAvailabilityZone', 'DbiResourceId', 'CACertificateIdentifier',
-              'CharacterSetName', 'DbiResourceId', 'LicenseModel', 'KmsKeyId'
+              'CharacterSetName', 'DbiResourceId', 'LicenseModel', 'KmsKeyId',
+              'DBClusterIdentifier'
               @db_instance[name] = value
             when 'MultiAZ', 'AutoMinorVersionUpgrade', 'PubliclyAccessible', 'StorageEncrypted'
               @db_instance[name] = (value == 'true')

data/lib/fog/aws/parsers/rds/delete_db_cluster.rb

@@ -0,0 +1,32 @@
+module Fog
+  module Parsers
+    module AWS
+      module RDS
+        require 'fog/aws/parsers/rds/db_cluster_parser'
+
+        class DeleteDBCluster < Fog::Parsers::AWS::RDS::DbClusterParser
+          def reset
+            @response = { 'DeleteDBClusterResult' => {}, 'ResponseMetadata' => {} }
+            super
+          end
+
+          def start_element(name, attrs = [])
+            super
+          end
+
+          def end_element(name)
+            case name
+            when 'DBCluster'
+              @response['DeleteDBClusterResult']['DBCluster'] = @db_cluster
+              @db_cluster = fresh_cluster
+            when 'RequestId'
+              @response['ResponseMetadata'][name] = value
+            else
+              super
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/parsers/rds/delete_db_cluster_snapshot.rb

@@ -0,0 +1,32 @@
+module Fog
+  module Parsers
+    module AWS
+      module RDS
+        require 'fog/aws/parsers/rds/db_cluster_snapshot_parser'
+
+        class DeleteDBClusterSnapshot < Fog::Parsers::AWS::RDS::DBClusterSnapshotParser
+          def reset
+            @response = {'DeleteDBClusterSnapshotResult' => {}, 'ResponseMetadata' => {} }
+            super
+          end
+
+          def start_element(name, attrs = [])
+            super
+          end
+
+          def end_element(name)
+            case name
+            when 'RequestId'
+              @response['ResponseMetadata'][name] = value
+            when 'DBClusterSnapshot'
+              @response['DeleteDBClusterSnapshotResult']['DBClusterSnapshot'] = @db_cluster_snapshot
+              @db_cluster_snapshot = fresh_snapshot
+            else
+              super
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/parsers/rds/describe_db_cluster_snapshots.rb

@@ -0,0 +1,34 @@
+module Fog
+  module Parsers
+    module AWS
+      module RDS
+        require 'fog/aws/parsers/rds/db_cluster_snapshot_parser'
+
+        class DescribeDBClusterSnapshots < Fog::Parsers::AWS::RDS::DBClusterSnapshotParser
+          def reset
+            @response = {'DescribeDBClusterSnapshotsResult' => {'DBClusterSnapshots' => []}, 'ResponseMetadata' => {}}
+            super
+          end
+
+          def start_element(name, attrs = [])
+            super
+          end
+
+          def end_element(name)
+            case name
+            when 'DBClusterSnapshot'
+              @response['DescribeDBClusterSnapshotsResult']['DBClusterSnapshots'] << @db_cluster_snapshot
+              @db_cluster_snapshot = fresh_snapshot
+            when 'Marker'
+              @response['DescribeDBClusterSnapshotsResult']['Marker'] = value
+            when 'RequestId'
+              @response['ResponseMetadata'][name] = value
+            else
+              super
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/parsers/rds/describe_db_clusters.rb

@@ -0,0 +1,34 @@
+module Fog
+  module Parsers
+    module AWS
+      module RDS
+        require 'fog/aws/parsers/rds/db_cluster_parser'
+
+        class DescribeDBClusters < Fog::Parsers::AWS::RDS::DbClusterParser
+          def reset
+            @response = { 'DescribeDBClustersResult' => { 'DBClusters' => []}, 'ResponseMetadata' => {} }
+            super
+          end
+
+          def start_element(name, attrs=[])
+            super
+          end
+
+          def end_element(name)
+            case name
+            when 'DBCluster'
+              @response['DescribeDBClustersResult']['DBClusters'] << @db_cluster
+              @db_cluster = fresh_cluster
+            when 'Marker'
+              @response['DescribeDBClustersResult']['Marker'] = value
+            when 'RequestId'
+              @response['ResponseMetadata'][name] = value
+            else
+              super
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/parsers/rds/describe_engine_default_parameters.rb

@@ -0,0 +1,34 @@
+module Fog
+  module Parsers
+    module AWS
+      module RDS
+        require 'fog/aws/parsers/rds/db_parameter_parser'
+
+        class DescribeEngineDefaultParameters < Fog::Parsers::AWS::RDS::DBParameterParser
+          def reset
+            @response = {'DescribeEngineDefaultParametersResult' => {'Parameters' => []}, 'ResponseMetadata' => {}}
+            super
+          end
+
+          def start_element(name, attrs = [])
+            super
+          end
+
+          def end_element(name)
+            case name
+            when 'Parameter'
+              @response['DescribeEngineDefaultParametersResult']['Parameters'] << @db_parameter
+              @db_parameter = new_db_parameter
+            when 'Marker'
+              @response['DescribeEngineDefaultParametersResult']['Marker'] = @value
+            when 'RequestId'
+              @response['ResponseMetadata'][name] = @value
+            else
+              super
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/parsers/rds/restore_db_instance_from_db_snapshot.rb

@@ -6,7 +6,7 @@ module Fog
 
         class RestoreDBInstanceFromDBSnapshot < Fog::Parsers::AWS::RDS::DbParser
           def reset
-            @response = { 'RestoreDBInstanceFromDBSnapshot' => {}, 'ResponseMetadata' => {} }
+            @response = { 'RestoreDBInstanceFromDBSnapshotResult' => {}, 'ResponseMetadata' => {} }
             super
           end
 
@@ -17,7 +17,7 @@ module Fog
           def end_element(name)
             case name
             when 'DBInstance'
-              @response['RestoreDBInstanceFromDBSnapshot']['DBInstance'] = @db_instance
+              @response['RestoreDBInstanceFromDBSnapshotResult']['DBInstance'] = @db_instance
               @db_instance = fresh_instance
             when 'RequestId'
               @response['ResponseMetadata'][name] = value

data/lib/fog/aws/parsers/rds/snapshot_parser.rb

@@ -17,19 +17,12 @@ module Fog
 
           def end_element(name)
             case name
-            when 'AllocatedStorage' then @db_snapshot['AllocatedStorage'] = value.to_i
-            when 'AvailabilityZone' then @db_snapshot['AvailabilityZone'] = value
-            when 'DBInstanceIdentifier' then @db_snapshot['DBInstanceIdentifier'] = value
-            when 'DBSnapshotIdentifier' then @db_snapshot['DBSnapshotIdentifier'] = value
-            when 'Engine' then @db_snapshot['Engine'] = value
-            when 'EngineVersion' then @db_snapshot['EngineVersion'] = value
-            when 'InstanceCreateTime' then @db_snapshot['InstanceCreateTime'] = Time.parse value
-            when 'Iops' then @db_snapshot['Iops'] = value
-            when 'MasterUsername' then @db_snapshot['MasterUsername'] = value
-            when 'Port' then @db_snapshot['Port'] = value.to_i
-            when 'SnapshotCreateTime' then @db_snapshot['SnapshotCreateTime'] = Time.parse value
-            when 'SnapshotType' then @db_snapshot['SnapshotType'] = value
-            when 'Status' then @db_snapshot['Status'] = value
+            when 'AllocatedStorage', 'Port'
+              @db_snapshot[name] = value.to_i
+            when 'InstanceCreateTime', 'SnapshotCreateTime'
+              @db_snapshot[name] = Time.parse(value)
+            else
+              @db_snapshot[name] = value
             end
           end
         end

data/lib/fog/aws/rds.rb

@@ -62,10 +62,23 @@ module Fog
       request :create_event_subscription
       request :delete_event_subscription
 
+      request :describe_engine_default_parameters
+
+      request :describe_db_clusters
+      request :describe_db_cluster_snapshots
+      request :create_db_cluster
+      request :create_db_cluster_snapshot
+      request :delete_db_cluster
+      request :delete_db_cluster_snapshot
+
       model_path 'fog/aws/models/rds'
       model       :server
       collection  :servers
 
+      model       :cluster
+      collection  :clusters
+      collection  :cluster_snapshots
+
       model       :snapshot
       collection  :snapshots
 
@@ -95,11 +108,23 @@ module Fog
           @data ||= Hash.new do |hash, region|
             hash[region] = Hash.new do |region_hash, key|
               region_hash[key] = {
+                :clusters            => {},
+                :cluster_snapshots   => {},
                 :servers             => {},
                 :security_groups     => {},
                 :subnet_groups       => {},
                 :snapshots           => {},
                 :event_subscriptions => {},
+                :default_parameters  => [
+                  {
+                    "DataType"      => "integer",
+                    "Source"        => "engine-default",
+                    "Description"   => "Intended for use with master-to-master replication, and can be used to control the operation of AUTO_INCREMENT columns",
+                    "ApplyType"     => "dynamic",
+                    "AllowedValues" => "1-65535",
+                    "ParameterName" => "auto_increment_increment"
+                  }
+                ],
                 :db_engine_versions  => [
                   {
                     'Engine'                     => "mysql",