fog-aws 3.3.0 → 3.4.0

data/tests/helpers/formats_helper_tests.rb

@@ -1,37 +1,37 @@
 Shindo.tests('test_helper', 'meta') do
 
   tests('comparing welcome data against schema') do
-    data = {:welcome => "Hello" }
-    data_matches_schema(:welcome => String) { data }
+    data = { welcome: 'Hello' }
+    data_matches_schema(welcome: String) { data }
   end
 
   tests('#data_matches_schema') do
     tests('when value matches schema expectation') do
-      data_matches_schema({"key" => String}) { {"key" => "Value"} }
+      data_matches_schema('key' => String) { { 'key' => 'Value' } }
     end
 
     tests('when values within an array all match schema expectation') do
-      data_matches_schema({"key" => [Integer]}) { {"key" => [1, 2]} }
+      data_matches_schema('key' => [Integer]) { { 'key' => [1, 2] } }
     end
 
     tests('when nested values match schema expectation') do
-      data_matches_schema({"key" => {:nested_key => String}}) { {"key" => {:nested_key => "Value"}} }
+      data_matches_schema('key' => { nested_key: String }) { { 'key' => { nested_key: 'Value' } } }
     end
 
     tests('when collection of values all match schema expectation') do
-      data_matches_schema([{"key" => String}]) { [{"key" => "Value"}, {"key" => "Value"}] }
+      data_matches_schema([{ 'key' => String }]) { [{ 'key' => 'Value' }, { 'key' => 'Value' }] }
     end
 
     tests('when collection is empty although schema covers optional members') do
-      data_matches_schema([{"key" => String}], {:allow_optional_rules => true}) { [] }
+      data_matches_schema([{ 'key' => String }], allow_optional_rules: true) { [] }
     end
 
     tests('when additional keys are passed and not strict') do
-      data_matches_schema({"key" => String}, {:allow_extra_keys => true}) { {"key" => "Value", :extra => "Bonus"} }
+      data_matches_schema({ 'key' => String }, allow_extra_keys: true) { { 'key' => 'Value', extra: 'Bonus' } }
     end
 
     tests('when value is nil and schema expects NilClass') do
-      data_matches_schema({"key" => NilClass}) { {"key" => nil} }
+      data_matches_schema('key' => NilClass) { { 'key' => nil } }
     end
 
     tests('when value and schema match as hashes') do
@@ -43,46 +43,45 @@ Shindo.tests('test_helper', 'meta') do
     end
 
     tests('when value is a Time') do
-      data_matches_schema({"time" => Time}) { {"time" => Time.now} }
+      data_matches_schema('time' => Time) { { 'time' => Time.now } }
     end
 
     tests('when key is missing but value should be NilClass (#1477)') do
-      data_matches_schema({"key" => NilClass}, {:allow_optional_rules => true}) { {} }
+      data_matches_schema({ 'key' => NilClass }, allow_optional_rules: true) { {} }
     end
 
     tests('when key is missing but value is nullable (#1477)') do
-      data_matches_schema({"key" => Fog::Nullable::String}, {:allow_optional_rules => true}) { {} }
+      data_matches_schema({ 'key' => Fog::Nullable::String }, allow_optional_rules: true) { {} }
     end
   end
 
   tests('#formats backwards compatible changes') do
-
     tests('when value matches schema expectation') do
-      formats({"key" => String}) { {"key" => "Value"} }
+      formats('key' => String) { { 'key' => 'Value' } }
     end
 
     tests('when values within an array all match schema expectation') do
-      formats({"key" => [Integer]}) { {"key" => [1, 2]} }
+      formats('key' => [Integer]) { { 'key' => [1, 2] } }
     end
 
     tests('when nested values match schema expectation') do
-      formats({"key" => {:nested_key => String}}) { {"key" => {:nested_key => "Value"}} }
+      formats('key' => { nested_key: String }) { { 'key' => { nested_key: 'Value' } } }
     end
 
     tests('when collection of values all match schema expectation') do
