brightbox-cli 3.1.0 → 4.0.0.rc2

data/spec/commands/login_spec.rb

@@ -9,13 +9,13 @@ describe "brightbox login" do
   let(:password) { "N:B3e%7Cmh" }
   let(:client_id) { "app-12345" }
   let(:secret) { "mocbuipbiaa6k6c" }
-  let(:api_url) { "http://api.brightbox.dev" }
+  let(:api_url) { "http://api.brightbox.localhost" }
 
   let(:default_account) { "acc-12345" }
   let(:client_alias) { email }
 
   context "when no arguments are given" do
-    let(:argv) { %w(login) }
+    let(:argv) { %w[login] }
 
     it "errors prompting for the email address" do
       remove_config
@@ -23,48 +23,99 @@ describe "brightbox login" do
     end
   end
 
-  context "when no config is present", vcr: true do
+  context "when no config is present" do
     let(:argv) { ["login", "-p", password, email] }
 
     before do
       remove_config
     end
 
-    it "does not error" do
-      expect { output }.to_not raise_error
-      expect(stderr).to_not include("ERROR")
-    end
+    context "without correct authentication" do
+      before do
+        stub_request(:post, "#{api_url}/token")
+          .with(
+            body: {
+              grant_type: "password",
+              username: email,
+              password: password
+            }.to_json
+          ).to_return(
+            status: 401,
+            body: { error: "invalid_client" }.to_json
+          )
+      end
 
-    it "sets up the config" do
-      expect { output }.to_not raise_error
+      it "does not error" do
+        expect { output }.to_not raise_error
+        expect(stderr).to_not include("ERROR")
+      end
 
-      @config = Brightbox::BBConfig.new
-      @client_section = @config.config[email]
+      it "sets up the config" do
+        expect { output }.to_not raise_error
 
-      expect(@client_section["api_url"]).to eql(Brightbox::DEFAULT_API_ENDPOINT)
-      expect(@client_section["username"]).to eql(email)
-      expect(@client_section["default_account"]).to eql(default_account)
-    end
+        @config = Brightbox::BBConfig.new
+        @client_section = @config.config[email]
 
-    it "requests access tokens" do
-      expect { output }.to_not raise_error
+        expect(@client_section["api_url"]).to eql(Brightbox::DEFAULT_API_ENDPOINT)
+        expect(@client_section["username"]).to eql(email)
 
-      @config = Brightbox::BBConfig.new :client_name => email
+        expect(@client_section["default_account"]).to be_nil
+      end
 
-      expect(cached_access_token(@config)).to eql(@config.access_token)
-      expect(cached_refresh_token(@config)).to eql(@config.refresh_token)
+      it "requests access tokens" do
+        expect { output }.to_not raise_error
+
+        @config = Brightbox::BBConfig.new :client_name => email
+
+        expect(cached_access_token(@config)).to eql(@config.access_token)
+        expect(cached_refresh_token(@config)).to eql(@config.refresh_token)
+      end
     end
 
-    it "does not prompt to rerun the command" do
-      expect(stderr).to_not include("please re-run your command")
+    context "with correct authentication" do
+      before do
+        stub_token_request
+        stub_accounts_request
+      end
+
+      it "does not error" do
+        expect { output }.to_not raise_error
+        expect(stderr).to_not include("ERROR")
+      end
+
+      it "sets up the config" do
+        expect { output }.to_not raise_error
+
+        @config = Brightbox::BBConfig.new
+        @client_section = @config.config[email]
+
+        expect(@client_section["api_url"]).to eql(Brightbox::DEFAULT_API_ENDPOINT)
+        expect(@client_section["username"]).to eql(email)
+        expect(@client_section["default_account"]).to eql(default_account)
+      end
+
+      it "requests access tokens" do
+        expect { output }.to_not raise_error
+
+        @config = Brightbox::BBConfig.new :client_name => email
+
+        expect(cached_access_token(@config)).to eql(@config.access_token)
+        expect(cached_refresh_token(@config)).to eql(@config.refresh_token)
+      end
+
+      it "does not prompt to rerun the command" do
+        expect(stderr).to_not include("please re-run your command")
+      end
     end
   end
 
-  context "when no password is given", vcr: true do
+  context "when no password is given" do
     let(:argv) { ["login", email] }
 
     before do
       remove_config
+      stub_token_request
+      stub_accounts_request
       mock_password_entry(password)
     end
 
@@ -102,16 +153,15 @@ describe "brightbox login" do
     end
   end
 
-  context "when custom api/auth URLs are given", vcr: true do
-    # FIXME: These need to be the "real" defaults to record the token interchange
-    #        May allow a regression that the defaults are used, not the passed argument
-    #        Need to use something better that VCR.
+  context "when custom api/auth URLs are given" do
     let(:api_url) { Brightbox::DEFAULT_API_ENDPOINT }
     let(:auth_url) { Brightbox::DEFAULT_API_ENDPOINT }
     let(:argv) { ["login", "--api-url", api_url, "--auth-url", auth_url, email] }
 
     before do
       remove_config
