beaker-abs 0.8.1 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 542e094d8256f1b3d3ada74a529c5c8f1ca43bdd6160d2080c5d5dd233004440
-  data.tar.gz: 4be53717ea6a8ec508a8053f4556ae1e21932aa239c868edbdd30c371c99f860
+  metadata.gz: b7afbb71da4317f1702a3a4fc26407c623792cfc860f82d0cb112939460e794b
+  data.tar.gz: 79ebb552b264ee29458dd6fc4fc46b8932b16639826046bad951c79a500c1d42
 SHA512:
-  metadata.gz: 35abd48debcfb67e37d176a493e6bb74643f41c83e3ca3c92ddb5554635f97dae70d70fd2c922a47e19e6ea82d4ab8c631588e698c34aa051a74c7038eba49e0
-  data.tar.gz: 60d24bfed3d554ebe8b8743dfb7889228f4a2ded06cb6a2f19a5449137d6a14a94b5412344263a8b64d37e6ad454c0259928c3df5fafe8d079d5e70b40e375b3
+  metadata.gz: 5abffdc17be4101eff3e2a70aa952b7cf6d1b1fc362210342cb87133cffd8c626ef00fb78bde4b4e4061296a153d002be8e13c015a7e317fab5ce424a706fafd
+  data.tar.gz: 2d13d8562bae6124f8d6bf34d369bec64ae5e291605f457a23181214a0807bff828c14451d087d441354edfd96601db6792825d3fd5d55eaf632c3c0ab877d6d

data/CODEOWNERS

@@ -1 +1 @@
-* @puppetlabs/beaker
+* @puppetlabs/dio

data/README.md

@@ -17,6 +17,12 @@ s.add_runtime_dependency 'beaker', '~>4.0'
 s.add_runtime_dependency 'beaker-abs'
 ~~~
 
+Beaker-abs changes the default beaker (core) behavior of settings the NET::SSH ssh config to 'false' which means do not respect any of the client's ssh_config.
+If beaker-abs detects that the ssh config will be false (it was not replaced in the option files, in the HOST config etc) it sets it to the value of
+SSH_CONFIG_FILE or default to 'true'. True means it will automatically check the typical locations (~/.ssh/config, /etc/ssh_config). Respecting the ssh_config is 
+useful to specify things like no strict hostkley checking, and also to support the smallstep 'step' command in CI.
+
+
 ## Usage
 
 Create a beaker host config with `hypervisor: abs`, and pass the data from the
@@ -68,6 +74,13 @@ $ cat options.rb
 $ bundle exec beaker --hosts=hosts.cfg --tests acceptance/tests --options options.rb
 ```
 
+## Environment vars
+| Var      | Description | Default |
+| ----------- | ----------- | ------ |
+| ABS_SERVICE_NAME      | When using locally via vmfloaty, the --service to use       | abs |
+| ABS_SERVICE_PRIORITY  | When using locally via vmfloaty, the priority to use        | 1 |
+| SSH_CONFIG_FILE       | If beaker-abs detects the beaker default of 'false', you can specify a file location for the ssh_config. True means it will automatically check the typical locations (~/.ssh/config, /etc/ssh_config). | true |
+
 ## Development
 
 After checking out the repo, run `bundle install --path .bundle` to install dependencies. Then, run `bundle exec rake test` to run the tests.

data/beaker-abs.gemspec

@@ -19,7 +19,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "beaker", "~> 4.0"
-  spec.add_dependency "vmfloaty", ">= 1.0", "< 1.2"
+  spec.add_dependency "vmfloaty", ">= 1.0", "< 2"
+  # accept more keys, for smallstep integration
+  spec.add_dependency 'ed25519', ">= 1.2", "< 2.0"
+  spec.add_dependency 'bcrypt_pbkdf', ">= 1.0", "< 2.0"
   spec.add_development_dependency "bundler", "~> 2.1"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "minitest", "~> 5.0"

data/lib/beaker/hypervisor/abs.rb

@@ -1,6 +1,5 @@
 require 'beaker'
 require 'json'
-require 'pry-byebug'
 require 'vmfloaty'
 require 'vmfloaty/conf'
 require 'vmfloaty/utils'
@@ -23,6 +22,18 @@ module Beaker
       @logger = options[:logger]
       @hosts = hosts
 
+      # set NET:SSH to use the ssh_config files if they exist
+      # beaker (upstream) defaults this settings to false
+      # NET:SSH documentation: set to true to load the default OpenSSH config files (~/.ssh/config, /etc/ssh_config), or to false to not load them,
+      # or to a file-name (or array of file-names) to load those specific configuration files. Defaults to true
+      if options[:ssh] && options[:ssh][:config] == false
+        options[:ssh][:config] = ENV['SSH_CONFIG_FILE'] || true
+        # code smell, replace existing host object (that's where NET::SSH gets the options, and the host has its own copy of the options!)
+        @hosts.each_with_index do |host, index|
+          @hosts[index] = Beaker::Host.create(host.name, host.host_hash, options)
+        end
+      end
+      
       resource_hosts = ENV['ABS_RESOURCE_HOSTS'] || @options[:abs_resource_hosts]
 
       @abs_service_name = ENV['ABS_SERVICE_NAME'] || @options[:abs_service_name] || "abs"

data/lib/beaker-abs/version.rb

@@ -1,5 +1,5 @@
 module BeakerAbs
   module Version
-    STRING = '0.8.1'
+    STRING = '0.11.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beaker-abs
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.11.0
 platform: ruby
 authors:
 - Josh Cooper
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-12-14 00:00:00.000000000 Z
+date: 2022-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beaker
@@ -34,7 +34,7 @@ dependencies:
         version: '1.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,8 +43,48 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
     - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
+- !ruby/object:Gem::Dependency
+  name: ed25519
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: bcrypt_pbkdf
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -128,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.0.9
 signing_key: 
 specification_version: 4
 summary: Let's test Puppet, using hosts provisioned by Always Be Scheduling service.