floatyhelper 2.0.2 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7024e7ae1ace180d0ba623a779142751f111ca132c7a1511fc639df0813e8f7
-  data.tar.gz: 3f485a4d782fb4cfd9d9046a37b849f7ed6fdc9612801b52c68fda2df248ea31
+  metadata.gz: 12632be13fdd03beaa837d72ea01a0ba7fff08494a79ed4f839070debfc35e89
+  data.tar.gz: d9ca928fc876f292aca393aa4b1071508797b4883e3e64797a2ff75fb436f12e
 SHA512:
-  metadata.gz: 3160e2841c6e1a56bbae01ef957e0d630cc0e1d73954bbb548fb0c715b0d252cbec65da8d4f19fc6aa6a9e7b5aade015185562dfcfdd56920810d9b4931169b4
-  data.tar.gz: 71e1c753ad8c414ca6b4c0c914ced8c3c3682d4b6db4be09911d5a4723ad99aee33209a2596e9cff20297d59260659c7ba483855d257b7496394454fee193300
+  metadata.gz: ec8bc4eedba90e8457588265add5cdf55924f4583f65b9da4e5e1404771d009b1cfb5cbf09abcb8376ff7eeeb5cdf65b8f96d63ad5643fcaf11dcae9663489d1
+  data.tar.gz: 3fa22d4d9a06edae1e6bf5db430b9b383f36549666c59056dfb5a87adc754b652da76af3ed0c1dd35f1222e8ca4f486d6298ce6951fff2cf7f580a122f2d8a8d

data/lib/floatyhelper/floaty.rb

@@ -12,7 +12,7 @@ class Floaty
     },
     'vmpooler' => {
       'type' => 'vm',
-      'url' => 'http://vmpooler.delivery.puppetlabs.net',
+      'url' => 'https://vmpooler-prod.k8s.infracore.puppet.net',
     },
     'nspooler' => {
       'type' => 'nonstandard',
@@ -32,6 +32,12 @@ class Floaty
     end
   end
 
+  def self.vmpooler_url
+    data = load_vmfloaty_config
+    url = data['services'] && data['services']['vmpooler'] ? data['services']['vmpooler']['url'] : nil
+    url || FLOATY_SERVICES['vmpooler']['url']
+  end
+
   # This adds some stdout printing here which I was trying to avoid, but
   # I think it makes sense to put it here rather than the main floatyhelper
   # somewhere.
@@ -81,7 +87,7 @@ class Floaty
   def self.check_tokens
     data = load_vmfloaty_config
     issues = false
-    FLOATY_SERVICES.each do |service, _info|
+    FLOATY_SERVICES.each do |service, info|
       if data['services'].nil? || data['services'][service].nil? || data['services'][service]['token'].nil?
         puts "#{service} service token not found in .vmfloaty.yml".yellow
         issues = true
@@ -93,7 +99,13 @@ class Floaty
       next if result['ok']
 
       puts "Problem checking #{service} token: #{result['reason']}".red
-      data['services']['token'] = nil
+      data['services'][service]['token'] = nil
+      if result['reason'].include?('Unparseable')
+        # User might have an old URL. Let's make sure to replace it with the latest.
+        # Should probably actually check the output for a 503/404 rather than make the
+        # assumption here.
+        data['services'][service]['url'] = info['url']
+      end
       issues = true
     end
     if issues
@@ -108,6 +120,7 @@ class Floaty
     # so ignore it until we reach the hash.
     lines = output.split("\n")
     index = lines.index { |l| l[0] == '{' }
+    return { 'ok' => false, 'reason' => 'Unparseable response from floaty' } if index.nil?
     output = lines[index..-1].join
     JSON.parse(output.gsub('=>',':'))
   end
@@ -120,35 +133,24 @@ class Floaty
     if use_pty
       output = ''
       status = nil
-      PTY.spawn("/usr/bin/env floaty #{command}") do |read, write, pid|
-        write.close
-        while status.nil?
-          begin
-            line = read.gets
+      IO.popen("/usr/bin/env floaty #{command}", :err => [:child, :out]) do |io|
+        while !Process.waitpid(io.pid, Process::WNOHANG)
+          line = io.gets
+          unless line.nil?
             puts line
             output += line
-          rescue EOFError, Errno::EIO
-            # GNU/Linux raises EIO on read operation when pty is closed - see pty.rb docs
-            # Ensure child process finishes and then pass through to ensure below to get status
-            nil
-          rescue IO::WaitReadable, IO::WaitWritable
-            retry
-          ensure
-            status ||= PTY.check(pid)
           end
         end
-
-        Process.waitall
-        # Double check we have the status
-        status ||= PTY.check(pid)
       end
+      # Need to check exit status
+      output
     else
       output, status = Open3.capture2e("/usr/bin/env floaty #{command}")
+      if !status.exitstatus.zero? && !ignore_error
+        puts "Error running 'floaty #{command}': #{output}".red
+        exit status.exitstatus
+      end
+      output
     end
-    if !status.exitstatus.zero? && !ignore_error
-      puts "Error running 'floaty #{command}': #{output}".red
-      exit status.exitstatus
-    end
-    output
   end
 end

data/lib/floatyhelper/version.rb

@@ -1,3 +1,3 @@
 module FloatyhelperVersion
-  VERSION = '2.0.2'.freeze
+  VERSION = '2.0.6'.freeze
 end

data/lib/floatyhelper/vm.rb

@@ -24,16 +24,20 @@ class VM
   end
 
   def self.find_pooled_platforms
+    vmpooler_url = Floaty.vmpooler_url
     begin # rubocop:disable Style/RedundantBegin
-      result = Net::HTTP.get('vmpooler.delivery.puppetlabs.net','/status')
-      result = JSON.parse(result)
+      uri = URI.parse("#{vmpooler_url}/status")
+      http = Net::HTTP.new(uri.host, uri.port)
+      http.use_ssl = true
+      result = http.get(uri.request_uri)
+      result = JSON.parse(result.body)
       # Techinally, 'max > 0' tells you if it's a pooled platform, but if
       # the pool is empty, we'll want to fall back to ABS anyway.
       result['pools'].select { |_pool, info| info['ready'].positive? }.map { |pool, _info| pool.gsub('-pixa4','') }
     rescue StandardError
       # Not a great practice to swallow all errors, but this list is probably
       # pretty stable, so let's just pass along the default.
-      puts 'Error looking up pooled platforms from vmpooler.delivery.puppetlabs.net. Using default pooled platform list instead.'.yellow
+      puts "Error looking up pooled platforms from #{vmpooler_url}/status. Using default pooled platform list instead.".yellow
       pooled_platforms_default
     end
   end
@@ -109,7 +113,7 @@ class VM
     puts 'Waiting for snapshots to appear in floaty query...'
     alldone = false
     until alldone
-      puts `tput cup #{hosts.count+2}` if clr
+      puts `tput cup #{hosts.count + 2}` if clr
       alldone = true
       print "\r" unless clr
       hosts.each do |host|
@@ -159,7 +163,10 @@ class VM
   def self.get_vm(platform: 'centos-7-x86_64', force_abs: false)
     if !find_pooled_platforms.include?(platform.gsub('-pixa4','')) || force_abs
       response = Floaty.floaty_cmd("get #{platform} --service abs --priority 1", use_pty: true)
-      response.chomp.split('- ')[1].split[0].split('.')[0]
+      vmlinesplit = response.chomp.split('- ')
+      # When use_pty is true, we've already printed stderr/stdout, so no need to do so again.
+      raise "Error obtaining a VM" if vmlinesplit.count == 1
+      vmlinesplit[1].split[0].split('.')[0]
     else
       response = Floaty.floaty_cmd("get #{platform} --service vmpooler")
       raise "Error obtaining a VM: #{response}" if response.include?('error')

data/lib/floatyhelper.rb

@@ -113,8 +113,10 @@ class Floatyhelper
             type = ''
             if options.check
               query = VM.query(host)
-              type = query[host]['template'].gsub('-pixa4','')
-              remaining = VM.alive(host, query) ? "#{query[host]['remaining']} hours remaining" : 'Expired'
+              if query && query['ok']
+                type = query[host]['template'].gsub('-pixa4','')
+                remaining = VM.alive(host, query) ? "#{query[host]['remaining']} hours remaining" : 'Expired'
+              end
             end
             puts '  %-15s  %-28s  %s' % [host, type, remaining]
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: floatyhelper
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.6
 platform: ruby
 authors:
 - Nick Burgan-Illig
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-23 00:00:00.000000000 Z
+date: 2021-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -203,8 +203,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: CLI tool for manipulating Puppet's vmpooler VMs with Vmfloaty.