JPERF-273: Support Jiras with an HTTP path

Author: dagguh

src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/install/HttpHost.kt

@@ -0,0 +1,19 @@
+package com.atlassian.performance.tools.infrastructure.api.jira.install
+
+import java.net.URI
+
+class HttpHost internal constructor(
+    val tcp: TcpHost,
+    private val basePath: String,
+    private val supportsTls: Boolean
+) {
+
+    fun addressPublicly(): URI = address(tcp.publicIp)
+    fun addressPrivately(): URI = address(tcp.privateIp)
+    fun addressPrivately(userName: String, password: String): URI = address(tcp.privateIp, "$userName:$password@")
+
+    private fun address(ip: String, userInfo: String = ""): URI {
+        val scheme = if (supportsTls) "https" else "http"
+        return URI("$scheme://$userInfo$ip:${tcp.port}$basePath/")
+    }
+}

src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/install/InstalledJira.kt

@@ -22,7 +22,7 @@ class InstalledJira(
      */
     val jdk: JavaDevelopmentKit,
     /**
-     * Hosts Jira. Specifies sockets used by Jira to handle requests.
+     * Connects to Jira on HTTP level or below.
      */
-    val host: TcpHost
+    val http: HttpHost
 )

src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/install/JiraInstallation.kt

@@ -10,13 +10,13 @@ import net.jcip.annotations.ThreadSafe
 interface JiraInstallation {
 
     /**
-     * Installs Jira on [host].
+     * Installs Jira on [tcp].
      *
-     * @param [host] will host the Jira
+     * @param [tcp] will host the Jira
      * @param [reports] accumulates reports
      */
     fun install(
-        host: TcpHost,
+        tcp: TcpHost,
         reports: Reports
     ): InstalledJira
 }

src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/install/ParallelInstallation.kt

@@ -16,10 +16,10 @@ class ParallelInstallation(
 ) : JiraInstallation {
 
     override fun install(
-        host: TcpHost,
+        tcp: TcpHost,
         reports: Reports
     ): InstalledJira {
-        host.ssh.newConnection().use { ssh ->
+        tcp.ssh.newConnection().use { ssh ->
             val pool = Executors.newCachedThreadPool { runnable ->
                 Thread(runnable, "jira-installation-${runnable.hashCode()}")
             }
@@ -32,7 +32,7 @@ class ParallelInstallation(
             val java = pool.submitWithLogContext("java") {
                 jdk.also { it.install(ssh) }
             }
-            val jira = InstalledJira(home.get(), product.get(), java.get(), host)
+            val jira = InstalledJira(home.get(), product.get(), java.get(), HttpHost(tcp, "", false))
             pool.shutdownNow()
             return jira
         }

src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/install/SequentialInstallation.kt

@@ -14,14 +14,14 @@ class SequentialInstallation(
 ) : JiraInstallation {
 
     override fun install(
-        host: TcpHost,
+        tcp: TcpHost,
         reports: Reports
     ): InstalledJira {
-        host.ssh.newConnection().use { ssh ->
+        tcp.ssh.newConnection().use { ssh ->
             val installation = productDistribution.installRemotely(ssh, ".")
             val home = jiraHomeSource.downloadRemotely(ssh)
             jdk.install(ssh)
-            return InstalledJira(home, installation, jdk, host)
+            return InstalledJira(home, installation, jdk, HttpHost(tcp, "", false))
         }
     }
 }

src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/install/hook/AsyncProfilerHook.kt

@@ -13,7 +13,7 @@ class AsyncProfilerHook : PreInstallHook {
 
     override fun call(
         ssh: SshConnection,
-        host: TcpHost,
+        tcp: TcpHost,
         hooks: PreInstallHooks,
         reports: Reports
     ) {
@@ -43,7 +43,7 @@ private class InstalledAsyncProfiler(
     ) {
         ssh.execute("$profilerPath -b 20000000 start ${jira.pid}")
         val profiler = StartedAsyncProfiler(jira.pid, profilerPath)
-        reports.add(profiler, jira.installed.host)
+        reports.add(profiler, jira)
     }
 }
 

src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/install/hook/JiraLogs.kt

@@ -10,7 +10,7 @@ import java.nio.file.Paths
 class JiraLogs : PostInstallHook {
 
     override fun call(ssh: SshConnection, jira: InstalledJira, hooks: PostInstallHooks, reports: Reports) {
-        reports.add(report(jira), jira.host)
+        reports.add(report(jira), jira)
     }
 
     fun report(jira: InstalledJira): Report {

src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/install/hook/JvmConfig.kt

@@ -23,9 +23,9 @@ class JvmConfig(
             connection = ssh,
             config = config,
             gcLog = gcLog,
-            jiraIp = jira.host.publicIp
+            jiraIp = jira.http.tcp.publicIp
         )
         val report = FileListing(gcLog.path("*"))
-        reports.add(report, jira.host)
+        reports.add(report, jira)
     }
 }

src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/install/hook/LateUbuntuSysstat.kt

@@ -32,6 +32,6 @@ private class PostStartOsMetric(
 ) : PostStartHook {
     override fun call(ssh: SshConnection, jira: StartedJira, hooks: PostStartHooks, reports: Reports) {
         val process = metric.start(ssh)
-        reports.add(RemoteMonitoringProcessReport(process), jira.installed.host)
+        reports.add(RemoteMonitoringProcessReport(process), jira)
     }
 }

src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/install/hook/PreInstallHook.kt

@@ -10,14 +10,14 @@ import com.atlassian.performance.tools.ssh.api.SshConnection
 interface PreInstallHook {
 
     /**
-     * @param [ssh] connects to the [host]
-     * @param [host] will install Jira
+     * @param [ssh] connects to the [tcp]
+     * @param [tcp] will install Jira
      * @param [hooks] inserts future hooks
      * @param [reports] accumulates reports
      */
     fun call(
         ssh: SshConnection,
-        host: TcpHost,
+        tcp: TcpHost,
         hooks: PreInstallHooks,
         reports: Reports
     )