floatyhelper 2.0.5 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1829fb78be42701872cbbc6e8960ab3e3ebcd8c20b4b5983a32111e5ee2a7b1c
-  data.tar.gz: 551dfec7ca2c9f64d1f975b6c202882de69b8e09f4cd06d66a50e55623a5d680
+  metadata.gz: 12632be13fdd03beaa837d72ea01a0ba7fff08494a79ed4f839070debfc35e89
+  data.tar.gz: d9ca928fc876f292aca393aa4b1071508797b4883e3e64797a2ff75fb436f12e
 SHA512:
-  metadata.gz: 5300396a677ea5076639329b4d7fc5cf5ec07c267ad59c840d782f4f997484a704b0e4cfdccfb1b64c1c6ef1937a58d287ce1832936ed6cfeb71d5403e0a335b
-  data.tar.gz: 91aec17eede5c0241b47e96653556580d476ebe17bdd8d0caae7df0b8f51094917b484f5b3e8c504b8b6669929da333f4bbdde7c1c3c9809965c487d3bce446b
+  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.

data/lib/floatyhelper/version.rb

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

data/lib/floatyhelper/vm.rb

@@ -24,8 +24,9 @@ class VM
   end
 
   def self.find_pooled_platforms
+    vmpooler_url = Floaty.vmpooler_url
     begin # rubocop:disable Style/RedundantBegin
-      uri = URI.parse('https://vmpooler.delivery.puppetlabs.net/status')
+      uri = URI.parse("#{vmpooler_url}/status")
       http = Net::HTTP.new(uri.host, uri.port)
       http.use_ssl = true
       result = http.get(uri.request_uri)
@@ -36,7 +37,7 @@ class VM
     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

metadata

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