fog-aws 0.8.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3fe29ce48c8320ccf8c25c90b13c56ceb6ea94c3
-  data.tar.gz: dde71551b86d3333f8e85cbae203fd85cef1cb8b
+  metadata.gz: e77bea854342136841867ba57ed6e1675c276946
+  data.tar.gz: 2df27806c77f8443b44cf76358575e98d34b3320
 SHA512:
-  metadata.gz: ddd00c675fb5dee5a7eeccbb255e380342b4a819278071d9c7ed1b746f6b2d03125ef5b0844bdb111d007d238812d10f9807cb925874f7685026369faf47f588
-  data.tar.gz: d31c7bbd8cb8b18d2a0ffdfc54a09c8f7bb6adb678c8d571aba151624e8912f6190bd3f16475dab04e3a1901ccb3d302b68ec832a84f73a9fdbacd70e7431593
+  metadata.gz: 57c26f03d63dfef478f8df9360d6e3e4111c73e4e2ebc0c4a9936e2a19c08719c6bf509c472434b9668a9abe85ce2a17b665bcec136541a2f896ec508e1327cd
+  data.tar.gz: 1968a9af031b2e8ffa1ea65678d9f12bad0032f72b4fa76f4580381e1e0a86c2e6e72f870c8c7e44178b1b7404b2a981628a96c299e1cdf2fb2a9e1e2eec6825

data/.gitignore

@@ -13,3 +13,4 @@
 *.a
 mkmf.log
 tests/.fog
+gemfiles/Gemfile-edge.lock

data/.travis.yml

@@ -23,6 +23,10 @@ matrix:
     gemfile: Gemfile
   - rvm: 2.2.0
     gemfile: gemfiles/Gemfile-edge
+  - rvm: 2.3.0
+    gemfile: gemfiles/Gemfile-edge
+  - rvm: 2.3.0
+    gemfile: Gemfile
   - rvm: jruby-18mode
     gemfile: gemfiles/Gemfile-ruby-1.8.7
   - rvm: jruby-19mode

data/README.md

