bugsnag-maze-runner 7.27.0 → 7.28.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2158a5376e4ff1d6c63a70eb138c33a2021aa7baff47f28882821e62a09fd0f
-  data.tar.gz: cd74c9cc69173584b6bf4c28a7fbaffdc3e115db09b38bfc507242f14726689e
+  metadata.gz: 4a074f231fdb2489046d9e6ad85f601239d3375edbbffe7de28ad862bc66a881
+  data.tar.gz: afe8771d431a5988986ad0ae5982f24c866436eb10edc95afb81af5fb5d2b0a7
 SHA512:
-  metadata.gz: 541182a68461d87cb7e2dd118cb6418fec9c4f3f2624622673ea12d16e695b81fd10ad6398e6a04c1446096a4c67e0b067f003687d326053258c20c77fc3e0cb
-  data.tar.gz: f033d06ba478c06163397026626b180cabdcbf7f2b246878d7415905c0af8a3ca46c26a044dbbf111599cc0860445ace5c8eb89b74d3a0f1d94cb9be907e2573
+  metadata.gz: 1091d4188d165f6d1122a5a2a0275eda1ed818a550bf953c9a826f84950691ca86674bda0e11a007260a45742665c3d52630c614f1705daf88dc6ff86dec0b82
+  data.tar.gz: 59ec8f4f08c75411e9766c4379b841f39d1a7f3dc9f02988231fc99c229fb7affe226145f86499860a3b005cf2be9261fc0f6a8eea6151ead2515ef7c27b3e96

data/lib/features/support/internal_hooks.rb

@@ -44,12 +44,6 @@ BeforeAll do
   Maze.run_uuid = SecureRandom.uuid
   $logger.info "UUID for this run: #{Maze.run_uuid}"
 
-  # Determine public IP if enabled
-  if Maze.config.aws_public_ip
-    Maze.public_address = Maze::AwsPublicIp.new.address
-    $logger.info "Public address: #{Maze.public_address}"
-  end
-
   # Start mock server
   Maze::Server.start
   Maze::Server.set_response_delay_generator(Maze::Generator.new [Maze::Server::DEFAULT_RESPONSE_DELAY].cycle)
@@ -66,6 +60,18 @@ BeforeAll do
   # This must happen after any client hooks have run, so that they can set the server root
   Maze::DocumentServer.start unless Maze.config.document_server_root.nil?
 
+  # Determine public IP if enabled
+  if Maze.config.aws_public_ip
+    public_ip = Maze::AwsPublicIp.new
+    Maze.public_address = public_ip.address
+    $logger.info "Public address: #{Maze.public_address}"
+
+    unless Maze.config.document_server_root.nil?
+      Maze.public_document_server_address = public_ip.document_server_address
+      $logger.info "Public document server address: #{Maze.public_document_server_address}"
+    end
+  end
+
   # An initial setup for total success status
   $success = true
 end

data/lib/maze/aws_public_ip.rb

@@ -1,16 +1,31 @@
 module Maze
   # Determines the public IP address and port when running on Buildkite with the Elastic CI Stack for AWS
   class AwsPublicIp
-    attr_reader :address
+    attr_reader :host
+    attr_reader :port
+    attr_reader :document_server_port
+
+    def address
+      "#{@ip}:#{@port}"
+    end
+
+    def document_server_address
+      return nil if @document_server_port.nil?
+
+      "#{@ip}:#{@document_server_port}"
+    end
 
     def initialize
       # This class is only relevant on Buildkite
       return unless ENV['BUILDKITE']
 
-      ip = determine_public_ip
-      port = determine_public_port
+      @ip = determine_public_ip
+      @port = determine_public_port Maze.config.port
+
+      unless Maze.config.document_server_root.nil?
+        @document_server_port = determine_public_port Maze.config.document_server_port
+      end
 
-      @address = "#{ip}:#{port}"
     end
 
     # Determines the public IP address of the running AWS instance
@@ -20,8 +35,9 @@ module Maze
       `curl --silent -XGET http://169.254.169.254/latest/meta-data/public-ipv4`
     end
 
-    # Determines the external port of the running Docker container that's associated with the port of the mock server
-    def determine_public_port
+    # Determines the external port of the running Docker container that's associated with the port given
+    # @param local_port Local port to find the external port for
+    def determine_public_port(local_port)
       port = 0
       count = 0
       max_attempts = 30
@@ -35,7 +51,7 @@ module Maze
           begin
             json_string = result[0][0].strip
             json_result = JSON.parse(json_string)
