brightbox-cli 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c5b05513e19a2b2086a60adcdcc9db34da763ea57057fe3cd4565f13d996325
-  data.tar.gz: 2330375316fccfb4681d2eafd793070821ac58e8af68d73c9b8370301a4ecd43
+  metadata.gz: 1cc8d372e2c0c019461ab6f5302f71d9a5241646d57cc91eaba2be3033794012
+  data.tar.gz: 95314299e02e4d28ea02467a00eb5093f7e74c9dbc561459ea892175edc08043
 SHA512:
-  metadata.gz: a2b9f70e55d3ac5273a6179ff17bd10f5c99d75c628d67dfd671413d657717d34f00a8ecbbb1397b952b56ed34b55249e836c09417c32b69eebcb677877b941e
-  data.tar.gz: de89095e13e79781b3c04828a4e20e1150056a4e3f838fa19923f949741c332cbeb4bb4b46b38566f2a7dc2b6e76b893cd658963b5194b33f7a79674cf650314
+  metadata.gz: e32fdba2d13ad2917a7200f5cba06223ec2fcf059dc3404685b790f81b64c009857e7f984e9c9a7e01f06d55db31f00820413c77ff1570ed5a934c78cc9c03a2
+  data.tar.gz: 1d7c5414f09b8b1ffba4a3a00792dacb5555b0b2da38da9044591d8ab6ddbcc36dcb7a35e700ad61a839f414f26f9b7d5fe04210221438e82b864eb5a607a3cc

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+### v3.0.1 / 2020-07-01
+
+[Full Changelog](https://github.com/brightbox/brightbox-cli/compare/v3.0.0...v3.0.1)
+
+Bug fixes:
+
+* Fix `cloudips update --name` to correctly set blank names
+
 ### v3.0.0 / 2020-07-01
 
 [Full Changelog](https://github.com/brightbox/brightbox-cli/compare/v2.12.0...v3.0.0)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    brightbox-cli (3.0.0)
+    brightbox-cli (3.0.1)
       dry-inflector (< 0.2)
       fog-brightbox (>= 1.1.0)
       fog-core (< 2.0)

data/Jenkinsfile

@@ -17,7 +17,7 @@ pipeline {
           }
           steps {
             sh 'bundle install --deployment'
-            sh 'bundle exec rake test'
+            sh 'bundle exec rake spec'
           }
         }
         stage("Ruby 2.1") {
@@ -28,7 +28,7 @@ pipeline {
           }
           steps {
             sh 'bundle install --deployment'
-            sh 'bundle exec rake test'
+            sh 'bundle exec rake spec'
           }
         }
         stage("Ruby 2.2") {
@@ -39,7 +39,7 @@ pipeline {
           }
           steps {
             sh 'bundle install --deployment'
-            sh 'bundle exec rake test'
+            sh 'bundle exec rake spec'
           }
         }
         stage("Ruby 2.3") {
@@ -50,7 +50,7 @@ pipeline {
           }
           steps {
             sh 'bundle install --deployment'
-            sh 'bundle exec rake test'
+            sh 'bundle exec rake spec'
           }
         }
         stage("Ruby 2.4") {
@@ -61,7 +61,7 @@ pipeline {
           }
           steps {
             sh 'bundle install --deployment'
-            sh 'bundle exec rake test'
+            sh 'bundle exec rake spec'
           }
         }
         stage("Ruby 2.5") {
@@ -72,7 +72,7 @@ pipeline {
           }
           steps {
             sh 'bundle install --deployment'
-            sh 'bundle exec rake test'
+            sh 'bundle exec rake spec'
           }
         }
         stage("Ruby 2.6") {
@@ -83,7 +83,7 @@ pipeline {
           }
           steps {
             sh 'bundle install --deployment'
-            sh 'bundle exec rake test'
+            sh 'bundle exec rake spec'
           }
         }
       }

data/lib/brightbox-cli/cloud_ips.rb

@@ -75,7 +75,7 @@ module Brightbox
         params[:reverse_dns] = ""
       end
 
-      if options[:n] && !options[:name].empty?
+      if options[:n] && !options[:n].nil?
         params[:name] = options[:n]
       end
 

data/lib/brightbox-cli/version.rb

@@ -1,3 +1,3 @@
 module Brightbox
-  VERSION = "3.0.0" unless defined?(Brightbox::VERSION)
+  VERSION = "3.0.1" unless defined?(Brightbox::VERSION)
 end

data/spec/commands/cloudips/update_spec.rb

@@ -7,6 +7,13 @@ describe "brightbox cloudips" do
     let(:stdout) { output.stdout }
     let(:stderr) { output.stderr }
 
+    before do
+      config_from_contents(USER_APP_CONFIG_CONTENTS)
+
+      stub_request(:post, "http://api.brightbox.dev/token").
+        to_return(status: 200, body: JSON.dump(access_token: "ACCESS-TOKEN", refresh_token: "REFRESH-TOKEN"))
+    end
+
     context "" do
       let(:argv) { %w(cloudips update) }
 
@@ -14,5 +21,63 @@ describe "brightbox cloudips" do
         expect { output }.to_not raise_error
       end
     end
+
+    context "when name is updated" do
+      let(:argv) { ["cloudips", "update", "--name=#{new_name}", "cip-12345"] }
+
+      let(:json_response) do
+        <<-EOS
+        {
+          "id":"cip-12345",
+          "name":"#{new_name}"
+        }
+        EOS
+      end
+
+      context "--name 'New name'" do
+        let(:new_name) { "New name" }
+        let(:expected_args) { ["cip-12345", { :name => new_name }] }
+
+        before do
+          stub_request(:put, "http://api.brightbox.dev/1.0/cloud_ips/cip-12345?account_id=acc-12345")
+            .with(:headers => { "Content-Type" => "application/json" },
+                  :body => hash_including("name" => "New name"))
+            .and_return(:status => 200, :body => json_response)
+
+          stub_request(:get, "http://api.brightbox.dev/1.0/cloud_ips/cip-12345?account_id=acc-12345")
+            .with(:headers => { "Content-Type" => "application/json" })
+            .and_return(:status => 200, :body => json_response)
+        end
+
+        it "puts new name in update" do
+          expect(Brightbox::CloudIP.conn).to receive(:update_cloud_ip).with(*expected_args).and_call_original
+          expect(stderr).to eq("")
+          expect(stdout).to include("cip-12345")
+          expect(stdout).to include("New name")
+        end
+      end
+
+      context "--name ''" do
+        let(:new_name) { "" }
+        let(:expected_args) { ["cip-12345", { :name => "" }] }
+
+        before do
+          stub_request(:put, "http://api.brightbox.dev/1.0/cloud_ips/cip-12345?account_id=acc-12345")
+            .with(:headers => { "Content-Type" => "application/json" },
+                  :body => hash_including("name" => ""))
+            .and_return(:status => 200, :body => json_response)
+
+          stub_request(:get, "http://api.brightbox.dev/1.0/cloud_ips/cip-12345?account_id=acc-12345")
+            .with(:headers => { "Content-Type" => "application/json" })
+            .and_return(:status => 200, :body => json_response)
+        end
+
+        it "puts new name in update" do
+          expect(Brightbox::CloudIP.conn).to receive(:update_cloud_ip).with(*expected_args).and_call_original
+          expect(stderr).to eq("")
+          expect(stdout).to include("cip-12345")
+        end
+      end
+    end
   end
 end

data/spec/commands/sql/instances/create_spec.rb

@@ -104,6 +104,32 @@ describe "brightbox sql instances" do
       end
     end
 
+    context "--snapshot=dbi-1493j" do
+      let(:argv) { ["sql", "instances", "create", "--snapshot=dbi-1493j"] }
+      let(:expected_args) { { :snapshot_id => "dbi-1493j" } }
+
+      let(:json_response) do
+        <<-EOS
+        {
+          "id":"dbs-12345"
+        }
+        EOS
+      end
+
+      before do
+        stub_request(:post, "http://api.brightbox.dev/1.0/database_servers?account_id=acc-12345")
+          .with(:headers => { "Content-Type" => "application/json" },
+                :body => hash_including("snapshot" => "dbi-1493j"))
+          .and_return(:status => 202, :body => json_response)
+      end
+
+      it "includes schedule fields in response" do
+        expect(Brightbox::DatabaseServer).to receive(:create).with(expected_args).and_call_original
+        expect(stdout).to include("id: dbs-12345")
+        expect(stderr).to eql("")
+      end
+    end
+
     context "--snapshots-schedule='0 12 * * 4'" do
       let(:argv) { ["sql", "instances", "create", "--snapshots-schedule=0 12 * * 4"] }
       let(:expected_args) { { :snapshots_schedule => "0 12 * * 4" } }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brightbox-cli
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - John Leach