fog-brightbox 1.6.0 → 1.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ed1e1f608af748e905cfeafeb9f1a72674074f11720c854988e324de9e1fa84
-  data.tar.gz: c078791baaf84d13fb09c1f0d8ff17b9c1116f247cfb8c73647b529b97ce3bea
+  metadata.gz: f51c2ad35b105ddc3a6506eba7efc70aeebc19836871abed4b4094495d81b7b5
+  data.tar.gz: c07306a38945cbf30b87fe108a136015c1f25042edc33dd641e21f2fae9c2bd5
 SHA512:
-  metadata.gz: fbfd902483fc3bb101255c4915d8fec6e54c5edf2995f6aa1b0eebe510e210a0b6173b109aa19811fee8fabc1c5f05c294d36b49fbcc9b15056bedf22e1ebac2
-  data.tar.gz: e3b208fa57e74eca736fa8d53683cbfa78645a6aa75a15b680f59365bbd26538cbb373828f92ba4d6de7a79a867e2377500179c9ef18171c35748dd3fa759e17
+  metadata.gz: 8c418bab634f034c05ee7ca8f53d309e5f6683182d47be8f9a9cb8513904a2545a35a0bc466babcb8ab054cef2c6692dec8af7c0e9d3fb16f9aeceab102305de
+  data.tar.gz: 2b22777c14423713ca9c8ce454bfc2b524b7409986b6a8d1d008dd51dbb7f83587a1835e6204360785e7aca104fd569bbd21c199333116bf98a2637b575f4ea8

data/CHANGELOG.md

@@ -1,3 +1,22 @@
+### 1.7.2 / 2022-08-17
+
+* Fix in `Storage.escape` regexp which failed to handle dashes correctly and broke generated URLs.
+
+### 1.7.1 / 2022-08-17
+
+Bug fixes:
+
+* Implement `Storage::Directory#public_url` to allow generation of `File` public URLs correctly.
+
+### 1.7.0 / 2022-07-28
+
+Changes:
+
+* Adds support for `ConfigMaps` which are simple key/value stores for configuring
+  other resources.
+* Updated the API models to include the latest set of attributes defined in the
+  Brightbox API enabling them to be referenced.
+
 ### 1.6.0 / 2022-07-25
 
 Changes:

data/lib/fog/brightbox/compute.rb

@@ -37,6 +37,8 @@ module Fog
       model :api_client
       collection :collaborations
       model :collaboration
+      collection :config_maps
+      model :config_map
       collection :servers
       model :server
       collection :server_groups
@@ -85,6 +87,7 @@ module Fog
       request :create_application
       request :create_cloud_ip
       request :create_collaboration
+      request :create_config_map
       request :create_firewall_policy
       request :create_firewall_rule
       request :create_image
@@ -97,6 +100,7 @@ module Fog
       request :delete_application
       request :delete_cloud_ip
       request :delete_collaboration
+      request :delete_config_map
       request :delete_firewall_policy
       request :delete_firewall_rule
       request :delete_image
@@ -114,6 +118,7 @@ module Fog
       request :get_authenticated_user
       request :get_cloud_ip
       request :get_collaboration
+      request :get_config_map
       request :get_firewall_policy
       request :get_firewall_rule
       request :get_image
@@ -135,6 +140,7 @@ module Fog
       request :list_applications
       request :list_cloud_ips
       request :list_collaborations
+      request :list_config_maps
       request :list_events
       request :list_firewall_policies
       request :list_images
@@ -188,6 +194,7 @@ module Fog
       request :update_api_client
       request :update_application
       request :update_cloud_ip
+      request :update_config_map
       request :update_firewall_policy
       request :update_firewall_rule
       request :update_image

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

@@ -3,8 +3,8 @@ module Fog
     class Compute
       class Account < Fog::Brightbox::Model
         identity :id
-        attribute :url
         attribute :resource_type
+        attribute :url
 
         attribute :name
         attribute :status
@@ -20,35 +20,47 @@ module Fog
         attribute :telephone_number
         attribute :verified_telephone
         attribute :verified_ip
-        attribute :servers_used
-        attribute :ram_limit
-        attribute :ram_used
-        attribute :cloud_ips_limit
-        attribute :cloud_ips_used
-        attribute :load_balancers_limit
-        attribute :load_balancers_used
-        attribute :dbs_servers_used
-        attribute :dbs_ram_limit
-        attribute :dbs_ram_used
+
+        # Account limits (read-only)
+        attribute :block_storage_limit, type: :integer
+        attribute :block_storage_used, type: :integer
+        attribute :cloud_ips_limit, type: :integer
+        attribute :cloud_ips_used, type: :integer
+        attribute :dbs_instances_used, type: :integer
+        attribute :dbs_ram_limit, type: :integer
+        attribute :dbs_ram_used, type: :integer
+        attribute :load_balancers_limit, type: :integer
+        attribute :load_balancers_used, type: :integer
+        attribute :ram_limit, type: :integer
+        attribute :ram_used, type: :integer
+        attribute :servers_used, type: :integer
+
         attribute :library_ftp_host
         attribute :library_ftp_user
         # This is always returned as nil unless after a call to reset_ftp_password
         attribute :library_ftp_password
 
         # Boolean flags
-        attribute :valid_credit_card
-        attribute :telephone_verified
+        attribute :valid_credit_card, type: :boolean
+        attribute :telephone_verified, type: :boolean
 
-        # Times
-        attribute :created_at, :type => :time
-        attribute :verified_at, :type => :time
+        # Timestamps
+        attribute :created_at, type: :time
+        attribute :verified_at, type: :time
 
-        # Links - to be replaced
-        attribute :owner_id, :aliases => "owner", :squash => "id"
+        # Links
+        attribute :owner_id, aliases: "owner", squash: "id"
         attribute :clients
+        attribute :cloud_ips
+        attribute :database_servers
+        attribute :database_snapshots
+        attribute :firewall_policies
         attribute :images
+        attribute :load_balancers
+        attribute :server_groups
         attribute :servers
         attribute :users
+        attribute :volumes
         attribute :zones
 
         # Resets the account's image library FTP password returning the new value

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

@@ -3,12 +3,20 @@ module Fog
     class Compute
       class ApiClient < Fog::Brightbox::Model
         identity :id
+        attribute :resource_type
+        attribute :url
+
         attribute :name
         attribute :description
+
         attribute :secret
-        attribute :revoked_at, :type => :time
         attribute :permissions_group
-        attribute :account_id
+
+        # Timestamps
+        attribute :revoked_at, type: :time
+
+        # Links
+        attribute :account_id, aliases: "account", squash: "id"
 
         def save
           raise Fog::Errors::Error.new("Resaving an existing object may create a duplicate") if persisted?

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

@@ -3,10 +3,18 @@ module Fog
     class Compute
       class Application < Fog::Brightbox::Model
         identity :id
+        attribute :resource_type
         attribute :url
+
         attribute :name
+        attribute :description
         attribute :secret
 
+        # Timestamps
+        attribute :created_at, type: :time
+        attribute :updated_at, type: :time
+        attribute :revoked_at, type: :time
+
         def save
           raise Fog::Errors::Error.new("Resaving an existing object may create a duplicate") if persisted?
           options = {

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

@@ -3,28 +3,28 @@ module Fog
     class Compute
       class CloudIp < Fog::Brightbox::Model
         identity :id
-        attribute :url
         attribute :resource_type
+        attribute :url
 
         attribute :name
         attribute :status
         attribute :description
 
-        attribute :reverse_dns
+        attribute :fqdn
+        attribute :mode
         attribute :public_ip
         attribute :public_ipv4
         attribute :public_ipv6
-        attribute :fqdn
+        attribute :reverse_dns
 
-        # Links - to be replaced
-        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"
+        # Links
+        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 :port_translators
-        attribute :name
 
         # Attempt to map or point the Cloud IP to the destination resource.
         #

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

@@ -3,10 +3,21 @@ module Fog
     class Compute
       class Collaboration < Fog::Brightbox::Model
         identity :id
+        attribute :resource_type
+        attribute :url
+
         attribute :status
+
         attribute :email
         attribute :role
         attribute :role_label
+
+        # Timestamps
+        attribute :created_at, type: :time
+        attribute :started_at, type: :time
+        attribute :finished_at, type: :time
+
+        # Links
         attribute :account
         attribute :user
         attribute :inviter

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

@@ -0,0 +1,14 @@
+module Fog
+  module Brightbox
+    class Compute
+      class ConfigMap < Fog::Brightbox::Model
+        identity :id
+        attribute :resource_type
+        attribute :url
+
+        attribute :name
+        attribute :data
+      end
+    end
+  end
+end

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

@@ -0,0 +1,22 @@
+module Fog
+  module Brightbox
+    class Compute
+      class ConfigMaps < Fog::Collection
+        model Fog::Brightbox::Compute::ConfigMap
+
+        def all
+          data = service.list_config_maps
+          load(data)
+        end
+
+        def get(identifier)
+          return nil if identifier.nil? || identifier == ""
+          data = service.get_config_map(identifier)
+          new(data)
+        rescue Excon::Errors::NotFound
+          nil
+        end
+      end
+    end
+  end
+end

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

@@ -5,39 +5,43 @@ module Fog
         include Fog::Brightbox::Compute::ResourceLocking
 
         identity :id
-        attribute :url
         attribute :resource_type
+        attribute :url
 
         attribute :name
         attribute :description
-        attribute :state, :aliases => "status"
+        attribute :state, aliases: "status"
 
         attribute :admin_username
         attribute :admin_password
-
+        attribute :allow_access
         attribute :database_engine
         attribute :database_version
+        attribute :maintenance_hour #, type: :integer
+        attribute :maintenance_weekday #, type: :integer
+        attribute :source
 
-        attribute :maintenance_weekday
-        attribute :maintenance_hour
+        attribute :snapshots_retention, type: :string
 
         # This is a crontab formatted string e.g. "* 5 * * 0"
-        attribute :snapshots_schedule, :type => :string
-        attribute :snapshots_schedule_next_at, :type => :time
+        attribute :snapshots_schedule, type: :string
+        attribute :snapshots_schedule_next_at, type: :time
 
-        attribute :created_at, :type => :time
-        attribute :updated_at, :type => :time
-        attribute :deleted_at, :type => :time
+        # Timestamps
+        attribute :created_at, type: :time
+        attribute :updated_at, type: :time
+        attribute :deleted_at, type: :time
 
-        attribute :allow_access
+        # Links
+        attribute :flavor_id, alias: "database_server_type", squash: "id"
+        attribute :zone_id, alias: "zone", squash: "id"
 
-        attribute :flavor_id, "alias" => "database_server_type", :squash => "id"
-        attribute :zone_id, "alias" => "zone", :squash => "id"
+        attribute :account
+        attribute :cloud_ips
 
+        # Generated from snapshot action and not a real attribute
         attribute :snapshot_id
 
-        attribute :cloud_ips
-
         def save
           options = {
             :name => name,

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

@@ -7,21 +7,28 @@ module Fog
         include Fog::Brightbox::Compute::ResourceLocking
 
         identity :id
-        attribute :url
         attribute :resource_type
+        attribute :url
 
         attribute :name
         attribute :description
-        attribute :state, :aliases => "status"
+        attribute :state, aliases: "status"
 
         attribute :database_engine
         attribute :database_version
 
-        attribute :size
+        attribute :size, type: :integer
+        attribute :source
+        attribute :source_trigger
+
+        # Timestamps
+        attribute :created_at, type: :time
+        attribute :updated_at, type: :time
+        attribute :deleted_at, type: :time
 
-        attribute :created_at, :type => :time
-        attribute :updated_at, :type => :time
-        attribute :deleted_at, :type => :time
+        # Links
+        attribute :account
+        attribute :account_id, aliases: "account", squash: "id"
 
         def save
           options = {

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

@@ -3,14 +3,17 @@ module Fog
     class Compute
       class DatabaseType < Fog::Brightbox::Model
         identity :id
-        attribute :url
         attribute :resource_type
+        attribute :url
 
         attribute :name
         attribute :description
 
-        attribute :disk, :aliases => "disk_size"
-        attribute :ram
+        attribute :disk, aliases: "disk_size", type: :integer
+        attribute :ram, type: :integer
+
+        # Boolean flags
+        attribute :default, type: :boolean
       end
     end
   end

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

@@ -4,17 +4,18 @@ module Fog
       # @api private
       class Event < Fog::Brightbox::Model
         identity :id
-        attribute :url
         attribute :resource_type
+        attribute :url
 
         attribute :action
         attribute :message
         attribute :short_message
 
-        # Times
-        attribute :created_at, :type => :time
+        # Timestamps
+        attribute :created_at, type: :time
 
-        # Links - to be replaced
+        # Links
+        attribute :affects
         attribute :resource
         attribute :client
         attribute :user

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

@@ -3,16 +3,22 @@ module Fog
     class Compute
       class FirewallPolicy < Fog::Brightbox::Model
         identity :id
-        attribute :url
         attribute :resource_type
+        attribute :url
 
         attribute :name
         attribute :description
 
-        attribute :default
+        # Boolean flags
+        attribute :default, type: :boolean
+
+        # Timestamps
+        attribute :created_at, type: :time
+
+        # Links
+        attribute :account_id, aliases: "account", squash: "id"
+        attribute :server_group_id, aliases: "server_group", squash: "id"
 
-        attribute :server_group_id, :aliases => "server_group", :squash => "id"
-        attribute :created_at, :type => :time
         attribute :rules
 
         # Sticking with existing Fog behaviour, save does not update but creates a new resource

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

@@ -3,20 +3,23 @@ module Fog
     class Compute
       class FirewallRule < Fog::Brightbox::Model
         identity :id
-        attribute :url
         attribute :resource_type
+        attribute :url
 
         attribute :description
 
-        attribute :source
-        attribute :source_port
         attribute :destination
         attribute :destination_port
-        attribute :protocol
         attribute :icmp_type_name
-        attribute :created_at, :type => :time
+        attribute :protocol
+        attribute :source
+        attribute :source_port
+
+        # Timestamps
+        attribute :created_at, type: :time
 
-        attribute :firewall_policy_id, :aliases => "firewall_policy", :squash => "id"
+        # Links
+        attribute :firewall_policy_id, aliases: "firewall_policy", squash: "id"
 
         # Sticking with existing Fog behaviour, save does not update but creates a new resource
         def save

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

@@ -3,19 +3,19 @@ module Fog
     class Compute
       class Flavor < Fog::Brightbox::Model
         identity :id
-        attribute :url
         attribute :resource_type
+        attribute :url
 
         attribute :name
         attribute :status
-        attribute :description
 
         attribute :handle
 
         attribute :bits
         attribute :cores
-        attribute :disk, :aliases => "disk_size"
+        attribute :disk, aliases: "disk_size"
         attribute :ram
+        attribute :storage_type
 
         def bits
           64 # This is actually based on the Image type used. 32bit or 64bit Images are supported

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

@@ -5,32 +5,34 @@ module Fog
         include Fog::Brightbox::Compute::ResourceLocking
 
         identity :id
-        attribute :url
         attribute :resource_type
+        attribute :url
 
         attribute :name
-        attribute :username
         attribute :status
         attribute :description
 
-        attribute :source
-        attribute :source_type
         attribute :arch
-        attribute :virtual_size
-        attribute :disk_size
+        attribute :disk_size, type: :integer
         attribute :licence_name
+        attribute :min_ram, type: :integer
+        attribute :source
+        attribute :source_trigger
+        attribute :source_type
+        attribute :username
+        attribute :virtual_size, type: :integer
 
         # Boolean flags
-        attribute :public
-        attribute :official
-        attribute :compatibility_mode
+        attribute :compatibility_mode, type: :boolean
+        attribute :official, type: :boolean
+        attribute :public, type: :boolean
 
-        # Times
-        attribute :created_at, :type => :time
+        # Timestamps
+        attribute :created_at, type: :time
 
-        # Links - to be replaced
-        attribute :ancestor_id, :aliases => "ancestor", :squash => "id"
-        attribute :owner_id, :aliases => "owner", :squash => "id"
+        # Links
+        attribute :ancestor_id, aliases: "ancestor", squash: "id"
+        attribute :owner_id, aliases: "owner", squash: "id"
 
         def ready?
           status == "available"

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

@@ -5,13 +5,13 @@ module Fog
         include Fog::Brightbox::Compute::ResourceLocking
 
         identity :id
-        attribute :url
         attribute :resource_type
+        attribute :url
 
         attribute :name
         attribute :status
 
-        attribute :buffer_size
+        attribute :buffer_size, type: :integer
 
         attribute :policy
         attribute :nodes
@@ -34,14 +34,18 @@ module Fog
         # List of domains for ACME
         attribute :domains
 
-        # Times
-        attribute :created_at, :type => :time
-        attribute :deleted_at, :type => :time
+        # Booleans
+        attribute :https_redirect, type: :boolean
+
+        # Timestamps
+        attribute :created_at, type: :time
+        attribute :deleted_at, type: :time
 
-        # Links - to be replaced
+        # Links
         attribute :account
-        attribute :server
-        attribute :cloud_ip
+
+        attribute :nodes
+        attribute :cloud_ips
 
         def ready?
           status == "active"

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

@@ -14,35 +14,37 @@ module Fog
         attribute :url
 
         attribute :name
-        attribute :state,       :aliases => "status"
+        attribute :state, aliases: "status"
 
-        attribute :hostname
-        attribute :fqdn
-        attribute :user_data
+        attribute :console_token
         attribute :console_url
         attribute :fqdn
-        attribute :console_token
+        attribute :hostname
+        attribute :user_data
 
-        attribute :disk_encrypted
+        # Boolean flags
+        attribute :compatibility_mode, type: :boolean
+        attribute :disk_encrypted, type: :boolean
 
-        # Times
-        attribute :created_at, :type => :time
-        attribute :started_at, :type => :time
-        attribute :console_token_expires, :type => :time
-        attribute :deleted_at, :type => :time
+        # Timestamps
+        attribute :created_at, type: :time
+        attribute :started_at, type: :time
+        attribute :console_token_expires, type: :time
+        attribute :deleted_at, type: :time
 
-        # Links - to be replaced
-        attribute :account_id,  :aliases => "account",      :squash => "id"
-        attribute :image_id,    :aliases => "image",        :squash => "id"
+        # Links
+        attribute :account_id, aliases: "account", squash: "id"
+        attribute :image_id, aliases: "image", squash: "id"
 
-        attribute :snapshots
+        attribute :server_type
+        attribute :zone
         attribute :cloud_ip # Creation option only
+
         attribute :cloud_ips
         attribute :interfaces
         attribute :server_groups
+        attribute :snapshots
         attribute :volumes
-        attribute :zone
-        attribute :server_type
 
         def initialize(attributes = {})
           # Call super first to initialize the service object for our default image

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

@@ -6,15 +6,23 @@ module Fog
       # Certain actions can accept a server group and affect all members
       class ServerGroup < Fog::Brightbox::Model
         identity :id
-
-        attribute :url
         attribute :resource_type
+        attribute :url
+
         attribute :name
         attribute :description
-        attribute :default
-        attribute :created_at, :type => :time
+        attribute :fqdn
+
+        # Booleans
+        attribute :default, type: :boolean
+
+        # Timestamps
+        attribute :created_at, type: :time
 
-        attribute :server_ids, :aliases => "servers"
+        # Links
+        attribute :account_id, aliases: "account", squash: "id"
+        attribute :firewall_policy_id, aliases: "firewall_policy", squash: "id"
+        attribute :server_ids, aliases: "servers"
 
         def save
           options = {

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

@@ -11,13 +11,18 @@ module Fog
         attribute :ssh_key
 
         # Boolean flags
-        attribute :email_verified
-        attribute :messaging_pref
+        attribute :email_verified, type: :boolean
 
-        # Links - to be replaced
-        attribute :account_id, :aliases => "default_account", :squash => "id"
+        # Timestamps
+        attribute :created_at, type: :time
+
+        # Links
+        attribute :account_id, aliases: "default_account", squash: "id"
         attribute :accounts
 
+        # Deprecated
+        attribute :messaging_pref, type: :boolean
+
         def save
           requires :identity
 

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

@@ -3,10 +3,21 @@ module Fog
     class Compute
       class UserCollaboration < Fog::Brightbox::Model
         identity :id
+        # resource_type is buggy for this resource
+        attribute :url
+
         attribute :status
+
         attribute :email
         attribute :role
         attribute :role_label
+
+        # Timestamps
+        attribute :created_at, type: :time
+        attribute :started_at, type: :time
+        attribute :finished_at, type: :time
+
+        # Links
         attribute :account
         attribute :user
         attribute :inviter

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

@@ -5,34 +5,35 @@ module Fog
         include Fog::Brightbox::Compute::ResourceLocking
 
         identity :id
-        attribute :url
         attribute :resource_type
+        attribute :url
 
         attribute :name
-        attribute :state, :aliases => "status"
-
+        attribute :state, aliases: "status"
         attribute :description
+
         attribute :filesystem_label
         attribute :filesystem_type
         attribute :serial
-        attribute :size
+        attribute :size, type: :integer
         attribute :source
         attribute :source_type
         attribute :storage_type
 
-        attribute :boot
-        attribute :delete_with_server
-        attribute :encrypted
+        # Boolean flags
+        attribute :boot, type: :boolean
+        attribute :delete_with_server, type: :boolean
+        attribute :encrypted, type: :boolean
 
-        # Times
-        attribute :created_at, :type => :time
-        attribute :updated_at, :type => :time
-        attribute :deleted_at, :type => :time
+        # Timestamps
+        attribute :created_at, type: :time
+        attribute :updated_at, type: :time
+        attribute :deleted_at, type: :time
 
         # Links
-        attribute :account_id, :aliases => "account", :squash => "id"
-        attribute :image_id, :aliases => "image", :squash => "id"
-        attribute :server_id, :aliases => "server", :squash => "id"
+        attribute :account_id, aliases: "account", squash: "id"
+        attribute :image_id, aliases: "image", squash: "id"
+        attribute :server_id, aliases: "server", squash: "id"
 
         def attach(server)
           requires :identity

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

@@ -3,13 +3,12 @@ module Fog
     class Compute
       class Zone < Fog::Brightbox::Model
         identity :id
-        attribute :url
         attribute :resource_type
-
-        attribute :status
-        attribute :handle
+        attribute :url
 
         attribute :description
+        attribute :handle
+        attribute :status
       end
     end
   end

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

@@ -31,8 +31,8 @@ module Fog
         attr_writer :public
 
         def public_url
-          # raise NotImplementedError
-          ""
+          requires :key
+          @public_url ||= [service.management_url , Fog::Brightbox::Storage.escape(key, "/")].join("/")
         end
 
         def save

data/lib/fog/brightbox/requests/compute/create_config_map.rb

@@ -0,0 +1,22 @@
+module Fog
+  module Brightbox
+    class Compute
+      class Real
+        # Create a new config map
+        #
+        # @param [Hash] options
+        # @option options [String] :name to identify this config map
+        # @option options [Hash] :data key/values to expose in config map
+        # @option options [Boolean] :nested passed through with the API request. When true nested resources are expanded.
+        #
+        # @return [Hash] if successful Hash version of JSON object
+        # @return [NilClass] if no options were passed
+        #
+        def create_config_map(options)
+          return nil if options.empty? || options.nil?
+          wrapped_request("post", "/1.0/config_maps", [200], options)
+        end
+      end
+    end
+  end
+end

data/lib/fog/brightbox/requests/compute/delete_config_map.rb

@@ -0,0 +1,20 @@
+module Fog
+  module Brightbox
+    class Compute
+      class Real
+        # Destroy the config map
+        #
+        # @param [String] identifier Unique reference to identify the resource
+        # @param [Hash] options
+        # @option options [Boolean] :nested passed through with the API request. When true nested resources are expanded.
+        #
+        # @return [Hash] if successful Hash version of JSON object
+        #
+        def delete_config_map(identifier, options = {})
+          return nil if identifier.nil? || identifier == ""
+          wrapped_request("delete", "/1.0/config_maps/#{identifier}", [200], options)
+        end
+      end
+    end
+  end
+end

data/lib/fog/brightbox/requests/compute/get_config_map.rb

@@ -0,0 +1,18 @@
+module Fog
+  module Brightbox
+    class Compute
+      class Real
+        # @param [String] identifier Unique reference to identify the resource
+        # @param [Hash] options
+        # @option options [Boolean] :nested passed through with the API request. When true nested resources are expanded.
+        #
+        # @return [Hash] if successful Hash version of JSON object
+        #
+        def get_config_map(identifier, options = {})
+          return nil if identifier.nil? || identifier == ""
+          wrapped_request("get", "/1.0/config_maps/#{identifier}", [200], options)
+        end
+      end
+    end
+  end
+end

data/lib/fog/brightbox/requests/compute/list_config_maps.rb

@@ -0,0 +1,18 @@
+module Fog
+  module Brightbox
+    class Compute
+      class Real
+        # Lists summary details of config maps owned by the account.
+        #
+        # @param [Hash] options
+        # @option options [Boolean] :nested passed through with the API request. When true nested resources are expanded.
+        #
+        # @return [Hash] if successful Hash version of JSON object
+        #
+        def list_config_maps(options = {})
+          wrapped_request("get", "/1.0/config_maps", [200], options)
+        end
+      end
+    end
+  end
+end

data/lib/fog/brightbox/requests/compute/update_config_map.rb

@@ -0,0 +1,22 @@
+module Fog
+  module Brightbox
+    class Compute
+      class Real
+        # @param [String] identifier Unique reference to identify the resource
+        # @param [Hash] options
+        # @option options [String] :name to identifier this config map
+        # @option options [Hash] :data key/values to expose in config map
+        # @option options [Boolean] :nested passed through with the API request. When true nested resources are expanded.
+        #
+        # @return [Hash] if successful Hash version of JSON object
+        # @return [NilClass] if no options were passed
+        #
+        def update_config_map(identifier, options)
+          return nil if identifier.nil? || identifier == ""
+          return nil if options.empty? || options.nil?
+          wrapped_request("put", "/1.0/config_maps/#{identifier}", [200], options)
+        end
+      end
+    end
+  end
+end

data/lib/fog/brightbox/storage.rb

@@ -215,7 +215,8 @@ module Fog
 
       # CGI.escape, but without special treatment on spaces
       def self.escape(str, extra_exclude_chars = "")
-        str.gsub(/([^a-zA-Z0-9_.-#{extra_exclude_chars}]+)/) do
+        # Includes fix to Regexp so "-" is correctly handled by placing last
+        str.gsub(/([^a-zA-Z0-9_.#{extra_exclude_chars}-]+)/) do
           "%" + Regexp.last_match[1].unpack("H2" * Regexp.last_match[1].bytesize).join("%").upcase
         end
       end

data/lib/fog/brightbox/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Brightbox
-    VERSION = "1.6.0"
+    VERSION = "1.7.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-brightbox
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.2
 platform: ruby
 authors:
 - Paul Thornthwaite
@@ -193,6 +193,8 @@ files:
 - lib/fog/brightbox/models/compute/cloud_ips.rb
 - lib/fog/brightbox/models/compute/collaboration.rb
 - lib/fog/brightbox/models/compute/collaborations.rb
+- lib/fog/brightbox/models/compute/config_map.rb
+- lib/fog/brightbox/models/compute/config_maps.rb
 - lib/fog/brightbox/models/compute/database_server.rb
 - lib/fog/brightbox/models/compute/database_servers.rb
 - lib/fog/brightbox/models/compute/database_snapshot.rb
@@ -240,6 +242,7 @@ files:
 - lib/fog/brightbox/requests/compute/create_application.rb
 - lib/fog/brightbox/requests/compute/create_cloud_ip.rb
 - lib/fog/brightbox/requests/compute/create_collaboration.rb
+- lib/fog/brightbox/requests/compute/create_config_map.rb
 - lib/fog/brightbox/requests/compute/create_database_server.rb
 - lib/fog/brightbox/requests/compute/create_firewall_policy.rb
 - lib/fog/brightbox/requests/compute/create_firewall_rule.rb
@@ -252,6 +255,7 @@ files:
 - lib/fog/brightbox/requests/compute/delete_application.rb
 - lib/fog/brightbox/requests/compute/delete_cloud_ip.rb
 - lib/fog/brightbox/requests/compute/delete_collaboration.rb
+- lib/fog/brightbox/requests/compute/delete_config_map.rb
 - lib/fog/brightbox/requests/compute/delete_database_server.rb
 - lib/fog/brightbox/requests/compute/delete_database_snapshot.rb
 - lib/fog/brightbox/requests/compute/delete_firewall_policy.rb
@@ -269,6 +273,7 @@ files:
 - lib/fog/brightbox/requests/compute/get_authenticated_user.rb
 - lib/fog/brightbox/requests/compute/get_cloud_ip.rb
 - lib/fog/brightbox/requests/compute/get_collaboration.rb
+- lib/fog/brightbox/requests/compute/get_config_map.rb
 - lib/fog/brightbox/requests/compute/get_database_server.rb
 - lib/fog/brightbox/requests/compute/get_database_snapshot.rb
 - lib/fog/brightbox/requests/compute/get_database_type.rb
@@ -290,6 +295,7 @@ files:
 - lib/fog/brightbox/requests/compute/list_applications.rb
 - lib/fog/brightbox/requests/compute/list_cloud_ips.rb
 - lib/fog/brightbox/requests/compute/list_collaborations.rb
+- lib/fog/brightbox/requests/compute/list_config_maps.rb
 - lib/fog/brightbox/requests/compute/list_database_servers.rb
 - lib/fog/brightbox/requests/compute/list_database_snapshots.rb
 - lib/fog/brightbox/requests/compute/list_database_types.rb
@@ -342,6 +348,7 @@ files:
 - lib/fog/brightbox/requests/compute/update_api_client.rb
 - lib/fog/brightbox/requests/compute/update_application.rb
 - lib/fog/brightbox/requests/compute/update_cloud_ip.rb
+- lib/fog/brightbox/requests/compute/update_config_map.rb
 - lib/fog/brightbox/requests/compute/update_database_server.rb
 - lib/fog/brightbox/requests/compute/update_database_snapshot.rb
 - lib/fog/brightbox/requests/compute/update_firewall_policy.rb