fog-aws 0.11.0 → 3.18.0

data/lib/fog/aws/models/iam/access_keys.rb

@@ -13,8 +13,6 @@ module Fog
 
         def all
           data = service.list_access_keys('UserName'=> @username).body['AccessKeys']
-          # AWS response doesn't contain the UserName, this injects it
-          data.each {|access_key| access_key['UserName'] = @username }
           load(data)
         end
 

data/lib/fog/aws/models/iam/instance_profile.rb

@@ -0,0 +1,40 @@
+module Fog
+  module AWS
+    class IAM
+      class InstanceProfile < Fog::Model
+        identity :name, :aliases => 'InstanceProfileName'
+
+        attribute :id,          :aliases => 'InstanceProfileId'
+        attribute :roles,       :aliases => 'Roles',              :type => :array
+        attribute :arn,         :aliases => 'Arn'
+        attribute :path,        :aliases => 'Path'
+        attribute :create_date, :aliases => 'CreateDate',         :type => :time
+
+        def add_role(role_name)
+          requires :identity
+          service.add_role_to_instance_profile(role_name, self.name)
+          true
+        end
+
+        def remove_role(role_name)
+          requires :identity
+          service.remove_role_from_instance_profile(role_name, self.name)
+          true
+        end
+
+        def destroy
+          requires :identity
+          service.delete_instance_profile(self.identity)
+          true
+        end
+
+        def save
+          requires :identity
+
+          data = service.create_instance_profile(self.name, self.path).body['InstanceProfile']
+          merge_attributes(data)
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/models/iam/instance_profiles.rb

@@ -0,0 +1,24 @@
+require 'fog/aws/models/iam/instance_profile'
+
+module Fog
+  module AWS
+    class IAM
+      class InstanceProfiles < Fog::AWS::IAM::PagedCollection
+        model Fog::AWS::IAM::InstanceProfile
+
+        def all(options={})
+          body = service.list_instance_profiles(page_params(options)).body
+
+          merge_attributes(body)
+          load(body["InstanceProfiles"])
+        end
+
+        def get(identity)
+          new(service.get_instance_profile(identity).body["Role"])
+        rescue Excon::Errors::NotFound, Fog::AWS::IAM::NotFound
+          nil
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/models/iam/managed_policies.rb

@@ -8,6 +8,7 @@ module Fog
 
         attribute :username
         attribute :group_name
+        attribute :role_name
 
         model Fog::AWS::IAM::ManagedPolicy
 
@@ -16,6 +17,8 @@ module Fog
                    all_by_user(self.username, options)
                  elsif self.group_name
                    all_by_group(self.group_name, options)
+                 elsif self.role_name
+                   all_by_role(self.role_name, options)
                  else
                    all_policies(options)
                  end
@@ -51,6 +54,15 @@ module Fog
           end
         end
 
+        def all_by_role(role_name, options={})
+          body = service.list_attached_role_policies(role_name, page_params(options)).body
+          merge_attributes(body)
+
+          body['Policies'].map do |policy|
+            service.get_policy(policy['PolicyArn']).body['Policy']
+          end
+        end
+
         def all_policies(options={})
           body = service.list_policies(page_params(options)).body
           merge_attributes(body)

data/lib/fog/aws/models/iam/managed_policy.rb

@@ -14,6 +14,8 @@ module Fog
         attribute :path,            :aliases => 'Path'
         attribute :updated_at,      :aliases => 'UpdateDate', :type => :time
 
+        attr_accessor :policy_document
+
         def attach(user_or_username)
           requires :arn
 
@@ -32,6 +34,24 @@ module Fog
           service.get_policy_version(self.arn, self.default_version).
             body['PolicyVersion']['Document']
         end
+
+        def reload
+          service.managed_policies.get(self.arn)
+        end
+
+        def save
+          requires :name, :policy_document
+
+          merge_attributes(service.create_policy(self.name, self.policy_document, self.path, self.description).body["Policy"])
+        end
+
+        def destroy
+          requires :arn
+
+          service.delete_policy(self.arn)
+
+          true
+        end
       end
     end
   end

data/lib/fog/aws/models/iam/role.rb

@@ -20,6 +20,41 @@ module Fog
           true
         end
 
+        def attach(policy_or_arn)
+          requires :rolename
+
+          arn = if policy_or_arn.respond_to?(:arn)
+                  policy_or_arn.arn
+                else
+                  policy_or_arn
+                end
+
+          service.attach_role_policy(self.rolename, arn)
+        end
+
+        def detach(policy_or_arn)
+          requires :rolename
+
+          arn = if policy_or_arn.respond_to?(:arn)
+                  policy_or_arn.arn
+                else
+                  policy_or_arn
+                end
+
+          service.detach_role_policy(self.rolename, arn)
+        end
+
+        def attached_policies
+          requires :rolename
+
+          service.managed_policies(:role_name => self.rolename)
+        end
+
+        def instance_profiles
+          requires :rolename
+          service.instance_profiles.load(service.list_instance_profiles_for_role(self.rolename).body["InstanceProfiles"])
+        end
+
         def destroy
           requires :rolename
 

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/instance_option.rb