-            port = json_result['NetworkSettings']['Ports']["#{Maze.config.port}/tcp"][0]['HostPort']
+            port = json_result['NetworkSettings']['Ports']["#{local_port}/tcp"][0]['HostPort']
           rescue StandardError
             $logger.error "Unable to parse public port from: #{json_string}"
             return 0

data/lib/maze/client/appium/bb_client.rb

@@ -6,7 +6,7 @@ module Maze
           config = Maze.config
           config.app = Maze::Client::BitBarClientUtils.upload_app config.access_key,
                                                                   config.app
-          if Maze.config.start_tunnel
+          if Maze::Client::BitBarClientUtils.use_local_tunnel?
             Maze::Client::BitBarClientUtils.start_local_tunnel config.sb_local,
                                                                config.username,
                                                                config.access_key
@@ -61,7 +61,7 @@ module Maze
 
         def stop_session
           super
-          if Maze.config.start_tunnel
+          if Maze::Client::BitBarClientUtils.use_local_tunnel?
             Maze::Client::BitBarClientUtils.stop_local_tunnel
           end
         end

data/lib/maze/client/bb_client_utils.rb

@@ -123,6 +123,10 @@ module Maze
           end
         end
 
+        def use_local_tunnel?
+          Maze.config.start_tunnel && !Maze.config.aws_public_ip
+        end
+
         # Starts the BitBar local tunnel
         #
         # @param sb_local [String] path to the SBSecureTunnel binary

data/lib/maze/client/selenium/bb_client.rb

@@ -4,11 +4,6 @@ module Maze
       class BitBarClient < BaseClient
         def start_session
           config = Maze.config
-          if ENV['BUILDKITE']
-            credentials = Maze::Client::BitBarClientUtils.account_credentials config.tms_uri
-            config.username = credentials[:username]
-            config.access_key = credentials[:access_key]
-          end
           capabilities = ::Selenium::WebDriver::Remote::Capabilities.new
           capabilities['bitbar_apiKey'] = config.access_key
           browsers = YAML.safe_load(File.read("#{__dir__}/bb_browsers.yml"))
@@ -16,9 +11,15 @@ module Maze
           capabilities.merge! JSON.parse(config.capabilities_option)
           config.capabilities = capabilities
 
-          Maze::Client::BitBarClientUtils.start_local_tunnel config.sb_local,
-                                                             config.username,
-                                                             config.access_key
+          if Maze::Client::BitBarClientUtils.use_local_tunnel?
+            credentials = Maze::Client::BitBarClientUtils.account_credentials config.tms_uri
+            config.username = credentials[:username]
+            config.access_key = credentials[:access_key]
+
+            Maze::Client::BitBarClientUtils.start_local_tunnel config.sb_local,
+                                                               config.username,
+                                                               config.access_key
+          end
 
           selenium_url = Maze.config.selenium_server_url
           Maze.driver = Maze::Driver::Browser.new :remote, selenium_url, config.capabilities
@@ -36,8 +37,10 @@ module Maze
 
         def stop_session
           super
-          Maze::Client::BitBarClientUtils.stop_local_tunnel
-          Maze::Client::BitBarClientUtils.release_account(Maze.config.tms_uri) if ENV['BUILDKITE']
+          if Maze::Client::BitBarClientUtils.use_local_tunnel?
+            Maze::Client::BitBarClientUtils.stop_local_tunnel
+            Maze::Client::BitBarClientUtils.release_account(Maze.config.tms_uri) if ENV['BUILDKITE']
+          end
         end
       end
     end

data/lib/maze.rb

@@ -7,10 +7,11 @@ require_relative 'maze/timers'
 # Glues the various parts of MazeRunner together that need to be accessed globally,
 # providing an alternative to the proliferation of global variables or singletons.
 module Maze
-  VERSION = '7.27.0'
+  VERSION = '7.28.0'
 
   class << self
-    attr_accessor :check, :driver, :internal_hooks, :mode, :start_time, :dynamic_retry, :public_address, :run_uuid
+    attr_accessor :check, :driver, :internal_hooks, :mode, :start_time, :dynamic_retry, :public_address,
+                  :public_document_server_address, :run_uuid
 
     def config
       @config ||= Maze::Configuration.new

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bugsnag-maze-runner
 version: !ruby/object:Gem::Version
-  version: 7.27.0
+  version: 7.28.0
 platform: ruby
 authors:
 - Steve Kirkland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-25 00:00:00.000000000 Z
+date: 2023-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber