From c6f7991aacb23a895fbb1d7df501d1598aad6787 Mon Sep 17 00:00:00 2001
From: Samuel Beaulieu <samuel+14401380@puppet.com>
Date: Tue, 26 Jul 2022 09:57:40 -0500
Subject: [PATCH] use jruby 9.3.6

---
 .github/workflows/release.yml |  4 ++--
 .github/workflows/testing.yml |  5 ++---
 lib/vmpooler/aws_setup.rb     | 11 +++++------
 lib/vmpooler/providers/ec2.rb |  2 --
 vmpooler-provider-ec2.gemspec |  2 +-
 5 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 17ec95b..e0538bf 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -20,10 +20,10 @@ jobs:
           draft: false
           prerelease: false
           generateReleaseNotes: true
-      - name: Install Ruby 2.5.8
+      - name: Install Ruby jruby-9.3.6.0
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '2.5.8'
+          ruby-version: 'jruby-9.3.6.0'
       - name: Build gem
         run: gem build *.gemspec
       - name: Publish gem
diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
index 501403f..068495e 100644
--- a/.github/workflows/testing.yml
+++ b/.github/workflows/testing.yml
@@ -18,7 +18,7 @@ jobs:
     strategy:
       matrix:
         ruby-version:
-          - '2.5.8'
+          - 'jruby-9.3.6.0'
     steps:
     - uses: actions/checkout@v2
     - name: Set up Ruby
@@ -34,8 +34,7 @@ jobs:
     strategy:
       matrix:
         ruby-version:
-          - '2.5.8'
-          - 'jruby-9.2.12.0'
+          - 'jruby-9.3.6.0'
     steps:
     - uses: actions/checkout@v2
     - name: Set up Ruby
diff --git a/lib/vmpooler/aws_setup.rb b/lib/vmpooler/aws_setup.rb
index 9b537f9..8077faf 100644
--- a/lib/vmpooler/aws_setup.rb
+++ b/lib/vmpooler/aws_setup.rb
@@ -18,11 +18,11 @@ module Vmpooler
 
       def setup_node_by_ssh(host, platform)
         conn = check_ssh_accepting_connections(host, platform)
-        if conn
-          @logger.log('s', "[>] [#{platform}] '#{@vm_name}' net:ssh connected")
-          configure_host(host, platform, conn)
-          @logger.log('s', "[>] [#{platform}] '#{@vm_name}' configured")
-        end
+        return unless conn
+
+        @logger.log('s', "[>] [#{platform}] '#{@vm_name}' net:ssh connected")
+        configure_host(host, platform, conn)
+        @logger.log('s', "[>] [#{platform}] '#{@vm_name}' configured")
       end
 
       # For an Amazon Linux AMI, the user name is ec2-user.
@@ -68,7 +68,6 @@ module Vmpooler
         rescue StandardError => e
           @logger.log('s', "[>] [#{platform}] '#{@vm_name}' net:ssh other error, skipping aws_setup: #{e}")
           puts e.backtrace
-          return nil
         end
       end
 
diff --git a/lib/vmpooler/providers/ec2.rb b/lib/vmpooler/providers/ec2.rb
index ce48f57..7ef5e36 100644
--- a/lib/vmpooler/providers/ec2.rb
+++ b/lib/vmpooler/providers/ec2.rb
@@ -254,8 +254,6 @@ module Vmpooler
           @logger.log('s', "[>] [#{pool_name}] '#{new_vmname}' instance running")
           ### System status checks
           # This check verifies that your instance is reachable. Amazon EC2 tests that network packets can get to your instance.
-          # If this check fails, there might be an issue with the infrastructure that is hosting your instance (such as AWS power, networking, or software systems). You can restart or replace the instance, wait for Amazon EC2’s systems to resolve the issue, or seek technical support.
-          # This check does not validate that your operating system and applications are accepting traffic.
           ### Instance status checks
           # This check verifies that your instance's operating system is accepting traffic.
           connection.client.wait_until(:instance_status_ok, { instance_ids: [instance_id] })
diff --git a/vmpooler-provider-ec2.gemspec b/vmpooler-provider-ec2.gemspec
index a569143..dd6986a 100644
--- a/vmpooler-provider-ec2.gemspec
+++ b/vmpooler-provider-ec2.gemspec
@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'pry'
   s.add_development_dependency 'rack-test', '>= 0.6'
   s.add_development_dependency 'rspec', '>= 3.2'
-  s.add_development_dependency 'rubocop', '~> 1.1.0'
+  s.add_development_dependency 'rubocop', '~> 1.28.2'
   s.add_development_dependency 'simplecov', '>= 0.11.2'
   s.add_development_dependency 'thor', '~> 1.0', '>= 1.0.1'
   s.add_development_dependency 'yarjuf', '>= 2.0'