@@ -4,7 +4,7 @@
 [![Build Status](https://travis-ci.org/fog/fog-aws.svg?branch=master)](https://travis-ci.org/fog/fog-aws)
 [![Dependency Status](https://gemnasium.com/fog/fog-aws.svg)](https://gemnasium.com/fog/fog-aws)
 [![Test Coverage](https://codeclimate.com/github/fog/fog-aws/badges/coverage.svg)](https://codeclimate.com/github/fog/fog-aws)
-[![Code Climate](https://codeclimate.com/github/fog/fog-aws.png)](https://codeclimate.com/github/fog/fog-aws)
+[![Code Climate](https://codeclimate.com/github/fog/fog-aws.svg)](https://codeclimate.com/github/fog/fog-aws)
 
 
 ## Installation

data/gemfiles/Gemfile-edge

@@ -4,6 +4,11 @@ source "https://rubygems.org"
 gem "fog-core", :github => "fog/fog-core"
 gem "fog-json", :github => "fog/fog-json"
 
+group :test, :default do
+  gem 'pry-nav'
+  gem 'mime-types', '~> 2.6', '>= 2.6.2'
+end
+
 gem "codeclimate-test-reporter", group: :test, require: nil
 
 gemspec :path => "../"

data/lib/fog/aws/models/compute/security_group.rb

@@ -83,8 +83,8 @@ module Fog
           requires_one :name, :group_id
 
           ip_permission = {
-            'FromPort'   => range.min,
-            'ToPort'     => range.max,
+            'FromPort'   => range.begin,
+            'ToPort'     => range.end,
             'IpProtocol' => options[:ip_protocol] || 'tcp'
           }
 
@@ -197,8 +197,8 @@ module Fog
           requires_one :name, :group_id
 
           ip_permission = {
-            'FromPort'   => range.min,
-            'ToPort'     => range.max,
+            'FromPort'   => range.begin,
+            'ToPort'     => range.end,
             'IpProtocol' => options[:ip_protocol] || 'tcp'
           }
 

data/lib/fog/aws/models/rds/cluster.rb

@@ -0,0 +1,93 @@
+module Fog
+  module AWS
+    class RDS
+      class Cluster < Fog::Model
+        identity :id, :aliases => 'DBClusterIdentifier'
+
+        attribute :allocated_storage,            :aliases => 'AllocatedStorage',          :type => :integer
+        attribute :backup_retention_period,      :aliases => 'BackupRetentionPeriod',     :type => :integer
+        attribute :db_cluster_members,           :aliases => 'DBClusterMembers',          :type => :array
+        attribute :db_cluster_parameter_group,   :aliases => 'DBClusterParameterGroup'
+        attribute :db_subnet_group,              :aliases => 'DBSubnetGroup'
+        attribute :endpoint,                     :aliases => 'Endpoint'
+        attribute :engine,                       :aliases => 'Engine'
+        attribute :engine_version,               :aliases => 'EngineVersion'
+        attribute :password,                     :aliases => 'MasterUserPassword'
+        attribute :master_username,              :aliases => 'MasterUsername'
+        attribute :port,                         :aliases => 'Port',                      :type => :integer
+        attribute :preferred_backup_window,      :aliases => 'PreferredBackupWindow'
+        attribute :preferred_maintenance_window, :aliases => 'PreferredMaintenanceWindow'
+        attribute :state,                        :aliases => 'Status'
+        attribute :vpc_security_groups,          :aliases => 'VpcSecurityGroups'
+
+        attr_accessor :storage_encrypted #not in the response
+
+        def ready?
+          state == "available"
+        end
+
+        def snapshots
+          requires :id
+          service.cluster_snapshots(:cluster => self)
+        end
+
+        def servers(set=db_cluster_members)
+          set.map do |member|
+            service.servers.get(member['DBInstanceIdentifier'])
+          end
+        end
+
+        def master
+          db_cluster_members.detect { |member| member["master"] }
+        end
+
+        def replicas
+          servers(db_cluster_members.select { |member| !member["master"] })
+        end
+
+        def has_replica?(replica_name)
+          replicas.detect { |replica| replica.id == replica_name }
+        end
+
+        def destroy(snapshot_identifier=nil)
+          requires :id
+          service.delete_db_cluster(id, snapshot_identifier, snapshot_identifier.nil?)
+          true
+        end
+
+        def save
+          requires :id
+          requires :engine
+          requires :master_username
+          requires :password
+
+          data = service.create_db_cluster(id, attributes_to_params)
+          merge_attributes(data.body['CreateDBClusterResult']['DBCluster'])
+          true
+        end
+
+        def attributes_to_params
+          options = {
+            'AllocatedStorage'           => allocated_storage,
+            'BackupRetentionPeriod'      => backup_retention_period,
+            'DBClusterIdentifier'        => identity,
+            'DBClusterParameterGroup'    => db_cluster_parameter_group,
+            'DBSubnetGroup'              => db_subnet_group,
+            'Endpoint'                   => endpoint,
+            'Engine'                     => engine,
+            'EngineVersion'              => engine_version,
+            'MasterUserPassword'         => password,
+            'MasterUsername'             => master_username,
+            'PreferredBackupWindow'      => preferred_backup_window,
+            'PreferredMaintenanceWindow' => preferred_maintenance_window,
+            'Status'                     => state,
+            'StorageEncrypted'           => storage_encrypted,
+            'VpcSecurityGroups'          => vpc_security_groups,
+          }
+
+          options.delete_if { |key,value| value.nil? }
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/models/rds/cluster_snapshots.rb

@@ -0,0 +1,48 @@
+require 'fog/aws/models/rds/snapshot'
+
+module Fog
+  module AWS
+    class RDS
+      class ClusterSnapshots < Fog::Collection
+        attribute :cluster
+        attribute :filters
+        model Fog::AWS::RDS::Snapshot
+
+        def initialize(attributes)
+          self.filters ||= {}
+          if attributes[:cluster]
+            filters[:identifier] = attributes[:cluster].id
+          end
+
+          if attributes[:type]
+            filters[:type] = attributes[:type]
+          end
+          super
+        end
+
+        def all(filters_arg = filters)
+          filters.merge!(filters_arg)
+
+          page = service.describe_db_cluster_snapshots(filters).body['DescribeDBClusterSnapshotsResult']
+          filters[:marker] = page['Marker']
+          load(page['DBClusterSnapshots'])
+        end
+
+        def get(identity)
+          data = service.describe_db_cluster_snapshots(:snapshot_id => identity).body['DescribeDBClusterSnapshotsResult']['DBClusterSnapshots'].first
+          new(data) # data is an attribute hash
+        rescue Fog::AWS::RDS::NotFound
+          nil
+        end
+
+        def create(params={})
+          if cluster
+            super(params.merge(:cluster_id => cluster.id))
+          else
+            super(params)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/models/rds/clusters.rb

@@ -0,0 +1,23 @@
+require 'fog/aws/models/rds/cluster'
+
+module Fog
+  module AWS
+    class RDS
+      class Clusters < Fog::Collection
+        model Fog::AWS::RDS::Cluster
+
+        def all
+          data = service.describe_db_clusters.body['DescribeDBClustersResult']['DBClusters']
+          load(data)
+        end
+
+        def get(identity)
+          data = service.describe_db_clusters(identity).body['DescribeDBClustersResult']['DBClusters'].first
+          new(data)
+        rescue Fog::AWS::RDS::NotFound
+          nil
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/models/rds/parameters.rb

@@ -29,6 +29,21 @@ module Fog
           end
           load(result) # data is an array of attribute hashes
         end
+
+        def defaults(family)
+          page1 = service.describe_engine_default_parameters(family).body['DescribeEngineDefaultParametersResult']
+
+          marker = page1['Marker']
+          parameters = page1['Parameters']
+
+          until marker.nil?
+            body        = service.describe_engine_default_parameters(family, 'Marker' => marker).body['DescribeEngineDefaultParametersResult']
+            marker      = body['Marker']
+            parameters += body['Parameters']
+          end
+
+          load(parameters)
+        end
       end
     end
   end

data/lib/fog/aws/models/rds/server.rb

@@ -10,6 +10,7 @@ module Fog
         attribute :backup_retention_period,      :aliases => 'BackupRetentionPeriod', :type => :integer
         attribute :ca_certificate_id,            :aliases => 'CACertificateIdentifier'
         attribute :character_set_name,           :aliases => 'CharacterSetName'
+        attribute :cluster_id,                   :aliases => 'DBClusterIdentifier'
         attribute :created_at,                   :aliases => 'InstanceCreateTime', :type => :time
         attribute :db_name,                      :aliases => 'DBName'
         attribute :db_parameter_groups,          :aliases => 'DBParameterGroups'
@@ -38,7 +39,12 @@ module Fog
         attribute :tde_credential_arn,           :aliases => 'TdeCredentialArn'
         attribute :vpc_security_groups,          :aliases => 'VpcSecurityGroups', :type => :array
 
-        attr_accessor :password, :parameter_group_name, :security_group_names, :port
+        attr_accessor :password, :parameter_group_name, :security_group_names, :port, :source_snapshot_id
+
+        def cluster
+          return nil unless cluster_id
+          service.clusters.get(cluster_id)
+        end
 
         def create_read_replica(replica_id, options={})
           options[:security_group_names] ||= options['DBSecurityGroups']
@@ -104,16 +110,27 @@ module Fog
         end
 
         def save
-          requires :engine
-          requires :allocated_storage
-          requires :master_username
-          requires :password
-
-          self.flavor_id ||= 'db.m1.small'
-
-          data = service.create_db_instance(id, attributes_to_params)
-          merge_attributes(data.body['CreateDBInstanceResult']['DBInstance'])
-          true
+          if source_snapshot_id
+            requires :id
+            data = service.restore_db_instance_from_db_snapshot(source_snapshot_id, id, attributes_to_params)
+            merge_attributes(data.body['RestoreDBInstanceFromDBSnapshotResult']['DBInstance'])
+          else
+            requires :engine
+
+            if engine == 'aurora'
+              requires :cluster_id
+              self.flavor_id ||= 'db.r3.large'
+            else
+              requires :master_username
+              requires :password
+              requires :allocated_storage
+              self.flavor_id ||= 'db.m1.small'
+            end
+
+            data = service.create_db_instance(id, attributes_to_params)
+            merge_attributes(data.body['CreateDBInstanceResult']['DBInstance'])
+            true
+          end
         end
 
         # Converts attributes to a parameter hash suitable for requests
@@ -123,6 +140,7 @@ module Fog
             'AutoMinorVersionUpgrade'       => auto_minor_version_upgrade,
             'AvailabilityZone'              => availability_zone,
             'BackupRetentionPeriod'         => backup_retention_period,
+            'DBClusterIdentifier'           => cluster_id,
             'DBInstanceClass'               => flavor_id,
             'DBInstanceIdentifier'          => id,
             'DBName'                        => db_name,

data/lib/fog/aws/models/rds/servers.rb

@@ -17,6 +17,10 @@ module Fog
         rescue Fog::AWS::RDS::NotFound
           nil
         end
+
+        def restore(options)
+          create(options)
+        end
       end
     end
   end

data/lib/fog/aws/models/rds/snapshot.rb

@@ -2,20 +2,25 @@ module Fog
   module AWS
     class RDS
       class Snapshot < Fog::Model
-        identity  :id, :aliases => ['DBSnapshotIdentifier', :name]
-        attribute  :instance_id, :aliases => 'DBInstanceIdentifier'
-        attribute  :created_at, :aliases => 'SnapshotCreateTime', :type => :time
-        attribute  :instance_created_at, :aliases => 'InstanceCreateTime', :type => :time
-        attribute  :engine, :aliases => 'Engine'
-        attribute  :engine_version, :aliases => 'EngineVersion'
-        attribute  :master_username, :aliases => 'MasterUsername'
-        attribute  :state, :aliases => 'Status'
-        attribute  :port, :aliases => 'Port', :type => :integer
-        attribute  :allocated_storage, :aliases => 'AllocatedStorage', :type => :integer
-        attribute  :iops, :aliases => 'Iops', :type => :integer
-        attribute  :availability_zone, :aliases => 'AvailabilityZone'
-        attribute  :type, :aliases => 'SnapshotType'
-        attribute  :publicly_accessible, :aliases => 'PubliclyAccessible'
+        identity  :id, :aliases => ['DBSnapshotIdentifier', 'DBClusterSnapshotIdentifier', :name]
+
+        attribute :allocated_storage,   :aliases => 'AllocatedStorage',    :type => :integer
+        attribute :availability_zone,   :aliases => 'AvailabilityZone'
+        attribute :cluster_created_at,  :aliases => 'ClusterCreateTime',   :type => :time
+        attribute :cluster_id,          :aliases => 'DBClusterIdentifier'
+        attribute :created_at,          :aliases => 'SnapshotCreateTime',  :type => :time
+        attribute :engine,              :aliases => 'Engine'
+        attribute :engine_version,      :aliases => 'EngineVersion'
+        attribute :instance_created_at, :aliases => 'InstanceCreateTime',  :type => :time
+        attribute :instance_id,         :aliases => 'DBInstanceIdentifier'
+        attribute :iops,                :aliases => 'Iops',                :type => :integer
+        attribute :license_model,       :aliases => 'LicenseModel'
+        attribute :master_username,     :aliases => 'MasterUsername'
+        attribute :port,                :aliases => 'Port',                :type => :integer
+        attribute :publicly_accessible, :aliases => 'PubliclyAccessible'
+        attribute :state,               :aliases => 'Status'
+        attribute :storage_type,        :aliases => 'StorageType'
+        attribute :type,                :aliases => 'SnapshotType'
 
         def ready?
           state == 'available'
@@ -23,16 +28,25 @@ module Fog
 
         def destroy
           requires :id
+          requires_one :instance_id, :cluster_id
 
-          service.delete_db_snapshot(id)
+          if instance_id
+            service.delete_db_snapshot(id)
+          else
+            service.delete_db_cluster_snapshot(id)
+          end
           true
         end
 
         def save
-          requires :instance_id
+          requires_one :instance_id, :cluster_id
           requires :id
 
-          data = service.create_db_snapshot(instance_id, id).body['CreateDBSnapshotResult']['DBSnapshot']
+          data = if instance_id
+                   service.create_db_snapshot(instance_id, id).body['CreateDBSnapshotResult']['DBSnapshot']
+                 elsif cluster_id
+                   service.create_db_cluster_snapshot(cluster_id, id).body['CreateDBClusterSnapshotResult']['DBClusterSnapshot']
+                 end
           merge_attributes(data)
           true
         end
@@ -41,6 +55,11 @@ module Fog
           requires :instance_id
           service.servers.get(instance_id)
         end
+
+        def cluster
+          requires :cluster_id
+          service.clusters.get(cluster_id)
+        end
       end
     end
   end

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

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