JsmContainer.groovy

 * enableJvmDebug is now smarter and works with already created containers

Something is borked, likely IntelliJ

Author: farthinder

.idea/.gitignore

@@ -6,7 +6,7 @@
 
     <groupId>com.eficode</groupId>
     <artifactId>devstack</artifactId>
-    <version>2.3.22</version>
+    <version>2.3.23</version>
     <packaging>jar</packaging>
 
     <name>DevStack</name>
@@ -23,7 +23,7 @@
         <spock-core.version>2.3-groovy-${groovy.major.version}</spock-core.version>
         <jiraShortcuts.version>2.0.3-SNAPSHOT-groovy-3.0</jiraShortcuts.version>
         <bitbucketinstancemanager.version>0.0.3-SNAPSHOT-groovy-3.0</bitbucketinstancemanager.version>
-        <jirainstancemanager.version>2.1.7</jirainstancemanager.version>
+        <jirainstancemanager.version>2.1.8</jirainstancemanager.version>
     </properties>
 
 
@@ -114,13 +114,13 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
-            <version>5.9.0</version>
+            <version>5.10.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>5.9.0</version>
+            <version>5.10.2</version>
             <scope>test</scope>
         </dependency>
 

pom.xml

@@ -32,18 +32,32 @@ class JsmContainer implements Container {
         }
     }
 
+
     /**
      * Enables JVM debug of JIRA for port portNr
      * @param portNr
      */
     void enableJvmDebug(String portNr = "5005") {
 
-
-        assert !created: "Error, cant enable JVM Debug for a container that has already been created"
+        log.info("Enabling JVM debug for port $portNr")
         debugPort = portNr
+        if (jvmDebugEnabled) {
+            log.debug("\tJVM Debug is already enabled")
+            return
+        }
+
+
         jvmSupportRecommendedArgs += ["-Xdebug", "-Xrunjdwp:transport=dt_socket,address=*:${debugPort},server=y,suspend=n"]
     }
 
+    /**
+     * Checks if jvm debug is enabled for a container that has been created
+     * @return
+     */
+    boolean isJvmDebugEnabled() {
+       hasEnv("-Xrunjdwp:transport=dt_socket,address=*:${debugPort},server=y,suspend=n")
+    }
+
     /**
      * Enables upload of Apps so that not only Marketplace apps can be installed
      * See: https://jira.atlassian.com/browse/JRASERVER-77129

src/main/groovy/com/eficode/devstack/container/impl/JsmContainer.groovy

@@ -13,6 +13,8 @@ import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 
 
+//TODO override stop and remove
+//TODO override stop and remove
 class JsmDevDeployment implements Deployment {
 
     Logger log = LoggerFactory.getLogger(this.class)

src/main/groovy/com/eficode/devstack/deployment/impl/JsmDevDeployment.groovy

@@ -170,11 +170,12 @@ class DirectorySyncer implements Container {
      * @param destVolumeName A docker volume to sync to, if it does not exist it will be created
      * @param rsyncOptions Options to use when running rsync, ie: rsync $rsyncOptions /mnt/src/*\/ /mnt/dest/<p>
      *      example: -avh --delete
+     * @param containerName Optional, if not given, one will be made up.
      * @param dockerHost Docker host to run on
      * @param dockerCertPath Docker certs to use
      * @return
      */
-    static DirectorySyncer createSyncToVolume(ArrayList<String> hostAbsSourcePaths, String destVolumeName, String rsyncOptions = "-avh", String dockerHost = "", String dockerCertPath = "") {
+    static DirectorySyncer createSyncToVolume(ArrayList<String> hostAbsSourcePaths, String destVolumeName, String rsyncOptions = "-avh",  String containerName = "",String dockerHost = "", String dockerCertPath = "") {
 
         DirectorySyncer container = new DirectorySyncer(dockerHost, dockerCertPath)
         Logger log = container.log

src/main/groovy/com/eficode/devstack/util/DirectorySyncer.groovy

@@ -0,0 +1,90 @@
+package com.eficode.devstack.deployment.impl
+
+import com.eficode.atlassian.jiraInstanceManager.JiraInstanceManagerRest
+import com.eficode.atlassian.jiraInstanceManager.beans.MarketplaceApp
+import com.eficode.devstack.DevStackSpec
+import de.gesellix.docker.remote.api.ContainerSummary
+import org.slf4j.LoggerFactory
+import spock.lang.Shared
+
+class JsmDevDeploymentSpec extends DevStackSpec{
+
+    @Shared
+    File srLicenseFile = new File(System.getProperty("user.home") + "/.licenses/jira/sr.license")
+    @Shared
+    File jsmLicenseFile = new File(System.getProperty("user.home") +  "/.licenses/jira/jsm.license")
+
+
+
+    def setupSpec() {
+
+
+        DevStackSpec.log = LoggerFactory.getLogger(JsmDevDeploymentSpec.class)
+
+
+        cleanupContainerNames = []
+        cleanupContainerPorts = []
+
+        disableCleanup = false
+
+
+    }
+
+    ArrayList<ContainerSummary> getContainers() {
+
+        return dockerClient.ps(true).content
+    }
+
+
+    def "Test basics"(){
+
+
+        setup:
+
+        File localSrcDir = File.createTempDir()
+        localSrcDir.deleteOnExit()
+
+        String baseUrl = "http://spockdev.localhost"
+
+        JiraInstanceManagerRest jim = new JiraInstanceManagerRest(baseUrl)
+
+
+        when:
+        JsmDevDeployment jsmDevDep= new JsmDevDeployment.Builder(baseUrl ,jsmLicenseFile.text, [localSrcDir.canonicalPath])
+                .setJsmJvmDebugPort("5005")
+                .setJsmVersion("latest")
+                .enableJsmDood()
+                .addAppToInstall(MarketplaceApp.getScriptRunnerVersion().downloadUrl, srLicenseFile.text)
+                .build()
+
+        jsmDevDep.stopAndRemoveDeployment()
+
+        ArrayList<ContainerSummary> containersBefore = getContainers()
+
+        jsmDevDep.setupDeployment()
+        ArrayList<ContainerSummary> containersAfter = getContainers()
+
+
+        then:
+        containersAfter.size() - containersBefore.size() == 3
+
+
+        when: "Creating a file in the local synced dir"
+        File localTestFile = new File(localSrcDir, "testFile.groovy")
+        localTestFile.text = System.currentTimeMillis()
+
+        then: "It should be available in the container"
+        jim.getScriptrunnerFile("testFile.groovy") == localTestFile.text
+
+        expect:
+        jsmDevDep.jsmContainer.appAppUploadEnabled
+        jsmDevDep.jsmContainer.enableJvmDebug() == null
+
+
+        cleanup:
+        jsmDevDep.stopAndRemoveDeployment()
+
+
+
+    }
+}