HL-1205 Postgres support #80
Conversation
CHANGELOG.md
Outdated
| [Unreleased]: https://github.com/atlassian/aws-infrastructure/compare/release-2.20.0...master | ||
| [Unreleased]: https://github.com/atlassian/aws-infrastructure/compare/release-2.20.2...master | ||
|
|
||
| ## [2.20.2] - 2020-02-04 |
There was a problem hiding this comment.
Given a version number MAJOR.MINOR.PATCH, increment the:
MAJOR version when you make incompatible API changes,
MINOR version when you add functionality in a backwards compatible manner, and
Shouldn't it be 2.21.0?
There was a problem hiding this comment.
it can be sir :) I will change this
There was a problem hiding this comment.
Let's remove the header, we'll add it after release
CHANGELOG.md
Outdated
| [Unreleased]: https://github.com/atlassian/aws-infrastructure/compare/release-2.20.0...master | ||
| [Unreleased]: https://github.com/atlassian/aws-infrastructure/compare/release-2.20.2...master | ||
|
|
||
| ## [2.20.2] - 2020-02-04 |
There was a problem hiding this comment.
Let's remove the header, we'll add it after release
| connection.execute("sudo rm -f $dbconfigXml") | ||
|
|
||
| var dbconfigContent = """ | ||
| <?xml version="1.0" encoding="UTF-8"?> |
There was a problem hiding this comment.
We can add the XML to src/main/resources and read it from classpath.
This way we'll be able to see XML with proper syntax highlight and verification.
| @@ -104,6 +104,7 @@ Resources: | |||
| SecurityGroupIds: | |||
| - Ref: SshSecurityGroup | |||
| - Ref: MySqlSecurityGroup | |||
| - Ref: PostgresSecurityGroup | |||
There was a problem hiding this comment.
It's a bit shoehorned, but shouldn't have negative consequences AFAIK
| @@ -183,6 +184,17 @@ Resources: | |||
| FromPort: 3306 | |||
| ToPort: 3306 | |||
| CidrIp: 0.0.0.0/0 | |||
| PostgresSecurityGroup: | |||
| Type: AWS::EC2::SecurityGroup | |||
There was a problem hiding this comment.
The mini-disadvantage is that it will allocate two Security Groups even tho only one is used. It's an AWS resource, so it'll cost a little and might increase CloudFormation provisioning time. OTOH SecurityGroups are relatively cheap, so I guess we're fine here. Just FYI.
| @@ -114,6 +115,39 @@ internal class StandaloneNodeFormula( | |||
| connection: SshConnection, | |||
| dbconfigXml: String | |||
| ) { | |||
| if (!isMySql) { | |||
| connection.execute("sudo rm -f $dbconfigXml") | |||
There was a problem hiding this comment.
It nicely explains the current tribal knowledge: the MySQL datasets have predefined dbconfig.xml 👍
| @@ -180,6 +181,7 @@ class StandaloneFormula private constructor( | |||
| CloseableThreadContext.push("Jira node").use { | |||
| key.get().file.facilitateSsh(jiraIp) | |||
| } | |||
| val isMySql = database is MySqlDatabase | |||
There was a problem hiding this comment.
This will cause Database decorators to malfunction. They do exist in the wild.
In that case, isMySql will be false and subsequently we'll delete dbconfig.xml and break that use case.
So let's detect is PostgresDatabase instead, because such callers don't exist yet. This is a short-term hack, so we can still 🤞 for the infra/aws-infra fix.
- detect
is PostgresDatabaseinstead
Please review and release this PR. I'm leaving atlassian in February. I would like to finish PG support before my leave. Regards, Marcin