fog-aws 3.0.0 → 3.10.0

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

@@ -1,12 +1,12 @@
 require 'fog/aws/models/compute/spot_request'
 
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class SpotRequests < Fog::Collection
         attribute :filters
 
-        model Fog::Compute::AWS::SpotRequest
+        model Fog::AWS::Compute::SpotRequest
 
         def initialize(attributes)
           self.filters ||= {}

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Subnet < Fog::Model
         identity  :subnet_id,                   :aliases => 'subnetId'
         attribute :state

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

@@ -1,12 +1,12 @@
 require 'fog/aws/models/compute/subnet'
 
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Subnets < Fog::Collection
         attribute :filters
 
-        model Fog::Compute::AWS::Subnet
+        model Fog::AWS::Compute::Subnet
 
         # Creates a new subnet
         #

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Tag < Fog::Model
         identity  :key
 

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

@@ -1,12 +1,12 @@
 require 'fog/aws/models/compute/tag'
 
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Tags < Fog::Collection
         attribute :filters
 
-        model Fog::Compute::AWS::Tag
+        model Fog::AWS::Compute::Tag
 
         def initialize(attributes)
           self.filters ||= {}

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Volume < Fog::Model
         identity  :id,                    :aliases => 'volumeId'
 
@@ -118,7 +118,7 @@ module Fog
         end
 
         def server=(_)
-          raise NoMethodError, 'use Fog::Compute::AWS::Volume#attach(server, device)'
+          raise NoMethodError, 'use Fog::AWS::Compute::Volume#attach(server, device)'
         end
 
         private

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

@@ -1,13 +1,13 @@
 require 'fog/aws/models/compute/volume'
 
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Volumes < Fog::Collection
         attribute :filters
         attribute :server
 
-        model Fog::Compute::AWS::Volume
+        model Fog::AWS::Compute::Volume
 
         # Used to create a volume.  There are 3 arguments and availability_zone and size are required.  You can generate a new key_pair as follows:
         # AWS.volumes.create(:availability_zone => 'us-east-1a', :size => 10)

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class VPC < Fog::Model
         identity :id,                :aliases => 'vpcId'
 
@@ -39,7 +39,7 @@ module Fog
         end
 
         def is_default?
-          require :is_default
+          requires :is_default
           is_default
         end
 
@@ -106,7 +106,13 @@ module Fog
 
         def save
           requires :cidr_block
-          data = service.create_vpc(cidr_block, { 'AmazonProvidedIpv6CidrBlock' => amazon_provided_ipv_6_cidr_block }).body['vpcSet'].first
+
+          options = {
+            'AmazonProvidedIpv6CidrBlock' => amazon_provided_ipv_6_cidr_block,
+            'InstanceTenancy' => tenancy
+          }
+
+          data = service.create_vpc(cidr_block, options).body['vpcSet'].first
           new_attributes = data.reject {|key,value| key == 'requestId'}
           new_attributes = data.reject {|key,value| key == 'requestId' || key == 'tagSet' }
           merge_attributes(new_attributes)

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

@@ -1,12 +1,12 @@
 require 'fog/aws/models/compute/vpc'
 
 module Fog
-  module Compute
-    class AWS
+  module AWS
+    class Compute
       class Vpcs < Fog::Collection
         attribute :filters
 
-        model Fog::Compute::AWS::VPC
+        model Fog::AWS::Compute::VPC
 
         # Creates a new VPC
         #

data/lib/fog/aws/models/dns/record.rb

@@ -1,6 +1,6 @@
 module Fog
-  module DNS
-    class AWS
+  module AWS
+    class DNS
       class Record < Fog::Model
         extend Fog::Deprecation
         deprecate :ip, :value

data/lib/fog/aws/models/dns/records.rb

@@ -1,8 +1,8 @@
 require 'fog/aws/models/dns/record'
 
 module Fog
-  module DNS
-    class AWS
+  module AWS
+    class DNS
       class Records < Fog::Collection
         attribute :is_truncated,            :aliases => ['IsTruncated']
         attribute :max_items,               :aliases => ['MaxItems']
@@ -15,7 +15,7 @@ module Fog
 
         attribute :zone
 
-        model Fog::DNS::AWS::Record
+        model Fog::AWS::DNS::Record
 
         def all(options = {})
           requires :zone
