From 36af124bf7dcdce19b40ec0251fedee39753c698 Mon Sep 17 00:00:00 2001
From: Ryosuke Iwanaga <ryosuke.iwanaga@autify.com>
Date: Tue, 25 Oct 2022 22:52:22 +0000
Subject: [PATCH] Add `autifyConnectClientExtraArguments`

---
 .../java/io/jenkins/plugins/autify/AutifyCli.java   |  3 ++-
 .../io/jenkins/plugins/autify/AutifyWebBuilder.java | 13 ++++++++++++-
 .../plugins/autify/AutifyWebBuilder/config.jelly    |  3 +++
 .../autify/AutifyWebBuilder/config.properties       |  1 +
 .../plugins/autify/AutifyWebBuilderTest.java        |  5 +++++
 5 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/src/main/java/io/jenkins/plugins/autify/AutifyCli.java b/src/main/java/io/jenkins/plugins/autify/AutifyCli.java
index ae6a0d4..e352084 100644
--- a/src/main/java/io/jenkins/plugins/autify/AutifyCli.java
+++ b/src/main/java/io/jenkins/plugins/autify/AutifyCli.java
@@ -55,7 +55,7 @@ public int install() {
 
     public int webTestRun(String autifyUrl, boolean wait, String timeout, List<UrlReplacement> urlReplacements,
             String testExecutionName, String browser, String device, String deviceType, String os, String osVersion,
-            String autifyConnect, boolean autifyConnectClient) {
+            String autifyConnect, boolean autifyConnectClient, String autifyConnectClientExtraArguments) {
         Builder builder = new Builder("web", "test", "run");
         builder.add(autifyUrl);
         builder.addFlag("--wait", wait);
@@ -82,6 +82,7 @@ public int webTestRun(String autifyUrl, boolean wait, String timeout, List<UrlRe
                 return 1;
             }
             builder.addFlag("--autify-connect-client", autifyConnectClient);
+            builder.addFlag("--autify-connect-client-extra-arguments", autifyConnectClientExtraArguments);
         }
         return execute(builder);
     }
