fog-brightbox 1.10.0 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e29dad67fb7b5d3a127610f2dce8890bfcab19161f43b5cf4f670b808361018f
-  data.tar.gz: 9f2ada9a08af31b9168e98b86f803bbb07d44434a8680f175120d32060ee3df4
+  metadata.gz: d2704dd100c0417f4e0c5542215cc2e0b1e84f0b066f8c4be9858dae64f96a53
+  data.tar.gz: 5bf6d58cdbb9360746281d9d2d2196b027db82702000e1e62691d21d30e6ddb3
 SHA512:
-  metadata.gz: 17f9017f895c9d6fb0ec020ab24ef19290485f73547bba6526dd516882a79bf2055b2e15d1fb8c5cf24bd1b9dfb1a7777e805c8e55683fc05cb7a1f63947b892
-  data.tar.gz: af042f15f47599ec50523e0c54359a0d798901fe3afc79f3eed5a8514af058332bf9123beb129238a2c4f18ab8f7203188ce376294917c4f00e676d3a6b93e0e
+  metadata.gz: 9b4009f6fc679a921ba6aa51bde935a8d4221d39d1d91e7b1815b31f8aa46ffbf4cf41ca4e49574c5c4829aeb8444f19893da742e67f024dfb0890227ad453b1
+  data.tar.gz: 4cdd670508ec4be444829057d96e373aee41df23c8506d66361f33d7228c22b5afaea1f3c74700ebc27f186a4e88c5219025e6747f2db45a2ffb126639bad66d

data/.rubocop.yml

@@ -1,20 +1,25 @@
-inherit_from: .rubocop_todo.yml
+AllCops:
+  TargetRubyVersion: 2.0
 
-HashSyntax:
-  EnforcedStyle: hash_rockets
-
-LineLength:
+Metrics/LineLength:
   Max: 100
   Enabled: false
 
-StringLiterals:
-  EnforcedStyle: double_quotes
-
-Encoding:
+Style/Encoding:
   Description: 'Use UTF-8 as the source file encoding.'
   Enabled: false
 
-SignalException:
+Style/HashSyntax:
+  EnforcedStyle: ruby19_no_mixed_keys
+
+Style/SignalException:
   Description: 'Do not enforce use of fail when raising exceptions.'
   # Valid values are: semantic, only_raise and only_fail
   EnforcedStyle: only_raise
+
+Style/SpecialGlobalVars:
+  # auto "correct" adds gem requirement
+  Enabled: false
+
+Style/StringLiterals:
+  EnforcedStyle: double_quotes

data/CHANGELOG.md

@@ -1,3 +1,20 @@
+### 1.11.0 / 2023-01-26
+
+Enhancements:
+
+* Add `DatabaseServer#reset` and `#resize` methods
+* Added requests to support database server resets and resizing
+
+Bug fixes:
+
+* Remove duplicated request references
+* Fix test method declaration causing parsing error in Ruby 2.0
+
+Changes:
+
+* Added `rubocop` gem configured to Ruby 2.0
+* Cleaning up of codebase to fix various style and layout problems
+
 ### 1.10.0 / 2023-01-24
 
 Enhancements:

data/Rakefile

@@ -1,7 +1,7 @@
 require "bundler/gem_tasks"
 require "rake/testtask"
 
-task :default => :test
+task default: :test
 
 Rake::TestTask.new do |t|
   t.libs << "spec"

data/fog-brightbox.gemspec

@@ -1,4 +1,5 @@
 # coding: utf-8
+
 lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "fog/brightbox/version"
@@ -8,9 +9,9 @@ Gem::Specification.new do |spec|
   spec.version       = Fog::Brightbox::VERSION
   spec.authors       = ["Paul Thornthwaite"]
   spec.email         = ["tokengeek@gmail.com"]
