Allow storing Avatars/Attachments in S3 #166
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,7 +12,14 @@ import java.util.concurrent.ConcurrentHashMap | |
| * | ||
| * @since 2.15.0 | ||
| */ | ||
| class AwsCli (val cliVersion: String = "2.9.12") { | ||
|
There was a problem hiding this comment. I've changed the default version to 2.9.12. The bulk copying in There was a problem hiding this comment. Let's drop old AWS cli support, unnecessary complexity. Preserve one constructor without parameters |
||
| private val versionRegex = Regex("""([0-9]+)\.[0-9]+\.[0-9]+""") | ||
| init { | ||
| require( versionRegex.matches(cliVersion)) { | ||
| "$cliVersion is not a valid aws cli version string." | ||
| } | ||
| } | ||
|
|
||
| private companion object { | ||
| private val LOCKS = ConcurrentHashMap<String, Any>() | ||
| } | ||
|
|
@@ -21,21 +28,50 @@ class AwsCli { | |
| val lock = LOCKS.computeIfAbsent(ssh.getHost().ipAddress) { Object() } | ||
| synchronized(lock) { | ||
| val awsCliExecutionResult = ssh.safeExecute("aws --version", Duration.ofSeconds(30), Level.TRACE, Level.TRACE) | ||
| if (awsCliExecutionResult.isSuccessful()) { | ||
| val combinedOutput = "${awsCliExecutionResult.output}${awsCliExecutionResult.errorOutput}" | ||
| require(combinedOutput.contains("aws-cli/$cliVersion")) { | ||
| "Aws Cli version $cliVersion requested but different version is already installed: '${combinedOutput}'." | ||
| } | ||
| } else { | ||
| Ubuntu().install(ssh, listOf("zip", "python"), Duration.ofMinutes(3)) | ||
| val majorVersion = versionRegex.find(cliVersion)?.groupValues?.get(1) | ||
| when (majorVersion) { | ||
| "1" -> installV1Cli(ssh) | ||
| else -> installV2Cli(ssh) | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private fun installV1Cli(ssh: SshConnection) { | ||
| ssh.execute( | ||
| cmd = "curl --silent https://s3.amazonaws.com/aws-cli/awscli-bundle-$cliVersion.zip -o awscli-bundle.zip", | ||
| timeout = Duration.ofSeconds(50) | ||
| ) | ||
| ssh.execute("unzip -n -q awscli-bundle.zip") | ||
| ssh.execute( | ||
| cmd = "sudo ./awscli-bundle/install -i /usr/local/aws -b /usr/local/bin/aws", | ||
| timeout = Duration.ofSeconds(60) | ||
| ) | ||
| } | ||
|
|
||
| /** | ||
| * Instructions for setting up a V2 CLI are from | ||
| * [link](https://docs.aws.amazon.com/cli/latest/userguide/getting-started-version.html) | ||
| */ | ||
| private fun installV2Cli(ssh: SshConnection) { | ||
| ssh.execute( | ||
| cmd="curl --silent https://awscli.amazonaws.com/awscli-exe-linux-x86_64-$cliVersion.zip -o awscliv2.zip", | ||
| timeout = Duration.ofSeconds(50) | ||
| ) | ||
| ssh.execute("unzip -n -q awscliv2.zip") | ||
| ssh.execute( | ||
| cmd = "sudo ./aws/install -i /usr/local/aws-cli -b /usr/local/bin", | ||
| timeout = Duration.ofSeconds(60) | ||
| ) | ||
| } | ||
|
|
||
| fun download( | ||
| location: StorageLocation, | ||
| ssh: SshConnection, | ||
|
|
@@ -98,4 +134,4 @@ class AwsCli { | |
| timeout | ||
| ) | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| package com.atlassian.performance.tools.awsinfrastructure.api.jira | ||
|
|
||
| /** | ||
| * Configuration for how and where to store data in a Jira DC cluster. | ||
| */ | ||
| class JiraSharedStorageConfig private constructor( | ||
| val storeAvatarsInS3: Boolean, | ||
| val storeAttachmentsInS3: Boolean | ||
| ){ | ||
|
|
||
| fun isAnyResourceStoredInS3(): Boolean { | ||
| return storeAvatarsInS3 || storeAttachmentsInS3 | ||
| } | ||
|
|
||
| override fun toString(): String { | ||
| return "JiraSharedStorageConfig(storeAvatarsInS3=$storeAvatarsInS3, storeAttachmentsInS3=$storeAttachmentsInS3)" | ||
| } | ||
|
|
||
| class Builder() { | ||
| private var storeAvatarsInS3: Boolean = false | ||
| private var storeAttachmentsInS3: Boolean = false | ||
|
|
||
| constructor( | ||
| jiraSharedStorageConfig: JiraSharedStorageConfig | ||
| ) : this() { | ||
| storeAvatarsInS3 = jiraSharedStorageConfig.storeAvatarsInS3 | ||
| storeAttachmentsInS3 = jiraSharedStorageConfig.storeAttachmentsInS3 | ||
| } | ||
|
|
||
| fun storeAvatarsInS3(storeAvatarsInS3: Boolean) = apply { this.storeAvatarsInS3 = storeAvatarsInS3 } | ||
| fun storeAttachmentsInS3(storeAttachmentsInS3: Boolean) = apply { this.storeAttachmentsInS3 = storeAttachmentsInS3 } | ||
|
|
||
| fun build() = JiraSharedStorageConfig( | ||
| storeAvatarsInS3 = storeAvatarsInS3, | ||
| storeAttachmentsInS3 = storeAttachmentsInS3 | ||
| ) | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
When 2 CLI versions dropped, this could become an implementation detail that could be skipped in changelog