@@ -10,6 +10,12 @@ module Fog
         attribute :availability_zones, :aliases => 'AvailabilityZones', :type => :array
         attribute :db_instance_class, :aliases => 'DBInstanceClass'
         attribute :vpc, :aliases => 'Vpc', :type => :boolean
+        attribute :supports_iops, :aliases => 'SupportsIops', :type => :boolean
+        attribute :supports_enhanced_monitoring, :aliases => 'SupportsEnhancedMonitoring', :type => :boolean
+        attribute :supports_iam_database_authentication, :aliases => 'SupportsIAMDatabaseAuthentication', :type => :boolean
+        attribute :supports_performance_insights, :aliases => 'SupportsPerformanceInsights', :type => :boolean
+        attribute :supports_storage_encryption, :aliases => 'SupportsStorageEncryption', :type => :boolean
+        attribute :storage_type, :aliases => 'StorageType'
       end
     end
   end

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

@@ -29,8 +29,9 @@ module Fog
 
         # group_owner_id defaults to the current owner_id
         def authorize_ec2_security_group(group_name, group_owner_id=owner_id)
+          key = group_name.match(/^sg-/) ? 'EC2SecurityGroupId' : 'EC2SecurityGroupName'
           authorize_ingress({
-            'EC2SecurityGroupName' => group_name,
+            key                       => group_name,
             'EC2SecurityGroupOwnerId' => group_owner_id
           })
         end
@@ -56,8 +57,9 @@ module Fog
 
         # group_owner_id defaults to the current owner_id
         def revoke_ec2_security_group(group_name, group_owner_id=owner_id)
+          key = group_name.match(/^sg-/) ? 'EC2SecurityGroupId' : 'EC2SecurityGroupName'
           revoke_ingress({
-            'EC2SecurityGroupName' => group_name,
+            key                       => group_name,
             'EC2SecurityGroupOwnerId' => group_owner_id
           })
         end

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,16 +1,17 @@
 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']
           load(data)
         end
 
+        # Warning! This retrieves and caches meta data for the first 10,000 objects in the bucket, which can be very expensive. When possible use directories.new
         def get(key, options = {})
           remap_attributes(options, {
             :delimiter  => 'delimiter',

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

@@ -2,8 +2,8 @@ require 'fog/aws/models/storage/files'
 require 'fog/aws/models/storage/versions'
 
 module Fog
-  module Storage
-    class AWS
+  module AWS
+    class Storage
       class Directory < Fog::Model
         VALID_ACLS = ['private', 'public-read', 'public-read-write', 'authenticated-read']
 
@@ -12,7 +12,6 @@ module Fog
         identity  :key,           :aliases => ['Name', 'name']
 
         attribute :creation_date, :aliases => 'CreationDate', :type => 'time'
-        attribute :location,      :aliases => 'LocationConstraint', :type => 'string'
 
         def acl=(new_acl)
           unless VALID_ACLS.include?(new_acl)
@@ -30,8 +29,32 @@ module Fog
           false
         end
 
+        # @param options [Hash] (defaults to: {}) — a customizable set of options.
+        #   Consider tuning this values for big buckets.
+        # @option options timeout [Integer] — default: Fog.timeout — Maximum number of
+        #   seconds to wait for the bucket to be empty.
+        # @option options interval [Proc|Integer] — default: Fog.interval — Seconds to wait before
+        #   retrying to check if the bucket is empty.
+        def destroy!(options = {})
+          requires :key
+          options = {
+            timeout: Fog.timeout,
+            interval: Fog.interval,
+          }.merge(options)
+
+          attempts = 0
+          begin
+            clear!
+            Fog.wait_for(options[:timeout], options[:interval]) { objects_keys.size == 0 }
+            service.delete_bucket(key)
+            true
+          rescue Excon::Errors::HTTPStatusError
+            false
+          end
+        end
+
         def location
-          @location ||= (bucket_location || AWS::DEFAULT_REGION)
+          @location ||= (bucket_location || Storage::DEFAULT_REGION)
         end
 
         # NOTE: you can't change the region once the bucket is created
@@ -40,7 +63,7 @@ module Fog
         end
 
         def files
-          @files ||= Fog::Storage::AWS::Files.new(:directory => self, :service => service)
+          @files ||= Fog::AWS::Storage::Files.new(:directory => self, :service => service)
         end
 
         def payer
@@ -67,7 +90,7 @@ module Fog
         end
 
         def versions
-          @versions ||= Fog::Storage::AWS::Versions.new(:directory => self, :service => service)
+          @versions ||= Fog::AWS::Storage::Versions.new(:directory => self, :service => service)
         end
 
         def public=(new_public)
@@ -119,6 +142,17 @@ module Fog
           data = service.get_bucket_location(key)
           data.body['LocationConstraint']
         end
+
+        def objects_keys
+          requires :key
+          bucket_query = service.get_bucket(key)
+          bucket_query.body["Contents"].map {|c| c["Key"]}
+        end
+
+        def clear!
+          requires :key
+          service.delete_multiple_objects(key, objects_keys) if objects_keys.size > 0
+        end
       end
     end
   end