HL-1205 Postgres support

CHANGELOG.md

@@ -21,7 +21,10 @@ Adding a requirement of a major version of a dependency is breaking a contract.
 Dropping a requirement of a major version of a dependency is a new contract.
 
 ## [Unreleased]
-[Unreleased]: https://github.com/atlassian/aws-infrastructure/compare/release-2.20.0...master
+[Unreleased]: https://github.com/atlassian/aws-infrastructure/compare/release-2.20.1...master
+
+## [2.20.1] - 2020-01-31
+[2.20.1]: https://github.com/atlassian/aws-infrastructure/compare/release-2.20.0...2.20.1
 
 ### Fixed
 - Eliminate sudo warnings emitted when the hostname was not resolvable. Fix [JPERF-595].

gradle/dependency-locks/apiDependenciesMetadata.lockfile

@@ -13,14 +13,14 @@ com.amazonaws:aws-java-sdk-sts:1.11.424
 com.amazonaws:aws-java-sdk-support:1.11.424
 com.amazonaws:jmespath-java:1.11.424
 com.atlassian.performance.tools:aws-resources:1.4.0
-com.atlassian.performance.tools:concurrency:1.0.0
-com.atlassian.performance.tools:infrastructure:4.13.0
+com.atlassian.performance.tools:concurrency:1.1.0
+com.atlassian.performance.tools:infrastructure:4.14.5-SNAPSHOT
 com.atlassian.performance.tools:io:1.2.0
 com.atlassian.performance.tools:jira-actions:3.3.0
-com.atlassian.performance.tools:jira-software-actions:1.3.1
+com.atlassian.performance.tools:jira-software-actions:1.3.2
 com.atlassian.performance.tools:jvm-tasks:1.0.1
 com.atlassian.performance.tools:ssh:2.3.0
-com.atlassian.performance.tools:virtual-users:3.6.4
+com.atlassian.performance.tools:virtual-users:3.10.0
 com.fasterxml.jackson.core:jackson-annotations:2.6.0
 com.fasterxml.jackson.core:jackson-core:2.9.4
 com.fasterxml.jackson.core:jackson-databind:2.6.7.1

gradle/dependency-locks/compileClasspath.lockfile

@@ -13,13 +13,13 @@ com.amazonaws:aws-java-sdk-sts:1.11.424
 com.amazonaws:aws-java-sdk-support:1.11.424
 com.amazonaws:jmespath-java:1.11.424
 com.atlassian.performance.tools:aws-resources:1.4.0
-com.atlassian.performance.tools:concurrency:1.0.0
-com.atlassian.performance.tools:infrastructure:4.13.0
+com.atlassian.performance.tools:concurrency:1.1.0
+com.atlassian.performance.tools:infrastructure:4.14.5-SNAPSHOT
 com.atlassian.performance.tools:io:1.2.0
 com.atlassian.performance.tools:jira-actions:3.3.0
 com.atlassian.performance.tools:jvm-tasks:1.0.1
 com.atlassian.performance.tools:ssh:2.3.0
-com.atlassian.performance.tools:virtual-users:3.6.4
+com.atlassian.performance.tools:virtual-users:3.10.0
 com.atlassian.performance.tools:workspace:2.0.0
 com.fasterxml.jackson.core:jackson-annotations:2.6.0
 com.fasterxml.jackson.core:jackson-core:2.9.4
@@ -58,8 +58,6 @@ org.glassfish:javax.json:1.1
 org.jetbrains.kotlin:kotlin-stdlib-common:1.2.70
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.70
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.2.70
-org.jetbrains.kotlin:kotlin-stdlib-jre7:1.2.70
-org.jetbrains.kotlin:kotlin-stdlib-jre8:1.2.70
 org.jetbrains.kotlin:kotlin-stdlib:1.2.70
 org.jetbrains:annotations:13.0
 org.jvnet.staxex:stax-ex:1.7.8

gradle/dependency-locks/default.lockfile

@@ -13,14 +13,14 @@ com.amazonaws:aws-java-sdk-sts:1.11.424
 com.amazonaws:aws-java-sdk-support:1.11.424
 com.amazonaws:jmespath-java:1.11.424
 com.atlassian.performance.tools:aws-resources:1.4.0
