vmfloaty 0.8.2 → 0.9.0

data/spec/vmfloaty/auth_spec.rb

@@ -1,86 +1,82 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require_relative '../../lib/vmfloaty/auth'
 
 describe Pooler do
   before :each do
-    @vmpooler_url = "https://vmpooler.example.com"
+    @vmpooler_url = 'https://vmpooler.example.com'
   end
 
-  describe "#get_token" do
+  describe '#get_token' do
     before :each do
-      @get_token_response = "{\"ok\": true,\"token\":\"utpg2i2xswor6h8ttjhu3d47z53yy47y\"}"
-      @token = "utpg2i2xswor6h8ttjhu3d47z53yy47y"
+      @get_token_response = '{"ok": true,"token":"utpg2i2xswor6h8ttjhu3d47z53yy47y"}'
+      @token = 'utpg2i2xswor6h8ttjhu3d47z53yy47y'
     end
 
-    it "returns a token from vmpooler" do
-      stub_request(:post, "https://first.last:password@vmpooler.example.com/token").
-                 with(:headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Content-Length'=>'0', 'User-Agent'=>'Faraday v0.9.2'}).
-                 to_return(:status => 200, :body => @get_token_response, :headers => {})
+    it 'returns a token from vmpooler' do
+      stub_request(:post, 'https://first.last:password@vmpooler.example.com/token')
+        .to_return(:status => 200, :body => @get_token_response, :headers => {})
 
-      token = Auth.get_token(false, @vmpooler_url, "first.last", "password")
+      token = Auth.get_token(false, @vmpooler_url, 'first.last', 'password')
       expect(token).to eq @token
     end
 
-    it "raises a token error if something goes wrong" do
-      stub_request(:post, "https://first.last:password@vmpooler.example.com/token").
-                 with(:headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Content-Length'=>'0', 'User-Agent'=>'Faraday v0.9.2'}).
-                 to_return(:status => 500, :body => "{\"ok\":false}", :headers => {})
+    it 'raises a token error if something goes wrong' do
+      stub_request(:post, 'https://first.last:password@vmpooler.example.com/token')
+        .to_return(:status => 500, :body => '{"ok":false}', :headers => {})
 
-      expect{ Auth.get_token(false, @vmpooler_url, "first.last", "password") }.to raise_error(TokenError)
+      expect { Auth.get_token(false, @vmpooler_url, 'first.last', 'password') }.to raise_error(TokenError)
     end
   end
 
-  describe "#delete_token" do
+  describe '#delete_token' do
     before :each do
-      @delete_token_response = "{\"ok\":true}"
-      @token = "utpg2i2xswor6h8ttjhu3d47z53yy47y"
+      @delete_token_response = '{"ok":true}'
+      @token = 'utpg2i2xswor6h8ttjhu3d47z53yy47y'
     end
 
-    it "deletes the specified token" do
-      stub_request(:delete, "https://first.last:password@vmpooler.example.com/token/utpg2i2xswor6h8ttjhu3d47z53yy47y").
-        with(:headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'User-Agent'=>'Faraday v0.9.2'}).
-        to_return(:status => 200, :body => @delete_token_response, :headers => {})
+    it 'deletes the specified token' do
+      stub_request(:delete, 'https://first.last:password@vmpooler.example.com/token/utpg2i2xswor6h8ttjhu3d47z53yy47y')
+        .to_return(:status => 200, :body => @delete_token_response, :headers => {})
 
-      expect(Auth.delete_token(false, @vmpooler_url, "first.last", "password", @token)).to eq JSON.parse(@delete_token_response)
+      expect(Auth.delete_token(false, @vmpooler_url, 'first.last', 'password', @token)).to eq JSON.parse(@delete_token_response)
     end
 
-    it "raises a token error if something goes wrong" do
-      stub_request(:delete, "https://first.last:password@vmpooler.example.com/token/utpg2i2xswor6h8ttjhu3d47z53yy47y").
-        with(:headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'User-Agent'=>'Faraday v0.9.2'}).
-        to_return(:status => 500, :body => "{\"ok\":false}", :headers => {})
+    it 'raises a token error if something goes wrong' do
+      stub_request(:delete, 'https://first.last:password@vmpooler.example.com/token/utpg2i2xswor6h8ttjhu3d47z53yy47y')
+        .to_return(:status => 500, :body => '{"ok":false}', :headers => {})
 
