fog-brightbox 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 436790875e6a2537f3df4c8eb055433d587a4698
-  data.tar.gz: a4bd9e31309af1881961aac487d3731fc0007d82
+  metadata.gz: 3ba0fd5a2af49de6bfd1c985302496ca96f0368c
+  data.tar.gz: 59f4dec412be2a7f9bd2f77585e4c045f62741a0
 SHA512:
-  metadata.gz: 037b0733e2c70416434de4396101e13ab9aede47ae11ee6d6b3ea54e149fdfa2bfe3c056479e6a28ae9d0d6d96344c17497ecd7ebac0f2647788848703fbf0e9
-  data.tar.gz: cea10f7f2d5756b10d31f4b406445d57f05990111ce1e16d698625e3f301927c2c799edfab294b17f5759dbbb0abf237d3ae4c8835ff6cc949db3f1037988554
+  metadata.gz: 6df22c1e489650cbf363a0c12f1a382235293108dc145ca089fb996d1720fed5a0e0de11e0120374102d75c4980541db203f681169f8af40ec0aa0729250017a
+  data.tar.gz: 8c186b06909f62c6d395a4ce85bfaa190ece428d761859dee413bc1b883ae4145282e15bb114d330bdadbad57ef495d30dde860d68c98b520b0915af371c929b

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+### 0.2.0 / 2014-08-07
+
+Enhancements:
+
+* Add resource locks to prevent accidental deleting of the following resources:
+  * Database servers
+  * Database snapshots
+  * Images
+  * Load balancers
+  * Servers
+
 ### 0.1.1 / 2014-06-26
 
 Bug fixes:

data/lib/fog/brightbox/compute.rb

@@ -137,6 +137,11 @@ module Fog
       request :list_users
       request :list_user_collaborations
       request :list_zones
+      request :lock_resource_database_server
+      request :lock_resource_database_snapshot
+      request :lock_resource_image
+      request :lock_resource_load_balancer
+      request :lock_resource_server
       request :map_cloud_ip
       request :move_servers_server_group
       request :reject_user_collaboration
@@ -156,6 +161,11 @@ module Fog
       request :snapshot_server
       request :start_server
       request :stop_server
+      request :unlock_resource_database_server
+      request :unlock_resource_database_snapshot
+      request :unlock_resource_image
+      request :unlock_resource_load_balancer
+      request :unlock_resource_server
       request :unmap_cloud_ip
       request :update_account
       request :update_api_client

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

@@ -0,0 +1,27 @@
+module ResourceLocking
+  def locked?
+    if attributes.key?("locked") || attributes.key?(:locked)
+      attributes["locked"] || attributes[:locked] || false
+    else
+      false
+    end
+  end
+
+  def lock!
+    locking_request(:lock)
+  end
+
+  def unlock!
+    locking_request(:unlock)
+  end
+
+  private
+
+  def locking_request(lock_setting)
+    requires :identity
+
+    data = service.send(:"#{lock_setting}_resource_#{resource_name}", identity)
+    merge_attributes(data)
+    true
+  end
+end

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

@@ -1,9 +1,12 @@
 require "fog/brightbox/model"
+require "fog/brightbox/compute/resource_locking"
 
 module Fog
   module Compute
     class Brightbox
       class DatabaseServer < Fog::Brightbox::Model
+        include ResourceLocking
+
         identity :id
         attribute :url
         attribute :resource_type

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

@@ -1,9 +1,12 @@
 require "fog/brightbox/model"
+require "fog/brightbox/compute/resource_locking"
 
 module Fog
   module Compute
     class Brightbox
       class DatabaseSnapshot < Fog::Brightbox::Model
+        include ResourceLocking
+
         identity :id
         attribute :url
         attribute :resource_type

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

@@ -1,9 +1,12 @@
 require "fog/brightbox/model"
+require "fog/brightbox/compute/resource_locking"
 
 module Fog
   module Compute
     class Brightbox
       class Image < Fog::Brightbox::Model
+        include ResourceLocking
+
         identity :id
         attribute :url
         attribute :resource_type

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

@@ -1,9 +1,11 @@
 require "fog/brightbox/model"
+require "fog/brightbox/compute/resource_locking"
 
 module Fog
   module Compute
     class Brightbox
       class LoadBalancer < Fog::Brightbox::Model
