JPERF-273 Move hook functionality out of API. It's not ready yet

atlassian · Sep 13, 2023 · cacb5f0 · cacb5f0
1 parent 0f871b7
commit cacb5f0
Show file tree

Hide file tree

Showing 45 changed files with 115 additions and 106 deletions.
diff --git a/...main/kotlin/com/atlassian/performance/tools/infrastructure/database/MysqlFiveConnector.kt b/...main/kotlin/com/atlassian/performance/tools/infrastructure/database/MysqlFiveConnector.kt
@@ -1,13 +1,12 @@
 package com.atlassian.performance.tools.infrastructure.database
 
 import com.atlassian.performance.tools.infrastructure.api.jira.install.InstalledJira
-import com.atlassian.performance.tools.infrastructure.api.jira.install.hook.PostInstallHook
-import com.atlassian.performance.tools.infrastructure.api.jira.install.hook.PostInstallHooks
+import com.atlassian.performance.tools.infrastructure.hookapi.jira.install.hook.PostInstallHook
+import com.atlassian.performance.tools.infrastructure.hookapi.jira.install.hook.PostInstallHooks
 import com.atlassian.performance.tools.infrastructure.api.jira.report.Reports
 import com.atlassian.performance.tools.jvmtasks.api.IdempotentAction
 import com.atlassian.performance.tools.jvmtasks.api.StaticBackoff
 import com.atlassian.performance.tools.ssh.api.SshConnection