-      formats([{"key" => String}]) { [{"key" => "Value"}, {"key" => "Value"}] }
+      formats([{ 'key' => String }]) { [{ 'key' => 'Value' }, { 'key' => 'Value' }] }
     end
 
     tests('when collection is empty although schema covers optional members') do
-      formats([{"key" => String}]) { [] }
+      formats([{ 'key' => String }]) { [] }
     end
 
     tests('when additional keys are passed and not strict') do
-      formats({"key" => String}, false) { {"key" => "Value", :extra => "Bonus"} }
+      formats({ 'key' => String }, false) { { 'key' => 'Value', :extra => 'Bonus' } }
     end
 
     tests('when value is nil and schema expects NilClass') do
-      formats({"key" => NilClass}) { {"key" => nil} }
+      formats('key' => NilClass) { { 'key' => nil } }
     end
 
     tests('when value and schema match as hashes') do
@@ -94,17 +93,15 @@ Shindo.tests('test_helper', 'meta') do
     end
 
     tests('when value is a Time') do
-      formats({"time" => Time}) { {"time" => Time.now} }
+      formats('time' => Time) { { 'time' => Time.now } }
     end
 
     tests('when key is missing but value should be NilClass (#1477)') do
-      formats({"key" => NilClass}) { {} }
+      formats('key' => NilClass) { {} }
     end
 
     tests('when key is missing but value is nullable (#1477)') do
-      formats({"key" => Fog::Nullable::String}) { {} }
+      formats('key' => Fog::Nullable::String) { {} }
     end
-
   end
-
 end

data/tests/helpers/mock_helper.rb