+        include ResourceLocking
 
         identity :id
         attribute :url

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

@@ -1,11 +1,12 @@
 require "fog/compute/models/server"
-require "fog/brightbox/model_helper"
+require "fog/brightbox/compute/resource_locking"
 
 module Fog
   module Compute
     class Brightbox
       class Server < Fog::Compute::Server
         include Fog::Brightbox::ModelHelper
+        include ResourceLocking
 
         identity  :id
         attribute :resource_type
@@ -212,7 +213,6 @@ module Fog
           end
         end
       end
-
     end
   end
 end

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

@@ -0,0 +1,19 @@
+module Fog
+  module Compute
+    class Brightbox
+      class Real
+        # @param [String] identifier Unique reference to identify the resource
+        #
+        # @return [Hash] if successful Hash version of JSON object
+        #
+        # @see https://api.gb1.brightbox.com/1.0/#database_server_lock_resource_database_server
+        #
+        def lock_resource_database_server(identifier)
+          return nil if identifier.nil? || identifier == ""
+          wrapped_request("put", "/1.0/database_servers/#{identifier}/lock_resource", [200])
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+module Fog
+  module Compute
+    class Brightbox
+      class Real
+        # @param [String] identifier Unique reference to identify the resource
+        #
+        # @return [Hash] if successful Hash version of JSON object
+        #
+        # @see https://api.gb1.brightbox.com/1.0/#database_snapshot_lock_resource_database_snapshot
+        #
+        def lock_resource_database_snapshot(identifier)
+          return nil if identifier.nil? || identifier == ""
+          wrapped_request("put", "/1.0/database_snapshots/#{identifier}/lock_resource", [200])
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+module Fog
+  module Compute
+    class Brightbox
+      class Real
+        # @param [String] identifier Unique reference to identify the resource
+        #
+        # @return [Hash] if successful Hash version of JSON object
+        #
+        # @see https://api.gb1.brightbox.com/1.0/#image_lock_resource_image
+        #
+        def lock_resource_image(identifier)
+          return nil if identifier.nil? || identifier == ""
+          wrapped_request("put", "/1.0/images/#{identifier}/lock_resource", [200])
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+module Fog
+  module Compute
+    class Brightbox
+      class Real
+        # @param [String] identifier Unique reference to identify the resource
+        #
+        # @return [Hash] if successful Hash version of JSON object
+        #
+        # @see https://api.gb1.brightbox.com/1.0/#load_balancer_lock_resource_load_balancer
+        #
+        def lock_resource_load_balancer(identifier)
+          return nil if identifier.nil? || identifier == ""
+          wrapped_request("put", "/1.0/load_balancers/#{identifier}/lock_resource", [200])
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+module Fog
+  module Compute
+    class Brightbox
+      class Real
+        # @param [String] identifier Unique reference to identify the resource
+        #
+        # @return [Hash] if successful Hash version of JSON object
+        #
+        # @see https://api.gb1.brightbox.com/1.0/#server_lock_resource_server
+        #
+        def lock_resource_server(identifier)
+          return nil if identifier.nil? || identifier == ""
+          wrapped_request("put", "/1.0/servers/#{identifier}/lock_resource", [200])
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+module Fog
+  module Compute
+    class Brightbox
+      class Real
+        # @param [String] identifier Unique reference to identify the resource
+        #
+        # @return [Hash] if successful Hash version of JSON object
+        #
+        # @see https://api.gb1.brightbox.com/1.0/#database_server_unlock_resource_database_server
+        #
+        def unlock_resource_database_server(identifier)
+          return nil if identifier.nil? || identifier == ""
+          wrapped_request("put", "/1.0/database_servers/#{identifier}/unlock_resource", [200])
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+module Fog
+  module Compute
+    class Brightbox
+      class Real
+        # @param [String] identifier Unique reference to identify the resource
+        #
+        # @return [Hash] if successful Hash version of JSON object
+        #
+        # @see https://api.gb1.brightbox.com/1.0/#database_snapshot_unlock_resource_database_snapshot
+        #
+        def unlock_resource_database_snapshot(identifier)
+          return nil if identifier.nil? || identifier == ""
+          wrapped_request("put", "/1.0/database_snapshots/#{identifier}/unlock_resource", [200])
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+module Fog
+  module Compute
+    class Brightbox
+      class Real
+        # @param [String] identifier Unique reference to identify the resource
+        #
+        # @return [Hash] if successful Hash version of JSON object
+        #
+        # @see https://api.gb1.brightbox.com/1.0/#image_unlock_resource_image
+        #
+        def unlock_resource_image(identifier)
+          return nil if identifier.nil? || identifier == ""
+          wrapped_request("put", "/1.0/images/#{identifier}/unlock_resource", [200])
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+module Fog
+  module Compute
+    class Brightbox
+      class Real
+        # @param [String] identifier Unique reference to identify the resource
+        #
+        # @return [Hash] if successful Hash version of JSON object
+        #
+        # @see https://api.gb1.brightbox.com/1.0/#load_balancer_unlock_resource_load_balancer
+        #
+        def unlock_resource_load_balancer(identifier)
+          return nil if identifier.nil? || identifier == ""
+          wrapped_request("put", "/1.0/load_balancers/#{identifier}/unlock_resource", [200])
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+module Fog
+  module Compute
+    class Brightbox
+      class Real
+        # @param [String] identifier Unique reference to identify the resource
+        #
+        # @return [Hash] if successful Hash version of JSON object
+        #
+        # @see https://api.gb1.brightbox.com/1.0/#server_unlock_resource_server
+        #
+        def unlock_resource_server(identifier)
+          return nil if identifier.nil? || identifier == ""
+          wrapped_request("put", "/1.0/servers/#{identifier}/unlock_resource", [200])
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/brightbox/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Brightbox
-    VERSION = "0.1.1"
+    VERSION = "0.2.0"
   end
 end