@@ -99,7 +99,7 @@ module Fog
               record
             end
           end.compact.first
-        rescue Fog::DNS::AWS::NotFound
+        rescue Fog::AWS::DNS::NotFound
           nil
         end
 

data/lib/fog/aws/models/dns/zone.rb

@@ -1,8 +1,8 @@
 # require 'fog/aws/models/dns/records'
 
 module Fog
-  module DNS
-    class AWS
+  module AWS
+    class DNS
       class Zone < Fog::Model
         identity :id,                 :aliases => 'Id'
 
@@ -20,7 +20,7 @@ module Fog
 
         def records
           @records ||= begin
-            Fog::DNS::AWS::Records.new(
+            Fog::AWS::DNS::Records.new(
               :zone       => self,
               :service => service
             )

data/lib/fog/aws/models/dns/zones.rb

@@ -1,13 +1,13 @@
 require 'fog/aws/models/dns/zone'
 
 module Fog
-  module DNS
-    class AWS
+  module AWS
+    class DNS
       class Zones < Fog::Collection
         attribute :marker,    :aliases => 'Marker'
         attribute :max_items, :aliases => 'MaxItems'
 
-        model Fog::DNS::AWS::Zone
+        model Fog::AWS::DNS::Zone
 
         def all(options = {})
           options[:marker]   ||= marker unless marker.nil?
@@ -19,7 +19,7 @@ module Fog
         def get(zone_id)
           data = service.get_hosted_zone(zone_id).body
           new(data)
-        rescue Fog::DNS::AWS::NotFound
+        rescue Fog::AWS::DNS::NotFound
           nil
         end
       end

data/lib/fog/aws/models/efs/file_system.rb

@@ -7,6 +7,8 @@ module Fog
         attribute :owner_id,                :aliases => 'OwnerId'
         attribute :creation_token,          :aliases => 'CreationToken'
         attribute :performance_mode,        :aliases => 'PerformanceMode'
+        attribute :encrypted,               :aliases => 'Encrypted'
+        attribute :kms_key_id,              :aliases => 'KmsKeyId'
         attribute :creation_time,           :aliases => 'CreationTime'
         attribute :state,                   :aliases => 'LifeCycleState'
         attribute :name,                    :aliases => 'Name'
@@ -33,6 +35,8 @@ module Fog
         def save
           params = {}
           params.merge!(:performance_mode => self.performance_mode) if self.performance_mode
+          params.merge!(:encrypted        => self.encrypted)        if self.encrypted
+          params.merge!(:kms_key_id       => self.kms_key_id)       if self.kms_key_id
 
           merge_attributes(service.create_file_system(self.creation_token || Fog::Mock.random_hex(32), params).body)
         end

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

@@ -23,7 +23,15 @@ module Fog
         attr_accessor :storage_encrypted #not in the response
 
         def ready?
-          state == "available"
+          # [2019.01] I don't think this is going to work, at least not with Aurora
+          # clusters. In my testing, the state reported by Fog for an Aurora cluster
+          # is "active" as soon as the cluster is retrievable from AWS, and the
+          # value doesn't change after that. Contrast that with the AWS Console UI,
+          # which reports the cluster as "Creating" while it's being created. I don't
+          # know where Fog is getting the state value from, but I don't think it's
+          # correct, at least not for the purpose of knowing if the Cluster is ready
+          # to have individual instances added to it.
+          state == 'available' || state == 'active'
         end
 
         def snapshots

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

@@ -4,40 +4,42 @@ module Fog
       class Server < Fog::Model
         identity  :id, :aliases => 'DBInstanceIdentifier'
 
-        attribute :allocated_storage,            :aliases => 'AllocatedStorage', :type => :integer
-        attribute :auto_minor_version_upgrade,   :aliases => 'AutoMinorVersionUpgrade'
-        attribute :availability_zone,            :aliases => 'AvailabilityZone'
-        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'
-        attribute :db_security_groups,           :aliases => 'DBSecurityGroups', :type => :array
-        attribute :db_subnet_group_name,         :aliases => 'DBSubnetGroupName'
-        attribute :dbi_resource_id,              :aliases => 'DbiResourceId'
-        attribute :endpoint,                     :aliases => 'Endpoint'
-        attribute :engine,                       :aliases => 'Engine'
-        attribute :engine_version,               :aliases => 'EngineVersion'
-        attribute :flavor_id,                    :aliases => 'DBInstanceClass'
-        attribute :iops,                         :aliases => 'Iops', :type => :integer
-        attribute :kms_key_id,                   :aliases => 'KmsKeyId'
-        attribute :last_restorable_time,         :aliases => 'LatestRestorableTime', :type => :time
-        attribute :license_model,                :aliases => 'LicenseModel'
-        attribute :master_username,              :aliases => 'MasterUsername'
-        attribute :multi_az,                     :aliases => 'MultiAZ', :type => :boolean
-        attribute :pending_modified_values,      :aliases => 'PendingModifiedValues'
-        attribute :preferred_backup_window,      :aliases => 'PreferredBackupWindow'
-        attribute :preferred_maintenance_window, :aliases => 'PreferredMaintenanceWindow'
-        attribute :publicly_accessible,          :aliases => 'PubliclyAccessible'
-        attribute :read_replica_identifiers,     :aliases => 'ReadReplicaDBInstanceIdentifiers', :type => :array
-        attribute :read_replica_source,          :aliases => 'ReadReplicaSourceDBInstanceIdentifier'
-        attribute :state,                        :aliases => 'DBInstanceStatus'
-        attribute :storage_encrypted,            :aliases => 'StorageEncrypted', :type => :boolean
-        attribute :storage_type,                 :aliases => 'StorageType'
-        attribute :tde_credential_arn,           :aliases => 'TdeCredentialArn'
-        attribute :vpc_security_groups,          :aliases => 'VpcSecurityGroups', :type => :array
+        attribute :allocated_storage,                  :aliases => 'AllocatedStorage', :type => :integer
+        attribute :auto_minor_version_upgrade,         :aliases => 'AutoMinorVersionUpgrade'
+        attribute :availability_zone,                  :aliases => 'AvailabilityZone'
+        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'
+        attribute :db_security_groups,                 :aliases => 'DBSecurityGroups', :type => :array
+        attribute :db_subnet_group_name,               :aliases => 'DBSubnetGroupName'
+        attribute :dbi_resource_id,                    :aliases => 'DbiResourceId'
+        attribute :enable_iam_database_authentication, :aliases => 'EnableIAMDatabaseAuthentication', :type => :boolean
+        attribute :endpoint,                           :aliases => 'Endpoint'
+        attribute :engine,                             :aliases => 'Engine'
+        attribute :engine_version,                     :aliases => 'EngineVersion'
+        attribute :flavor_id,                          :aliases => 'DBInstanceClass'
+        attribute :iops,                               :aliases => 'Iops', :type => :integer
+        attribute :kms_key_id,                         :aliases => 'KmsKeyId'
+        attribute :last_restorable_time,               :aliases => 'LatestRestorableTime', :type => :time
+        attribute :license_model,                      :aliases => 'LicenseModel'
+        attribute :master_username,                    :aliases => 'MasterUsername'
+        attribute :multi_az,                           :aliases => 'MultiAZ', :type => :boolean
+        attribute :pending_modified_values,            :aliases => 'PendingModifiedValues'
+        attribute :preferred_backup_window,            :aliases => 'PreferredBackupWindow'
+        attribute :preferred_maintenance_window,       :aliases => 'PreferredMaintenanceWindow'
+        attribute :publicly_accessible,                :aliases => 'PubliclyAccessible'
+        attribute :read_replica_identifiers,           :aliases => 'ReadReplicaDBInstanceIdentifiers', :type => :array
+        attribute :read_replica_source,                :aliases => 'ReadReplicaSourceDBInstanceIdentifier'
+        attribute :state,                              :aliases => 'DBInstanceStatus'
+        attribute :storage_encrypted,                  :aliases => 'StorageEncrypted', :type => :boolean
+        attribute :storage_type,                       :aliases => 'StorageType'
+        attribute :tde_credential_arn,                 :aliases => 'TdeCredentialArn'
+        attribute :vpc_security_groups,                :aliases => 'VpcSecurityGroups', :type => :array
+        attribute :db_subnet_group,                    :aliases => 'DBSubnetGroup'
 
         attr_accessor :password, :parameter_group_name, :security_group_names, :port, :source_snapshot_id
 
@@ -117,14 +119,14 @@ module Fog
           else
             requires :engine
 
-            if engine == 'aurora'
+            if engine.start_with?('aurora')
               requires :cluster_id
-              self.flavor_id ||= 'db.r3.large'
+              self.flavor_id ||= 'db.r4.large'
             else
               requires :master_username
               requires :password
               requires :allocated_storage
-              self.flavor_id ||= 'db.m1.small'
+              self.flavor_id ||= 'db.m4.large'
             end
 
             data = service.create_db_instance(id, attributes_to_params)
@@ -136,32 +138,33 @@ module Fog
         # Converts attributes to a parameter hash suitable for requests
         def attributes_to_params
           options = {
-            'AllocatedStorage'              => allocated_storage,
-            'AutoMinorVersionUpgrade'       => auto_minor_version_upgrade,
-            'AvailabilityZone'              => availability_zone,
-            'BackupRetentionPeriod'         => backup_retention_period,
-            'DBClusterIdentifier'           => cluster_id,
-            'DBInstanceClass'               => flavor_id,
-            'DBInstanceIdentifier'          => id,
-            'DBName'                        => db_name,
-            'DBParameterGroupName'          => parameter_group_name || attributes['DBParameterGroupName'],
-            'DBSecurityGroups'              => security_group_names,
-            'DBSubnetGroupName'             => db_subnet_group_name,
-            'Engine'                        => engine,
-            'EngineVersion'                 => engine_version,
-            'Iops'                          => iops,
-            'KmsKeyId'                      => kms_key_id,
-            'LicenseModel'                  => license_model,
-            'MasterUserPassword'            => password || attributes['MasterUserPassword'],
-            'MasterUsername'                => master_username,
-            'MultiAZ'                       => multi_az,
-            'Port'                          => port || attributes['Port'],
-            'PreferredBackupWindow'         => preferred_backup_window,
-            'PreferredMaintenanceWindow'    => preferred_maintenance_window,
-            'PubliclyAccessible'            => publicly_accessible,
-            'StorageEncrypted'              => storage_encrypted,
-            'StorageType'                   => storage_type,
-            'VpcSecurityGroups'             => vpc_security_groups,
+            'AllocatedStorage'                => allocated_storage,
+            'AutoMinorVersionUpgrade'         => auto_minor_version_upgrade,
+            'AvailabilityZone'                => availability_zone,
+            'BackupRetentionPeriod'           => backup_retention_period,
+            'DBClusterIdentifier'             => cluster_id,
+            'DBInstanceClass'                 => flavor_id,
+            'DBInstanceIdentifier'            => id,
+            'DBName'                          => db_name,
+            'DBParameterGroupName'            => parameter_group_name || attributes['DBParameterGroupName'],
+            'DBSecurityGroups'                => security_group_names,
+            'DBSubnetGroupName'               => db_subnet_group_name,
+            'EnableIAMDatabaseAuthentication' => enable_iam_database_authentication,
+            'Engine'                          => engine,
+            'EngineVersion'                   => engine_version,
+            'Iops'                            => iops,
+            'KmsKeyId'                        => kms_key_id,
+            'LicenseModel'                    => license_model,
+            'MasterUserPassword'              => password || attributes['MasterUserPassword'],
+            'MasterUsername'                  => master_username,
+            'MultiAZ'                         => multi_az,
+            'Port'                            => port || attributes['Port'],
+            'PreferredBackupWindow'           => preferred_backup_window,
+            'PreferredMaintenanceWindow'      => preferred_maintenance_window,
+            'PubliclyAccessible'              => publicly_accessible,
+            'StorageEncrypted'                => storage_encrypted,
+            'StorageType'                     => storage_type,
+            'VpcSecurityGroups'               => vpc_security_groups,
           }
 
           options.delete_if {|key, value| value.nil?}

data/lib/fog/aws/models/storage/directories.rb

@@ -1,10 +1,10 @@
 require 'fog/aws/models/storage/directory'
 
 module Fog
-  module Storage
-    class AWS
+  module AWS
+    class Storage
       class Directories < Fog::Collection
-        model Fog::Storage::AWS::Directory
+        model Fog::AWS::Storage::Directory
 
         def all
           data = service.get_service.body['Buckets']