fog-aws 3.0.0 → 3.1.0

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

@@ -163,10 +163,13 @@ module Fog
             # expect eventual consistency
             if (tags = server.tags) && tags.size > 0
               Fog.wait_for { server.reload rescue nil }
-              service.create_tags(
-                server.identity,
-                tags
-              )
+              Fog.wait_for {
+                begin
+                  service.create_tags(server.identity, tags)
+                rescue Fog::Compute::AWS::NotFound
+                  false
+                end
+              }
             end
             server
           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/server.rb

@@ -4,40 +4,41 @@ 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
 
         attr_accessor :password, :parameter_group_name, :security_group_names, :port, :source_snapshot_id
 
@@ -136,32 +137,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/parsers/rds/db_parser.rb

@@ -51,7 +51,8 @@ module Fog
               'CharacterSetName', 'DbiResourceId', 'LicenseModel', 'KmsKeyId',
               'DBClusterIdentifier'
               @db_instance[name] = value
-            when 'MultiAZ', 'AutoMinorVersionUpgrade', 'PubliclyAccessible', 'StorageEncrypted'
+            when 'MultiAZ', 'AutoMinorVersionUpgrade', 'PubliclyAccessible',
+              'StorageEncrypted', 'EnableIAMDatabaseAuthentication'
               @db_instance[name] = (value == 'true')
             when 'DBParameterGroups'
               @in_db_parameter_groups = false

data/lib/fog/aws/requests/auto_scaling/set_instance_protection.rb

@@ -0,0 +1,67 @@
+module Fog
+  module AWS
+    class AutoScaling
+      class Real
+        require 'fog/aws/parsers/auto_scaling/basic'
+
+        # Sets or removes scale in instance protection from one or more instances from the specified
+        # Auto Scaling group.
+        #
+        #  cli equiv:
+        # `aws autoscaling set-instance-protection --instance-ids i-5f2e8a0d --auto-scaling-group-name my-asg --protected-from-scale-in`
+        #
+        # ==== Parameters
+        #
+        #   * AutoScalingGroupName<~String> - The name of the Auto Scaling group``
+        #   * 'InstanceIds'<~Array> - The list of Auto Scaling instances to set or remove protection on.
+        #   * 'ProtectedFromScaleIn'<~Boolean> - Protection state
+        #
+        # ==== See Also
+        #
+        # https://docs.aws.amazon.com/autoscaling/latest/APIReference/API_SetInstanceProtection.html
+
+        ExpectedOptions[:asg_name] = %w[AutoScalingGroupName]
+        ExpectedOptions[:instance_ids] = %w[InstanceIds]
+        ExpectedOptions[:protected_from_scale_in] = %w[ProtectedFromScaleIn]
+
+        def set_instance_protection(auto_scaling_group_name, options = {})
+          if instance_ids = options.delete('InstanceIds')
+            options.merge!(AWS.indexed_param('InstanceIds.member.%d', [*instance_ids]))
+          end
+          protected_from_scale_in = options.delete('ProtectedFromScaleIn')
+
+          request({
+            'Action'               => 'SetInstanceProtection',
+            'AutoScalingGroupName' => auto_scaling_group_name,
+            'ProtectedFromScaleIn' => protected_from_scale_in,
+            :parser                => Fog::Parsers::AWS::AutoScaling::Basic.new
+          }.merge!(options))
+        end
+      end
+
+      class Mock
+        def set_instance_protection(auto_scaling_group_name, options = {})
+          unexpected_options = options.keys - \
+            ExpectedOptions[:asg_name] - \
+            ExpectedOptions[:instance_ids] - \
+            ExpectedOptions[:protected_from_scale_in]
+
+          unless unexpected_options.empty?
+            raise Fog::AWS::AutoScaling::ValidationError.new("Options #{unexpected_options.join(',')} should not be included in request")
+          end
+
+          unless self.data[:auto_scaling_groups].key?(auto_scaling_group_name)
+            raise Fog::AWS::AutoScaling::ValidationError.new('AutoScalingGroup name not found - null')
+          end
+
+          response = Excon::Response.new
+          response.status = 200
+          response.body = {
+            'ResponseMetadata' => { 'RequestId' => Fog::AWS::Mock.request_id }
+          }
+          response
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/dns/change_resource_record_sets.rb

