fog-aws 3.12.0 → 3.13.0

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

@@ -108,15 +108,16 @@ module Fog
         # @return [File]
         #
         def body
-          return attributes[:body] if attributes[:body]
-          return '' unless last_modified
+          return attributes[:body] if attributes.key?(:body)
 
           file = collection.get(identity)
-          if file
-            attributes[:body] = file.body
-          else
-            attributes[:body] = ''
-          end
+
+          attributes[:body] =
+            if file
+              file.body
+            else
+              ''
+            end
         end
 
         # Set body attribute.

data/lib/fog/aws/requests/compute/create_network_interface.rb

@@ -2,6 +2,7 @@ module Fog
   module AWS
     class Compute
       class Real
+        require 'ipaddr'
         require 'fog/aws/parsers/compute/create_network_interface'
 
         # Creates a network interface
@@ -68,7 +69,7 @@ module Fog
               raise Fog::AWS::Compute::Error.new("Unknown subnet '#{subnetId}' specified")
             else
               id = Fog::AWS::Mock.network_interface_id
-              cidr_block = IPAddress.parse(subnet['cidrBlock'])
+              cidr_block = IPAddr.new(subnet['cidrBlock'])
 
               groups = {}
               if options['GroupSet']
@@ -82,12 +83,14 @@ module Fog
               end
 
               if options['PrivateIpAddress'].nil?
+                range = cidr_block.to_range
                 # Here we try to act like a DHCP server and pick the first
                 # available IP (not including the first in the cidr block,
                 # which is typically reserved for the gateway).
-                cidr_block.each_host do |p_ip|
-                  unless self.data[:network_interfaces].map{ |ni, ni_conf| ni_conf['privateIpAddress'] }.include?p_ip.to_s ||
-                    cidr_block.first == p_ip
+                range = range.drop(2)[0..-2] if cidr_block.ipv4?
+
+                range.each do |p_ip|
+                  unless self.data[:network_interfaces].map{ |ni, ni_conf| ni_conf['privateIpAddress'] }.include?p_ip.to_s
                     options['PrivateIpAddress'] = p_ip.to_s
                     break
                   end

data/lib/fog/aws/requests/compute/create_subnet.rb

@@ -2,7 +2,7 @@ module Fog
   module AWS
     class Compute
       class Real
-        require 'ipaddress'
+        require 'ipaddr'
         require 'fog/aws/parsers/compute/create_subnet'
 
         # Creates a Subnet with the CIDR block you specify.
@@ -50,11 +50,11 @@ module Fog
               if vpc.nil?
                 raise Fog::AWS::Compute::NotFound.new("The vpc ID '#{vpcId}' does not exist")
               end
-              if ! ::IPAddress.parse(vpc['cidrBlock']).include?(::IPAddress.parse(cidrBlock))
+              if ! ::IPAddr.new(vpc['cidrBlock']).include?(::IPAddr.new(cidrBlock))
                 raise Fog::AWS::Compute::Error.new("Range => The CIDR '#{cidrBlock}' is invalid.")
               end
               self.data[:subnets].select{ |s| s['vpcId'] == vpcId }.each do |subnet|
-                if ::IPAddress.parse(subnet['cidrBlock']).include?(::IPAddress.parse(cidrBlock))
+                if ::IPAddr.new(subnet['cidrBlock']).include?(::IPAddr.new(cidrBlock))
                   raise Fog::AWS::Compute::Error.new("Conflict => The CIDR '#{cidrBlock}' conflicts with another subnet")
                 end
               end

data/lib/fog/aws/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module AWS
-    VERSION = "3.12.0"
+    VERSION = "3.13.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-aws
 version: !ruby/object:Gem::Version
-  version: 3.12.0
+  version: 3.13.0
 platform: ruby
 authors:
 - Josh Lane
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-23 00:00:00.000000000 Z
+date: 2022-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -123,20 +123,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
-- !ruby/object:Gem::Dependency
-  name: ipaddress
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.8'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.8'
 description: |-
   This library can be used as a module for `fog` or as standalone provider
                           to use the Amazon Web Services in applications..
@@ -176,7 +162,9 @@ files:
 - lib/fog/aws/federation.rb
 - lib/fog/aws/glacier.rb
 - lib/fog/aws/iam.rb
