beaker-abs 0.9.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 27a203607bea7dbf86a777845e5001652eaaf84cb9e4cf68bdd363101bbd4720
-  data.tar.gz: 254e86cb24ad8dd8485b04d1eb051cd174e50f04cbe71a8a6a587477d6b2f5c6
+  metadata.gz: 9e71b0f3712201cfa7d1a16790657faad5c448f929d610a5a0530e2fb4442d00
+  data.tar.gz: b29f88d99c39480d7b90b328e43784a3e1e480156791de64d185f25794e6712f
 SHA512:
-  metadata.gz: 076db68386151e5accabb9c2b1407b2c1ddaf43904083c58b99007b3627283a1362943190d4471d4fa2cf51412b7c1f5de8e1c97416f1ece296a0baa564b4cd1
-  data.tar.gz: 168fee1b01fe2266bc2cf48dffa16753ab5ae2c9645077218ca2fc85e81742abb37bd9569bc165f1452d4ab2a29191d3b7900dc7ebcd014158b35173ffacc315
+  metadata.gz: bdf47ea69b4c7822110289ee2a78cb1b98600dc0390ecf7da13977e1293158db4b2c630bfb64d9d80f612bac1cfa19ef193ad60aab72bab1dce157023d29e992
+  data.tar.gz: c43c807d7db562e8ca5615d2261f514a91af04bca3758807b14a5fe2d396fcd62f306dbd6c141eb06b1a14f9bbb2b9d208b4c9a89879c3c63fa6bb32cbb4841a

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

@@ -20,6 +20,9 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "beaker", "~> 4.0"
   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

@@ -23,6 +23,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.9.0'
+    STRING = '0.10.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beaker-abs
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.1
 platform: ruby
 authors:
 - Josh Cooper
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-07-12 00:00:00.000000000 Z
+date: 2022-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beaker
@@ -45,6 +45,46 @@ dependencies:
     - - "<"
       - !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.