-  spec.description   = %q(Module for the 'fog' gem to support Brightbox Cloud)
-  spec.summary       = %q(This library can be used as a module for `fog` or as standalone provider
-                        to use the Brightbox Cloud in applications)
+  spec.description   = "Module for the 'fog' gem to support Brightbox Cloud"
+  spec.summary       = "This library can be used as a module for `fog` or as standalone provider
+                        to use the Brightbox Cloud in applications"
   spec.homepage      = "https://github.com/fog/fog-brightbox"
   spec.license       = "MIT"
 
@@ -29,6 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "minitest"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "rubocop", "< 0.50"
   spec.add_development_dependency "shindo"
   spec.add_development_dependency "webmock"
   spec.add_development_dependency "yard"

data/lib/fog/brightbox/compute/shared.rb

@@ -9,7 +9,7 @@ module Fog
 
         attr_writer :scoped_account
 
-        API_URL = "https://api.gb1.brightbox.com/"
+        API_URL = "https://api.gb1.brightbox.com/".freeze
 
         # Creates a new instance of the Brightbox Compute service
         #
@@ -23,11 +23,11 @@ module Fog
         #   of a {Brightbox::Config} object but may be a Hash.
         #
         def initialize(config)
-          if config.respond_to?(:config_service?) && config.config_service?
-            @config = config
-          else
-            @config = Fog::Brightbox::Config.new(config)
-          end
+          @config = if config.respond_to?(:config_service?) && config.config_service?
+                      config
+                    else
+                      Fog::Brightbox::Config.new(config)
+                    end
           @config = Fog::Brightbox::Compute::Config.new(@config)
 
           # Currently authentication and api endpoints are the same but may change
@@ -49,7 +49,7 @@ module Fog
           # If existing tokens have been cached, allow continued use of them in the service
           credentials.update_tokens(@config.cached_access_token, @config.cached_refresh_token)
 
-          @token_management    = @config.managed_tokens?
+          @token_management = @config.managed_tokens?
         end
 
         # This returns the account identifier that the request should be scoped by
@@ -82,7 +82,7 @@ module Fog
         # @return [Fog::Brightbox::Compute::Account]
         #
         def account
-          account_data = get_scoped_account.merge(:service => self)
+          account_data = get_scoped_account.merge(service: self)
           Fog::Brightbox::Compute::Account.new(account_data)
         end
 
@@ -95,7 +95,7 @@ module Fog
         # Returns true if an access token is set
         # @return [Boolean]
         def access_token_available?
-          !! @credentials.access_token
+          !!@credentials.access_token
         end
 
         # Returns the current access token or nil
@@ -212,7 +212,8 @@ module Fog
         # @return [Excon::Response]
         def authenticated_request(options)
           headers = options[:headers] || {}
-          headers.merge!("Authorization" => "Bearer #{@credentials.access_token}", "Content-Type" => "application/json")
+          headers["Authorization"] = "Bearer #{@credentials.access_token}"
+          headers["Content-Type"] = "application/json"
           options[:headers] = headers
           # TODO: This is just a wrapper around a call to Excon::Connection#request
           #   so can be extracted from Compute by passing in the connection,

data/lib/fog/brightbox/compute.rb

@@ -79,20 +79,18 @@ module Fog
       request :add_nodes_load_balancer
       request :add_servers_server_group
       request :apply_to_firewall_policy
-      request :accept_user_collaboration
       request :attach_volume
-      request :remove_firewall_policy
       request :copy_volume
       request :create_api_client
       request :create_application
       request :create_cloud_ip
       request :create_collaboration
       request :create_config_map
+      request :create_database_server
       request :create_firewall_policy
       request :create_firewall_rule
       request :create_image
       request :create_load_balancer
-      request :create_database_server
       request :create_server
       request :create_server_group
       request :create_volume
@@ -101,12 +99,12 @@ module Fog
       request :delete_cloud_ip
       request :delete_collaboration
       request :delete_config_map
+      request :delete_database_server
+      request :delete_database_snapshot
       request :delete_firewall_policy
       request :delete_firewall_rule
       request :delete_image
       request :delete_load_balancer
-      request :delete_database_server
-      request :delete_database_snapshot
       request :delete_server
       request :delete_server_group
       request :delete_user_collaboration
@@ -119,14 +117,14 @@ module Fog
       request :get_cloud_ip
       request :get_collaboration
       request :get_config_map
+      request :get_database_server
+      request :get_database_snapshot
+      request :get_database_type
       request :get_firewall_policy
       request :get_firewall_rule
       request :get_image
       request :get_interface
       request :get_load_balancer
-      request :get_database_server
-      request :get_database_snapshot
-      request :get_database_type
       request :get_scoped_account
       request :get_server
       request :get_server_group
@@ -141,18 +139,18 @@ module Fog
       request :list_cloud_ips
       request :list_collaborations
       request :list_config_maps
+      request :list_database_servers
+      request :list_database_snapshots
+      request :list_database_types
       request :list_events
       request :list_firewall_policies
       request :list_images
       request :list_load_balancers
-      request :list_database_servers
-      request :list_database_snapshots
-      request :list_database_types
       request :list_server_groups
       request :list_server_types
       request :list_servers
-      request :list_users
       request :list_user_collaborations
+      request :list_users
       request :list_volumes
       request :list_zones
       request :lock_resource_database_server
@@ -165,19 +163,20 @@ module Fog
       request :move_servers_server_group
       request :reboot_server
       request :reject_user_collaboration
+      request :remove_firewall_policy
       request :remove_listeners_load_balancer
       request :remove_nodes_load_balancer
       request :remove_servers_server_group
       request :resend_collaboration
+      request :reset_database_server
       request :reset_ftp_password_account
       request :reset_ftp_password_scoped_account
       request :reset_password_database_server
       request :reset_secret_api_client
       request :reset_secret_application
       request :reset_server
-      request :resend_collaboration
+      request :resize_database_server
       request :resize_volume
-      request :reject_user_collaboration
       request :shutdown_server
       request :snapshot_database_server
       request :snapshot_server
@@ -195,12 +194,12 @@ module Fog
       request :update_application
       request :update_cloud_ip
       request :update_config_map
+      request :update_database_server
+      request :update_database_snapshot
       request :update_firewall_policy
       request :update_firewall_rule
       request :update_image
       request :update_load_balancer
-      request :update_database_server
-      request :update_database_snapshot
       request :update_scoped_account
       request :update_server
       request :update_server_group
@@ -286,17 +285,17 @@ module Fog
         # @return [Hash]
         def _wrapped_request(method, path, expected_responses, parameters = {})
           request_options = {
-            :method   => method.to_s.upcase,
-            :path     => path,
-            :expects  => expected_responses
+            method: method.to_s.upcase,
+            path: path,
+            expects: expected_responses
           }
 
           query = {}
 
           # Select the account to scope for this request
           account = scoped_account(parameters.fetch(:account_id, nil))
-          query.merge!(:account_id => account) if account
-          query.merge!(:nested => parameters.delete(:nested)) if parameters.key?(:nested)
+          query[:account_id] = account if account
+          query[:nested] = parameters.delete(:nested) if parameters.key?(:nested)
           request_options[:query] = query unless query.empty?
 
           request_options[:body] = Fog::JSON.encode(parameters) unless parameters.empty?

data/lib/fog/brightbox/config.rb

@@ -56,11 +56,10 @@ module Fog
       # @return [OAuth2::CredentialSet]
       def credentials
         @credentials ||= OAuth2::CredentialSet.new(client_id, client_secret,
-                                                   :username => username,
-                                                   :password => password,
-                                                   :access_token => cached_access_token,
-                                                   :refresh_token => cached_refresh_token
-                                                  )
+                                                   username: username,
+                                                   password: password,
+                                                   access_token: cached_access_token,
+                                                   refresh_token: cached_refresh_token)
       end
 
       # @return [Boolean]
@@ -88,7 +87,7 @@ module Fog
       def compute_url
         URI.parse(@options.fetch(:brightbox_api_url, "https://api.gb1.brightbox.com"))
       end
-      alias_method :api_url, :compute_url
+      alias api_url compute_url
 
       def storage_url
         URI.parse(@options[:brightbox_storage_url] || "https://orbit.brightbox.com")
@@ -103,15 +102,13 @@ module Fog
       def storage_management_url
         @storage_management_url ||= if @options.key?(:brightbox_storage_management_url)
                                       URI.parse(@options[:brightbox_storage_management_url])
-                                    else
-                                      nil
                                     end
       end
 
       # @param [URI] management_url The +URI+ to use for management requests.
       # @raise [ArgumentError] if non +URI+ object passed
       def storage_management_url=(management_url)
-        raise ArgumentError unless management_url.kind_of?(URI)
+        raise ArgumentError unless management_url.is_a?(URI)
         @storage_management_url = management_url
       end
 

data/lib/fog/brightbox/models/compute/api_client.rb

@@ -19,11 +19,11 @@ module Fog
         attribute :account_id, aliases: "account", squash: "id"
 
         def save
-          raise Fog::Errors::Error.new("Resaving an existing object may create a duplicate") if persisted?
+          raise Fog::Errors::Error, "Resaving an existing object may create a duplicate" if persisted?
           options = {
-            :name => name,
-            :description => description,
-            :permissions_group => permissions_group
+            name: name,
+            description: description,
+            permissions_group: permissions_group
           }.delete_if { |_k, v| v.nil? || v == "" }
           data = service.create_api_client(options)
           merge_attributes(data)

data/lib/fog/brightbox/models/compute/application.rb

@@ -16,9 +16,9 @@ module Fog
         attribute :revoked_at, type: :time
 
         def save
-          raise Fog::Errors::Error.new("Resaving an existing object may create a duplicate") if persisted?
+          raise Fog::Errors::Error, "Resaving an existing object may create a duplicate" if persisted?
           options = {
-            :name => name
+            name: name
           }.delete_if { |_k, v| v.nil? || v == "" }
           data = service.create_application(options)
           merge_attributes(data)

data/lib/fog/brightbox/models/compute/cloud_ip.rb

@@ -21,9 +21,9 @@ module Fog
         attribute :account_id, aliases: "account", squash: "id"
         attribute :interface_id, aliases: "interface", squash: "id"
         attribute :server_id, aliases: "server", squash: "id"
-        attribute :load_balancer, :alias => "load_balancer", squash: "id"
-        attribute :server_group, :alias => "server_group", squash: "id"
-        attribute :database_server, :alias => "database_server", squash: "id"
+        attribute :load_balancer, alias: "load_balancer", squash: "id"
+        attribute :server_group, alias: "server_group", squash: "id"
+        attribute :database_server, alias: "database_server", squash: "id"
         attribute :port_translators
 
         # Attempt to map or point the Cloud IP to the destination resource.
@@ -32,14 +32,14 @@ module Fog
         #
         def map(destination)
           requires :identity
-          if destination.respond_to?(:mapping_identity)
-            final_destination = destination.mapping_identity
-          elsif destination.respond_to?(:identity)
-            final_destination = destination.identity
-          else
-            final_destination = destination
-          end
-          service.map_cloud_ip(identity, :destination => final_destination)
+          final_destination = if destination.respond_to?(:mapping_identity)
+                                destination.mapping_identity
+                              elsif destination.respond_to?(:identity)
+                                destination.identity
+                              else
+                                destination
+                              end
+          service.map_cloud_ip(identity, destination: final_destination)
         end
 
         def mapped?

data/lib/fog/brightbox/models/compute/collaboration.rb