@@ -28,14 +28,13 @@ module Fog
         }
       end
 
-      # See https://forums.aws.amazon.com/message.jspa?messageID=612414
-      # Note: Oddly, to update this list, I have had to revert to going to
-      #       dev console at https://console.aws.amazon.com/route53/home, then using
-      #       search all sources for Z14GRHDCWA56QT to find this in a HashMap
+      # See https://docs.aws.amazon.com/general/latest/gr/rande.html#elb_region
+      # This needs to be kept in sync manually sadly for now as seemingly this data is not available via an API
       def self.elb_dualstack_hosted_zone_mapping
         @elb_dualstack_hosted_zone_mapping ||= {
           "ap-northeast-1" => "Z14GRHDCWA56QT",
           "ap-northeast-2" => "ZWKZPGTI48KDX",
+          "ap-northeast-3" => "Z5LXEXXYW11ES",
           "ap-south-1" => "ZP97RAFLXTNZK",
           "ap-southeast-1" => "Z1LMS91P8CMLE5",
           "ap-southeast-2" => "Z1GM3OXH4ZPM65",
@@ -43,6 +42,7 @@ module Fog
           "eu-central-1" => "Z215JYRZR1TBD5",
           "eu-west-1" => "Z32O12XQLNTSW2",
           "eu-west-2" => "ZHURV8PSTC4K8",
+          "eu-west-3" => "Z3Q77PNBQS71R4",
           "us-east-1" => "Z35SXDOTRQ7X7K",
           "us-east-2" => "Z3AADJGX6KTTL2",
           "us-west-1" => "Z368ELLRRE2KJ0",

data/lib/fog/aws/requests/efs/create_file_system.rb

@@ -7,17 +7,27 @@ module Fog
         # ==== Parameters
         # * CreationToken <~String> - String of up to 64 ASCII characters. Amazon EFS uses this to ensure idempotent creation.
         # * PerformanceMode <~String> - (Optional) The PerformanceMode of the file system. We recommend generalPurpose performance mode for most file systems. File systems using the maxIO performance mode can scale to higher levels of aggregate throughput and operations per second with a tradeoff of slightly higher latencies for most file operations. This can't be changed after the file system has been created.
+        # * Encrypted <~Boolean> - (Optional) A Boolean value that, if true, creates an encrypted file system. When creating an encrypted file system, you have the option of specifying a CreateFileSystem:KmsKeyId for an existing AWS Key Management Service (AWS KMS) customer master key (CMK). If you don't specify a CMK, then the default CMK for Amazon EFS, /aws/elasticfilesystem, is used to protect the encrypted file system. 
+        # * KmsKeyId <~String> - (Optional) The ID of the AWS KMS CMK to be used to protect the encrypted file system. This parameter is only required if you want to use a non-default CMK. If this parameter is not specified, the default CMK for Amazon EFS is used. This ID can be in one of the following formats:
+        #   - Key ID - A unique identifier of the key, for example, 1234abcd-12ab-34cd-56ef-1234567890ab.
+        #   - ARN - An Amazon Resource Name (ARN) for the key, for example, arn:aws:kms:us-west-2:111122223333:key/1234abcd-12ab-34cd-56ef-1234567890ab.
+        #   - Key alias - A previously created display name for a key. For example, alias/projectKey1.
+        #   - Key alias ARN - An ARN for a key alias, for example, arn:aws:kms:us-west-2:444455556666:alias/projectKey1.
+        #   If KmsKeyId is specified, the CreateFileSystem:Encrypted parameter must be set to true.
         # ==== Returns
         # * response<~Excon::Response>
         #   * body<~Hash>
         def create_file_system(creation_token, options={})
-          request({
+          params = {
             :path             => "file-systems",
             :method           => 'POST',
             :expects          => 201,
             'CreationToken'   => creation_token,
-            'PerformanceMode' => options[:peformance_mode] || 'generalPurpose'
-          })
+            'PerformanceMode' => options[:peformance_mode] || 'generalPurpose',
+            'Encrypted'       => options[:encrypted] || false
+          }
+          params[:kms_key_id] = options[:kms_key_id] if options.key?(:kms_key_id)
+          request(params)
         end
       end
 
@@ -30,6 +40,7 @@ module Fog
             "OwnerId"              => Fog::AWS::Mock.owner_id,
             "CreationToken"        => creation_token,
             "PerformanceMode"      => options[:performance_mode] || "generalPurpose",
+            "Encrypted"            => options[:encrypted] || false,
             "FileSystemId"         => id,
             "CreationTime"         => Time.now.to_i.to_f,
             "LifeCycleState"       => "creating",
@@ -39,6 +50,7 @@ module Fog
               "Timestamp" => Time.now.to_i.to_f
             }
           }