diff --git a/src/main/java/io/jenkins/plugins/autify/AutifyWebBuilder.java b/src/main/java/io/jenkins/plugins/autify/AutifyWebBuilder.java
index ca7f9a6..9fc1546 100644
--- a/src/main/java/io/jenkins/plugins/autify/AutifyWebBuilder.java
+++ b/src/main/java/io/jenkins/plugins/autify/AutifyWebBuilder.java
@@ -57,6 +57,7 @@ public class AutifyWebBuilder extends Builder implements SimpleBuildStep {
     private String osVersion;
     private String autifyConnect;
     private boolean autifyConnectClient;
+    private String autifyConnectClientExtraArguments;
     private String autifyPath;
     private String shellInstallerUrl;
 
@@ -173,6 +174,15 @@ public void setAutifyConnectClient(@CheckForNull boolean value) {
         this.autifyConnectClient = value;
     }
 
+    public String getAutifyConnectClientExtraArguments() {
+        return StringUtils.trimToEmpty(autifyConnectClientExtraArguments);
+    }
+
+    @DataBoundSetter
+    public void setAutifyConnectClientExtraArguments(@CheckForNull String value) {
+        this.autifyConnectClientExtraArguments = value;
+    }
+
     public String getAutifyPath() {
         return StringUtils.trimToEmpty(autifyPath);
     }
@@ -211,7 +221,8 @@ public void perform(Run<?, ?> run, FilePath workspace, EnvVars env, Launcher lau
         }
         autifyCli.webAuthLogin(webAccessToken);
         if (autifyCli.webTestRun(autifyUrl, wait, timeout, urlReplacements, testExecutionName, browser, device,
-                deviceType, os, osVersion, autifyConnect, autifyConnectClient) != 0) {
+                deviceType, os, osVersion, autifyConnect, autifyConnectClient,
+                autifyConnectClientExtraArguments) != 0) {
             listener.getLogger().println("Failed to execute autify web test run");
             run.setResult(Result.FAILURE);
             return;
diff --git a/src/main/resources/io/jenkins/plugins/autify/AutifyWebBuilder/config.jelly b/src/main/resources/io/jenkins/plugins/autify/AutifyWebBuilder/config.jelly
index eb6e9dc..da07e8a 100644
--- a/src/main/resources/io/jenkins/plugins/autify/AutifyWebBuilder/config.jelly
+++ b/src/main/resources/io/jenkins/plugins/autify/AutifyWebBuilder/config.jelly
@@ -40,5 +40,8 @@
         <f:entry title="${%AutifyConnectClient}" field="autifyConnectClient">
             <f:checkbox />
         </f:entry>
+        <f:entry title="${%AutifyConnectClientExtraArguments}" field="autifyConnectClientExtraArguments">
+            <f:textbox placeholder="--experimental-tunnel-proxy http://proxy"/>
+        </f:entry>
     </f:advanced>
 </j:jelly>
diff --git a/src/main/resources/io/jenkins/plugins/autify/AutifyWebBuilder/config.properties b/src/main/resources/io/jenkins/plugins/autify/AutifyWebBuilder/config.properties
index 8ecdfd5..7cf8d72 100644
--- a/src/main/resources/io/jenkins/plugins/autify/AutifyWebBuilder/config.properties
+++ b/src/main/resources/io/jenkins/plugins/autify/AutifyWebBuilder/config.properties
@@ -16,3 +16,4 @@ Os=OS
 OsVersion=OS version (Effective only for real mobile device)
 AutifyConnect=Autify Connect Access Point
 AutifyConnectClient=Run with Autify Connect Client?
+AutifyConnectClientExtraArguments=Extra command line arguments you want to pass to Autify Connect Client
diff --git a/src/test/java/io/jenkins/plugins/autify/AutifyWebBuilderTest.java b/src/test/java/io/jenkins/plugins/autify/AutifyWebBuilderTest.java
index 56821a7..9369b5e 100644
--- a/src/test/java/io/jenkins/plugins/autify/AutifyWebBuilderTest.java
+++ b/src/test/java/io/jenkins/plugins/autify/AutifyWebBuilderTest.java
@@ -51,6 +51,7 @@ public class AutifyWebBuilderTest {
             .add("--os-version", stub)
             .add("--autify-connect", stub)
             .add("--autify-connect-client")
+            .add("--autify-connect-client-extra-arguments", stub)
             .toString() + "\n";
 
     AutifyWebBuilder builder;
@@ -91,6 +92,7 @@ public void testConfigRoundtripFull() throws Exception {
         builder.setOsVersion(stub);
         builder.setAutifyConnect(stub);
         builder.setAutifyConnectClient(true);
+        builder.setAutifyConnectClientExtraArguments(stub);
         project.getBuildersList().add(builder);
         project = jenkins.configRoundtrip(project);
 
@@ -106,6 +108,7 @@ public void testConfigRoundtripFull() throws Exception {
         lhs.setOsVersion(stub);
         lhs.setAutifyConnect(stub);
         lhs.setAutifyConnectClient(true);
+        lhs.setAutifyConnectClientExtraArguments(stub);
         jenkins.assertEqualDataBoundBeans(lhs, project.getBuildersList().get(0));
     }
 
@@ -131,6 +134,7 @@ public void testBuildAllFields() throws Exception {
         builder.setOsVersion(stub);
         builder.setAutifyConnect(stub);
         builder.setAutifyConnectClient(true);
+        builder.setAutifyConnectClientExtraArguments(stub);
         project.getBuildersList().add(builder);
         FreeStyleBuild build = jenkins.buildAndAssertSuccess(project);
         jenkins.assertLogContains(webTestRunFullCommand, build);
@@ -173,6 +177,7 @@ public void testScriptedPipelineAllFields() throws Exception {
                 + "  osVersion: '" + stub + "', "
                 + "  autifyConnect: '" + stub + "', "
                 + "  autifyConnectClient: true, "
+                + "  autifyConnectClientExtraArguments: '" + stub + "', "
                 + "  shellInstallerUrl: '" + shellInstallerUrl + "'\n"
                 + "}";
         job.setDefinition(new CpsFlowDefinition(pipelineScript, true));