@@ -27,11 +27,11 @@ module Fog
         end
 
         def save
-          raise Fog::Errors::Error.new("Resaving an existing object may create a duplicate") if identity
+          raise Fog::Errors::Error, "Resaving an existing object may create a duplicate" if identity
 
           options = {
-            :role => role,
-            :email => email
+            role: role,
+            email: email
           }.delete_if { |_k, v| v.nil? || v == "" }
 
           data = service.create_collaboration(options)

data/lib/fog/brightbox/models/compute/collaborations.rb

@@ -30,7 +30,7 @@ module Fog
         def invite(email, role)
           return nil if email.nil? || email == ""
           return nil if role.nil? || role == ""
-          options = { :email => email, :role => role }
+          options = { email: email, role: role }
           data = service.create_collaboration(options)
           new(data)
         end

data/lib/fog/brightbox/models/compute/config_map.rb

@@ -22,7 +22,7 @@ module Fog
                   service.update_config_map(identity, options)
                 else
                   # create
-                  raise Fog::Errors::Error.new("'data' is required") if data.nil? || data.empty?
+                  raise Fog::Errors::Error, "'data' is required" if data.nil? || data.empty?
                   options[:data] = payload
                   service.create_config_map(options)
                 end
@@ -30,8 +30,7 @@ module Fog
           merge_attributes(res)
           true
         rescue StandardError => e
-          raise Fog::Errors::Error.new(e.message)
-          false
+          raise Fog::Errors::Error, e.message
         end
 
         def destroy

data/lib/fog/brightbox/models/compute/database_server.rb

@@ -17,8 +17,8 @@ module Fog
         attribute :allow_access
         attribute :database_engine
         attribute :database_version
-        attribute :maintenance_hour #, type: :integer
-        attribute :maintenance_weekday #, type: :integer
+        attribute :maintenance_hour # , type: :integer
+        attribute :maintenance_weekday # , type: :integer
         attribute :source
 
         attribute :snapshots_retention, type: :string
@@ -44,8 +44,8 @@ module Fog
 
         def save
           options = {
-            :name => name,
-            :description => description
+            name: name,
+            description: description
           }
 
           options[:allow_access] = allow_access if allow_access
@@ -79,7 +79,7 @@ module Fog
         def snapshot(return_snapshot = false)
           requires :identity
 
-          response, snapshot_id = service.snapshot_database_server(identity, :return_link => return_snapshot)
+          response, snapshot_id = service.snapshot_database_server(identity, return_link: return_snapshot)
           merge_attributes(response)
 
           if return_snapshot
@@ -95,12 +95,24 @@ module Fog
           true
         end
 
+        def reset
+          requires :identity
+          merge_attributes(service.reset_database_server(identity))
+          true
+        end
+
         def reset_password
           requires :identity
           merge_attributes(service.reset_password_database_server(identity))
           true
         end
 
+        def resize(new_type)
+          requires :identity
+          merge_attributes(service.resize_database_server(identity, new_type: new_type))
+          true
+        end
+
         private
 
         def create_database_server(options)

data/lib/fog/brightbox/models/compute/database_snapshot.rb

@@ -32,8 +32,8 @@ module Fog
 
         def save
           options = {
-            :name => name,
-            :description => description
+            name: name,
+            description: description
           }
           data = update_database_snapshot(options)
           merge_attributes(data)

data/lib/fog/brightbox/models/compute/firewall_policy.rb

@@ -23,11 +23,11 @@ module Fog
 
         # Sticking with existing Fog behaviour, save does not update but creates a new resource
         def save
-          raise Fog::Errors::Error.new("Resaving an existing object may create a duplicate") if persisted?
+          raise Fog::Errors::Error, "Resaving an existing object may create a duplicate" if persisted?
           options = {
-            :server_group => server_group_id,
-            :name => name,
-            :description => description
+            server_group: server_group_id,
+            name: name,
+            description: description
           }.delete_if { |_k, v| v.nil? || v == "" }
           data = service.create_firewall_policy(options)
           merge_attributes(data)
@@ -37,7 +37,7 @@ module Fog
         def apply_to(server_group_id)
           requires :identity
           options = {
-            :server_group => server_group_id
+            server_group: server_group_id
           }
           data = service.apply_to_firewall_policy(identity, options)
           merge_attributes(data)
@@ -47,7 +47,7 @@ module Fog
         def remove(server_group_id)
           requires :identity
           options = {
-            :server_group => server_group_id
+            server_group: server_group_id
           }
           data = service.remove_firewall_policy(identity, options)
           merge_attributes(data)

data/lib/fog/brightbox/models/compute/firewall_rule.rb

@@ -23,17 +23,17 @@ module Fog
 
         # Sticking with existing Fog behaviour, save does not update but creates a new resource
         def save
-          raise Fog::Errors::Error.new("Resaving an existing object may create a duplicate") if persisted?
+          raise Fog::Errors::Error, "Resaving an existing object may create a duplicate" if persisted?
           requires :firewall_policy_id
           options = {
-            :firewall_policy => firewall_policy_id,
-            :protocol => protocol,
-            :description => description,
-            :source => source,
-            :source_port => source_port,
-            :destination => destination,
-            :destination_port => destination_port,
-            :icmp_type_name => icmp_type_name
+            firewall_policy: firewall_policy_id,
+            protocol: protocol,
+            description: description,
+            source: source,
+            source_port: source_port,
+            destination: destination,
+            destination_port: destination_port,
+            icmp_type_name: icmp_type_name
           }.delete_if { |_k, v| v.nil? || v == "" }
           data = service.create_firewall_rule(options)
           merge_attributes(data)

data/lib/fog/brightbox/models/compute/image.rb

@@ -42,17 +42,17 @@ module Fog
         end
 
         def save
-          raise Fog::Errors::Error.new("Resaving an existing object may create a duplicate") if persisted?
+          raise Fog::Errors::Error, "Resaving an existing object may create a duplicate" if persisted?
 
           options = {
-            :arch => arch,
-            :description => description,
-            :http_url => http_url,
-            :name => name,
-            :server => server,
-            :source => source,
-            :username => username,
-            :volume => volume
+            arch: arch,
+            description: description,
+            http_url: http_url,
+            name: name,
+            server: server,
+            source: source,
+            username: username,
+            volume: volume
           }.delete_if { |_k, v| v.nil? || v == "" }
           data = service.create_image(options)
           merge_attributes(data)

data/lib/fog/brightbox/models/compute/load_balancer.rb

@@ -52,20 +52,20 @@ module Fog
         end
 
         def save
-          raise Fog::Errors::Error.new("Resaving an existing object may create a duplicate") if persisted?
+          raise Fog::Errors::Error, "Resaving an existing object may create a duplicate" if persisted?
           requires :nodes, :listeners, :healthcheck
           options = {
-            :nodes => nodes,
-            :listeners => listeners,
-            :healthcheck => healthcheck,
-            :policy => policy,
-            :name => name,
-            :domains => domains,
-            :buffer_size => buffer_size,
-            :certificate_pem => certificate_pem,
-            :certificate_private_key => certificate_private_key,
-            :ssl_minimum_version => ssl_minimum_version,
-            :sslv3 => ssl3?
+            nodes: nodes,
+            listeners: listeners,
+            healthcheck: healthcheck,
+            policy: policy,
+            name: name,
+            domains: domains,
+            buffer_size: buffer_size,
+            certificate_pem: certificate_pem,
+            certificate_private_key: certificate_private_key,
+            ssl_minimum_version: ssl_minimum_version,
+            sslv3: ssl3?
           }.delete_if { |_k, v| v.nil? || v == "" }
           data = service.create_load_balancer(options)
           merge_attributes(data)