brightbox-cli 2.2.0 → 2.3.0

data/spec/cassettes/brightbox_login/when_no_password_is_given/requests_access_tokens.yml

@@ -0,0 +1,101 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: http://api.brightbox.dev/token
+    body:
+      encoding: UTF-8
+      string: '{"grant_type":"password","username":"jason.null@brightbox.com","password":"N:B3e%7Cmh"}'
+    headers:
+      User-Agent:
+      - fog-core/1.32.1
+      Authorization:
+      - Basic YXBwLTEyMzQ1Om1vY2J1aXBiaWFhNms2Yw==
+      Content-Type:
+      - application/json
+  response:
+    status:
+      code: 200
+      message: 
+    headers:
+      Content-Type:
+      - application/json
+      Cache-Control:
+      - no-store
+      X-Oauth-Scopes:
+      - infrastructure, orbit
+      Content-Length:
+      - '190'
+      X-Content-Type-Options:
+      - nosniff
+      X-Ua-Compatible:
+      - IE=Edge
+      Etag:
+      - '"03a2f5ef6ee075450f1823c2eb312874"'
+      X-Request-Id:
+      - c18a04b5e0ecf421a517d40e66a7cf39
+      X-Runtime:
+      - '0.090494'
+      Server:
+      - WEBrick/1.3.1 (Ruby/1.9.3/2014-11-13)
+      Date:
+      - Mon, 12 Oct 2015 14:53:51 GMT
+      Connection:
+      - Keep-Alive
+    body:
+      encoding: UTF-8
+      string: '{"access_token":"0e2b6ecb38dc7edeecd010fdbb130dc81eed3244","token_type":"Bearer","refresh_token":"84e7fbdaee8490c190fcadb0d6e514bb0dd28f7b","scope":"infrastructure,
+        orbit","expires_in":7200}'
+    http_version: 
+  recorded_at: Mon, 12 Oct 2015 14:53:51 GMT
+- request:
+    method: get
+    uri: http://api.brightbox.dev/1.0/accounts
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - fog-core/1.32.1
+      Authorization:
+      - Bearer 0e2b6ecb38dc7edeecd010fdbb130dc81eed3244
+      Content-Type:
+      - application/json
+  response:
+    status:
+      code: 200
+      message: 
+    headers:
+      X-Oauth-Scopes:
+      - infrastructure, orbit
+      Content-Type:
+      - application/json; charset=utf-8
+      X-Ua-Compatible:
+      - IE=Edge
+      Etag:
+      - '"c9a269456e92ca15ff834e08ba6414ad"'
+      Cache-Control:
+      - max-age=0, private, must-revalidate
+      X-Request-Id:
+      - b4645084926cf99f30046e0441fbcf6f
+      X-Runtime:
+      - '0.048355'
+      Server:
+      - WEBrick/1.3.1 (Ruby/1.9.3/2014-11-13)
+      Date:
+      - Mon, 12 Oct 2015 14:53:51 GMT
+      Content-Length:
+      - '1611'
+      Connection:
+      - Keep-Alive
+    body:
+      encoding: UTF-8
+      string: '[{"id":"acc-12345","resource_type":"account","url":"https://api.gb1.brightbox.com/1.0/accounts/acc-12345","name":"CLI
+        test account","status":"active","ram_limit":3200000,"ram_used":0,"dbs_ram_limit":32768,"dbs_ram_used":0,"cloud_ips_limit":32,"cloud_ips_used":0,"load_balancers_limit":5,"load_balancers_used":0,"clients":[{"id":"cli-12345","resource_type":"api_client","url":"https://api.gb1.brightbox.com/1.0/api_clients/cli-12345","name":"CLI
+        test API client","description":"","revoked_at":null,"permissions_group":"full"}],"images":[],"servers":[],"load_balancers":[],"database_servers":[],"database_snapshots":[],"cloud_ips":[],"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":"2015-10-12T09:23:03Z","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":"2015-10-12T09:23:03Z","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":"Jason
+        Null","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: Mon, 12 Oct 2015 14:53:51 GMT
+recorded_with: VCR 2.5.0

data/spec/cassettes/brightbox_login/when_no_password_is_given/sets_up_the_config.yml