+- lib/fog/aws/iam/default_policies.json
 - lib/fog/aws/iam/default_policies.rb
+- lib/fog/aws/iam/default_policy_versions.json
 - lib/fog/aws/iam/paged_collection.rb
 - lib/fog/aws/kinesis.rb
 - lib/fog/aws/kms.rb
@@ -1451,269 +1439,6 @@ files:
 - lib/fog/aws/sts.rb
 - lib/fog/aws/support.rb
 - lib/fog/aws/version.rb
-- tests/credentials_tests.rb
-- tests/helper.rb
-- tests/helpers/collection_helper.rb
-- tests/helpers/compute/flavors_helper.rb
-- tests/helpers/compute/server_helper.rb
-- tests/helpers/compute/servers_helper.rb
-- tests/helpers/dns_helper.rb
-- tests/helpers/formats_helper.rb
-- tests/helpers/formats_helper_tests.rb
-- tests/helpers/mock_helper.rb
-- tests/helpers/model_helper.rb
-- tests/helpers/responds_to_helper.rb
-- tests/helpers/schema_validator_tests.rb
-- tests/helpers/succeeds_helper.rb
-- tests/lorem.txt
-- tests/models/auto_scaling/activities_tests.rb
-- tests/models/auto_scaling/configuration_test.rb
-- tests/models/auto_scaling/configurations_tests.rb
-- tests/models/auto_scaling/groups_test.rb
-- tests/models/auto_scaling/helper.rb
-- tests/models/auto_scaling/instance_tests.rb
-- tests/models/auto_scaling/instances_tests.rb
-- tests/models/beanstalk/application_tests.rb
-- tests/models/beanstalk/applications_tests.rb
-- tests/models/beanstalk/environment_tests.rb
-- tests/models/beanstalk/environments_tests.rb
-- tests/models/beanstalk/template_tests.rb
-- tests/models/beanstalk/templates_tests.rb
-- tests/models/beanstalk/version_tests.rb
-- tests/models/beanstalk/versions_tests.rb
-- tests/models/cdn/distribution_tests.rb
-- tests/models/cdn/distributions_tests.rb
-- tests/models/cdn/invalidation_tests.rb
-- tests/models/cdn/invalidations_tests.rb
-- tests/models/cdn/streaming_distribution_tests.rb
-- tests/models/cdn/streaming_distributions_tests.rb
-- tests/models/cloud_watch/alarm_data_tests.rb
-- tests/models/cloud_watch/alarm_history_tests.rb
-- tests/models/cloud_watch/metric_statistics_tests.rb
-- tests/models/cloud_watch/metrics_tests.rb
-- tests/models/compute/address_tests.rb
-- tests/models/compute/addresses_tests.rb
-- tests/models/compute/dhcp_option_tests.rb
-- tests/models/compute/dhcp_options_tests.rb
-- tests/models/compute/internet_gateway_tests.rb
-- tests/models/compute/internet_gateways_tests.rb
-- tests/models/compute/key_pair_tests.rb
-- tests/models/compute/key_pairs_tests.rb
-- tests/models/compute/network_acl_tests.rb
-- tests/models/compute/network_acls_tests.rb
-- tests/models/compute/network_interfaces_test.rb
-- tests/models/compute/security_group_tests.rb
-- tests/models/compute/security_groups_tests.rb
-- tests/models/compute/server_tests.rb
-- tests/models/compute/snapshot_tests.rb
-- tests/models/compute/snapshots_tests.rb
-- tests/models/compute/subnet_tests.rb
-- tests/models/compute/subnets_tests.rb
-- tests/models/compute/volume_tests.rb
-- tests/models/compute/volumes_tests.rb
-- tests/models/compute/vpc_tests.rb
-- tests/models/compute/vpcs_tests.rb
-- tests/models/data_pipeline/pipeline_tests.rb
-- tests/models/data_pipeline/pipelines_tests.rb
-- tests/models/dns/record_tests.rb
-- tests/models/dns/records_tests.rb
-- tests/models/dns/zone_tests.rb
-- tests/models/dns/zones_tests.rb
-- tests/models/efs/file_system_tests.rb
-- tests/models/efs/mount_target_tests.rb
-- tests/models/efs/mount_targets_tests.rb
-- tests/models/elasticache/cluster_tests.rb
-- tests/models/elasticache/parameter_groups_tests.rb
-- tests/models/elasticache/security_groups_tests.rb
-- tests/models/elasticache/subnet_groups_tests.rb
-- tests/models/elb/model_tests.rb
-- tests/models/elb/tagging_tests.rb
-- tests/models/glacier/model_tests.rb
-- tests/models/iam/access_keys_tests.rb
-- tests/models/iam/groups_tests.rb
-- tests/models/iam/instance_profile_tests.rb
-- tests/models/iam/managed_policies_tests.rb
-- tests/models/iam/policies_tests.rb
-- tests/models/iam/roles_tests.rb
-- tests/models/iam/users_tests.rb
-- tests/models/rds/cluster_tests.rb
-- tests/models/rds/clusters_tests.rb
-- tests/models/rds/event_subscription_tests.rb
-- tests/models/rds/event_subscriptions_tests.rb
-- tests/models/rds/helper.rb
-- tests/models/rds/instance_option_tests.rb
-- tests/models/rds/parameter_group_tests.rb
-- tests/models/rds/parameter_groups_tests.rb
-- tests/models/rds/security_group_tests.rb
-- tests/models/rds/security_groups_tests.rb
-- tests/models/rds/server_tests.rb
-- tests/models/rds/servers_tests.rb
-- tests/models/rds/snapshot_tests.rb
-- tests/models/rds/snapshots_tests.rb
-- tests/models/rds/tagging_tests.rb
-- tests/models/sns/topic_tests.rb
-- tests/models/sns/topics_tests.rb
-- tests/models/storage/directory_tests.rb
-- tests/models/storage/file_tests.rb
-- tests/models/storage/files_tests.rb
-- tests/models/storage/url_tests.rb
-- tests/models/storage/version_tests.rb
-- tests/models/storage/versions_tests.rb
-- tests/models/support/trusted_advisor_tests.rb
-- tests/parsers/compute/describe_images_tests.rb
-- tests/parsers/elb/describe_load_balancers.rb
-- tests/parsers/elbv2/create_load_balancer_tests.rb
-- tests/parsers/elbv2/describe_listeners_tests.rb
-- tests/parsers/elbv2/describe_load_balancers_tests.rb
-- tests/parsers/elbv2/describe_tags_tests.rb
-- tests/requests/auto_scaling/auto_scaling_tests.rb
-- tests/requests/auto_scaling/describe_types_tests.rb
-- tests/requests/auto_scaling/helper.rb
-- tests/requests/auto_scaling/model_tests.rb
-- tests/requests/auto_scaling/notification_configuration_tests.rb
-- tests/requests/auto_scaling/tag_tests.rb
-- tests/requests/beanstalk/application_tests.rb
-- tests/requests/beanstalk/solution_stack_tests.rb
-- tests/requests/cdn/cdn_tests.rb
-- tests/requests/cloud_formation/stack_tests.rb
-- tests/requests/cloud_watch/get_metric_statistics_tests.rb
-- tests/requests/cloud_watch/list_metrics_test.rb
-- tests/requests/cloud_watch/put_metric_data_tests.rb
-- tests/requests/compute/address_tests.rb
-- tests/requests/compute/assign_private_ip_tests.rb
-- tests/requests/compute/availability_zone_tests.rb
-- tests/requests/compute/client_tests.rb
-- tests/requests/compute/dhcp_options_tests.rb
-- tests/requests/compute/helper.rb
-- tests/requests/compute/image_tests.rb
-- tests/requests/compute/instance_attrib_tests.rb
-- tests/requests/compute/instance_tests.rb
-- tests/requests/compute/internet_gateway_tests.rb
-- tests/requests/compute/key_pair_tests.rb
-- tests/requests/compute/network_acl_tests.rb
-- tests/requests/compute/network_interface_tests.rb
-- tests/requests/compute/placement_group_tests.rb
-- tests/requests/compute/region_tests.rb
-- tests/requests/compute/route_tests.rb
-- tests/requests/compute/security_group_tests.rb
-- tests/requests/compute/snapshot_tests.rb
-- tests/requests/compute/spot_datafeed_subscription_tests.rb
-- tests/requests/compute/spot_instance_tests.rb
-- tests/requests/compute/spot_price_history_tests.rb
-- tests/requests/compute/subnet_tests.rb
-- tests/requests/compute/tag_tests.rb
-- tests/requests/compute/volume_tests.rb
-- tests/requests/compute/vpc_tests.rb
-- tests/requests/data_pipeline/helper.rb
-- tests/requests/data_pipeline/pipeline_tests.rb
-- tests/requests/dns/change_resource_record_sets_tests.rb
-- tests/requests/dns/dns_tests.rb
-- tests/requests/dns/health_check_tests.rb
-- tests/requests/dns/helper.rb
-- tests/requests/dynamodb/item_tests.rb
-- tests/requests/dynamodb/table_tests.rb
-- tests/requests/ecs/cluster_tests.rb
-- tests/requests/ecs/container_instance_tests.rb
-- tests/requests/ecs/helper.rb
-- tests/requests/ecs/sample_task_definition1.json
-- tests/requests/ecs/service_tests.rb
-- tests/requests/ecs/task_definitions_tests.rb
-- tests/requests/ecs/task_tests.rb
-- tests/requests/efs/file_system_tests.rb
-- tests/requests/efs/helper.rb
-- tests/requests/elasticache/cache_cluster_tests.rb
-- tests/requests/elasticache/describe_events.rb
-- tests/requests/elasticache/describe_reserved_cache_nodes.rb
-- tests/requests/elasticache/helper.rb
-- tests/requests/elasticache/parameter_group_tests.rb
-- tests/requests/elasticache/security_group_tests.rb
-- tests/requests/elasticache/subnet_group_tests.rb
-- tests/requests/elb/helper.rb
-- tests/requests/elb/listener_tests.rb
-- tests/requests/elb/load_balancer_tests.rb
-- tests/requests/elb/policy_tests.rb
-- tests/requests/elbv2/helper.rb
-- tests/requests/elbv2/load_balancer_tests.rb
-- tests/requests/emr/helper.rb
-- tests/requests/emr/instance_group_tests.rb
-- tests/requests/emr/job_flow_tests.rb
-- tests/requests/federation/get_signin_token_tests.rb
-- tests/requests/glacier/archive_tests.rb
-- tests/requests/glacier/multipart_upload_tests.rb
-- tests/requests/glacier/tree_hash_tests.rb
-- tests/requests/glacier/vault_tests.rb
-- tests/requests/iam/access_key_tests.rb
-- tests/requests/iam/account_policy_tests.rb
-- tests/requests/iam/account_tests.rb
-- tests/requests/iam/group_policy_tests.rb
-- tests/requests/iam/group_tests.rb
-- tests/requests/iam/helper.rb
-- tests/requests/iam/instance_profile_tests.rb
-- tests/requests/iam/login_profile_tests.rb
-- tests/requests/iam/managed_policy_tests.rb
-- tests/requests/iam/mfa_tests.rb
-- tests/requests/iam/role_tests.rb
-- tests/requests/iam/server_certificate_tests.rb
-- tests/requests/iam/user_policy_tests.rb
-- tests/requests/iam/user_tests.rb
-- tests/requests/iam/versioned_managed_policy_tests.rb
-- tests/requests/kinesis/helper.rb
-- tests/requests/kinesis/stream_tests.rb
-- tests/requests/kms/helper.rb
-- tests/requests/kms/key_tests.rb
-- tests/requests/lambda/function_sample_1.js
-- tests/requests/lambda/function_sample_2.js
-- tests/requests/lambda/function_tests.rb
-- tests/requests/lambda/helper.rb
-- tests/requests/rds/cluster_snapshot_tests.rb
-- tests/requests/rds/cluster_tests.rb
-- tests/requests/rds/db_engine_versions.rb
-- tests/requests/rds/db_snapshot_tests.rb
-- tests/requests/rds/describe_events.rb
-- tests/requests/rds/event_subscription_tests.rb
-- tests/requests/rds/helper.rb
-- tests/requests/rds/instance_option_tests.rb
-- tests/requests/rds/instance_tests.rb
-- tests/requests/rds/log_file_tests.rb
-- tests/requests/rds/parameter_group_tests.rb
-- tests/requests/rds/parameter_request_tests.rb
-- tests/requests/rds/security_group_tests.rb
-- tests/requests/rds/subnet_groups_tests.rb
-- tests/requests/rds/tagging_tests.rb
-- tests/requests/redshift/cluster_parameter_group_tests.rb
-- tests/requests/redshift/cluster_security_group_tests.rb
-- tests/requests/redshift/cluster_snapshot_tests.rb
-- tests/requests/redshift/cluster_tests.rb
-- tests/requests/ses/helper.rb
-- tests/requests/ses/verified_domain_identity_tests.rb
-- tests/requests/ses/verified_email_address_tests.rb
-- tests/requests/simpledb/attributes_tests.rb
-- tests/requests/simpledb/domain_tests.rb
-- tests/requests/simpledb/helper.rb
-- tests/requests/sns/helper.rb
-- tests/requests/sns/subscription_tests.rb
-- tests/requests/sns/topic_tests.rb
-- tests/requests/sqs/helper.rb
-- tests/requests/sqs/message_tests.rb
-- tests/requests/sqs/queue_tests.rb
-- tests/requests/storage/acl_utils_tests.rb
-- tests/requests/storage/bucket_tests.rb
-- tests/requests/storage/cors_utils_tests.rb
-- tests/requests/storage/delete_multiple_objects_tests.rb
-- tests/requests/storage/multipart_copy_tests.rb
-- tests/requests/storage/multipart_upload_tests.rb
-- tests/requests/storage/object_tests.rb
-- tests/requests/storage/versioning_tests.rb
-- tests/requests/sts/assume_role_tests.rb
-- tests/requests/sts/assume_role_with_saml_tests.rb
-- tests/requests/sts/assume_role_with_web_identity_tests.rb
-- tests/requests/sts/get_federation_token_tests.rb
-- tests/requests/sts/session_token_tests.rb
-- tests/requests/support/helper.rb
-- tests/requests/support/trusted_advisor_check_tests.rb
-- tests/signaturev4_tests.rb
-- tests/signed_params_tests.rb
-- tests/storage_tests.rb
 homepage: https://github.com/fog/fog-aws
 licenses:
 - MIT