-      expect{ Auth.delete_token(false, @vmpooler_url, "first.last", "password", @token) }.to raise_error(TokenError)
+      expect { Auth.delete_token(false, @vmpooler_url, 'first.last', 'password', @token) }.to raise_error(TokenError)
     end
 
-    it "raises a token error if no token provided" do
-      expect{ Auth.delete_token(false, @vmpooler_url, "first.last", "password", nil) }.to raise_error(TokenError)
+    it 'raises a token error if no token provided' do
+      expect { Auth.delete_token(false, @vmpooler_url, 'first.last', 'password', nil) }.to raise_error(TokenError)
     end
   end
 
-  describe "#token_status" do
+  describe '#token_status' do
     before :each do
-      @token_status_response = "{\"ok\":true,\"utpg2i2xswor6h8ttjhu3d47z53yy47y\":{\"created\":\"2015-04-28 19:17:47 -0700\"}}"
-      @token = "utpg2i2xswor6h8ttjhu3d47z53yy47y"
+      @token_status_response = '{"ok":true,"utpg2i2xswor6h8ttjhu3d47z53yy47y":{"created":"2015-04-28 19:17:47 -0700"}}'
+      @token = 'utpg2i2xswor6h8ttjhu3d47z53yy47y'
     end
 
-    it "checks the status of a token" do
-      stub_request(:get, "#{@vmpooler_url}/token/utpg2i2xswor6h8ttjhu3d47z53yy47y").
-        with(:headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'User-Agent'=>'Faraday v0.9.2'}).
-        to_return(:status => 200, :body => @token_status_response, :headers => {})
+    it 'checks the status of a token' do
+      stub_request(:get, "#{@vmpooler_url}/token/utpg2i2xswor6h8ttjhu3d47z53yy47y")
+        .to_return(:status => 200, :body => @token_status_response, :headers => {})
 
       expect(Auth.token_status(false, @vmpooler_url, @token)).to eq JSON.parse(@token_status_response)
     end
 
-    it "raises a token error if something goes wrong" do
-      stub_request(:get, "#{@vmpooler_url}/token/utpg2i2xswor6h8ttjhu3d47z53yy47y").
-        with(:headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'User-Agent'=>'Faraday v0.9.2'}).
-        to_return(:status => 500, :body => "{\"ok\":false}", :headers => {})
+    it 'raises a token error if something goes wrong' do
+      stub_request(:get, "#{@vmpooler_url}/token/utpg2i2xswor6h8ttjhu3d47z53yy47y")
+        .to_return(:status => 500, :body => '{"ok":false}', :headers => {})
 
-      expect{ Auth.token_status(false, @vmpooler_url, @token) }.to raise_error(TokenError)
+      expect { Auth.token_status(false, @vmpooler_url, @token) }.to raise_error(TokenError)
     end
 
-    it "raises a token error if no token provided" do
-      expect{ Auth.token_status(false, @vmpooler_url, nil) }.to raise_error(TokenError)
+    it 'raises a token error if no token provided' do
+      expect { Auth.token_status(false, @vmpooler_url, nil) }.to raise_error(TokenError)
     end
   end
 end

data/spec/vmfloaty/nonstandard_pooler_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'vmfloaty/utils'
 require 'vmfloaty/errors'
@@ -6,48 +8,35 @@ require 'vmfloaty/nonstandard_pooler'
 describe NonstandardPooler do
   before :each do
     @nspooler_url = 'https://nspooler.example.com'