@@ -0,0 +1,101 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: http://api.brightbox.dev/token
+    body:
+      encoding: UTF-8
+      string: '{"grant_type":"password","username":"jason.null@brightbox.com","password":"N:B3e%7Cmh"}'
+    headers:
+      User-Agent:
+      - fog-core/1.32.1
+      Authorization:
+      - Basic YXBwLTEyMzQ1Om1vY2J1aXBiaWFhNms2Yw==
+      Content-Type:
+      - application/json
+  response:
+    status:
+      code: 200
+      message: 
+    headers:
+      Content-Type:
+      - application/json
+      Cache-Control:
+      - no-store
+      X-Oauth-Scopes:
+      - infrastructure, orbit
+      Content-Length:
+      - '190'
+      X-Content-Type-Options:
+      - nosniff
+      X-Ua-Compatible:
+      - IE=Edge
+      Etag:
+      - '"d942cf5e51cc86fde5b2a75984557ca9"'
+      X-Request-Id:
+      - 41f8efe24820a636ee030168b905eb90
+      X-Runtime:
+      - '0.087310'
+      Server:
+      - WEBrick/1.3.1 (Ruby/1.9.3/2014-11-13)
+      Date:
+      - Mon, 12 Oct 2015 14:53:51 GMT
+      Connection:
+      - Keep-Alive
+    body:
+      encoding: UTF-8
+      string: '{"access_token":"b07faf14eafa2fd510bb7ef94aff0acfaaa3c70f","token_type":"Bearer","refresh_token":"83aa5702840aba673845a9b9bd35421065eb4d8f","scope":"infrastructure,
+        orbit","expires_in":7200}'
+    http_version: 
+  recorded_at: Mon, 12 Oct 2015 14:53:51 GMT
+- request:
+    method: get
+    uri: http://api.brightbox.dev/1.0/accounts
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - fog-core/1.32.1
+      Authorization:
+      - Bearer b07faf14eafa2fd510bb7ef94aff0acfaaa3c70f
+      Content-Type:
+      - application/json
+  response:
+    status:
+      code: 200
+      message: 
+    headers:
+      X-Oauth-Scopes:
+      - infrastructure, orbit
+      Content-Type:
+      - application/json; charset=utf-8
+      X-Ua-Compatible:
+      - IE=Edge
+      Etag:
+      - '"c9a269456e92ca15ff834e08ba6414ad"'
+      Cache-Control:
+      - max-age=0, private, must-revalidate
+      X-Request-Id:
+      - b168c47f4374123523356a9760242b31
+      X-Runtime:
+      - '0.127805'
+      Server:
+      - WEBrick/1.3.1 (Ruby/1.9.3/2014-11-13)
+      Date:
+      - Mon, 12 Oct 2015 14:53:51 GMT
+      Content-Length:
+      - '1611'
+      Connection:
+      - Keep-Alive
+    body:
+      encoding: UTF-8
+      string: '[{"id":"acc-12345","resource_type":"account","url":"https://api.gb1.brightbox.com/1.0/accounts/acc-12345","name":"CLI
+        test account","status":"active","ram_limit":3200000,"ram_used":0,"dbs_ram_limit":32768,"dbs_ram_used":0,"cloud_ips_limit":32,"cloud_ips_used":0,"load_balancers_limit":5,"load_balancers_used":0,"clients":[{"id":"cli-12345","resource_type":"api_client","url":"https://api.gb1.brightbox.com/1.0/api_clients/cli-12345","name":"CLI
+        test API client","description":"","revoked_at":null,"permissions_group":"full"}],"images":[],"servers":[],"load_balancers":[],"database_servers":[],"database_snapshots":[],"cloud_ips":[],"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":"2015-10-12T09:23:03Z","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":"2015-10-12T09:23:03Z","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":"Jason
+        Null","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: Mon, 12 Oct 2015 14:53:51 GMT
+recorded_with: VCR 2.5.0

data/spec/commands/accounts/list_spec.rb

@@ -60,6 +60,7 @@ describe "brightbox accounts" do
 
       before do
         config = config_from_contents(USER_APP_CONFIG_CONTENTS)
+        #mock_password_entry(password)
 
         # Setup in the VCR recordings as the access token is expired
         cache_access_token(config, "08f204123bb2fc400521577445df9d1d212da42e")

data/spec/commands/login_spec.rb

