beaker-abs 0.7.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64463104e5baa6488316a4824290f54d746e9ad36a91fad15d4e549a45d525fa
-  data.tar.gz: 4c957500c3726171b389eb6610b4c65e8197f984edb868e2da31f8cdf67236cb
+  metadata.gz: 9e71b0f3712201cfa7d1a16790657faad5c448f929d610a5a0530e2fb4442d00
+  data.tar.gz: b29f88d99c39480d7b90b328e43784a3e1e480156791de64d185f25794e6712f
 SHA512:
-  metadata.gz: fc6272ea353435e50fa23c78635db4701a8fa2086ea0a44ce074e5aa95e56c16568618d84f8140d12d4bb7d4bbbe8c3f3d8f283cb315708589113c3939dcea9e
-  data.tar.gz: d094be28dac020761822898a028593b3f4e3c4b3de0cfcc2ea3fc7ed6c52ea508c30e18d76940e9840a50d3d7c4b1379bf15bc9d2160dbd02a37cf214882b40b
+  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
@@ -51,6 +57,30 @@ the environment variable ABS_SERVICE_NAME or the top level option in the hosts f
 it will take precedence over CI tests. Be careful not to run a CI test with this option. The priority can be configured via
 the environment variable ABS_SERVICE_PRIORITY or the top level option in the hosts file abs_service_priority.
 
+#### Examples
+
+Changing from default priority 1 to 3 via env var
+```
+ABS_SERVICE_PRIORITY=3 bundle exec beaker --provision --hosts=hosts.cfg --tests acceptance/tests
+```
+
+Changing the service name to look for in ~/.vmfloaty.yml via a beaker option file
+```
+$ cat options.rb
+{
+  provision: 'true',
+  abs_service_name: "FOOBAR"
+}
+$ 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

@@ -6,12 +6,35 @@ require 'vmfloaty/conf'
 require 'vmfloaty/utils'
 
 module Beaker
+  class Clifloaty
+    # the floaty service needs a 'cli' object that would normally represent the flags passed on the command line
+    # that object is then "merged" with the floaty config files to add/change options
+    # creating a dummy cli here
+    attr_reader :url, :token, :user, :service, :priority
+    def initialize(service, priority)
+      @service = service #the name of the service you want to use
+      @priority = priority
+    end
+  end
+
   class Abs < Beaker::Hypervisor
     def initialize(hosts, options)
       @options = options
       @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"
@@ -91,13 +114,7 @@ module Beaker
       config = Conf.read_config # get the vmfloaty config file in home dir
 
       # TODO: the options object provided by the floaty cli is required in get_service_config()
-      # we should make it optional or accept nil
-      cli = Object.new
-      def cli.service() @abs_service_name end
-      def cli.priority() @abs_service_priority end # forces going ahead of queue
-      def cli.url() nil end
-      def cli.token() nil end
-      def cli.user() nil end
+      cli = Clifloaty.new(@abs_service_name, @abs_service_priority)
 
       #the service object is the interfacte to all methods
       abs_service = Service.new(cli, config)

data/lib/beaker-abs/version.rb

@@ -1,5 +1,5 @@
 module BeakerAbs
   module Version
-    STRING = '0.7.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.7.0
+  version: 0.10.1
 platform: ruby
 authors:
 - Josh Cooper
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-12-10 00:00:00.000000000 Z
+date: 2022-04-29 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.