Merge pull request #112 from puppetlabs/v1.1.1

V1.1.1

Author: genebean

lib/vmfloaty/abs.rb

@@ -64,7 +64,7 @@ def self.list_active(verbose, url, _token, user)
   end
 
   def self.get_active_requests(verbose, url, user)
-    conn = Http.get_conn(verbose, url)
+    conn = Http.get_conn(verbose, supported_abs_url(url))
     res = conn.get 'status/queue'
     if valid_json?(res.body)
       requests = JSON.parse(res.body)
@@ -105,7 +105,7 @@ def self.all_job_resources_accounted_for(allocated_resources, hosts)
 
   def self.delete(verbose, url, hosts, token, user)
     # In ABS terms, this is a "returned" host.
-    conn = Http.get_conn(verbose, url)
+    conn = Http.get_conn(verbose, supported_abs_url(url))
     conn.headers['X-AUTH-TOKEN'] = token if token
 
     FloatyLogger.info "Trying to delete hosts #{hosts}" if verbose
@@ -163,7 +163,7 @@ def self.delete(verbose, url, hosts, token, user)
 
   # List available VMs in ABS
   def self.list(verbose, url, os_filter = nil)
-    conn = Http.get_conn(verbose, url)
+    conn = Http.get_conn(verbose, supported_abs_url(url))
 
     os_list = []
 
@@ -245,7 +245,7 @@ def self.retrieve(verbose, os_types, token, url, user, config, _ondemand = nil)
     #   }
     # }
 
-    conn = Http.get_conn(verbose, url)
+    conn = Http.get_conn(verbose, supported_abs_url(url))
     conn.headers['X-AUTH-TOKEN'] = token if token
 
     saved_job_id = user + "-" + DateTime.now.strftime('%Q')
@@ -348,7 +348,7 @@ def self.snapshot(_verbose, _url, _hostname, _token)
   end
 
   def self.status(verbose, url)
-    conn = Http.get_conn(verbose, url)
+    conn = Http.get_conn(verbose, supported_abs_url(url))
 
     res = conn.get 'status'
 
@@ -366,7 +366,7 @@ def self.query(verbose, url, job_id)
     return @active_hostnames if @active_hostnames && !@active_hostnames.empty?
 
     # If using the cli query job_id
-    conn = Http.get_conn(verbose, url)
+    conn = Http.get_conn(verbose, supported_abs_url(url))
     queue_info_res = conn.get "status/queue/info/#{job_id}"
     if valid_json?(queue_info_res.body)
       queue_info = JSON.parse(queue_info_res.body)
@@ -411,4 +411,15 @@ def self.valid_json?(json)
   rescue TypeError, JSON::ParserError => e
     return false
   end
+
+  # when missing, adds the required api/v2 in the url
+  def self.supported_abs_url(url)
+    expected_ending = "api/v2"
+    if !url.include?(expected_ending)
+      # add a slash if missing
+      expected_ending = "/#{expected_ending}" if url[-1] != "/"
+      url = "#{url}#{expected_ending}"
+    end
+    url
+  end
 end

lib/vmfloaty/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 class Vmfloaty
-  VERSION = '1.0.0'
+  VERSION = '1.1.1'
 end
 

spec/vmfloaty/abs_spec.rb

@@ -11,11 +11,11 @@
 
   describe '#list' do
     it 'skips empty platforms and lists aws' do
-      stub_request(:get, "http://foo/status/platforms/vmpooler").
+      stub_request(:get, "http://foo/api/v2/status/platforms/vmpooler").
           to_return(:status => 200, :body => "", :headers => {})
-      stub_request(:get, "http://foo/status/platforms/ondemand_vmpooler").
+      stub_request(:get, "http://foo/api/v2/status/platforms/ondemand_vmpooler").
           to_return(:status => 200, :body => "", :headers => {})
-      stub_request(:get, "http://foo/status/platforms/nspooler").
+      stub_request(:get, "http://foo/api/v2/status/platforms/nspooler").
           to_return(:status => 200, :body => "", :headers => {})
       body = '{
                 "aws_platforms": [
@@ -26,7 +26,7 @@
                   "redhat-8-arm64"
                 ]
               }'
-      stub_request(:get, "http://foo/status/platforms/aws").
+      stub_request(:get, "http://foo/api/v2/status/platforms/aws").
           to_return(:status => 200, :body => body, :headers => {})
 
 
@@ -35,16 +35,16 @@
       expect(results).to include("amazon-6-x86_64", "amazon-7-x86_64", "amazon-7-arm64", "centos-7-x86-64-west", "redhat-8-arm64")
     end
     it 'legacy JSON string, prior to PR 306' do
-      stub_request(:get, "http://foo/status/platforms/vmpooler").
+      stub_request(:get, "http://foo/api/v2/status/platforms/vmpooler").
           to_return(:status => 200, :body => "", :headers => {})
-      stub_request(:get, "http://foo/status/platforms/ondemand_vmpooler").
+      stub_request(:get, "http://foo/api/v2/status/platforms/ondemand_vmpooler").
           to_return(:status => 200, :body => "", :headers => {})
-      stub_request(:get, "http://foo/status/platforms/nspooler").
+      stub_request(:get, "http://foo/api/v2/status/platforms/nspooler").
           to_return(:status => 200, :body => "", :headers => {})
       body = '{
           "aws_platforms": "[\"amazon-6-x86_64\",\"amazon-7-x86_64\",\"amazon-7-arm64\",\"centos-7-x86-64-west\",\"redhat-8-arm64\"]"
       }'
-      stub_request(:get, "http://foo/status/platforms/aws").
+      stub_request(:get, "http://foo/api/v2/status/platforms/aws").
           to_return(:status => 200, :body => body, :headers => {})
 
       results = ABS.list(false, "http://foo")
@@ -125,7 +125,7 @@
       end
 
       it 'will skip a line with a null value returned from abs' do
-        stub_request(:get, 'https://abs.example.com/status/queue')
+        stub_request(:get, 'https://abs.example.com/api/v2/status/queue')
           .to_return(:status => 200, :body => @active_requests_response, :headers => {})
 
         ret = ABS.get_active_requests(false, @abs_url, @test_user)
@@ -156,9 +156,9 @@
       end
 
       it 'will delete the whole job' do
-        stub_request(:get, 'https://abs.example.com/status/queue')
+        stub_request(:get, 'https://abs.example.com/api/v2/status/queue')
           .to_return(:status => 200, :body => @active_requests_response, :headers => {})
-        stub_request(:post, 'https://abs.example.com/return')
+        stub_request(:post, 'https://abs.example.com/api/v2/return')
           .with(:body => @return_request)
           .to_return(:status => 200, :body => 'OK', :headers => {})