@@ -9,101 +9,101 @@ end
 # if in mocked mode, fill in some fake credentials for us
 if Fog.mock?
   Fog.credentials = {
-    :aws_access_key_id                => 'aws_access_key_id',
-    :aws_secret_access_key            => 'aws_secret_access_key',
-    :ia_access_key_id                 => 'aws_access_key_id',
-    :ia_secret_access_key             => 'aws_secret_access_key',
-    :bluebox_api_key                  => 'bluebox_api_key',
-    :bluebox_customer_id              => 'bluebox_customer_id',
-    :brightbox_client_id              => 'brightbox_client_id',
-    :brightbox_secret                 => 'brightbox_secret',
-    :cloudstack_disk_offering_id      => '',
-    :cloudstack_host                  => 'http://cloudstack.example.org',
-    :cloudstack_network_ids           => '',
-    :cloudstack_service_offering_id   => '4437ac6c-9fe3-477a-57ec-60a5a45896a4',
-    :cloudstack_template_id           => '8a31cf9c-f248-0588-256e-9dbf58785216',
-    :cloudstack_zone_id               => 'c554c592-e09c-9df5-7688-4a32754a4305',
-    :cloudstack_project_id            => 'f1f1f1f1-f1f1-f1f1-f1f1-f1f1f1f1f1f1',
-    :clodo_api_key                    => 'clodo_api_key',
-    :clodo_username                   => 'clodo_username',
-    :digitalocean_api_key             => 'digitalocean_api_key',
-    :digitalocean_client_id           => 'digitalocean_client_id',
-    :dnsimple_email                   => 'dnsimple_email',
-    :dnsimple_password                => 'dnsimple_password',
-    :dnsmadeeasy_api_key              => 'dnsmadeeasy_api_key',
-    :dnsmadeeasy_secret_key           => 'dnsmadeeasy_secret_key',
-    :glesys_username                  => 'glesys_username',
-    :glesys_api_key                   => 'glesys_api_key',
-    :go_grid_api_key                  => 'go_grid_api_key',
-    :go_grid_shared_secret            => 'go_grid_shared_secret',
-    :google_storage_access_key_id     => 'google_storage_access_key_id',
-    :google_storage_secret_access_key => 'google_storage_secret_access_key',
-    :google_project                   => 'google_project_name',
-    :google_client_email              => 'fake@developer.gserviceaccount.com',
-    :google_key_location              => '~/fake.p12',
-    :hp_access_key                    => 'hp_access_key',
-    :hp_secret_key                    => 'hp_secret_key',
-    :hp_tenant_id                     => 'hp_tenant_id',
-    :hp_avl_zone                      => 'hp_avl_zone',
-    :os_account_meta_temp_url_key     => 'os_account_meta_temp_url_key',
-    :ibm_username                     => 'ibm_username',
-    :ibm_password                     => 'ibm_password',
-    :joyent_username                  => "joyentuser",
-    :joyent_password                  => "joyentpass",
-    :linode_api_key                   => 'linode_api_key',
-    :local_root                       => '~/.fog',
-    :bare_metal_cloud_password        => 'bare_metal_cloud_password',
-    :bare_metal_cloud_username        => 'bare_metal_cloud_username',
-    :ninefold_compute_key             => 'ninefold_compute_key',
-    :ninefold_compute_secret          => 'ninefold_compute_secret',
-    :ninefold_storage_secret          => 'ninefold_storage_secret',
-    :ninefold_storage_token           => 'ninefold_storage_token',
-#    :public_key_path                  => '~/.ssh/id_rsa.pub',
-#    :private_key_path                 => '~/.ssh/id_rsa',
-    :opennebula_endpoint              => 'http://opennebula:2633/RPC2',
-    :opennebula_username              => 'oneadmin',
-    :opennebula_password              => 'oneadmin',
-    :openstack_api_key                => 'openstack_api_key',
-    :openstack_username               => 'openstack_username',
-    :openstack_tenant                 => 'openstack_tenant',
-    :openstack_auth_url               => 'http://openstack:35357/v2.0/tokens',
-    :ovirt_url                        => 'http://ovirt:8080/api',
-    :ovirt_username                   => 'admin@internal',
-    :ovirt_password                   => '123123',
-    :profitbricks_username            => 'profitbricks_username',
-    :profitbricks_password            => 'profitbricks_password',
-    :libvirt_uri                      => 'qemu://libvirt/system',
-    :rackspace_api_key                => 'rackspace_api_key',
-    :rackspace_region                 => 'dfw',
-    :rackspace_username               => 'rackspace_username',
-    :riakcs_access_key_id             => 'riakcs_access_key_id',
-    :riakcs_secret_access_key         => 'riakcs_secret_access_key',
-    :sakuracloud_api_token            => 'sakuracloud_api_token',
-    :sakuracloud_api_token_secret     => 'sakuracloud_api_token_secret',
-    :storm_on_demand_username         => 'storm_on_demand_username',
-    :storm_on_demand_password         => 'storm_on_demand_password',
-    :vcloud_host                      => 'vcloud_host',
-    :vcloud_password                  => 'vcloud_password',
-    :vcloud_username                  => 'vcloud_username',
-    :vcloud_director_host             => 'vcloud-director-host',
-    :vcloud_director_password         => 'vcloud_director_password',
-    :vcloud_director_username         => 'vcd_user@vcd_org_name',
-    :zerigo_email                     => 'zerigo_email',
-    :zerigo_token                     => 'zerigo_token',
-    :dynect_customer                  => 'dynect_customer',
-    :dynect_username                  => 'dynect_username',
-    :dynect_password                  => 'dynect_password',
-    :vsphere_server                   => 'virtualcenter.lan',
-    :vsphere_username                 => 'apiuser',
-    :vsphere_password                 => 'apipassword',
-    :vsphere_expected_pubkey_hash     => 'abcdef1234567890',
-    :libvirt_username                 => 'root',
-    :libvirt_password                 => 'password',
-    :cloudsigma_username              => 'csuname',
-    :cloudsigma_password              => 'cspass',
-    :docker_username                  => 'docker-fan',
-    :docker_password                  => 'i<3docker',
-    :docker_email                     => 'dockerfan@gmail.com',
-    :docker_url                       => 'unix://var/run/docker.sock'
+    aws_access_key_id:                 'aws_access_key_id',
+    aws_secret_access_key:             'aws_secret_access_key',
+    ia_access_key_id:                  'aws_access_key_id',
+    ia_secret_access_key:              'aws_secret_access_key',
+    bluebox_api_key:                   'bluebox_api_key',
+    bluebox_customer_id:               'bluebox_customer_id',
+    brightbox_client_id:               'brightbox_client_id',
+    brightbox_secret:                  'brightbox_secret',
+    cloudstack_disk_offering_id:       '',
+    cloudstack_host:                   'http://cloudstack.example.org',
+    cloudstack_network_ids:            '',
+    cloudstack_service_offering_id:    '4437ac6c-9fe3-477a-57ec-60a5a45896a4',
+    cloudstack_template_id:            '8a31cf9c-f248-0588-256e-9dbf58785216',
+    cloudstack_zone_id:                'c554c592-e09c-9df5-7688-4a32754a4305',
+    cloudstack_project_id:             'f1f1f1f1-f1f1-f1f1-f1f1-f1f1f1f1f1f1',
+    clodo_api_key:                     'clodo_api_key',
+    clodo_username:                    'clodo_username',
+    digitalocean_api_key:              'digitalocean_api_key',
+    digitalocean_client_id:            'digitalocean_client_id',
+    dnsimple_email:                    'dnsimple_email',
+    dnsimple_password:                 'dnsimple_password',
+    dnsmadeeasy_api_key:               'dnsmadeeasy_api_key',
+    dnsmadeeasy_secret_key:            'dnsmadeeasy_secret_key',
+    glesys_username:                   'glesys_username',
+    glesys_api_key:                    'glesys_api_key',
+    go_grid_api_key:                   'go_grid_api_key',
+    go_grid_shared_secret:             'go_grid_shared_secret',
+    google_storage_access_key_id:      'google_storage_access_key_id',
+    google_storage_secret_access_key:  'google_storage_secret_access_key',
+    google_project:                    'google_project_name',
+    google_client_email:               'fake@developer.gserviceaccount.com',
+    google_key_location:               '~/fake.p12',
+    hp_access_key:                     'hp_access_key',
+    hp_secret_key:                     'hp_secret_key',
+    hp_tenant_id:                      'hp_tenant_id',
+    hp_avl_zone:                       'hp_avl_zone',
+    os_account_meta_temp_url_key:      'os_account_meta_temp_url_key',
+    ibm_username:                      'ibm_username',
+    ibm_password:                      'ibm_password',
+    joyent_username:                   'joyentuser',
+    joyent_password:                   'joyentpass',
+    linode_api_key:                    'linode_api_key',
+    local_root:                        '~/.fog',
+    bare_metal_cloud_password:         'bare_metal_cloud_password',
+    bare_metal_cloud_username:         'bare_metal_cloud_username',
+    ninefold_compute_key:              'ninefold_compute_key',
+    ninefold_compute_secret:           'ninefold_compute_secret',
+    ninefold_storage_secret:           'ninefold_storage_secret',
+    ninefold_storage_token:            'ninefold_storage_token',
+#    public_key_path:                   '~/.ssh/id_rsa.pub',
+#    private_key_path:                  '~/.ssh/id_rsa',
+    opennebula_endpoint:               'http://opennebula:2633/RPC2',
+    opennebula_username:               'oneadmin',
+    opennebula_password:               'oneadmin',
+    openstack_api_key:                 'openstack_api_key',
+    openstack_username:                'openstack_username',
+    openstack_tenant:                  'openstack_tenant',
+    openstack_auth_url:                'http://openstack:35357/v2.0/tokens',
+    ovirt_url:                         'http://ovirt:8080/api',
+    ovirt_username:                    'admin@internal',
+    ovirt_password:                    '123123',
+    profitbricks_username:             'profitbricks_username',
+    profitbricks_password:             'profitbricks_password',
+    libvirt_uri:                       'qemu://libvirt/system',
+    rackspace_api_key:                 'rackspace_api_key',
+    rackspace_region:                  'dfw',
+    rackspace_username:                'rackspace_username',
+    riakcs_access_key_id:              'riakcs_access_key_id',
+    riakcs_secret_access_key:          'riakcs_secret_access_key',
+    sakuracloud_api_token:             'sakuracloud_api_token',
+    sakuracloud_api_token_secret:      'sakuracloud_api_token_secret',
+    storm_on_demand_username:          'storm_on_demand_username',
+    storm_on_demand_password:          'storm_on_demand_password',
+    vcloud_host:                       'vcloud_host',
+    vcloud_password:                   'vcloud_password',
+    vcloud_username:                   'vcloud_username',
+    vcloud_director_host:              'vcloud-director-host',
+    vcloud_director_password:          'vcloud_director_password',
+    vcloud_director_username:          'vcd_user@vcd_org_name',
+    zerigo_email:                      'zerigo_email',
+    zerigo_token:                      'zerigo_token',
+    dynect_customer:                   'dynect_customer',
+    dynect_username:                   'dynect_username',
+    dynect_password:                   'dynect_password',
+    vsphere_server:                    'virtualcenter.lan',
+    vsphere_username:                  'apiuser',
+    vsphere_password:                  'apipassword',
+    vsphere_expected_pubkey_hash:      'abcdef1234567890',
+    libvirt_username:                  'root',
+    libvirt_password:                  'password',
+    cloudsigma_username:               'csuname',
+    cloudsigma_password:               'cspass',
+    docker_username:                   'docker-fan',
+    docker_password:                   'i<3docker',
+    docker_email:                      'dockerfan@gmail.com',
+    docker_url:                        'unix://var/run/docker.sock'
   }.merge(Fog.credentials)
 end