+          file_system[:kms_key_id] = options[:kms_key_id] if options.key?(:kms_key_id)
 
           self.data[:file_systems][id] = file_system
           response.body = file_system

data/lib/fog/aws/storage.rb

@@ -221,8 +221,8 @@ module Fog
           case region.to_s
           when DEFAULT_REGION, ''
             's3.amazonaws.com'
-          when 'cn-north-1'
-            's3.cn-north-1.amazonaws.com.cn'
+          when %r{\Acn-.*}
+            "s3.#{region}.amazonaws.com.cn"
           else
             "s3-#{region}.amazonaws.com"
           end
@@ -316,7 +316,8 @@ module Fog
         def params_to_url(params)
           query = params[:query] && params[:query].map do |key, value|
             if value
-              [key, escape(value.to_s)].join('=')
+              # URL parameters need / to be escaped
+              [key, Fog::AWS.escape(value.to_s)].join('=')
             else
               key
             end

data/lib/fog/aws/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module AWS
-    VERSION = "3.0.0"
+    VERSION = "3.1.0"
   end
 end

data/stale.yml

@@ -0,0 +1,17 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 60
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 7
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - pinned
+  - security
+# Label to use when marking an issue as stale
+staleLabel: wontfix
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked stale due to inactivity.
+  It will be closed if no further activity occurs.
+  Thank you for your contributions.
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false

data/tests/requests/auto_scaling/auto_scaling_tests.rb

@@ -51,6 +51,14 @@ Shindo.tests('AWS::AutoScaling | auto_scaling_tests', ['aws', 'auto_scaling']) d
       tests("#attach_instances").formats(AWS::AutoScaling::Formats::BASIC) do
         Fog::AWS[:auto_scaling].attach_instances(@asg_name, 'InstanceIds' => 'i-deadbeef').body
       end
+
+      tests("#set_instance_protection").formats(AWS::AutoScaling::Formats::BASIC) do
+        Fog::AWS[:auto_scaling].set_instance_protection(
+          @asg_name,
+          'InstanceIds' => 'i-deadbeef',
+          'ProtectedFromScaleIn' => true
+        ).body
+      end
     end
 
     tests("#describe_auto_scaling_groups").formats(AWS::AutoScaling::Formats::DESCRIBE_AUTO_SCALING_GROUPS) do

data/tests/requests/efs/helper.rb

@@ -10,6 +10,8 @@ class AWS
         "NumberOfMountTargets" => Integer,
         "OwnerId"              => String,
         "PerformanceMode"      => String,
+        "Encrypted"            => Fog::Nullable::Boolean,
+        "KmsKeyId"             => Fog::Nullable::String,
         "SizeInBytes"          => {
           "Timestamp" => Fog::Nullable::Float,
           "Value"     => Integer

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-aws
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Josh Lane
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-23 00:00:00.000000000 Z
+date: 2018-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -773,6 +773,7 @@ files:
 - lib/fog/aws/requests/auto_scaling/resume_processes.rb
 - lib/fog/aws/requests/auto_scaling/set_desired_capacity.rb
 - lib/fog/aws/requests/auto_scaling/set_instance_health.rb
+- lib/fog/aws/requests/auto_scaling/set_instance_protection.rb
 - lib/fog/aws/requests/auto_scaling/suspend_processes.rb
 - lib/fog/aws/requests/auto_scaling/terminate_instance_in_auto_scaling_group.rb
 - lib/fog/aws/requests/auto_scaling/update_auto_scaling_group.rb
@@ -1424,6 +1425,7 @@ files:
 - lib/fog/aws/sts.rb
 - lib/fog/aws/support.rb
 - lib/fog/aws/version.rb
+- stale.yml
 - tests/credentials_tests.rb
 - tests/helper.rb
 - tests/helpers/collection_helper.rb