-    @post_request_headers = {
-      'Accept' => '*/*',
-      'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
-      'User-Agent' => 'Faraday v0.9.2',
-      'X-Auth-Token' => 'token-value'
-    }
-    @get_request_headers = {
-      'Accept' => '*/*',
-      'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
-      'User-Agent' => 'Faraday v0.9.2',
-      'X-Auth-Token' => 'token-value'
+    @auth_token_headers = {
+      'X-Auth-Token' => 'token-value',
     }
-    @get_request_headers_notoken = @get_request_headers.tap do |headers|
-      headers.delete('X-Auth-Token')
-    end
-
   end
 
   describe '#list' do
     before :each do
-      @status_response_body = <<-BODY
-{
-    "ok": true,
-    "solaris-10-sparc": {
-        "total_hosts": 11,
-        "available_hosts": 11
-    },
-    "ubuntu-16.04-power8": {
-        "total_hosts": 10,
-        "available_hosts": 10
-    },
-    "aix-7.2-power": {
-        "total_hosts": 5,
-        "available_hosts": 4
-    }
-}
+      @status_response_body = <<~BODY
+        {
+            "ok": true,
+            "solaris-10-sparc": {
+                "total_hosts": 11,
+                "available_hosts": 11
+            },
+            "ubuntu-16.04-power8": {
+                "total_hosts": 10,
+                "available_hosts": 10
+            },
+            "aix-7.2-power": {
+                "total_hosts": 5,
+                "available_hosts": 4
+            }
+        }
       BODY
     end
 
     it 'returns an array with operating systems from the pooler' do
       stub_request(:get, "#{@nspooler_url}/status")
-        .to_return(status: 200, body: @status_response_body, headers: {})
+        .to_return(:status => 200, :body => @status_response_body, :headers => {})
 
       list = NonstandardPooler.list(false, @nspooler_url, nil)
       expect(list).to be_an_instance_of Array
@@ -55,7 +44,7 @@ describe NonstandardPooler do
 
     it 'filters operating systems based on the filter param' do
       stub_request(:get, "#{@nspooler_url}/status")
-        .to_return(status: 200, body: @status_response_body, headers: {})
+        .to_return(:status => 200, :body => @status_response_body, :headers => {})
 
       list = NonstandardPooler.list(false, @nspooler_url, 'aix')
       expect(list).to be_an_instance_of Array
@@ -64,7 +53,7 @@ describe NonstandardPooler do
 
     it 'returns nothing if the filter does not match' do
       stub_request(:get, "#{@nspooler_url}/status")
-        .to_return(status: 199, body: @status_response_body, headers: {})
+        .to_return(:status => 199, :body => @status_response_body, :headers => {})
 
       list = NonstandardPooler.list(false, @nspooler_url, 'windows')
       expect(list).to be_an_instance_of Array
@@ -74,24 +63,24 @@ describe NonstandardPooler do
 
   describe '#list_active' do
     before :each do
-      @token_status_body_active = <<-BODY
-{
-  "ok": true,
-  "user": "first.last",
-  "created": "2017-09-18 01:25:41 +0000",
-  "last_accessed": "2017-09-21 19:46:25 +0000",
-  "reserved_hosts": ["sol10-9", "sol10-11"]
-}
-BODY
-      @token_status_body_empty = <<-BODY
-{
-  "ok": true,
-  "user": "first.last",
-  "created": "2017-09-18 01:25:41 +0000",
-  "last_accessed": "2017-09-21 19:46:25 +0000",
-  "reserved_hosts": []
-}
-BODY
+      @token_status_body_active = <<~BODY
+        {
+          "ok": true,
+          "user": "first.last",
+          "created": "2017-09-18 01:25:41 +0000",
+          "last_accessed": "2017-09-21 19:46:25 +0000",
+          "reserved_hosts": ["sol10-9", "sol10-11"]
+        }
+      BODY
+      @token_status_body_empty = <<~BODY
+        {
+          "ok": true,
+          "user": "first.last",
+          "created": "2017-09-18 01:25:41 +0000",
+          "last_accessed": "2017-09-21 19:46:25 +0000",
+          "reserved_hosts": []
+        }
+      BODY
     end
 
     it 'prints an output of fqdn, template, and duration' do
@@ -99,65 +88,65 @@ BODY
         .with(false, @nspooler_url, 'token-value')
         .and_return(JSON.parse(@token_status_body_active))
 
-      list = NonstandardPooler.list_active(false, @nspooler_url, 'token-value')
+      list = NonstandardPooler.list_active(false, @nspooler_url, 'token-value', 'user')
       expect(list).to eql ['sol10-9', 'sol10-11']
     end
   end
 
   describe '#retrieve' do
     before :each do
-      @retrieve_response_body_single = <<-BODY
-{
-  "ok": true,
-  "solaris-11-sparc": {
-    "hostname": "sol11-4.delivery.puppetlabs.net"
-  }
-}
-BODY
-      @retrieve_response_body_many = <<-BODY
-{
-  "ok": true,
-  "solaris-10-sparc": {
-    "hostname": [
-      "sol10-9.delivery.puppetlabs.net",
-      "sol10-10.delivery.puppetlabs.net"
-    ]
-  },
-  "aix-7.1-power": {
-    "hostname": "pe-aix-71-ci-acceptance.delivery.puppetlabs.net"
-  }
-}
-BODY
+      @retrieve_response_body_single = <<~BODY
+        {
+          "ok": true,
+          "solaris-11-sparc": {
+            "hostname": "sol11-4.delivery.puppetlabs.net"
+          }
+        }
+      BODY
+      @retrieve_response_body_many = <<~BODY
+        {
+          "ok": true,
+          "solaris-10-sparc": {
+            "hostname": [
+              "sol10-9.delivery.puppetlabs.net",
+              "sol10-10.delivery.puppetlabs.net"
+            ]
+          },
+          "aix-7.1-power": {
+            "hostname": "pe-aix-71-ci-acceptance.delivery.puppetlabs.net"
+          }
+        }
+      BODY
     end
 
     it 'raises an AuthError if the token is invalid' do
       stub_request(:post, "#{@nspooler_url}/host/solaris-11-sparc")
-        .with(headers: @post_request_headers)
-        .to_return(status: 401, body: '{"ok":false,"reason": "token: token-value does not exist"}', headers: {})
+        .with(:headers => @auth_token_headers)
+        .to_return(:status => 401, :body => '{"ok":false,"reason": "token: token-value does not exist"}', :headers => {})
 
       vm_hash = { 'solaris-11-sparc' => 1 }
-      expect { NonstandardPooler.retrieve(false, vm_hash, 'token-value', @nspooler_url) }.to raise_error(AuthError)
+      expect { NonstandardPooler.retrieve(false, vm_hash, 'token-value', @nspooler_url, 'first.last', {}) }.to raise_error(AuthError)
     end
 
     it 'retrieves a single vm with a token' do
       stub_request(:post, "#{@nspooler_url}/host/solaris-11-sparc")
-        .with(headers: @post_request_headers)
-        .to_return(status: 200, body: @retrieve_response_body_single, headers: {})
+        .with(:headers => @auth_token_headers)
+        .to_return(:status => 200, :body => @retrieve_response_body_single, :headers => {})
 
       vm_hash = { 'solaris-11-sparc' => 1 }
-      vm_req = NonstandardPooler.retrieve(false, vm_hash, 'token-value', @nspooler_url)
+      vm_req = NonstandardPooler.retrieve(false, vm_hash, 'token-value', @nspooler_url, 'first.last', {})
       expect(vm_req).to be_an_instance_of Hash
       expect(vm_req['ok']).to equal true
       expect(vm_req['solaris-11-sparc']['hostname']).to eq 'sol11-4.delivery.puppetlabs.net'
     end
 
     it 'retrieves a multiple vms with a token' do
-      stub_request(:post,"#{@nspooler_url}/host/aix-7.1-power+solaris-10-sparc+solaris-10-sparc")
-        .with(headers: @post_request_headers)
-        .to_return(status: 200, body: @retrieve_response_body_many, headers: {})
+      stub_request(:post, "#{@nspooler_url}/host/aix-7.1-power+solaris-10-sparc+solaris-10-sparc")
+        .with(:headers => @auth_token_headers)
+        .to_return(:status => 200, :body => @retrieve_response_body_many, :headers => {})
 
       vm_hash = { 'aix-7.1-power' => 1, 'solaris-10-sparc' => 2 }
-      vm_req = NonstandardPooler.retrieve(false, vm_hash, 'token-value', @nspooler_url)
+      vm_req = NonstandardPooler.retrieve(false, vm_hash, 'token-value', @nspooler_url, 'first.last', {})
       expect(vm_req).to be_an_instance_of Hash
       expect(vm_req['ok']).to equal true
       expect(vm_req['solaris-10-sparc']['hostname']).to be_an_instance_of Array
@@ -172,23 +161,23 @@ BODY
     end
 
     it 'raises an error if the user tries to modify an unsupported attribute' do
-      stub_request(:put, "https://nspooler.example.com/host/myfakehost").
-          with(body: {"{}"=>true},
-               headers: {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Content-Type'=>'application/x-www-form-urlencoded', 'User-Agent'=>'Faraday v0.9.2', 'X-Auth-Token'=>'token-value'}).
-          to_return(status: 200, body: "", headers: {})
-      details = { lifetime: 12 }
+      stub_request(:put, 'https://nspooler.example.com/host/myfakehost')
+        .with(:body    => { '{}' => true },
+              :headers => @auth_token_headers)
+        .to_return(:status => 200, :body => '', :headers => {})
+      details = { :lifetime => 12 }
       expect { NonstandardPooler.modify(false, @nspooler_url, 'myfakehost', 'token-value', details) }
-          .to raise_error(ModifyError)
+        .to raise_error(ModifyError)
     end
 
     it 'modifies the reason of a vm' do
       modify_request_body = { '{"reserved_for_reason":"testing"}' => true }
       stub_request(:put, "#{@nspooler_url}/host/myfakehost")
-        .with(body: modify_request_body,
-              headers: @post_request_headers)
-        .to_return(status: 200, body: '{"ok": true}', headers: {})
+        .with(:body    => modify_request_body,
+              :headers => @auth_token_headers)
+        .to_return(:status => 200, :body => '{"ok": true}', :headers => {})
 
-      modify_hash = { reason: "testing" }
+      modify_hash = { :reason => 'testing' }
       modify_req = NonstandardPooler.modify(false, @nspooler_url, 'myfakehost', 'token-value', modify_hash)
       expect(modify_req['ok']).to be true
     end
@@ -198,29 +187,28 @@ BODY
     before :each do
       @status_response_body = '{"capacity":{"current":716,"total":717,"percent": 99.9},"status":{"ok":true,"message":"Battle station fully armed and operational."}}'
       # TODO: make this report stuff like 'broken'
-      @status_response_body = <<-BODY
-{
-  "ok": true,
-  "solaris-10-sparc": {
-    "total_hosts": 11,
-    "available_hosts": 10
-  },
-  "ubuntu-16.04-power8": {
-    "total_hosts": 10,
-    "available_hosts": 10
-  },
-  "aix-7.2-power": {
-    "total_hosts": 5,
-    "available_hosts": 4
-  }
-}
-BODY
+      @status_response_body = <<~BODY
+        {
+          "ok": true,
+          "solaris-10-sparc": {
+            "total_hosts": 11,
+            "available_hosts": 10
+          },
+          "ubuntu-16.04-power8": {
+            "total_hosts": 10,
+            "available_hosts": 10
+          },
+          "aix-7.2-power": {
+            "total_hosts": 5,
+            "available_hosts": 4
+          }
+        }
+      BODY
     end
 
     it 'prints the status' do
       stub_request(:get, "#{@nspooler_url}/status")
-        .with(headers: @get_request_headers)
-        .to_return(status: 200, body: @status_response_body, headers: {})
+        .to_return(:status => 200, :body => @status_response_body, :headers => {})
 
       status = NonstandardPooler.status(false, @nspooler_url)
       expect(status).to be_an_instance_of Hash
@@ -229,22 +217,21 @@ BODY
 
   describe '#summary' do
     before :each do
-      @status_response_body = <<-BODY
-{
-  "ok": true,
-  "total": 57,
-  "available": 39,
-  "in_use": 16,
-  "resetting": 2,
-  "broken": 0
-}
-BODY
+      @status_response_body = <<~BODY
+        {
+          "ok": true,
+          "total": 57,
+          "available": 39,
+          "in_use": 16,
+          "resetting": 2,
+          "broken": 0
+        }
+      BODY
     end
 
     it 'prints the summary' do
       stub_request(:get, "#{@nspooler_url}/summary")
-        .with(headers: @get_request_headers)
-        .to_return(status: 200, body: @status_response_body, headers: {})
+        .to_return(:status => 200, :body => @status_response_body, :headers => {})
 
       summary = NonstandardPooler.summary(false, @nspooler_url)
       expect(summary).to be_an_instance_of Hash
@@ -253,24 +240,23 @@ BODY
 
   describe '#query' do
     before :each do
-      @query_response_body = <<-BODY
-{
-  "ok": true,
-  "sol10-11": {
-    "fqdn": "sol10-11.delivery.puppetlabs.net",
-    "os_triple": "solaris-10-sparc",
-    "reserved_by_user": "first.last",
-    "reserved_for_reason": "testing",
-    "hours_left_on_reservation": 29.12
-  }
-}
-BODY
+      @query_response_body = <<~BODY
+        {
+          "ok": true,
+          "sol10-11": {
+            "fqdn": "sol10-11.delivery.puppetlabs.net",
+            "os_triple": "solaris-10-sparc",
+            "reserved_by_user": "first.last",
+            "reserved_for_reason": "testing",
+            "hours_left_on_reservation": 29.12
+          }
+        }
+      BODY
     end
 
     it 'makes a query about a vm' do
       stub_request(:get, "#{@nspooler_url}/host/sol10-11")
-        .with(headers: @get_request_headers_notoken)
-        .to_return(status: 200, body: @query_response_body, headers: {})
+        .to_return(:status => 200, :body => @query_response_body, :headers => {})
 
       query_req = NonstandardPooler.query(false, @nspooler_url, 'sol10-11')
       expect(query_req).to be_an_instance_of Hash
@@ -285,8 +271,8 @@ BODY
 
     it 'deletes a single existing vm' do
       stub_request(:delete, "#{@nspooler_url}/host/sol11-7")
-        .with(headers: @post_request_headers)
-        .to_return(status: 200, body: @delete_response_success, headers: {})
+        .with(:headers => @auth_token_headers)
+        .to_return(:status => 200, :body => @delete_response_success, :headers => {})
 
       request = NonstandardPooler.delete(false, @nspooler_url, 'sol11-7', 'token-value')
       expect(request['sol11-7']['ok']).to be true
@@ -294,8 +280,8 @@ BODY
 
     it 'does not delete a nonexistant vm' do
       stub_request(:delete, "#{@nspooler_url}/host/fakehost")
-        .with(headers: @post_request_headers)
-        .to_return(status: 401, body: @delete_response_failure, headers: {})
+        .with(:headers => @auth_token_headers)
+        .to_return(:status => 401, :body => @delete_response_failure, :headers => {})
 
       request = NonstandardPooler.delete(false, @nspooler_url, 'fakehost', 'token-value')
       expect(request['fakehost']['ok']).to be false