data/tests/helpers/model_helper.rb

@@ -1,9 +1,8 @@
 def model_tests(collection, params = {}, mocks_implemented = true)
   tests('success') do
-
     @instance = collection.new(params)
 
-    tests("#save").succeeds do
+    tests('#save').succeeds do
       pending if Fog.mocking? && !mocks_implemented
       @instance.save
     end
@@ -12,7 +11,7 @@ def model_tests(collection, params = {}, mocks_implemented = true)
       yield(@instance)
     end
 
-    tests("#destroy").succeeds do
+    tests('#destroy').succeeds do
       pending if Fog.mocking? && !mocks_implemented
       @instance.destroy
     end
@@ -26,6 +25,6 @@ end
 # E.g. 'fog-test-1234'
 def uniq_id(base_name = 'fog-test')
   # random_differentiator
-  suffix = rand(65536).to_s(16).rjust(4, '0')
-  [base_name, suffix] * '-'
+  suffix = rand(65_536).to_s(16).rjust(4, '0')
+  [base_name, suffix].join('-')
 end

data/tests/helpers/responds_to_helper.rb

@@ -1,7 +1,7 @@
 module Shindo
   class Tests
     def responds_to(method_names)
-      for method_name in [*method_names]
+      [*method_names].each do |method_name|
         tests("#respond_to?(:#{method_name})").returns(true) do
           @instance.respond_to?(method_name)
         end