+      stub_token_request
+      stub_accounts_request
       mock_password_entry(password)
     end
 
@@ -150,12 +200,13 @@ describe "brightbox login" do
     end
   end
 
-  context "when default account is passed", vcr: true do
+  context "when default account is passed" do
     let(:account) { "acc-23456" }
     let(:argv) { ["login", "--default-account", account, email] }
 
     before do
       remove_config
+      stub_token_request
       mock_password_entry(password)
     end
 
@@ -194,13 +245,15 @@ describe "brightbox login" do
     end
   end
 
-  context "when alternative client credentials are given", vcr: true do
+  context "when alternative client credentials are given" do
     let(:other_client_identifier) { "app-23456" }
     let(:other_client_secret) { "ho04hondtzjjdf4" }
     let(:argv) { ["login", "--application-id", other_client_identifier, "--application-secret", other_client_secret, email] }
 
     before do
       remove_config
+      stub_token_request
+      stub_accounts_request
       mock_password_entry(password)
     end
 
@@ -266,7 +319,8 @@ describe "brightbox login" do
 
       stub_request(:post, "https://auth.example.com/token").to_return(
         :status => 200,
-        :body => '{"access_token":"44320b29286077c44f14c4efdfed70f63f4a8361","token_type":"Bearer","refresh_token":"759b2b28c228948a0ba5d07a89f39f9e268a95c0","scope":"infrastructure orbit","expires_in":7200}').times(2)
+        :body => '{"access_token":"44320b29286077c44f14c4efdfed70f63f4a8361","token_type":"Bearer","refresh_token":"759b2b28c228948a0ba5d07a89f39f9e268a95c0","scope":"infrastructure orbit","expires_in":7200}'
+      ).times(2)
     end
 
     it "does not change the config" do
@@ -291,4 +345,54 @@ describe "brightbox login" do
       expect(stderr).to_not include("please re-run your command")
     end
   end
+
+  context "when user has 2FA set up" do
+    let(:config) { Brightbox::BBConfig.new client_name: email }
+
+    context "with existing configuration" do
+      let(:contents) do
+        <<-EOS
+        [core]
+        default_client = #{client_alias}
+
+        [#{client_alias}]
+        username = #{email}
+        default_account = #{default_account}
+        two_factor = true
+        EOS
+      end
+
+      context "when no password is given" do
+        let(:argv) { ["login", email] }
+
+        before do
+          config_from_contents(contents)
+          stub_token_request(two_factor: true)
+          stub_accounts_request
+          mock_password_entry(password)
+          mock_otp_entry("123456")
+        end
+
+        it "prompts for the password" do
+          expect { output }.not_to raise_error
+        end
+
+        it "does not error" do
+          expect { output }.to_not raise_error
+          expect(stderr).to_not include("ERROR")
+        end
+
+        it "requests access tokens" do
+          expect { output }.to_not raise_error
+
+          expect(cached_access_token(config)).to eql(config.access_token)
+          expect(cached_refresh_token(config)).to eql(config.refresh_token)
+        end
+
+        it "does not prompt to rerun the command" do
+          expect(stderr).to_not include("please re-run your command")
+        end
+      end
+    end
+  end
 end

data/spec/commands/policies/apply_spec.rb

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

data/spec/commands/policies/create_spec.rb

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

data/spec/commands/policies/destroy_spec.rb

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

data/spec/commands/policies/list_spec.rb

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

data/spec/commands/policies/remove_spec.rb

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

data/spec/commands/policies/show_spec.rb

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

data/spec/commands/policies/update_spec.rb

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

data/spec/commands/rules/create_spec.rb

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

data/spec/commands/rules/destroy_spec.rb

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

data/spec/commands/rules/list_spec.rb

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

data/spec/commands/rules/show_spec.rb

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

data/spec/commands/rules/update_spec.rb

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

data/spec/commands/servers/activate_console_spec.rb

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

data/spec/commands/servers/create_spec.rb

@@ -1,23 +1,27 @@
 require "spec_helper"
 
 describe "brightbox servers" do
-
   describe "create" do
     let(:output) { FauxIO.new { Brightbox.run(argv) } }
     let(:stdout) { output.stdout }
     let(:stderr) { output.stderr }
 
+    let(:image) { double(:id => "img-12345", :name => "Linux") }
+    let(:type) { double(:id => "typ-12345", :handle => "nano") }
+    let(:zone) { double(:handle => "gb1-a") }
+
     before do
       config = config_from_contents(USER_APP_CONFIG_CONTENTS)
       cache_access_token(config, "f83da712e6299cda953513ec07f7a754f747d727")
 
-      stub_request(:post, "http://api.brightbox.dev/token").to_return(
+      stub_request(:post, "http://api.brightbox.localhost/token").to_return(
         :status => 200,
-        :body => '{"access_token":"44320b29286077c44f14c4efdfed70f63f4a8361","token_type":"Bearer","refresh_token":"759b2b28c228948a0ba5d07a89f39f9e268a95c0","scope":"infrastructure orbit","expires_in":7200}')
+        :body => '{"access_token":"44320b29286077c44f14c4efdfed70f63f4a8361","token_type":"Bearer","refresh_token":"759b2b28c228948a0ba5d07a89f39f9e268a95c0","scope":"infrastructure orbit","expires_in":7200}'
+      )
     end
 
     context "without arguments" do
-      let(:argv) { %w(servers create) }
+      let(:argv) { %w[servers create] }
 
       it "does not error" do
         expect { output }.to_not raise_error
@@ -25,11 +29,7 @@ describe "brightbox servers" do
     end
 
     context "with --cloud-ip with nominated IP argument" do
-      let(:argv) { %w(servers create --cloud-ip cip-12345 img-12345) }
-
-      let(:image) { double(:id => "img-12345", :name => "Linux") }
-      let(:type) { double(:id => "typ-12345", :handle => "nano") }
-      let(:zone) { double(:handle => "gb1-a") }
+      let(:argv) { %w[servers create --cloud-ip cip-12345 img-12345] }
 
       before do
         expect(Brightbox::Image).to receive(:find).with("img-12345").and_return(image)
@@ -37,7 +37,7 @@ describe "brightbox servers" do
       end
 
       it "requests nominated Cloud IP" do
-        stub_request(:post, "http://api.brightbox.dev/1.0/servers?account_id=acc-12345")
+        stub_request(:post, "http://api.brightbox.localhost/1.0/servers?account_id=acc-12345")
           .with(:body => /"cloud_ip":"cip-12345"/)
           .and_return(:status => 202, :body => sample_response)
 
@@ -48,11 +48,7 @@ describe "brightbox servers" do
     end
 
     context "with --cloud-ip true argument" do
-      let(:argv) { %w(servers create --cloud-ip true img-12345) }
-
-      let(:image) { double(:id => "img-12345", :name => "Linux") }
-      let(:type) { double(:id => "typ-12345", :handle => "nano") }
-      let(:zone) { double(:handle => "gb1-a") }
+      let(:argv) { %w[servers create --cloud-ip true img-12345] }
 
       before do
         expect(Brightbox::Image).to receive(:find).with("img-12345").and_return(image)
@@ -60,7 +56,7 @@ describe "brightbox servers" do
       end
 
       it "requests new allocated Cloud IP" do
-        stub_request(:post, "http://api.brightbox.dev/1.0/servers?account_id=acc-12345")
+        stub_request(:post, "http://api.brightbox.localhost/1.0/servers?account_id=acc-12345")
           .with(:body => /"cloud_ip":"true"/)
           .and_return(:status => 202, :body => sample_response)
 
@@ -70,6 +66,26 @@ describe "brightbox servers" do
       end
     end
 
+    context "with --disk-encrypted switch" do
+      let(:argv) { %w[servers create --disk-encrypted img-12345] }
+
+      before do
+        expect(Brightbox::Image).to receive(:find).with("img-12345").and_return(image)
+        expect(Brightbox::Type).to receive(:find_by_handle).and_return(type)
+      end
+
+      it "requests new server with encryption at rest enabled" do
+        stub_request(:post, "http://api.brightbox.localhost/1.0/servers?account_id=acc-12345")
+          .with(:headers => { "Content-Type" => "application/json" },
+                :body => hash_including(:disk_encrypted => true))
+          .and_return(:status => 202, :body => sample_response)
+
+        expect(stderr).to match("Creating a nano")
+        expect(stderr).not_to match("ERROR")
+        expect(stdout).to match("srv-12345")
+      end
+    end
+
     def sample_response
       '{
         "id": "srv-12345",

data/spec/commands/servers/destroy_spec.rb

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

data/spec/commands/servers/list_spec.rb

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

data/spec/commands/servers/locking_spec.rb

@@ -19,7 +19,7 @@ describe "brightbox servers" do
 
   describe "lock" do
     context "when resource is known" do
-      let(:argv) { %w(servers lock srv-12345) }
+      let(:argv) { %w[servers lock srv-12345] }
 
       before do
         expect(resource_class).to receive(:find_or_call).with(resource_ids).and_return(results)
@@ -32,7 +32,7 @@ describe "brightbox servers" do
     end
 
     context "when resource is unknown" do
-      let(:argv) { %w(servers lock srv-12345) }
+      let(:argv) { %w[servers lock srv-12345] }
 
       before do
         expect(resource_class).to receive(:find).with(resource_id).and_raise(Brightbox::Api::NotFound)
@@ -46,7 +46,7 @@ describe "brightbox servers" do
 
   describe "unlock" do
     context "when resource is known" do
-      let(:argv) { %w(servers unlock srv-12345) }
+      let(:argv) { %w[servers unlock srv-12345] }
 
       before do
         expect(resource_class).to receive(:find_or_call).with(resource_ids).and_return(results)
@@ -59,7 +59,7 @@ describe "brightbox servers" do
     end
 
     context "when resource is unknown" do
-      let(:argv) { %w(servers unlock srv-12345) }
+      let(:argv) { %w[servers unlock srv-12345] }
 
       before do
         expect(resource_class).to receive(:find).with(resource_id).and_raise(Brightbox::Api::NotFound)