fog-brightbox 1.7.3 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92ebad94e1526398b760b8a104898cdb2600d3a624e6f77af9b9a2bf24011279
-  data.tar.gz: 913cf9025ebd5dda7b47b4c2511da1b3f03eea54de7db58a30b1ca15423d592e
+  metadata.gz: 1061e46a1ab7bab3542b35bd9a37f966370f5ab44c98d9ce003c56aecabbea47
+  data.tar.gz: '09abdac10bca6dbafddf1a7931d0243456caf605c62757e05353b9f8611bf9ab'
 SHA512:
-  metadata.gz: 7d7d77edd59fb85d9d5ae125896a6d9f2f572ea7161a1da1eb4f183567f6fbf9682d18b55e648560cfa1ea179006aaa764b15a0fe11502d727038f2d97571cf2
-  data.tar.gz: 24359f5541ce79e0f658bdd86c039e1b90358e5b1a3defa2b52bc7fd391fbf87f783cdd33f96d4caaffccaa48fefb2b5438f90ff979462cd1b1a8f3c0536150b
+  metadata.gz: b587653fc85f39d14e3a9a46bdbff8d83b79046f3fa9baf9de12258db58d3e03c68e22b8930c409c3c5fa2209fc04606fd2d9089737321aaf28bff1c66c3e79f
+  data.tar.gz: eff1f83c2b30a808b6b569e73c321788838c2887a9844a129137789c0052fb260e613c71497bc73733d922381d8759615284407c13fc514b1c650adff255f326

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+### 1.8.1 / 2022-12-05
+
+Bug fixes:
+
+* Remove outdated check for required arguments in `Image.create` model which
+  prevented using newer arguments in the latest API version
+
+### 1.8.0 / 2022-08-31
+
+Changes:
+
+* Allow custom `volume_size` in server creation where supported
+
 ### 1.7.3 / 2022-08-17
 
 Bug fixes:

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

@@ -14,13 +14,16 @@ module Fog
 
         attribute :arch
         attribute :disk_size, type: :integer
+        attribute :http_url
         attribute :licence_name
         attribute :min_ram, type: :integer
+        attribute :server
         attribute :source
         attribute :source_trigger
         attribute :source_type
         attribute :username
         attribute :virtual_size, type: :integer
+        attribute :volume
 
         # Boolean flags
         attribute :compatibility_mode, type: :boolean
@@ -40,13 +43,16 @@ module Fog
 
         def save
           raise Fog::Errors::Error.new("Resaving an existing object may create a duplicate") if persisted?
-          requires :source, :arch
+
           options = {
-            :source => source,
             :arch => arch,
+            :description => description,
+            :http_url => http_url,
             :name => name,
+            :server => server,
+            :source => source,
             :username => username,
-            :description => description
+            :volume => volume
           }.delete_if { |_k, v| v.nil? || v == "" }
           data = service.create_image(options)
           merge_attributes(data)

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

@@ -8,6 +8,7 @@ module Fog
         include Fog::Brightbox::Compute::ResourceLocking
 
         attr_accessor :volume_id
+        attr_accessor :volume_size
 
         identity :id
         attribute :resource_type
@@ -197,7 +198,16 @@ module Fog
           options.merge!(:disk_encrypted => disk_encrypted) if disk_encrypted
 
           if volume_id
-            options.merge!(:volumes => [:volume => volume_id])
+            options.merge!(:volumes => [{ volume: volume_id }])
+          elsif volume_size
+            options.merge!(
+              volumes: [
+                {
+                  image: image_id,
+                  size: volume_size
+                }
+              ]
+            )
           else
             options.merge!(:image => image_id)
           end

data/lib/fog/brightbox/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Brightbox
-    VERSION = "1.7.3"
+    VERSION = "1.8.1"
   end
 end

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

@@ -20,7 +20,7 @@ describe Fog::Brightbox::Compute::Server do
   end
 
   describe "when creating" do
-    describe "with required image_id" do
+    describe "with image_id" do
       it "sends correct JSON" do
         options = {
           image_id: "img-12345"
@@ -38,6 +38,33 @@ describe Fog::Brightbox::Compute::Server do
       end
     end
 
+    describe "with image_id and custom size" do
+      it "sends correct JSON" do
+        options = {
+          image_id: "img-12345",
+          volume_size: 25_000
+        }
+        expected_args = {
+          volumes: [
+            {
+              image: "img-12345",
+              size: 25_000
+            }
+          ]
+        }
+
+        stub_request(:post, "http://localhost/1.0/servers").
+          with(:query => hash_including(:account_id),
+               :headers => { "Authorization" => "Bearer FAKECACHEDTOKEN",
+                             "Content-Type" => "application/json" },
+                             :body => hash_including(expected_args)).
+        to_return(:status => 202, :body => %q({"id":"srv-12345"}), :headers => {})
+
+        @server = Fog::Brightbox::Compute::Server.new({ :service => service }.merge(options))
+        assert @server.save
+      end
+    end
+
     describe "with additional disk_encrypted" do
       it "sends correct JSON" do
         options = {
@@ -61,6 +88,27 @@ describe Fog::Brightbox::Compute::Server do
     end
   end
 
+  describe "with volume_id" do
+    it "sends correct JSON" do
+      options = {
+        volume_id: "vol-12345"
+      }
+      expected_args = {
+        volumes: [{ volume: "vol-12345" }]
+      }
+
+      stub_request(:post, "http://localhost/1.0/servers").
+        with(:query => hash_including(:account_id),
+             :headers => { "Authorization" => "Bearer FAKECACHEDTOKEN",
+                           "Content-Type" => "application/json" },
+                           :body => hash_including(expected_args)).
+      to_return(:status => 202, :body => %q({"id":"srv-12345"}), :headers => {})
+
+      @server = Fog::Brightbox::Compute::Server.new({ :service => service }.merge(options))
+      assert @server.save
+    end
+  end
+
   describe "when snapshotting with no options" do
     it "returns the server" do
       stub_request(:post, "http://localhost/1.0/servers/srv-12345/snapshot").

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-brightbox
 version: !ruby/object:Gem::Version
-  version: 1.7.3
+  version: 1.8.1
 platform: ruby
 authors:
 - Paul Thornthwaite