data/tests/helpers/schema_validator_tests.rb

@@ -1,37 +1,37 @@
+# frozen_string_literal: true
+
 Shindo.tests('Fog::Schema::DataValidator', 'meta') do
 
   validator = Fog::Schema::DataValidator.new
 
   tests('#validate') do
-
     tests('returns true') do
-
       returns(true, 'when value matches schema expectation') do
-        validator.validate({"key" => "Value"}, {"key" => String})
+        validator.validate({ 'key' => 'Value' }, 'key' => String)
       end
 
       returns(true, 'when values within an array all match schema expectation') do
-        validator.validate({"key" => [1, 2]}, {"key" => [Integer]})
+        validator.validate({ 'key' => [1, 2] }, 'key' => [Integer])
       end
 
       returns(true, 'when nested values match schema expectation') do
-        validator.validate({"key" => {:nested_key => "Value"}}, {"key" => {:nested_key => String}})
+        validator.validate({ 'key' => { nested_key: 'Value' } }, 'key' => { nested_key: String })
       end
 
       returns(true, 'when collection of values all match schema expectation') do
-        validator.validate([{"key" => "Value"}, {"key" => "Value"}], [{"key" => String}])
+        validator.validate([{ 'key' => 'Value' }, 'key' => 'Value'], [{ 'key' => String }])
       end
 
       returns(true, 'when collection is empty although schema covers optional members') do
-        validator.validate([], [{"key" => String}])
+        validator.validate([], [{ 'key' => String }])
       end
 
       returns(true, 'when additional keys are passed and not strict') do
-        validator.validate({"key" => "Value", :extra => "Bonus"}, {"key" => String}, {:allow_extra_keys => true})
+        validator.validate({ 'key' => 'Value', extra: 'Bonus' }, { 'key' => String }, allow_extra_keys: true)
       end
 
       returns(true, 'when value is nil and schema expects NilClass') do
-        validator.validate({"key" => nil}, {"key" => NilClass})
+        validator.validate({ 'key' => nil }, 'key' => NilClass)
       end
 
       returns(true, 'when value and schema match as hashes') do
@@ -43,43 +43,41 @@ Shindo.tests('Fog::Schema::DataValidator', 'meta') do
       end
 
       returns(true, 'when value is a Time') do
-        validator.validate({"time" => Time.now}, {"time" => Time})
+        validator.validate({ 'time' => Time.now }, 'time' => Time)
       end
 
       returns(true, 'when key is missing but value should be NilClass (#1477)') do
-        validator.validate({}, {"key" => NilClass}, {:allow_optional_rules => true})
+        validator.validate({}, { 'key' => NilClass }, allow_optional_rules: true)
       end
 
       returns(true, 'when key is missing but value is nullable (#1477)') do
-        validator.validate({}, {"key" => Fog::Nullable::String}, {:allow_optional_rules => true})
+        validator.validate({}, { 'key' => Fog::Nullable::String }, allow_optional_rules: true)
       end
-
     end
 
     tests('returns false') do
-
       returns(false, 'when value does not match schema expectation') do
-        validator.validate({"key" => nil}, {"key" => String})
+        validator.validate({ 'key' => nil }, 'key' => String)
       end
 
       returns(false, 'when key formats do not match') do
-        validator.validate({"key" => "Value"}, {:key => String})
+        validator.validate({ 'key' => 'Value' }, key: String)
       end
 
       returns(false, 'when additional keys are passed and strict') do
-        validator.validate({"key" => "Missing"}, {})
+        validator.validate({ 'key' => 'Missing' }, {})
       end
 
       returns(false, 'when some keys do not appear') do
-        validator.validate({}, {"key" => String})
+        validator.validate({}, 'key' => String)
       end
 
       returns(false, 'when collection contains a member that does not match schema') do
-        validator.validate([{"key" => "Value"}, {"key" => 5}], [{"key" => String}])
+        validator.validate([{ 'key' => 'Value' }, 'key' => 5], ['key' => String])
       end
 
       returns(false, 'when collection has multiple schema patterns') do
-        validator.validate([{"key" => "Value"}], [{"key" => Integer}, {"key" => String}])
+        validator.validate([{ 'key' => 'Value' }], [{ 'key' => Integer }, { 'key' => String }])
       end
 
       returns(false, 'when hash and array are compared') do
@@ -91,17 +89,16 @@ Shindo.tests('Fog::Schema::DataValidator', 'meta') do
       end
 
       returns(false, 'when a hash is expected but another data type is found') do
-        validator.validate({"key" => {:nested_key => []}}, {"key" => {:nested_key => {}}})
+        validator.validate({ 'key' => { nested_key: [] } }, 'key' => { nested_key: {} })
       end
 
       returns(false, 'when key is missing but value should be NilClass (#1477)') do
-        validator.validate({}, {"key" => NilClass}, {:allow_optional_rules => false})
+        validator.validate({}, { 'key' => NilClass }, allow_optional_rules: false)
       end
 
       returns(false, 'when key is missing but value is nullable (#1477)') do
-        validator.validate({}, {"key" => Fog::Nullable::String}, {:allow_optional_rules => false})
+        validator.validate({}, { 'key' => Fog::Nullable::String }, allow_optional_rules: false)
       end
-
     end
   end
 end