data/spec/fog/compute/brightbox/database_server_spec.rb

@@ -3,6 +3,7 @@ require "fog/brightbox/models/compute/database_server"
 
 describe Fog::Compute::Brightbox::DatabaseServer do
   include ModelSetup
+  include SupportsResourceLocking
 
   subject { service.database_servers.new }
 

data/spec/fog/compute/brightbox/database_snapshot_spec.rb

@@ -3,6 +3,7 @@ require "fog/brightbox/models/compute/database_snapshot"
 
 describe Fog::Compute::Brightbox::DatabaseSnapshot do
   include ModelSetup
+  include SupportsResourceLocking
 
   subject { service.database_snapshots.new }
 

data/spec/fog/compute/brightbox/image_spec.rb

@@ -3,6 +3,7 @@ require "fog/brightbox/models/compute/image"
 
 describe Fog::Compute::Brightbox::Image do
   include ModelSetup
+  include SupportsResourceLocking
 
   subject { service.images.new }
 

data/spec/fog/compute/brightbox/load_balancer_spec.rb

@@ -3,6 +3,7 @@ require "fog/brightbox/models/compute/load_balancer"
 
 describe Fog::Compute::Brightbox::LoadBalancer do
   include ModelSetup
+  include SupportsResourceLocking
 
   subject { service.load_balancers.new }
 

data/spec/fog/compute/brightbox/server_spec.rb

@@ -3,6 +3,7 @@ require "fog/brightbox/models/compute/server"
 
 describe Fog::Compute::Brightbox::Server do
   include ModelSetup
+  include SupportsResourceLocking
 
   subject { service.servers.new }
 

data/spec/model_setup.rb

@@ -0,0 +1,22 @@
+module ModelSetup
+  def self.included(base)
+    base.class_eval do
+      let(:configuration) do
+        {
+          :brightbox_auth_url => "http://localhost",
+          :brightbox_api_url => "http://localhost",
+          :brightbox_client_id => "",
+          :brightbox_secret => "",
+          :brightbox_username => "",
+          :brightbox_password => "",
+          :brightbox_account => "",
+          :brightbox_default_image => "img-test",
+          :brightbox_access_token => "FAKECACHEDTOKEN"
+        }
+      end
+
+      let(:config) { Fog::Brightbox::Config.new(configuration) }
+      let(:service) { Fog::Compute::Brightbox.new(config) }
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,3 +1,4 @@
 require "minitest/autorun"
 require "fog/brightbox"
 require "model_helper"
+require "supports_resource_locking"