-import java.time.Duration
 import java.time.Duration.ofSeconds
 
 /**
@@ -28,4 +27,4 @@ class MysqlFiveConnector : PostInstallHook {
         ssh.execute("tar -xzf mysql-connector-java-5.1.40.tar.gz")
         ssh.execute("cp mysql-connector-java-5.1.40/mysql-connector-java-5.1.40-bin.jar ${jira.installation.path}/lib")
     }
-}
+}
diff --git a/...in/com/atlassian/performance/tools/infrastructure/database/MysqlFiveDotSevenJiraConfig.kt b/...in/com/atlassian/performance/tools/infrastructure/database/MysqlFiveDotSevenJiraConfig.kt
@@ -2,8 +2,8 @@ package com.atlassian.performance.tools.infrastructure.database
 
 import com.atlassian.performance.tools.infrastructure.api.jira.install.InstalledJira
 import com.atlassian.performance.tools.infrastructure.api.jira.install.TcpNode
-import com.atlassian.performance.tools.infrastructure.api.jira.install.hook.PostInstallHook
-import com.atlassian.performance.tools.infrastructure.api.jira.install.hook.PostInstallHooks
+import com.atlassian.performance.tools.infrastructure.hookapi.jira.install.hook.PostInstallHook
+import com.atlassian.performance.tools.infrastructure.hookapi.jira.install.hook.PostInstallHooks
 import com.atlassian.performance.tools.infrastructure.api.jira.report.Reports
 import com.atlassian.performance.tools.infrastructure.api.jira.report.StaticReport
 import com.atlassian.performance.tools.infrastructure.api.os.RemotePath

diff --git a/...tructure/api/database/DatabaseIpConfig.kt → ...ture/hookapi/database/DatabaseIpConfig.kt b/...tructure/api/database/DatabaseIpConfig.kt → ...ture/hookapi/database/DatabaseIpConfig.kt
@@ -1,9 +1,9 @@
-package com.atlassian.performance.tools.infrastructure.api.database
+package com.atlassian.performance.tools.infrastructure.hookapi.database
 
 import com.atlassian.performance.tools.infrastructure.api.Sed
 import com.atlassian.performance.tools.infrastructure.api.jira.install.InstalledJira
-import com.atlassian.performance.tools.infrastructure.api.jira.install.hook.PostInstallHook
-import com.atlassian.performance.tools.infrastructure.api.jira.install.hook.PostInstallHooks
+import com.atlassian.performance.tools.infrastructure.hookapi.jira.install.hook.PostInstallHook
+import com.atlassian.performance.tools.infrastructure.hookapi.jira.install.hook.PostInstallHooks
 import com.atlassian.performance.tools.infrastructure.api.jira.report.Reports
 import com.atlassian.performance.tools.infrastructure.api.jira.report.StaticReport
 import com.atlassian.performance.tools.ssh.api.SshConnection
@@ -27,4 +27,4 @@ class DatabaseIpConfig(
             file = dbConfigXml
         )
     }
-}
+}
diff --git a/...ructure/api/database/DockerMysqlServer.kt → ...ure/hookapi/database/DockerMysqlServer.kt b/...ructure/api/database/DockerMysqlServer.kt → ...ure/hookapi/database/DockerMysqlServer.kt
@@ -1,16 +1,18 @@
-package com.atlassian.performance.tools.infrastructure.api.database
+package com.atlassian.performance.tools.infrastructure.hookapi.database
 
 import com.atlassian.performance.tools.infrastructure.api.dataset.DatasetPackage
 import com.atlassian.performance.tools.infrastructure.api.jira.install.TcpNode
-import com.atlassian.performance.tools.infrastructure.api.jira.install.hook.PreInstallHooks
-import com.atlassian.performance.tools.infrastructure.api.jira.instance.JiraInstance
-import com.atlassian.performance.tools.infrastructure.api.jira.instance.PostInstanceHook
-import com.atlassian.performance.tools.infrastructure.api.jira.instance.PostInstanceHooks
-import com.atlassian.performance.tools.infrastructure.api.jira.instance.PreInstanceHook
+import com.atlassian.performance.tools.infrastructure.hookapi.jira.install.hook.PreInstallHooks
 import com.atlassian.performance.tools.infrastructure.api.jira.report.Reports
 import com.atlassian.performance.tools.infrastructure.api.network.TcpServerRoom
 import com.atlassian.performance.tools.infrastructure.api.os.Ubuntu
 import com.atlassian.performance.tools.infrastructure.database.*
+import com.atlassian.performance.tools.infrastructure.database.Mysql
+import com.atlassian.performance.tools.infrastructure.database.SshMysqlClient
+import com.atlassian.performance.tools.infrastructure.hookapi.jira.instance.JiraInstance
+import com.atlassian.performance.tools.infrastructure.hookapi.jira.instance.PostInstanceHook
+import com.atlassian.performance.tools.infrastructure.hookapi.jira.instance.PostInstanceHooks
+import com.atlassian.performance.tools.infrastructure.hookapi.jira.instance.PreInstanceHook
 import com.atlassian.performance.tools.ssh.api.Ssh
 import com.atlassian.performance.tools.ssh.api.SshConnection
 

diff --git a/...pi/jira/install/hook/AsyncProfilerHook.kt → ...pi/jira/install/hook/AsyncProfilerHook.kt b/...pi/jira/install/hook/AsyncProfilerHook.kt → ...pi/jira/install/hook/AsyncProfilerHook.kt
@@ -1,11 +1,11 @@
-package com.atlassian.performance.tools.infrastructure.api.jira.install.hook
+package com.atlassian.performance.tools.infrastructure.hookapi.jira.install.hook
 
 import com.atlassian.performance.tools.infrastructure.api.jira.install.HttpNode
 import com.atlassian.performance.tools.infrastructure.api.jira.report.Report
 import com.atlassian.performance.tools.infrastructure.api.jira.report.Reports
 import com.atlassian.performance.tools.infrastructure.api.jira.start.StartedJira
-import com.atlassian.performance.tools.infrastructure.api.jira.start.hook.PostStartHook
-import com.atlassian.performance.tools.infrastructure.api.jira.start.hook.PostStartHooks
+import com.atlassian.performance.tools.infrastructure.hookapi.jira.start.hook.PostStartHook
+import com.atlassian.performance.tools.infrastructure.hookapi.jira.start.hook.PostStartHooks
 import com.atlassian.performance.tools.ssh.api.SshConnection
 import java.net.URI
 

diff --git a/...i/jira/install/hook/DisabledAutoBackup.kt → ...i/jira/install/hook/DisabledAutoBackup.kt b/...i/jira/install/hook/DisabledAutoBackup.kt → ...i/jira/install/hook/DisabledAutoBackup.kt
@@ -1,7 +1,9 @@
-package com.atlassian.performance.tools.infrastructure.api.jira.install.hook
+package com.atlassian.performance.tools.infrastructure.hookapi.jira.install.hook
 
 import com.atlassian.performance.tools.infrastructure.api.jira.install.InstalledJira
 import com.atlassian.performance.tools.infrastructure.api.jira.report.Reports
+import com.atlassian.performance.tools.infrastructure.hookapi.jira.install.hook.PostInstallHook
+import com.atlassian.performance.tools.infrastructure.hookapi.jira.install.hook.PostInstallHooks
 import com.atlassian.performance.tools.ssh.api.SshConnection
 
 class DisabledAutoBackup : PostInstallHook {

diff --git a/...api/jira/install/hook/JiraHomeProperty.kt → ...api/jira/install/hook/JiraHomeProperty.kt b/...api/jira/install/hook/JiraHomeProperty.kt → ...api/jira/install/hook/JiraHomeProperty.kt
@@ -1,7 +1,9 @@
-package com.atlassian.performance.tools.infrastructure.api.jira.install.hook
+package com.atlassian.performance.tools.infrastructure.hookapi.jira.install.hook
 
 import com.atlassian.performance.tools.infrastructure.api.jira.install.InstalledJira
 import com.atlassian.performance.tools.infrastructure.api.jira.report.Reports
+import com.atlassian.performance.tools.infrastructure.hookapi.jira.install.hook.PostInstallHook
+import com.atlassian.performance.tools.infrastructure.hookapi.jira.install.hook.PostInstallHooks
 import com.atlassian.performance.tools.ssh.api.SshConnection
 
 class JiraHomeProperty : PostInstallHook {

diff --git a/...ructure/api/jira/install/hook/JiraLogs.kt → ...ure/hookapi/jira/install/hook/JiraLogs.kt b/...ructure/api/jira/install/hook/JiraLogs.kt → ...ure/hookapi/jira/install/hook/JiraLogs.kt
@@ -1,4 +1,4 @@
-package com.atlassian.performance.tools.infrastructure.api.jira.install.hook
+package com.atlassian.performance.tools.infrastructure.hookapi.jira.install.hook
 
 import com.atlassian.performance.tools.infrastructure.api.jira.install.InstalledJira
 import com.atlassian.performance.tools.infrastructure.api.jira.report.Report

diff --git a/...ucture/api/jira/install/hook/JvmConfig.kt → ...re/hookapi/jira/install/hook/JvmConfig.kt b/...ucture/api/jira/install/hook/JvmConfig.kt → ...re/hookapi/jira/install/hook/JvmConfig.kt
@@ -1,11 +1,13 @@
-package com.atlassian.performance.tools.infrastructure.api.jira.install.hook
+package com.atlassian.performance.tools.infrastructure.hookapi.jira.install.hook
 
 import com.atlassian.performance.tools.infrastructure.api.jira.JiraGcLog
 import com.atlassian.performance.tools.infrastructure.api.jira.JiraNodeConfig
 import com.atlassian.performance.tools.infrastructure.api.jira.SetenvSh
 import com.atlassian.performance.tools.infrastructure.api.jira.install.InstalledJira
 import com.atlassian.performance.tools.infrastructure.api.jira.report.FileListing
 import com.atlassian.performance.tools.infrastructure.api.jira.report.Reports
+import com.atlassian.performance.tools.infrastructure.hookapi.jira.install.hook.PostInstallHook
+import com.atlassian.performance.tools.infrastructure.hookapi.jira.install.hook.PostInstallHooks
 import com.atlassian.performance.tools.ssh.api.SshConnection
 
 class JvmConfig(

diff --git a/...pi/jira/install/hook/LateUbuntuSysstat.kt → ...pi/jira/install/hook/LateUbuntuSysstat.kt b/...pi/jira/install/hook/LateUbuntuSysstat.kt → ...pi/jira/install/hook/LateUbuntuSysstat.kt
@@ -1,14 +1,14 @@
-package com.atlassian.performance.tools.infrastructure.api.jira.install.hook
+package com.atlassian.performance.tools.infrastructure.hookapi.jira.install.hook
 
 import com.atlassian.performance.tools.infrastructure.Iostat
 import com.atlassian.performance.tools.infrastructure.api.jira.install.InstalledJira
 import com.atlassian.performance.tools.infrastructure.api.jira.report.Reports
 import com.atlassian.performance.tools.infrastructure.api.jira.start.StartedJira
-import com.atlassian.performance.tools.infrastructure.api.jira.start.hook.PostStartHook
-import com.atlassian.performance.tools.infrastructure.api.jira.start.hook.PostStartHooks
 import com.atlassian.performance.tools.infrastructure.api.os.OsMetric
 import com.atlassian.performance.tools.infrastructure.api.os.Ubuntu
 import com.atlassian.performance.tools.infrastructure.api.os.Vmstat
+import com.atlassian.performance.tools.infrastructure.hookapi.jira.start.hook.PostStartHook
+import com.atlassian.performance.tools.infrastructure.hookapi.jira.start.hook.PostStartHooks
 import com.atlassian.performance.tools.infrastructure.jira.report.RemoteMonitoringProcessReport
 import com.atlassian.performance.tools.ssh.api.SshConnection
 

diff --git a/.../api/jira/install/hook/PostInstallHook.kt → ...kapi/jira/install/hook/PostInstallHook.kt b/.../api/jira/install/hook/PostInstallHook.kt → ...kapi/jira/install/hook/PostInstallHook.kt
@@ -1,4 +1,4 @@
-package com.atlassian.performance.tools.infrastructure.api.jira.install.hook
+package com.atlassian.performance.tools.infrastructure.hookapi.jira.install.hook
 
 import com.atlassian.performance.tools.infrastructure.api.jira.install.InstalledJira
 import com.atlassian.performance.tools.infrastructure.api.jira.report.Reports

diff --git a/...api/jira/install/hook/PostInstallHooks.kt → ...api/jira/install/hook/PostInstallHooks.kt b/...api/jira/install/hook/PostInstallHooks.kt → ...api/jira/install/hook/PostInstallHooks.kt
@@ -1,9 +1,9 @@
-package com.atlassian.performance.tools.infrastructure.api.jira.install.hook
+package com.atlassian.performance.tools.infrastructure.hookapi.jira.install.hook
 
 import com.atlassian.performance.tools.infrastructure.api.jira.JiraNodeConfig
 import com.atlassian.performance.tools.infrastructure.api.jira.install.InstalledJira
 import com.atlassian.performance.tools.infrastructure.api.jira.report.Reports
-import com.atlassian.performance.tools.infrastructure.api.jira.start.hook.PreStartHooks
+import com.atlassian.performance.tools.infrastructure.hookapi.jira.start.hook.PreStartHooks
 import com.atlassian.performance.tools.infrastructure.jira.install.hook.ProfilerHook
 import com.atlassian.performance.tools.infrastructure.jira.install.hook.SplunkForwarderHook
 import com.atlassian.performance.tools.ssh.api.SshConnection

diff --git a/...e/api/jira/install/hook/PreInstallHook.kt → ...okapi/jira/install/hook/PreInstallHook.kt b/...e/api/jira/install/hook/PreInstallHook.kt → ...okapi/jira/install/hook/PreInstallHook.kt
@@ -1,9 +1,8 @@
-package com.atlassian.performance.tools.infrastructure.api.jira.install.hook
+package com.atlassian.performance.tools.infrastructure.hookapi.jira.install.hook
 
 import com.atlassian.performance.tools.infrastructure.api.jira.install.HttpNode
 import com.atlassian.performance.tools.infrastructure.api.jira.report.Reports
 import com.atlassian.performance.tools.ssh.api.SshConnection
-import org.apache.http.HttpHost
 
 /**
  * Intercepts a call before Jira is installed.

diff --git a/.../api/jira/install/hook/PreInstallHooks.kt → ...kapi/jira/install/hook/PreInstallHooks.kt b/.../api/jira/install/hook/PreInstallHooks.kt → ...kapi/jira/install/hook/PreInstallHooks.kt
@@ -1,4 +1,4 @@
-package com.atlassian.performance.tools.infrastructure.api.jira.install.hook
+package com.atlassian.performance.tools.infrastructure.hookapi.jira.install.hook
 
 import com.atlassian.performance.tools.infrastructure.api.jira.install.HttpNode
 import com.atlassian.performance.tools.infrastructure.api.jira.report.Reports

diff --git a/...ucture/api/jira/install/hook/SystemLog.kt → ...re/hookapi/jira/install/hook/SystemLog.kt b/...ucture/api/jira/install/hook/SystemLog.kt → ...re/hookapi/jira/install/hook/SystemLog.kt
@@ -1,8 +1,10 @@
-package com.atlassian.performance.tools.infrastructure.api.jira.install.hook
+package com.atlassian.performance.tools.infrastructure.hookapi.jira.install.hook
 
 import com.atlassian.performance.tools.infrastructure.api.jira.install.HttpNode
 import com.atlassian.performance.tools.infrastructure.api.jira.report.FileListing
 import com.atlassian.performance.tools.infrastructure.api.jira.report.Reports
+import com.atlassian.performance.tools.infrastructure.hookapi.jira.install.hook.PreInstallHook
+import com.atlassian.performance.tools.infrastructure.hookapi.jira.install.hook.PreInstallHooks
 import com.atlassian.performance.tools.ssh.api.SshConnection
 
 class SystemLog : PreInstallHook {

diff --git a/...jira/instance/DefaultClusterProperties.kt → ...jira/instance/DefaultClusterProperties.kt b/...jira/instance/DefaultClusterProperties.kt → ...jira/instance/DefaultClusterProperties.kt
@@ -1,8 +1,8 @@
-package com.atlassian.performance.tools.infrastructure.api.jira.instance
+package com.atlassian.performance.tools.infrastructure.hookapi.jira.instance
 
 import com.atlassian.performance.tools.infrastructure.api.jira.install.InstalledJira
-import com.atlassian.performance.tools.infrastructure.api.jira.install.hook.PostInstallHook
-import com.atlassian.performance.tools.infrastructure.api.jira.install.hook.PostInstallHooks
+import com.atlassian.performance.tools.infrastructure.hookapi.jira.install.hook.PostInstallHook
+import com.atlassian.performance.tools.infrastructure.hookapi.jira.install.hook.PostInstallHooks
 import com.atlassian.performance.tools.infrastructure.api.jira.report.Reports
 import com.atlassian.performance.tools.infrastructure.jira.instance.ClusterProperties
 import com.atlassian.performance.tools.ssh.api.SshConnection

diff --git a/...e/api/jira/instance/JiraDataCenterPlan.kt → ...okapi/jira/instance/JiraDataCenterPlan.kt b/...e/api/jira/instance/JiraDataCenterPlan.kt → ...okapi/jira/instance/JiraDataCenterPlan.kt
@@ -1,12 +1,12 @@
-package com.atlassian.performance.tools.infrastructure.api.jira.instance
+package com.atlassian.performance.tools.infrastructure.hookapi.jira.instance
 
 import com.atlassian.performance.tools.infrastructure.api.jira.install.HttpNode
 import com.atlassian.performance.tools.infrastructure.api.jira.install.InstalledJira
 import com.atlassian.performance.tools.infrastructure.api.jira.report.Reports
 import com.atlassian.performance.tools.infrastructure.api.jira.start.StartedJira
-import com.atlassian.performance.tools.infrastructure.api.loadbalancer.ApacheProxyPlan
-import com.atlassian.performance.tools.infrastructure.api.loadbalancer.LoadBalancerPlan
-import com.atlassian.performance.tools.infrastructure.api.network.HttpServerRoom
+import com.atlassian.performance.tools.infrastructure.hookapi.loadbalancer.ApacheProxyPlan
+import com.atlassian.performance.tools.infrastructure.hookapi.loadbalancer.LoadBalancerPlan
+import com.atlassian.performance.tools.infrastructure.hookapi.network.HttpServerRoom
 import java.time.Duration
 import kotlin.streams.asStream
 import kotlin.streams.toList

diff --git a/...ructure/api/jira/instance/JiraInstance.kt → ...ure/hookapi/jira/instance/JiraInstance.kt b/...ructure/api/jira/instance/JiraInstance.kt → ...ure/hookapi/jira/instance/JiraInstance.kt
@@ -1,8 +1,7 @@
-package com.atlassian.performance.tools.infrastructure.api.jira.instance
+package com.atlassian.performance.tools.infrastructure.hookapi.jira.instance
 
 import com.atlassian.performance.tools.infrastructure.api.jira.install.HttpNode
 import com.atlassian.performance.tools.infrastructure.api.jira.start.StartedJira
-import java.net.URI
 
 interface JiraInstance {
     val address: HttpNode

diff --git a/...ure/api/jira/instance/JiraInstancePlan.kt → ...hookapi/jira/instance/JiraInstancePlan.kt b/...ure/api/jira/instance/JiraInstancePlan.kt → ...hookapi/jira/instance/JiraInstancePlan.kt
@@ -1,8 +1,8 @@
-package com.atlassian.performance.tools.infrastructure.api.jira.instance
+package com.atlassian.performance.tools.infrastructure.hookapi.jira.instance
 
 import com.atlassian.performance.tools.infrastructure.api.jira.report.Reports
 
 interface JiraInstancePlan {
     fun materialize(): JiraInstance
     fun report(): Reports
-}
+}
diff --git a/...ructure/api/jira/instance/JiraNodePlan.kt → ...ure/hookapi/jira/instance/JiraNodePlan.kt b/...ructure/api/jira/instance/JiraNodePlan.kt → ...ure/hookapi/jira/instance/JiraNodePlan.kt
@@ -1,14 +1,14 @@
-package com.atlassian.performance.tools.infrastructure.api.jira.instance
+package com.atlassian.performance.tools.infrastructure.hookapi.jira.instance
 
 import com.atlassian.performance.tools.infrastructure.api.distribution.PublicJiraSoftwareDistribution
 import com.atlassian.performance.tools.infrastructure.api.jira.EmptyJiraHome
 import com.atlassian.performance.tools.infrastructure.api.jira.install.JiraInstallation
 import com.atlassian.performance.tools.infrastructure.api.jira.install.ParallelInstallation
-import com.atlassian.performance.tools.infrastructure.api.jira.install.hook.PreInstallHooks
+import com.atlassian.performance.tools.infrastructure.hookapi.jira.install.hook.PreInstallHooks
 import com.atlassian.performance.tools.infrastructure.api.jira.start.JiraLaunchScript
 import com.atlassian.performance.tools.infrastructure.api.jira.start.JiraStart
 import com.atlassian.performance.tools.infrastructure.api.jvm.OracleJDK
-import com.atlassian.performance.tools.infrastructure.api.network.HttpServerRoom
+import com.atlassian.performance.tools.infrastructure.hookapi.network.HttpServerRoom
 import com.atlassian.performance.tools.infrastructure.jira.install.hook.HookedJiraInstallation
 import com.atlassian.performance.tools.infrastructure.jira.start.hook.HookedJiraStart
 import net.jcip.annotations.NotThreadSafe

diff --git a/...cture/api/jira/instance/JiraServerPlan.kt → ...e/hookapi/jira/instance/JiraServerPlan.kt b/...cture/api/jira/instance/JiraServerPlan.kt → ...e/hookapi/jira/instance/JiraServerPlan.kt
@@ -1,9 +1,9 @@
-package com.atlassian.performance.tools.infrastructure.api.jira.instance
+package com.atlassian.performance.tools.infrastructure.hookapi.jira.instance
 
 import com.atlassian.performance.tools.infrastructure.api.jira.install.HttpNode
 import com.atlassian.performance.tools.infrastructure.api.jira.report.Reports
 import com.atlassian.performance.tools.infrastructure.api.jira.start.StartedJira
-import com.atlassian.performance.tools.infrastructure.api.network.HttpServerRoom
+import com.atlassian.performance.tools.infrastructure.hookapi.network.HttpServerRoom
 
 class JiraServerPlan private constructor(
     private val plan: JiraNodePlan,

diff --git a/...ure/api/jira/instance/PostInstanceHook.kt → ...hookapi/jira/instance/PostInstanceHook.kt b/...ure/api/jira/instance/PostInstanceHook.kt → ...hookapi/jira/instance/PostInstanceHook.kt
@@ -1,4 +1,4 @@
-package com.atlassian.performance.tools.infrastructure.api.jira.instance
+package com.atlassian.performance.tools.infrastructure.hookapi.jira.instance
 
 import com.atlassian.performance.tools.infrastructure.api.jira.report.Reports
 

diff --git a/...re/api/jira/instance/PostInstanceHooks.kt → ...ookapi/jira/instance/PostInstanceHooks.kt b/...re/api/jira/instance/PostInstanceHooks.kt → ...ookapi/jira/instance/PostInstanceHooks.kt
@@ -1,4 +1,4 @@
-package com.atlassian.performance.tools.infrastructure.api.jira.instance
+package com.atlassian.performance.tools.infrastructure.hookapi.jira.instance
 
 import com.atlassian.performance.tools.infrastructure.api.jira.report.Reports
 import java.util.*

diff --git a/...ture/api/jira/instance/PreInstanceHook.kt → .../hookapi/jira/instance/PreInstanceHook.kt b/...ture/api/jira/instance/PreInstanceHook.kt → .../hookapi/jira/instance/PreInstanceHook.kt
@@ -1,6 +1,6 @@
-package com.atlassian.performance.tools.infrastructure.api.jira.instance
+package com.atlassian.performance.tools.infrastructure.hookapi.jira.instance
 
-import com.atlassian.performance.tools.infrastructure.api.jira.install.hook.PreInstallHooks
+import com.atlassian.performance.tools.infrastructure.hookapi.jira.install.hook.PreInstallHooks
 import com.atlassian.performance.tools.infrastructure.api.jira.report.Reports
 
 interface PreInstanceHook {

diff --git a/...ure/api/jira/instance/PreInstanceHooks.kt → ...hookapi/jira/instance/PreInstanceHooks.kt b/...ure/api/jira/instance/PreInstanceHooks.kt → ...hookapi/jira/instance/PreInstanceHooks.kt
@@ -1,6 +1,6 @@
-package com.atlassian.performance.tools.infrastructure.api.jira.instance
+package com.atlassian.performance.tools.infrastructure.hookapi.jira.instance
 
-import com.atlassian.performance.tools.infrastructure.api.jira.install.hook.PreInstallHooks
+import com.atlassian.performance.tools.infrastructure.hookapi.jira.install.hook.PreInstallHooks
 import com.atlassian.performance.tools.infrastructure.api.jira.report.Reports
 import java.util.*
 import java.util.concurrent.ConcurrentLinkedQueue