Remove apiPort from class state in order to avoid concurrency issues

Author: Michał Budziak

src/main/java/com/saucelabs/ci/sauceconnect/SauceConnectManager.java

@@ -140,43 +140,29 @@ public String getDefaultSauceConnectLogDirectory() {
   private static final String SAUCE_CONNECT_PREFIX = "sauce-connect-";
   public static final String SAUCE_CONNECT = SAUCE_CONNECT_PREFIX + CURRENT_SC_VERSION;
 
-  private static final int DEFAULT_API_PORT = 9000;
-  private int apiPort;
-
   /** Constructs a new instance with quiet mode disabled. */
   public SauceConnectManager() {
     this(false);
   }
 
-  /**
-   * Constructs a new instance with quiet mode disabled.
-   *
-   * @param runner System which runs SauceConnect, this info is added to '--metadata runner=' argument
-   */
-  public SauceConnectManager(String runner) {
-    this(false, runner, DEFAULT_API_PORT);
-  }
-
   /**
    * Constructs a new instance.
    *
    * @param quietMode indicates whether Sauce Connect output should be suppressed
    */
   public SauceConnectManager(boolean quietMode) {
-    this(quietMode, "jenkins", DEFAULT_API_PORT);
+    this(quietMode, "jenkins");
   }
 
   /**
    * Constructs a new instance.
    *
    * @param quietMode indicates whether Sauce Connect output should be suppressed
    * @param runner System which runs SauceConnect, this info is added to '--metadata runner=' argument
-   * @param apiPort Port the Sauce Connect process will listen on
    */
-  public SauceConnectManager(boolean quietMode, String runner, int apiPort) {
+  public SauceConnectManager(boolean quietMode, String runner) {
     super(quietMode);
     this.runner = runner;
-    this.apiPort = apiPort;
   }
 
   /**
@@ -241,17 +227,13 @@ protected Process prepAndCreateProcess(
         }
       }
 
-      if ( apiPort != 0 ) {
-        this.apiPort = apiPort;
-      }
-
       // although we are setting the working directory, we need to specify the full path to the exe
       String[] args = {sauceConnectBinary.getPath()};
       if (legacy) {
-          args = generateSauceConnectArgsLegacy(args, username, accessKey, options);
+          args = generateSauceConnectArgsLegacy(args, username, accessKey, options, apiPort);
           args = addExtraInfoLegacy(args);
       } else {
-          args = generateSauceConnectArgs(args, username, accessKey, options);
+          args = generateSauceConnectArgs(args, username, accessKey, options, apiPort);
           args = addExtraInfo(args);
       }
 
@@ -343,12 +325,13 @@ public static String getLatestSauceConnectVersion() {
    * @param username name of the user which launched Sauce Connect
    * @param accessKey the access key for the Sauce user
    * @param options command line args specified by the user
+   * @param apiPort specify the port the Sauce Connect API will listen on
    * @return String array representing the command line args to be used to launch Sauce Connect
    */
   protected String[] generateSauceConnectArgs(
-      String[] args, String username, String accessKey, String options) {
+      String[] args, String username, String accessKey, String options, int apiPort) {
     String[] result =
-        joinArgs(args, "run", "--username", username.trim(), "--access-key", accessKey.trim(), "--api-address", ":" + String.valueOf(this.apiPort));
+        joinArgs(args, "run", "--username", username.trim(), "--access-key", accessKey.trim(), "--api-address", ":" + String.valueOf(apiPort));
     result = addElement(result, options);
     return result;
   }
@@ -367,10 +350,10 @@ protected String[] addExtraInfo(String[] args) {
    */
   @Deprecated
   protected String[] generateSauceConnectArgsLegacy(
-      String[] args, String username, String accessKey, String options) {
+      String[] args, String username, String accessKey, String options, int apiPort) {
     String[] result;
 
-    result = joinArgs(args, "legacy", "--user", username.trim(), "--api-key", accessKey.trim(), "--status-address", "0.0.0.0:" + String.valueOf(this.apiPort));
+    result = joinArgs(args, "legacy", "--user", username.trim(), "--api-key", accessKey.trim(), "--status-address", "0.0.0.0:" + String.valueOf(apiPort));
     result = addElement(result, options);
     return result;
   }

src/test/java/com/saucelabs/ci/sauceconnect/SauceConnectManagerTest.java

@@ -244,7 +244,8 @@ void testSauceConnectSecretsCoveredWithStars() {
             args,
             "username",
             "apikey",
-            "--access-key apiKey");
+            "--access-key apiKey",
+            9000);
     String result = manager.hideSauceConnectCommandlineSecrets(args);
 
     assertEquals(
@@ -263,7 +264,8 @@ void testSauceConnectLegacySecretsCoveredWithStars() {
             args,
             "username",
             "apikey",
-            "--api-key apiKey");
+            "--api-key apiKey",
+            9000);
     String result = manager.hideSauceConnectCommandlineSecrets(args);
 
     assertEquals(
@@ -282,7 +284,8 @@ void testSauceConnectAuthSecretsCoveredWithStars() {
             args,
             "username",
             "apikey",
-            "--auth foo:bar@host:8080");
+            "--auth foo:bar@host:8080",
+            9000);
     String result = manager.hideSauceConnectCommandlineSecrets(args);
 
     assertEquals(
@@ -295,7 +298,8 @@ void testSauceConnectAuthSecretsCoveredWithStars() {
             args,
             "username",
             "apikey",
-            "-a foo:bar@host:8080");
+            "-a foo:bar@host:8080",
+            9000);
     result = manager.hideSauceConnectCommandlineSecrets(args);
 
     assertEquals(
@@ -308,7 +312,8 @@ void testSauceConnectAuthSecretsCoveredWithStars() {
             args,
             "username",
             "apikey",
-            "-a foo:bar@host:8080 -a user:pwd@host1:1234 --auth root:pass@host2:9999 --auth uucp:pass@host3:8080");
+            "-a foo:bar@host:8080 -a user:pwd@host1:1234 --auth root:pass@host2:9999 --auth uucp:pass@host3:8080",
+            9000);
     result = manager.hideSauceConnectCommandlineSecrets(args);
 
     assertEquals(
@@ -327,7 +332,8 @@ void testSauceConnectProxySecretsCoveredWithStars() {
             args,
             "username",
             "apikey",
-            "--proxy user:pwd@host:8080");
+            "--proxy user:pwd@host:8080",
+            9000);
     String result = manager.hideSauceConnectCommandlineSecrets(args);
 
     assertEquals(
@@ -340,7 +346,8 @@ void testSauceConnectProxySecretsCoveredWithStars() {
             args,
             "username",
             "apikey",
-            "--proxy user@host:8080");
+            "--proxy user@host:8080",
+            9000);
     result = manager.hideSauceConnectCommandlineSecrets(args);
 
     assertEquals(
@@ -353,7 +360,8 @@ void testSauceConnectProxySecretsCoveredWithStars() {
             args,
             "username",
             "apikey",
-            "-x user@host:8080");
+            "-x user@host:8080",
+            9000);
     result = manager.hideSauceConnectCommandlineSecrets(args);
 
     assertEquals(
@@ -366,7 +374,8 @@ void testSauceConnectProxySecretsCoveredWithStars() {
             args,
             "username",
             "apikey",
-            "--proxy-sauce user@host:8080");
+            "--proxy-sauce user@host:8080",
+            9000);
     result = manager.hideSauceConnectCommandlineSecrets(args);
 
     assertEquals(
@@ -385,7 +394,8 @@ void testSauceConnectAPIBasicAuthSecretsCoveredWithStars() {
             args,
             "username",
             "apiKey",
-            "--api-basic-auth user:pwd");
+            "--api-basic-auth user:pwd",
+            9000);
     String result = manager.hideSauceConnectCommandlineSecrets(args);
 
     assertEquals(
@@ -398,7 +408,8 @@ void testSauceConnectAPIBasicAuthSecretsCoveredWithStars() {
             args,
             "username",
             "apiKey",
-            "--api-basic-auth user");
+            "--api-basic-auth user",
+            9000);
     result = manager.hideSauceConnectCommandlineSecrets(args);
 
     assertEquals(