brightbox-cli 4.5.0 → 4.6.0

data/spec/cassettes/brightbox_config/client_add/when_new_client_is_first_and_only_client/sets_up_the_config.yml

@@ -78,7 +78,7 @@ http_interactions:
       Cache-Control:
       - max-age=0, private, must-revalidate
     body:
-      string: "{\"id\":\"acc-12345\",\"resource_type\":\"account\",\"url\":\"https://api.gb1.brightbox.com/1.0/accounts/acc-12345\",\"name\":\"Aurnqfvgsbeyiprni\",\"status\":\"active\",\"address_1\":\"Kaycee Throughway\",\"address_2\":\"\",\"city\":\"South Hellenport\",\"county\":\"\",\"postcode\":\"60364-9886\",\"country_code\":\"GB\",\"country_name\":\"United Kingdom\",\"vat_registration_number\":\"\",\"telephone_number\":\"+444238318140\",\"telephone_verified\":false,\"verified_telephone\":null,\"verified_at\":null,\"verified_ip\":null,\"created_at\":\"2013-09-04T07:53:13Z\",\"ram_limit\":32768,\"ram_used\":0,\"cloud_ips_limit\":20,\"cloud_ips_used\":1,\"load_balancers_limit\":5,\"load_balancers_used\":0,\"valid_credit_card\":false,\"library_ftp_host\":\"ftp.library.gb1.brightbox.com\",\"library_ftp_user\":\"acc-12345\",\"library_ftp_password\":null,\"clients\":[{\"id\":\"cli-12345\",\"resource_type\":\"api_client\",\"url\":\"https://api.gb1.brightbox.com/1.0/api_clients/cli-12345\",\"name\":null,\"description\":null,\"revoked_at\":null}],\"images\":[],\"servers\":[],\"load_balancers\":[],\"cloud_ips\":[{\"id\":\"cip-12345\",\"resource_type\":\"cloud_ip\",\"url\":\"https://api.gb1.brightbox.com/1.0/cloud_ips/cip-12345\",\"status\":\"unmapped\",\"public_ip\":\"56.67.59.219\",\"reverse_dns\":\"cip-12345-67-59-219.gb1.brightbox.com\",\"name\":null}],\"server_groups\":[{\"id\":\"grp-12345\",\"resource_type\":\"server_group\",\"url\":\"https://api.gb1.brightbox.com/1.0/server_groups/grp-12345\",\"name\":\"default\",\"description\":\"All new servers are added to this group unless specified otherwise.\",\"created_at\":\"2013-09-04T07:53:13Z\",\"default\":true}],\"firewall_policies\":[{\"id\":\"fwp-12345\",\"resource_type\":\"firewall_policy\",\"url\":\"https://api.gb1.brightbox.com/1.0/firewall_policies/fwp-12345\",\"default\":true,\"name\":\"default\",\"created_at\":\"2013-09-04T07:53:14Z\",\"description\":\"Applied to the default server group.\"}],\"owner\":{\"id\":\"usr-12345\",\"resource_type\":\"user\",\"url\":\"https://api.gb1.brightbox.com/1.0/users/usr-12345\",\"name\":\"Dylan Fay DDS\",\"email_address\":\"jason.null@brightbox.com\"},\"users\":[],\"zones\":[{\"id\":\"zon-12345\",\"resource_type\":\"zone\",\"url\":\"https://api.gb1.brightbox.com/1.0/zones/zon-12345\",\"handle\":\"gb1-a\"},{\"id\":\"zon-12345\",\"resource_type\":\"zone\",\"url\":\"https://api.gb1.brightbox.com/1.0/zones/zon-12345\",\"handle\":\"gb1-b\"}]}"
+      string: "{\"id\":\"acc-12345\",\"resource_type\":\"account\",\"url\":\"https://api.gb1.brightbox.com/1.0/accounts/acc-12345\",\"name\":\"Aurnqfvgsbeyiprni\",\"status\":\"active\",\"address_1\":\"Kaycee Throughway\",\"address_2\":\"\",\"city\":\"South Hellenport\",\"county\":\"\",\"postcode\":\"60364-9886\",\"country_code\":\"GB\",\"country_name\":\"United Kingdom\",\"vat_registration_number\":\"\",\"telephone_number\":\"+444238318140\",\"telephone_verified\":false,\"verified_telephone\":null,\"verified_at\":null,\"verified_ip\":null,\"created_at\":\"2013-09-04T07:53:13Z\",\"ram_limit\":32768,\"ram_used\":0,\"cloud_ips_limit\":20,\"cloud_ips_used\":1,\"load_balancers_limit\":5,\"load_balancers_used\":0,\"valid_credit_card\":false,\"library_ftp_host\":\"\",\"library_ftp_user\":\"acc-12345\",\"library_ftp_password\":null,\"clients\":[{\"id\":\"cli-12345\",\"resource_type\":\"api_client\",\"url\":\"https://api.gb1.brightbox.com/1.0/api_clients/cli-12345\",\"name\":null,\"description\":null,\"revoked_at\":null}],\"images\":[],\"servers\":[],\"load_balancers\":[],\"cloud_ips\":[{\"id\":\"cip-12345\",\"resource_type\":\"cloud_ip\",\"url\":\"https://api.gb1.brightbox.com/1.0/cloud_ips/cip-12345\",\"status\":\"unmapped\",\"public_ip\":\"56.67.59.219\",\"reverse_dns\":\"cip-12345-67-59-219.gb1.brightbox.com\",\"name\":null}],\"server_groups\":[{\"id\":\"grp-12345\",\"resource_type\":\"server_group\",\"url\":\"https://api.gb1.brightbox.com/1.0/server_groups/grp-12345\",\"name\":\"default\",\"description\":\"All new servers are added to this group unless specified otherwise.\",\"created_at\":\"2013-09-04T07:53:13Z\",\"default\":true}],\"firewall_policies\":[{\"id\":\"fwp-12345\",\"resource_type\":\"firewall_policy\",\"url\":\"https://api.gb1.brightbox.com/1.0/firewall_policies/fwp-12345\",\"default\":true,\"name\":\"default\",\"created_at\":\"2013-09-04T07:53:14Z\",\"description\":\"Applied to the default server group.\"}],\"owner\":{\"id\":\"usr-12345\",\"resource_type\":\"user\",\"url\":\"https://api.gb1.brightbox.com/1.0/users/usr-12345\",\"name\":\"Dylan Fay DDS\",\"email_address\":\"jason.null@brightbox.com\"},\"users\":[],\"zones\":[{\"id\":\"zon-12345\",\"resource_type\":\"zone\",\"url\":\"https://api.gb1.brightbox.com/1.0/zones/zon-12345\",\"handle\":\"gb1-a\"},{\"id\":\"zon-12345\",\"resource_type\":\"zone\",\"url\":\"https://api.gb1.brightbox.com/1.0/zones/zon-12345\",\"handle\":\"gb1-b\"}]}"
     http_version:
   recorded_at: Fri, 06 Sep 2013 15:58:58 GMT
 - request:

data/spec/commands/images/register_spec.rb

@@ -29,18 +29,18 @@ describe "brightbox images" do
       it "does not error" do
         expect { output }.to_not raise_error
 
-        expect(stderr).to match("ERROR: You must specify one of 'server', 'source', 'url', or 'volume'")
+        expect(stderr).to match("ERROR: You must specify one of 'server', 'url', or 'volume'")
         expect(stdout).to match("")
       end
     end
 
     context "with mutually exclusive arguments" do
-      let(:argv) { %w[images register --arch x86_64 --source test.img --url http://example.com/test.img] }
+      let(:argv) { %w[images register --arch x86_64 --server srv-12345 --url http://example.com/test.img] }
 
       it "does not error" do
         expect { output }.to_not raise_error
 
-        expect(stderr).to match("ERROR: You cannot register from multiple sources. Use either 'source', 'server', 'url', or 'volume'")
+        expect(stderr).to match("ERROR: You cannot register from multiple sources. Use either 'server', 'url', or 'volume'")
         expect(stdout).to match("")
       end
     end
@@ -83,44 +83,6 @@ describe "brightbox images" do
       end
     end
 
-    context "with 'source' argument" do
-      let(:argv) { %w[images register --arch x86_64 --source custom.img] }
-
-      before do
-        expect(Brightbox::Image).to receive(:register)
-          .with(hash_including(
-                  arch: "x86_64",
-                  source: "custom.img"
-                ))
-          .and_call_original
-
-        stub_request(:post, "#{api_url}/1.0/images?account_id=acc-12345")
-          .with(body: /"source":"custom.img"/)
-          .to_return(
-            status: 201,
-            body: {
-              id: "img-12345"
-            }.to_json
-          )
-
-        stub_request(:get, "#{api_url}/1.0/images/img-12345?account_id=acc-12345")
-          .to_return(
-            status: 200,
-            body: {
-              id: "img-12345"
-            }.to_json
-          )
-      end
-
-      it "does not error" do
-        expect { output }.to_not raise_error
-
-        expect(stderr).to match("")
-        expect(stderr).not_to match("ERROR")
-        expect(stdout).to match("img-12345")
-      end
-    end
-
     context "with 'url' argument" do
       let(:argv) { %w[images register --arch x86_64 --url https://example.com/os-22.iso] }
 
@@ -198,14 +160,14 @@ describe "brightbox images" do
     end
 
     context "with min-ram argument" do
-      let(:argv) { %w[images register --arch x86_64 --source custom.img --min-ram 2048] }
+      let(:argv) { %w[images register --arch x86_64 --url https://example.com/os-22.iso --min-ram 2048] }
 
       before do
         expect(Brightbox::Image).to receive(:register)
           .with(hash_including(
                   arch: "x86_64",
                   min_ram: 2048,
-                  source: "custom.img"
+                  http_url: "https://example.com/os-22.iso"
                 ))
           .and_call_original
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brightbox-cli
 version: !ruby/object:Gem::Version
-  version: 4.5.0
+  version: 4.6.0
 platform: ruby
 authors:
 - John Leach
@@ -303,7 +303,6 @@ files:
 - lib/brightbox-cli/commands/accounts/default.rb
 - lib/brightbox-cli/commands/accounts/list.rb
 - lib/brightbox-cli/commands/accounts/remove.rb
-- lib/brightbox-cli/commands/accounts/reset_ftp_password.rb
 - lib/brightbox-cli/commands/accounts/show.rb
 - lib/brightbox-cli/commands/cloudips/create.rb
 - lib/brightbox-cli/commands/cloudips/destroy.rb
@@ -588,7 +587,6 @@ files:
 - spec/cassettes/brightbox_sql_snapshots/show/when_resource_exists/does_not_output_to_stderr.yml
 - spec/commands/accounts/default_spec.rb
 - spec/commands/accounts/list_spec.rb
-- spec/commands/accounts/reset_ftp_password_spec.rb
 - spec/commands/accounts/show_spec.rb
 - spec/commands/cloudips/create_spec.rb
 - spec/commands/cloudips/destroy_spec.rb
@@ -957,7 +955,6 @@ test_files:
 - spec/cassettes/brightbox_sql_snapshots/show/when_resource_exists/does_not_output_to_stderr.yml
 - spec/commands/accounts/default_spec.rb
 - spec/commands/accounts/list_spec.rb
-- spec/commands/accounts/reset_ftp_password_spec.rb
 - spec/commands/accounts/show_spec.rb
 - spec/commands/cloudips/create_spec.rb
 - spec/commands/cloudips/destroy_spec.rb

data/lib/brightbox-cli/commands/accounts/reset_ftp_password.rb

@@ -1,40 +0,0 @@
-module Brightbox
-  command [:accounts] do |cmd|
-    cmd.desc I18n.t("accounts.reset_ftp_password.desc")
-    cmd.arg_name "account-id..."
-    cmd.command [:reset_ftp_password] do |c|
-      c.action do |global_options, _options, args|
-        if args.empty?
-          raise "You must specify the accounts to reset ftp passwords for"
-        end
-
-        accounts = Account.find_or_call(args) do |id|
-          raise "Couldn't find account #{id}"
-        end
-
-        rows = []
-
-        accounts.each do |s|
-          info "Resetting ftp password for #{s}"
-          new_password = s.reset_ftp_password
-          o = s.to_row
-          o[:library_ftp_password] = new_password
-          rows << o
-        end
-
-        table_opts = global_options.merge(
-          :vertical => true,
-          :fields => %i[
-            id
-            name
-            library_ftp_host
-            library_ftp_user
-            library_ftp_password
-          ]
-        )
-
-        render_table(rows, table_opts)
-      end
-    end
-  end
-end

data/spec/commands/accounts/reset_ftp_password_spec.rb

@@ -1,17 +0,0 @@
-require "spec_helper"
-
-describe "brightbox accounts" do
-  describe "reset_ftp_password" do
-    let(:output) { FauxIO.new { Brightbox.run(argv) } }
-    let(:stdout) { output.stdout }
-    let(:stderr) { output.stderr }
-
-    context "" do
-      let(:argv) { %w[accounts reset_ftp_password] }
-
-      it "does not error" do
-        expect { output }.to_not raise_error
-      end
-    end
-  end
-end