@@ -1733,7 +1458,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.3.5
 signing_key:
 specification_version: 4
 summary: Module for the 'fog' gem to support Amazon Web Services.

data/tests/credentials_tests.rb

@@ -1,190 +0,0 @@
-# frozen_string_literal: true
-
-Shindo.tests('AWS | credentials', ['aws']) do
-  old_mock_value = Excon.defaults[:mock]
-  fog_was_mocked = Fog.mocking?
-  Excon.stubs.clear
-  Fog.unmock!
-  begin
-    Excon.defaults[:mock] = true
-    Excon.stub({ method: :put, path: '/latest/api/token' }, { status: 200, body: 'token1234' })
-
-    Excon.stub({ method: :get, path: '/latest/meta-data/iam/security-credentials/' }, { status: 200, body: 'arole' })
-    Excon.stub({ method: :get, path: '/latest/meta-data/placement/availability-zone/' }, { status: 200, body: 'us-west-1a' })
-
-    expires_at = Time.at(Time.now.to_i + 500)
-    credentials = {
-      'AccessKeyId' => 'dummykey',
-      'SecretAccessKey' => 'dummysecret',
-      'Token' => 'dummytoken',
-      'Expiration' => expires_at.xmlschema
-    }
-
-    Excon.stub({ method: :get, path: '/latest/meta-data/iam/security-credentials/arole' }, { status: 200, body: Fog::JSON.encode(credentials) })
-
-    tests('#fetch_credentials') do
-      returns(aws_access_key_id: 'dummykey',
-              aws_secret_access_key: 'dummysecret',
-              aws_session_token: 'dummytoken',
-              region: 'us-west-1',
-              aws_credentials_expire_at: expires_at) { Fog::AWS::Compute.fetch_credentials(use_iam_profile: true) }
-    end
-
-    tests('#fetch_credentials when the v2 token 404s') do
-      Excon.stub({ method: :put, path: '/latest/api/token' }, { status: 404, body: 'not found' })
-      returns(aws_access_key_id: 'dummykey',
-              aws_secret_access_key: 'dummysecret',
-              aws_session_token: 'dummytoken',
-              region: 'us-west-1',
-              aws_credentials_expire_at: expires_at) { Fog::AWS::Compute.fetch_credentials(use_iam_profile: true) }
-    end
-
-    tests('#fetch_credentials when the v2 disabled') do
-      returns(aws_access_key_id: 'dummykey',
-              aws_secret_access_key: 'dummysecret',
-              aws_session_token: 'dummytoken',
-              region: 'us-west-1',
-              aws_credentials_expire_at: expires_at) { Fog::AWS::Compute.fetch_credentials(use_iam_profile: true, disable_imds_v2: true) }
-    end
-
-    ENV['AWS_CONTAINER_CREDENTIALS_RELATIVE_URI'] = '/v1/credentials?id=task_id'
-    Excon.stub({ method: :get, path: '/v1/credentials?id=task_id' }, { status: 200, body: Fog::JSON.encode(credentials) })
-
-    tests('#fetch_credentials') do
-      returns(aws_access_key_id: 'dummykey',
-              aws_secret_access_key: 'dummysecret',
-              aws_session_token: 'dummytoken',
-              region: 'us-west-1',
-              aws_credentials_expire_at: expires_at) { Fog::AWS::Compute.fetch_credentials(use_iam_profile: true) }
-    end
-
-    ENV['AWS_CONTAINER_CREDENTIALS_RELATIVE_URI'] = nil
-
-    ENV['AWS_WEB_IDENTITY_TOKEN_FILE'] = File.dirname(__FILE__) + '/lorem.txt'
-    ENV['AWS_ROLE_ARN'] = "dummyrole"
-    ENV['AWS_ROLE_SESSION_NAME'] = "dummyrolesessionname"
-    document = 
-      '<AssumeRoleWithWebIdentityResponse xmlns="https://sts.amazonaws.com/doc/2011-06-15/">'\
-        '<AssumeRoleWithWebIdentityResult>'\
-          '<Credentials>'\
-            '<SessionToken>dummytoken</SessionToken>'\
-            '<SecretAccessKey>dummysecret</SecretAccessKey>'\
-            "<Expiration>#{expires_at.xmlschema}</Expiration>"\
-            '<AccessKeyId>dummykey</AccessKeyId>'\
-          '</Credentials>'\
-        '</AssumeRoleWithWebIdentityResult>'\
-      '</AssumeRoleWithWebIdentityResponse>'
-    
-    Excon.stub({method: :get, path: "/", idempotent: true}, { status: 200, body: document})
-
-    tests('#fetch_credentials token based') do
-      returns(
-        aws_access_key_id: 'dummykey',
-        aws_secret_access_key: 'dummysecret',
-        aws_session_token: 'dummytoken',
-        region: 'us-west-1',
-        sts_endpoint: "https://sts.amazonaws.com",
-        aws_credentials_expire_at: expires_at
-      ) { Fog::AWS::Compute.fetch_credentials(use_iam_profile: true) }
-    end
-
-    ENV['AWS_ROLE_SESSION_NAME'] = nil
-
-    tests('#fetch_credentials token based without session name') do
-      returns(
-        aws_access_key_id: 'dummykey',
-        aws_secret_access_key: 'dummysecret',
-        aws_session_token: 'dummytoken',
-        region: 'us-west-1',
-        sts_endpoint: "https://sts.amazonaws.com",
-        aws_credentials_expire_at: expires_at
-      ) { Fog::AWS::Compute.fetch_credentials(use_iam_profile: true, region: 'us-west-1') }
-    end
-
-    ENV["AWS_STS_REGIONAL_ENDPOINTS"] = "regional"
-
-    tests('#fetch_credentials with no region specified') do
-      returns(
-        aws_access_key_id: 'dummykey',
-        aws_secret_access_key: 'dummysecret',
-        aws_session_token: 'dummytoken',
-        region: 'us-west-1',
-        sts_endpoint: "https://sts.amazonaws.com",
-        aws_credentials_expire_at: expires_at
-      ) { Fog::AWS::Compute.fetch_credentials(use_iam_profile: true) }
-    end
-
-    tests('#fetch_credentials with regional STS endpoint') do
-      returns(
-        aws_access_key_id: 'dummykey',
-        aws_secret_access_key: 'dummysecret',
-        aws_session_token: 'dummytoken',
-        region: 'us-west-1',
-        sts_endpoint: "https://sts.us-west-1.amazonaws.com",
-        aws_credentials_expire_at: expires_at
-      ) { Fog::AWS::Compute.fetch_credentials(use_iam_profile: true, region: 'us-west-1') }
-    end
-
-    ENV["AWS_DEFAULT_REGION"] = "us-west-1"
-
-    tests('#fetch_credentials with regional STS endpoint with region in env') do
-      returns(
-        aws_access_key_id: 'dummykey',
-        aws_secret_access_key: 'dummysecret',
-        aws_session_token: 'dummytoken',
-        region: 'us-west-1',
-        sts_endpoint: "https://sts.us-west-1.amazonaws.com",
-        aws_credentials_expire_at: expires_at
-      ) { Fog::AWS::Compute.fetch_credentials(use_iam_profile: true) }
-    end
-
-    ENV["AWS_STS_REGIONAL_ENDPOINTS"] = nil
-    ENV["AWS_DEFAULT_REGION"] = nil
-    ENV['AWS_WEB_IDENTITY_TOKEN_FILE'] = nil
-
-    compute = Fog::AWS::Compute.new(use_iam_profile: true)
-
-    tests('#refresh_credentials_if_expired') do
-      returns(nil) { compute.refresh_credentials_if_expired }
-    end
-
-    credentials['AccessKeyId'] = 'newkey'
-    credentials['SecretAccessKey'] = 'newsecret'
-    credentials['Expiration'] = (expires_at + 10).xmlschema
-
-    Excon.stub({ method: :get, path: '/latest/meta-data/iam/security-credentials/arole' }, { status: 200, body: Fog::JSON.encode(credentials) })
-
-    Fog::Time.now = expires_at + 1
-    tests('#refresh_credentials_if_expired') do
-      returns(true) { compute.refresh_credentials_if_expired }
-      returns('newkey') { compute.instance_variable_get(:@aws_access_key_id) }
-    end
-    Fog::Time.now = Time.now
-
-    default_credentials = Fog::AWS::Compute.fetch_credentials({})
-    tests('#fetch_credentials when the url 404s') do
-      Excon.stub({ method: :put, path: '/latest/api/token' }, { status: 404, body: 'not found' })
-      Excon.stub({ method: :get, path: '/latest/meta-data/iam/security-credentials/' }, { status: 404, body: 'not bound' })
-      Excon.stub({ method: :get, path: '/latest/meta-data/placement/availability-zone/' }, { status: 400, body: 'not found' })
-      returns(default_credentials) { Fog::AWS::Compute.fetch_credentials(use_iam_profile: true) }
-    end
-
-    mocked_credentials = {
-      aws_access_key_id: 'access-key-id',
-      aws_secret_access_key: 'secret-access-key',
-      aws_session_token: 'session-token',
-      aws_credentials_expire_at: Time.at(Time.now.to_i + 500).xmlschema
-    }
-    tests('#fetch_credentials when mocking') do
-      Fog.mock!
-      Fog::AWS::Compute::Mock.data[:iam_role_based_creds] = mocked_credentials
-      returns(mocked_credentials) { Fog::AWS::Compute.fetch_credentials(use_iam_profile: true) }
-    end
-  ensure
-    ENV['AWS_CONTAINER_CREDENTIALS_RELATIVE_URI'] = nil
-    ENV['AWS_WEB_IDENTITY_TOKEN_FILE'] = nil
-    Excon.stubs.clear
-    Excon.defaults[:mock] = old_mock_value
-    Fog.mock! if fog_was_mocked
-  end
-end

data/tests/helper.rb

@@ -1,29 +0,0 @@
-begin
-  require 'simplecov'
-  SimpleCov.start
-  SimpleCov.command_name 'Shindo'
-rescue LoadError => e
-  $stderr.puts "not recording test coverage: #{e.inspect}"
-end
-
-require File.expand_path('../../lib/fog/aws', __FILE__)
-
-Bundler.require(:test)
-
-Excon.defaults.merge!(debug_request: true, debug_response: true)
-
-require File.expand_path(File.join(File.dirname(__FILE__), 'helpers', 'mock_helper'))
-
-# This overrides the default 600 seconds timeout during live test runs
-unless Fog.mocking?
-  Fog.timeout = ENV['FOG_TEST_TIMEOUT'] || 2_000
-  Fog::Logger.warning "Setting default fog timeout to #{Fog.timeout} seconds"
-end
-
-def lorem_file
-  File.open(File.dirname(__FILE__) + '/lorem.txt', 'r')
-end
-
-def array_differences(array_a, array_b)
-  (array_a - array_b) | (array_b - array_a)
-end