beaker-abs 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db7f2bf4afb44988411438cf873a24f69d45065ff3a2113fc06ce3d3f2642377
-  data.tar.gz: 64d423895137167696e7b7ef56c7c8c7d41d34cae9fcd0a8160b53c0060d42ca
+  metadata.gz: f8435e87c6355cd2a8ae1f61b6bbdf65fddfc9f6c58e112e4aee1f9524e37a1f
+  data.tar.gz: de010987d68324aae08368c0a048016e924bfd3daa9121dfa6aea6ca4fcff0f1
 SHA512:
-  metadata.gz: 805801c7d805112f89288e09fa3a5589db49f4a828bc307b5e4b918e581e851bbfb8e3068006eb79f62ad289983a9210f5d3136be5f0d6e8e5f510845a88b2b4
-  data.tar.gz: ab8665e8543fcd9fca7847c0883deaa69e038f8b1043505da8b674111ef59d58d1a100f27e2b27bafc6560371fb826a67109e9f4b2a6a65b5a1654782bd324b4
+  metadata.gz: 793b31558dd6c9a2a1056c3804ceeff526edf0f1c0e1921aa99b3164aea6fb4de339732f95c4816859f77545f1c2cd82b58595139f6345bf3449d2e467366a71
+  data.tar.gz: 23112d30fa46e9c2ccd34d131b3e00b391d96d26f9e90381467e916e8fa4ad89c3175aa16e937f5c1905f992462b86770287952e5e2e5d7de3d5214db798795b

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## [1.2.0](https://github.com/puppetlabs/beaker-abs/tree/1.2.0) (2026-08-03)
+
+[Full Changelog](https://github.com/puppetlabs/beaker-abs/compare/1.1.0...1.2.0)
+
+**Fixed bugs:**
+
+- \(PA-8450\) Fix beaker destroy when ABS\_RESOURCE\_HOSTS is unset [\#49](https://github.com/puppetlabs/beaker-abs/pull/49) ([joshcooper](https://github.com/joshcooper))
+
+**Merged pull requests:**
+
+- \(PA-9008\) Allow beaker 7 [\#51](https://github.com/puppetlabs/beaker-abs/pull/51) ([shubhamshinde360](https://github.com/shubhamshinde360))
+
 ## [1.1.0](https://github.com/puppetlabs/beaker-abs/tree/1.1.0) (2024-05-28)
 
 [Full Changelog](https://github.com/puppetlabs/beaker-abs/compare/1.0.0...1.1.0)
@@ -105,7 +117,7 @@
 
 **Merged pull requests:**
 
-- \(QENG-6081\) Remove beaker dependency [\#10](https://github.com/puppetlabs/beaker-abs/pull/10) ([smcelmurry](https://github.com/smcelmurry))
+- \(QENG-6081\) Remove beaker dependency [\#10](https://github.com/puppetlabs/beaker-abs/pull/10) ([junebug-spencer](https://github.com/junebug-spencer))
 
 ## [0.3.0](https://github.com/puppetlabs/beaker-abs/tree/0.3.0) (2017-08-14)
 

data/Gemfile

@@ -14,5 +14,5 @@ def location_for(place, fake_version = nil)
 end
 
 group :testing do
-  gem "beaker", *location_for(ENV['BEAKER_VERSION'] || '>= 5.0', '< 7')
+  gem "beaker", *location_for(ENV['BEAKER_VERSION'] || '>= 5.0', '< 8')
 end

data/beaker-abs.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "beaker", ">= 5.0", "< 7"
+  spec.add_dependency "beaker", ">= 5.0", "< 8"
   spec.add_dependency "vmfloaty", ">= 1.0", "< 2"
   # accept more keys, for smallstep integration
   spec.add_dependency 'ed25519', ">= 1.2", "< 2.0"

data/lib/beaker/hypervisor/abs.rb

@@ -39,9 +39,7 @@ module Beaker
       @abs_service_name = ENV['ABS_SERVICE_NAME'] || @options[:abs_service_name] || "abs"
       @abs_service_priority = ENV['ABS_SERVICE_PRIORITY'] || @options[:abs_service_priority] || "1"
 
-      raise ArgumentError.new("ABS_RESOURCE_HOSTS must be specified when using the Beaker::Abs hypervisor when provisioning") if resource_hosts.nil? && !options[:provision]
-      resource_hosts = provision_vms(hosts).to_json if resource_hosts.nil?
-      @resource_hosts = JSON.parse(resource_hosts)
+      @resource_hosts = resource_hosts ? JSON.parse(resource_hosts) : []
     end
 
     def connection_preference(host)
@@ -65,6 +63,11 @@ module Beaker
     end
 
     def provision
+      if @resource_hosts.empty? && !@hosts.empty?
+        raise ArgumentError, "ABS_RESOURCE_HOSTS must be specified when using the Beaker::Abs hypervisor" unless @options[:provision]
+        @resource_hosts = JSON.parse(provision_vms(@hosts).to_json)
+      end
+
       type2hosts = {}
 
       # Each resource_host is of the form:
@@ -104,7 +107,22 @@ module Beaker
     end
 
     def cleanup
-      # nothing to do
+      return if ENV['ABS_RESOURCE_HOSTS'] || @options[:abs_resource_hosts]
+
+      hostnames = @hosts.map(&:hostname)
+      return if hostnames.empty?
+
+      verbose = false
+      config = Conf.read_config
+      cli = Clifloaty.new(@abs_service_name, @abs_service_priority)
+      abs_service = Service.new(cli, config)
+      abs_service.delete(verbose, hostnames).each_pair do |hostname, result|
+        if result['ok']
+          @logger.info("Destroyed #{hostname}")
+        else
+          @logger.warn("Failed to destroy #{hostname}")
+        end
+      end
     end
 
     def provision_vms(hosts)

data/lib/beaker-abs/version.rb

@@ -1,5 +1,5 @@
 module BeakerAbs
   module Version
-    STRING = '1.1.0'
+    STRING = '1.2.0'
   end
 end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-abs
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Josh Cooper
 - Rick Bradley
-autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-05-28 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beaker
@@ -20,7 +19,7 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -30,7 +29,7 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: vmfloaty
   requirement: !ruby/object:Gem::Requirement
@@ -167,7 +166,6 @@ homepage: https://github.com/puppetlabs/beaker-abs
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -182,8 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.27
-signing_key: 
+rubygems_version: 4.0.16
 specification_version: 4
 summary: Let's test Puppet, using hosts provisioned by Always Be Scheduling service.
 test_files: []