-com.atlassian.performance.tools:concurrency:1.0.0
-com.atlassian.performance.tools:infrastructure:4.13.0
+com.atlassian.performance.tools:concurrency:1.1.0
+com.atlassian.performance.tools:infrastructure:4.14.5-SNAPSHOT
 com.atlassian.performance.tools:io:1.2.0
 com.atlassian.performance.tools:jira-actions:3.3.0
-com.atlassian.performance.tools:jira-software-actions:1.3.1
+com.atlassian.performance.tools:jira-software-actions:1.3.2
 com.atlassian.performance.tools:jvm-tasks:1.0.1
 com.atlassian.performance.tools:ssh:2.3.0
-com.atlassian.performance.tools:virtual-users:3.6.4
+com.atlassian.performance.tools:virtual-users:3.10.0
 com.atlassian.performance.tools:workspace:2.0.0
 com.fasterxml.jackson.core:jackson-annotations:2.6.0
 com.fasterxml.jackson.core:jackson-core:2.9.4

gradle/dependency-locks/implementationDependenciesMetadata.lockfile

@@ -13,14 +13,14 @@ com.amazonaws:aws-java-sdk-sts:1.11.424
 com.amazonaws:aws-java-sdk-support:1.11.424
 com.amazonaws:jmespath-java:1.11.424
 com.atlassian.performance.tools:aws-resources:1.4.0
-com.atlassian.performance.tools:concurrency:1.0.0
-com.atlassian.performance.tools:infrastructure:4.13.0
+com.atlassian.performance.tools:concurrency:1.1.0
+com.atlassian.performance.tools:infrastructure:4.14.5-SNAPSHOT
 com.atlassian.performance.tools:io:1.2.0
 com.atlassian.performance.tools:jira-actions:3.3.0
-com.atlassian.performance.tools:jira-software-actions:1.3.1
+com.atlassian.performance.tools:jira-software-actions:1.3.2
 com.atlassian.performance.tools:jvm-tasks:1.0.1
 com.atlassian.performance.tools:ssh:2.3.0
-com.atlassian.performance.tools:virtual-users:3.6.4
+com.atlassian.performance.tools:virtual-users:3.10.0
 com.atlassian.performance.tools:workspace:2.0.0
 com.fasterxml.jackson.core:jackson-annotations:2.6.0
 com.fasterxml.jackson.core:jackson-core:2.9.4

gradle/dependency-locks/runtimeClasspath.lockfile

@@ -13,14 +13,14 @@ com.amazonaws:aws-java-sdk-sts:1.11.424
 com.amazonaws:aws-java-sdk-support:1.11.424
 com.amazonaws:jmespath-java:1.11.424
 com.atlassian.performance.tools:aws-resources:1.4.0
-com.atlassian.performance.tools:concurrency:1.0.0
-com.atlassian.performance.tools:infrastructure:4.13.0
+com.atlassian.performance.tools:concurrency:1.1.0
+com.atlassian.performance.tools:infrastructure:4.14.5-SNAPSHOT
 com.atlassian.performance.tools:io:1.2.0
 com.atlassian.performance.tools:jira-actions:3.3.0
-com.atlassian.performance.tools:jira-software-actions:1.3.1
+com.atlassian.performance.tools:jira-software-actions:1.3.2
 com.atlassian.performance.tools:jvm-tasks:1.0.1
 com.atlassian.performance.tools:ssh:2.3.0
-com.atlassian.performance.tools:virtual-users:3.6.4
+com.atlassian.performance.tools:virtual-users:3.10.0
 com.atlassian.performance.tools:workspace:2.0.0
 com.fasterxml.jackson.core:jackson-annotations:2.6.0
 com.fasterxml.jackson.core:jackson-core:2.9.4

gradle/dependency-locks/testCompileClasspath.lockfile

@@ -13,13 +13,13 @@ com.amazonaws:aws-java-sdk-sts:1.11.424
 com.amazonaws:aws-java-sdk-support:1.11.424
 com.amazonaws:jmespath-java:1.11.424
 com.atlassian.performance.tools:aws-resources:1.4.0
-com.atlassian.performance.tools:concurrency:1.0.0
-com.atlassian.performance.tools:infrastructure:4.13.0
+com.atlassian.performance.tools:concurrency:1.1.0
+com.atlassian.performance.tools:infrastructure:4.14.5-SNAPSHOT
 com.atlassian.performance.tools:io:1.2.0
 com.atlassian.performance.tools:jira-actions:3.3.0
 com.atlassian.performance.tools:jvm-tasks:1.0.1
 com.atlassian.performance.tools:ssh:2.3.0
-com.atlassian.performance.tools:virtual-users:3.6.4
+com.atlassian.performance.tools:virtual-users:3.10.0
 com.atlassian.performance.tools:workspace:2.0.0
 com.fasterxml.jackson.core:jackson-annotations:2.6.0
 com.fasterxml.jackson.core:jackson-core:2.9.4
@@ -62,8 +62,6 @@ org.hamcrest:hamcrest-library:1.3
 org.jetbrains.kotlin:kotlin-stdlib-common:1.2.70
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.70
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.2.70
-org.jetbrains.kotlin:kotlin-stdlib-jre7:1.2.70
-org.jetbrains.kotlin:kotlin-stdlib-jre8:1.2.70
 org.jetbrains.kotlin:kotlin-stdlib:1.2.70
 org.jetbrains:annotations:13.0
 org.jvnet.staxex:stax-ex:1.7.8

gradle/dependency-locks/testImplementationDependenciesMetadata.lockfile

@@ -13,14 +13,14 @@ com.amazonaws:aws-java-sdk-sts:1.11.424
 com.amazonaws:aws-java-sdk-support:1.11.424
 com.amazonaws:jmespath-java:1.11.424
 com.atlassian.performance.tools:aws-resources:1.4.0
-com.atlassian.performance.tools:concurrency:1.0.0
-com.atlassian.performance.tools:infrastructure:4.13.0
+com.atlassian.performance.tools:concurrency:1.1.0
+com.atlassian.performance.tools:infrastructure:4.14.5-SNAPSHOT
 com.atlassian.performance.tools:io:1.2.0
 com.atlassian.performance.tools:jira-actions:3.3.0
-com.atlassian.performance.tools:jira-software-actions:1.3.1
+com.atlassian.performance.tools:jira-software-actions:1.3.2
 com.atlassian.performance.tools:jvm-tasks:1.0.1
 com.atlassian.performance.tools:ssh:2.3.0
-com.atlassian.performance.tools:virtual-users:3.6.4
+com.atlassian.performance.tools:virtual-users:3.10.0
 com.atlassian.performance.tools:workspace:2.0.0
 com.fasterxml.jackson.core:jackson-annotations:2.6.0
 com.fasterxml.jackson.core:jackson-core:2.9.4

gradle/dependency-locks/testRuntimeClasspath.lockfile

@@ -13,14 +13,14 @@ com.amazonaws:aws-java-sdk-sts:1.11.424
 com.amazonaws:aws-java-sdk-support:1.11.424
 com.amazonaws:jmespath-java:1.11.424
 com.atlassian.performance.tools:aws-resources:1.4.0
-com.atlassian.performance.tools:concurrency:1.0.0
-com.atlassian.performance.tools:infrastructure:4.13.0
+com.atlassian.performance.tools:concurrency:1.1.0
+com.atlassian.performance.tools:infrastructure:4.14.5-SNAPSHOT
 com.atlassian.performance.tools:io:1.2.0
 com.atlassian.performance.tools:jira-actions:3.3.0
-com.atlassian.performance.tools:jira-software-actions:1.3.1
+com.atlassian.performance.tools:jira-software-actions:1.3.2
 com.atlassian.performance.tools:jvm-tasks:1.0.1
 com.atlassian.performance.tools:ssh:2.3.0
-com.atlassian.performance.tools:virtual-users:3.6.4
+com.atlassian.performance.tools:virtual-users:3.10.0
 com.atlassian.performance.tools:workspace:2.0.0
 com.fasterxml.jackson.core:jackson-annotations:2.6.0
 com.fasterxml.jackson.core:jackson-core:2.9.4

src/main/kotlin/com/atlassian/performance/tools/awsinfrastructure/api/jira/DataCenterFormula.kt

@@ -23,6 +23,7 @@ import com.atlassian.performance.tools.awsinfrastructure.jira.home.SharedHomeFor
 import com.atlassian.performance.tools.concurrency.api.submitWithLogContext
 import com.atlassian.performance.tools.infrastructure.api.app.Apps
 import com.atlassian.performance.tools.infrastructure.api.database.Database
+import com.atlassian.performance.tools.infrastructure.api.database.PostgresDatabase
 import com.atlassian.performance.tools.infrastructure.api.distribution.ProductDistribution
 import com.atlassian.performance.tools.infrastructure.api.jira.JiraHomeSource
 import com.atlassian.performance.tools.infrastructure.api.jira.JiraNodeConfig
@@ -210,6 +211,7 @@ class DataCenterFormula private constructor(
             .mapIndexed { i: Int, instance ->
                 val ipAddress = InstanceAddressSelector.getReachableIpAddress(instance)
                 val ssh = Ssh(SshHost(ipAddress, "ubuntu", keyPath), connectivityPatience = 5)
+                val isPostgres = database.type() == "postgres"
                 DiagnosableNodeFormula(
                     delegate = DataCenterNodeFormula(
                         base = StandaloneNodeFormula(
@@ -220,7 +222,8 @@ class DataCenterFormula private constructor(
                             productDistribution = productDistribution,
                             ssh = ssh,
                             config = configs[i],
-                            computer = computer
+                            computer = computer,
+                            isPostgres = isPostgres
                         ),
                         nodeIndex = i,
                         sharedHome = sharedHome,

src/main/kotlin/com/atlassian/performance/tools/awsinfrastructure/api/jira/StandaloneFormula.kt

@@ -1,7 +1,6 @@
 package com.atlassian.performance.tools.awsinfrastructure.api.jira
 
 import com.amazonaws.services.cloudformation.model.Parameter
-import com.amazonaws.services.ec2.model.Tag
 import com.atlassian.performance.tools.aws.api.*
 import com.atlassian.performance.tools.awsinfrastructure.ApplicationStorageWrapper
 import com.atlassian.performance.tools.awsinfrastructure.TemplateBuilder
@@ -18,6 +17,7 @@ import com.atlassian.performance.tools.awsinfrastructure.jira.StandaloneNodeForm
 import com.atlassian.performance.tools.concurrency.api.submitWithLogContext
 import com.atlassian.performance.tools.infrastructure.api.app.Apps
 import com.atlassian.performance.tools.infrastructure.api.database.Database
+import com.atlassian.performance.tools.infrastructure.api.database.PostgresDatabase
 import com.atlassian.performance.tools.infrastructure.api.distribution.ProductDistribution
 import com.atlassian.performance.tools.infrastructure.api.jira.JiraHomeSource
 import com.atlassian.performance.tools.infrastructure.api.jira.JiraNodeConfig
@@ -180,6 +180,7 @@ class StandaloneFormula private constructor(
         CloseableThreadContext.push("Jira node").use {
             key.get().file.facilitateSsh(jiraIp)
         }
+        val isPostgres = database.type() == "postgres"
         val nodeFormula = StandaloneNodeFormula(
             config = config,
             jiraHomeSource = jiraHomeSource,
@@ -188,7 +189,8 @@ class StandaloneFormula private constructor(
             databaseIp = databaseIp,
             productDistribution = productDistribution,
             ssh = ssh,
-            computer = computer
+            computer = computer,
+            isPostgres = isPostgres
         )
 
         uploadPlugins.get()

src/main/kotlin/com/atlassian/performance/tools/awsinfrastructure/jira/StandaloneNodeFormula.kt

@@ -11,6 +11,7 @@ import com.atlassian.performance.tools.infrastructure.api.jira.JiraHomeSource
 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.os.Ubuntu
+import com.atlassian.performance.tools.io.api.readResourceText
 import com.atlassian.performance.tools.jvmtasks.api.Backoff
 import com.atlassian.performance.tools.jvmtasks.api.IdempotentAction
 import com.atlassian.performance.tools.ssh.api.Ssh
@@ -29,7 +30,8 @@ internal class StandaloneNodeFormula(
     private val productDistribution: ProductDistribution,
     private val ssh: Ssh,
     private val config: JiraNodeConfig,
-    private val computer: Computer
+    private val computer: Computer,
+    private val isPostgres: Boolean
 ) : NodeFormula {
     private val logger: Logger = LogManager.getLogger(this::class.java)
     private val jdk = config.jdk
@@ -114,6 +116,12 @@ internal class StandaloneNodeFormula(
         connection: SshConnection,
         dbconfigXml: String
     ) {
+        if (isPostgres) {
+            connection.execute("sudo rm -f $dbconfigXml")
+            var dbconfigContent = readResourceText("postgres/dbconfig.xml")
+            connection.execute("sudo printf '$dbconfigContent' > $dbconfigXml")
+        }
+
         Sed().replace(
             connection = connection,
             expression = "(<url>.*(@(//)?|//))" + "([^:/]+)" + "(.*</url>)",

src/main/resources/aws/2-nodes-dc.yaml

@@ -104,6 +104,7 @@ Resources:
       SecurityGroupIds:
         - Ref: SshSecurityGroup
         - Ref: MySqlSecurityGroup
+        - Ref: PostgresSecurityGroup
       KeyName:
         Ref: KeyName
       ImageId: !Ref Ami
@@ -183,6 +184,17 @@ Resources:
           FromPort: 3306
           ToPort: 3306
           CidrIp: 0.0.0.0/0
+  PostgresSecurityGroup:
+    Type: AWS::EC2::SecurityGroup
+    Properties:
+      VpcId:
+        Ref: Vpc
+      GroupDescription: Enables Postgres access
+      SecurityGroupIngress:
+        - IpProtocol: tcp
+          FromPort: 5432
+          ToPort: 5432
+          CidrIp: 0.0.0.0/0
   SubnetSecurityGroup:
     Type: AWS::EC2::SecurityGroup
     Properties:

src/main/resources/aws/single-node.yaml

@@ -31,6 +31,7 @@ Resources:
       SecurityGroupIds:
         - Ref: SshSecurityGroup
         - Ref: MySqlSecurityGroup
+        - Ref: PostgresSecurityGroup
       KeyName:
         Ref: KeyName
       ImageId: !Ref Ami
@@ -104,3 +105,14 @@ Resources:
           FromPort: 3306
           ToPort: 3306
           CidrIp: 0.0.0.0/0
+  PostgresSecurityGroup:
+    Type: AWS::EC2::SecurityGroup
+    Properties:
+      VpcId:
+        Ref: Vpc
+      GroupDescription: Enables Postgres access
+      SecurityGroupIngress:
+        - IpProtocol: tcp
+          FromPort: 5432
+          ToPort: 5432
+          CidrIp: 0.0.0.0/0

src/main/resources/postgres/dbconfig.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<jira-database-config>
+    <name>defaultDS</name>
+    <delegator-name>default</delegator-name>
+    <database-type>postgres72</database-type>
+    <schema-name>public</schema-name>
+    <jdbc-datasource>
+        <url>jdbc:postgresql://localhost:3306/jira</url>
+        <driver-class>org.postgresql.Driver</driver-class>
+        <username>jira</username>
+        <password>jira</password>
+        <pool-min-size>20</pool-min-size>
+        <pool-max-size>20</pool-max-size>
+        <pool-max-wait>30000</pool-max-wait>
+        <validation-query>select 1</validation-query>
+        <min-evictable-idle-time-millis>60000</min-evictable-idle-time-millis>
+        <time-between-eviction-runs-millis>300000</time-between-eviction-runs-millis>
+        <pool-max-idle>20</pool-max-idle>
+        <pool-remove-abandoned>true</pool-remove-abandoned>
+        <pool-remove-abandoned-timeout>300</pool-remove-abandoned-timeout>
+        <pool-test-on-borrow>false</pool-test-on-borrow>
+        <pool-test-while-idle>true</pool-test-while-idle>
+    </jdbc-datasource>
+</jira-database-config>