cem_acpt 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7329475f3aa0a02e2b6f65017ed0c24b35769f31eddcff07f306297d99b6558
-  data.tar.gz: 346c753606378a5b022f2c0cd5e2f3db37dbc473468828075c1c6b9d1f2bf8d6
+  metadata.gz: e7eb7faf465af2f2ea5ab7649db1cf7e05c55573b869966c7e99c49aff498bf7
+  data.tar.gz: d79aadcc053957630a339b49a5ea456c5d67cc0dab24b036184cfec3e6c67609
 SHA512:
-  metadata.gz: d3eeb3af0f675509e0e02f658656a21d66e682c2d127196155a44adedade3513f4361dd78bb818070d0bd4bb2e349782d4a475a3d1a7a51b9ab800bcc0d9b1e6
-  data.tar.gz: 2ac9dc43f0bd592b22053599060ffce68cccb995b32755686c0c4128cf69c2d125b155738be38a0ad91cbca7e7017109ab0721bfda4adaae4da46ab72e30a00d
+  metadata.gz: cee1f24c8c38d68b01078f56e41963a02f5c3c5e2df8a35907b86e19b20600fe5ba612d7382be02da41b0a38f662a09019f629cf4decae30f35dad14f878fd38
+  data.tar.gz: 968a449a29d6f487e802954ca9af7d1d64bd2dd85c7f95cbaf95cecf7357a261a113293e712b8be8b01a593564de885d25c80ab5b01632215b98e8bd43310012

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cem_acpt (0.8.1)
+    cem_acpt (0.8.2)
       async-http (>= 0.60, < 0.70)
       bcrypt_pbkdf (>= 1.0, < 2.0)
       deep_merge (>= 1.2, < 2.0)

data/lib/cem_acpt/provision/terraform.rb

@@ -25,6 +25,7 @@ module CemAcpt
         @module_package_path = nil
         @private_key = nil
         @public_key = nil
+        @applied = false
       end
 
       # @return [Hash] A hash of instance names and IPs
@@ -36,13 +37,18 @@ module CemAcpt
         terraform_init
         terraform_plan(formatted_vars, DEFAULT_PLAN_NAME)
         terraform_apply(DEFAULT_PLAN_NAME)
-        begin
-          output = terraform_output('instance_name_ip', json: true)
-          JSON.parse(output)
-        rescue JSON::ParserError => e
-          logger.error('CemAcpt::Provision::Terraform') { "Error parsing Terraform output: #{output}" }
-          raise e
-        end
+        @applied = true
+      end
+
+      def output
+        raise 'Terraform has not been applied yet' unless @applied
+
+        output = terraform_output('instance_name_ip', json: true)
+        logger.debug('CemAcpt::Provision::Terraform') { "Terraform output:\n#{output}" }
+        JSON.parse(output)
+      rescue JSON::ParserError => e
+        logger.error('CemAcpt::Provision::Terraform') { "Error parsing Terraform output: #{output}" }
+        raise e
       end
 
       def destroy

data/lib/cem_acpt/test_runner.rb

@@ -59,7 +59,8 @@ module CemAcpt
         @run_data[:nodes] = new_node_data
         logger.info('CemAcpt::TestRunner') { 'Created node data...' }
         logger.verbose('CemAcpt::TestRunner') { "Node data: #{@run_data[:nodes]}" }
-        @instance_names_ips = provision_test_nodes
+        provision_test_nodes
+        @instance_names_ips = provisioner_output
         logger.info('CemAcpt::TestRunner') { "Instance names and IPs class: #{@instance_names_ips.class}" }
         @provisioned = true
         logger.info('CemAcpt::TestRunner') { 'Provisioned test nodes...' }
@@ -156,6 +157,24 @@ module CemAcpt
         @provisioner.provision
       end
 
+      def provisioner_output
+        logger.info('CemAcpt::TestRunner') { 'Getting provisioner output...' }
+        @attempts = 0
+        @max_attempts = 3
+        output = nil
+        while @attempts < @max_attempts
+          @attempts += 1
+          output = @provisioner.output
+          break unless (output.nil? || output.empty?) && @attempts < @max_attempts # Don't sleep if this is last attempt
+
+          logger.info('CemAcpt::TestRunner') { "Provisioner output is nil or empty, retrying (#{@attempts}/#{@max_attempts})" }
+          sleep 3
+        end
+        raise 'Provisioner output is nil or empty' if output.nil? || output.empty?
+
+        output
+      end
+
       def destroy_test_nodes
         logger.info('CemAcpt::TestRunner') { 'Destroying test nodes if necessary...' }
         if !@provisioned

data/lib/cem_acpt/utils/shell.rb

@@ -30,19 +30,10 @@ module CemAcpt
           stdin.close
           outerr.sync = true
           output_thread = Thread.new do
-            while (line = outerr.readline_nonblock)
+            while (line = outerr.gets("\n"))
               output << line if output
               io_outerr.write(line) unless line.chomp.empty?
             end
-          rescue IO::WaitReadable
-            begin
-              IO.select([outerr])
-              retry
-            rescue IOError
-              # outerr closed, won't retry
-            end
-          rescue EOFError
-            # outerr closed, won't retry
           end
           wait_thr.join
           output_thread.exit
@@ -70,21 +61,6 @@ module CemAcpt
         end
         nil
       end
-
-      # IO monkey patch for non-blocking readline
-      class ::IO
-        def readline_nonblock
-          rlnb = []
-          rnlb << read_nonblock(1) while rlnb[-1] != "\n"
-          rlnb.join
-        rescue IO::WaitReadable => blocking
-          raise blocking if rlnb.empty?
-
-          rlnb.join
-        rescue EOFError
-          rlnb.join
-        end
-      end
     end
   end
 end

data/lib/cem_acpt/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CemAcpt
-  VERSION = '0.8.1'
+  VERSION = '0.8.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cem_acpt
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - puppetlabs