fog-brightbox 1.7.3 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92ebad94e1526398b760b8a104898cdb2600d3a624e6f77af9b9a2bf24011279
-  data.tar.gz: 913cf9025ebd5dda7b47b4c2511da1b3f03eea54de7db58a30b1ca15423d592e
+  metadata.gz: 2fd48abde8380eb206f3b30abcb6000a8bec7c066d1913649efdde89719f0a79
+  data.tar.gz: b75f15aabc38798dcb1a8bcb13eb3e0b66e9ee9fe93beb91e462808d822f9fb7
 SHA512:
-  metadata.gz: 7d7d77edd59fb85d9d5ae125896a6d9f2f572ea7161a1da1eb4f183567f6fbf9682d18b55e648560cfa1ea179006aaa764b15a0fe11502d727038f2d97571cf2
-  data.tar.gz: 24359f5541ce79e0f658bdd86c039e1b90358e5b1a3defa2b52bc7fd391fbf87f783cdd33f96d4caaffccaa48fefb2b5438f90ff979462cd1b1a8f3c0536150b
+  metadata.gz: 6ea1059b94824d5ae37fda327001f94704a544fd29bfa7825627599cef850653fdcb55c18d493352af9bb1afd6864faf89c2d824da4baccd9fcdbd0d020096e4
+  data.tar.gz: 464af05ddefa022497cce27fb7535eaac5f9db282e32037e922780f0ab05f96eb1f72ccad07f9ad5860c5a2e62228a5a05c676ee83e666507d1a62191e7f3580

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+### 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/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.0"
   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.0
 platform: ruby
 authors:
 - Paul Thornthwaite