@@ -0,0 +1,239 @@
+require "spec_helper"
+
+describe "brightbox login" do
+  let(:output) { FauxIO.new { Brightbox.run(argv) } }
+  let(:stdout) { output.stdout }
+  let(:stderr) { output.stderr }
+
+  let(:email) { "jason.null@brightbox.com" }
+  let(:password) { "N:B3e%7Cmh" }
+  let(:client_id) { "app-12345" }
+  let(:secret) { "mocbuipbiaa6k6c" }
+  let(:api_url) { "http://api.brightbox.dev" }
+
+  let(:default_account) { "acc-12345" }
+  let(:client_alias) { email }
+
+  context "when no arguments are given" do
+    let(:argv) { %w(login) }
+
+    it "errors prompting for the email address" do
+      remove_config
+      expect(stderr).to include("You must specify your email address")
+    end
+  end
+
+  context "when no config is present", vcr: true 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
+
+    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
+
+  context "when no password is given", vcr: true do
+    let(:argv) { ["login", email] }
+
+    before do
+      remove_config
+      mock_password_entry(password)
+    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 "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
+
+  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.
+    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
+      mock_password_entry(password)
+    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 "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["auth_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
+
+  context "when default account is passed", vcr: true do
+    let(:account) { "acc-23456" }
+    let(:argv) { ["login", "--default-account", account, email] }
+
+    before do
+      remove_config
+      mock_password_entry(password)
+    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 "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["auth_url"]).to eql(Brightbox::DEFAULT_API_ENDPOINT)
+      expect(@client_section["username"]).to eql(email)
+      expect(@client_section["default_account"]).to eql(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
+
+  context "when alternative client credentials are given", vcr: true 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
+      mock_password_entry(password)
+    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 "sets up the config" do
+      expect { output }.to_not raise_error
+
+      @config = Brightbox::BBConfig.new
+      @client_section = @config.config[email]
+
+      expect(@client_section["client_id"]).to eql(other_client_identifier)
+      expect(@client_section["secret"]).to eql(other_client_secret)
+    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

data/spec/configs/user_app.ini

@@ -3,8 +3,6 @@ default_client = testing
 
 [testing]
 alias = testing
-client_id = app-12345
-secret = mocbuipbiaa6k6c
 username = jason.null@brightbox.com
 api_url = http://api.brightbox.dev
 auth_url = http://api.brightbox.dev

data/spec/spec_helper.rb

@@ -38,6 +38,7 @@ RSpec.configure do |config|
   config.around(:each) do |example|
     Dir.mktmpdir do |tmp_home|
       ENV["HOME"] = tmp_home
+      Brightbox.config = nil
       example.run
       ENV["HOME"] = TEST_RUNNER_HOME
     end

data/spec/support/config_helpers.rb

@@ -16,6 +16,11 @@ module ConfigHelpers
       f.write contents
     end
 
+    config = Brightbox::BBConfig.new
+
+    # Subvert the global
+    Brightbox.config = config
+
     config
   end
 

data/spec/unit/brightbox/account/all_spec.rb

@@ -2,9 +2,7 @@ require "spec_helper"
 
 describe Brightbox::Account do
   before do
-    # Unfortunately need to change $config for Api.conn to work until we can
-    # eliminate the global class method
-    $config = config_from_contents(contents)
+    Brightbox.config = config_from_contents(contents)
   end
 
   describe ".all" do

data/spec/unit/brightbox/api/conn_spec.rb

@@ -1,6 +1,9 @@
 require "spec_helper"
 
 describe Brightbox::Api, ".conn" do
+  before do
+    config_from_contents(API_CLIENT_CONFIG_CONTENTS)
+  end
 
   context "when account is not required", vcr: true do
     it "returns a 'real' fog compute instance" do

data/spec/unit/brightbox/api/find_spec.rb

@@ -1,6 +1,9 @@
 require "spec_helper"
 
 describe Brightbox::Api, ".find" do
+  before do
+    config_from_contents(API_CLIENT_CONFIG_CONTENTS)
+  end
 
   context "when passed nil" do
     it "raises an error" do

data/spec/unit/brightbox/bb_config/account_spec.rb

@@ -35,6 +35,8 @@ describe Brightbox::BBConfig do
         @account_name = "acc-ghj32"
         @client_name = "app-b3n5b"
         contents = <<-EOS
+        [core]
+        default_client = #{@client_name}
         [#{@client_name}]
         default_account = #{@account_name}
         EOS