data/spec/supports_resource_locking.rb

@@ -0,0 +1,41 @@
+require "webmock/minitest"
+
+module SupportsResourceLocking
+  def self.included(base)
+    base.class_eval do
+      let(:collection_name) { subject.collection_name }
+
+      def test_responds_to_locked
+        assert_respond_to subject, :locked?
+      end
+
+      def test_responds_to_lock
+        assert_respond_to subject, :lock!
+      end
+
+      def test_lock_makes_request
+        skip if RUBY_VERSION < "1.9"
+
+        subject.id = "tst-12345"
+
+        stub_request(:put, "http://localhost/1.0/#{collection_name}/tst-12345/lock_resource?account_id=").to_return(:status => 200, :body => "{}", :headers => {})
+
+        subject.lock!
+      end
+
+      def test_responds_to_unlock
+        assert_respond_to subject, :unlock!
+      end
+
+      def test_unlock_makes_request
+        skip if RUBY_VERSION < "1.9"
+
+        subject.id = "tst-12345"
+
+        stub_request(:put, "http://localhost/1.0/#{collection_name}/tst-12345/unlock_resource?account_id=").to_return(:status => 200, :body => "{}", :headers => {})
+
+        subject.unlock!
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-brightbox
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Paul Thornthwaite
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-26 00:00:00.000000000 Z
+date: 2014-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -142,6 +142,7 @@ files:
 - lib/fog/brightbox/compute.rb
 - lib/fog/brightbox/compute/config.rb
 - lib/fog/brightbox/compute/image_selector.rb
+- lib/fog/brightbox/compute/resource_locking.rb
 - lib/fog/brightbox/compute/shared.rb
 - lib/fog/brightbox/config.rb
 - lib/fog/brightbox/core.rb
@@ -255,6 +256,11 @@ files:
 - lib/fog/brightbox/requests/compute/list_user_collaborations.rb
 - lib/fog/brightbox/requests/compute/list_users.rb
 - lib/fog/brightbox/requests/compute/list_zones.rb
+- lib/fog/brightbox/requests/compute/lock_resource_database_server.rb
+- lib/fog/brightbox/requests/compute/lock_resource_database_snapshot.rb
+- lib/fog/brightbox/requests/compute/lock_resource_image.rb
+- lib/fog/brightbox/requests/compute/lock_resource_load_balancer.rb
+- lib/fog/brightbox/requests/compute/lock_resource_server.rb
 - lib/fog/brightbox/requests/compute/map_cloud_ip.rb
 - lib/fog/brightbox/requests/compute/move_servers_server_group.rb
 - lib/fog/brightbox/requests/compute/reject_user_collaboration.rb
@@ -273,6 +279,11 @@ files:
 - lib/fog/brightbox/requests/compute/snapshot_server.rb
 - lib/fog/brightbox/requests/compute/start_server.rb
 - lib/fog/brightbox/requests/compute/stop_server.rb
+- lib/fog/brightbox/requests/compute/unlock_resource_database_server.rb
+- lib/fog/brightbox/requests/compute/unlock_resource_database_snapshot.rb
+- lib/fog/brightbox/requests/compute/unlock_resource_image.rb
+- lib/fog/brightbox/requests/compute/unlock_resource_load_balancer.rb
+- lib/fog/brightbox/requests/compute/unlock_resource_server.rb
 - lib/fog/brightbox/requests/compute/unmap_cloud_ip.rb
 - lib/fog/brightbox/requests/compute/update_account.rb
 - lib/fog/brightbox/requests/compute/update_api_client.rb
@@ -311,7 +322,9 @@ files:
 - spec/fog/compute/brightbox/zone_spec.rb
 - spec/fog/compute/brightbox_spec.rb
 - spec/model_helper.rb
+- spec/model_setup.rb
 - spec/spec_helper.rb
+- spec/supports_resource_locking.rb
 homepage: ''
 licenses:
 - MIT
@@ -360,4 +373,7 @@ test_files:
 - spec/fog/compute/brightbox/zone_spec.rb
 - spec/fog/compute/brightbox_spec.rb
 - spec/model_helper.rb
+- spec/model_setup.rb
 - spec/spec_helper.rb
+- spec/supports_resource_locking.rb
+has_rdoc: