Skip to content

Commit

Permalink
misc: re-enable MRAP e2e test (#1354)
Browse files Browse the repository at this point in the history
  • Loading branch information
@lauzadis
lauzadis authored Jul 10, 2024
1 parent b53022c commit 75179c7
Show file tree
Hide file tree
Showing 3 changed files with 246 additions and 246 deletions.
29 changes: 14 additions & 15 deletions services/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,21 +90,20 @@ subprojects {

if (project.name == "s3") {
dependencies {
// FIXME SDK-KT-214 or re-enable after next release
// val services = project.parent?.subprojects
//
// if (services?.any { it.name == "s3control" } == true) {
// implementation(project(":services:s3control"))
// } else {
// implementation("aws.sdk.kotlin:s3control:+")
// }
//
// if (services?.any { it.name == "sts" } == true) {
// implementation(project(":services:sts"))
// } else {
// implementation("aws.sdk.kotlin:sts:+")
// }
// implementation(libs.smithy.kotlin.aws.signing.crt)
val services = project.parent?.subprojects

if (services?.any { it.name == "s3control" } == true) {
implementation(project(":services:s3control"))
} else {
implementation("aws.sdk.kotlin:s3control:+")
}

if (services?.any { it.name == "sts" } == true) {
implementation(project(":services:sts"))
} else {
implementation("aws.sdk.kotlin:sts:+")
}
implementation(libs.smithy.kotlin.aws.signing.crt)
}
}

Expand Down
210 changes: 102 additions & 108 deletions services/s3/e2eTest/src/MutliRegionAccessPointTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,112 +4,106 @@
*/
package aws.sdk.kotlin.e2etest

class MutliRegionAccessPointTest
import aws.sdk.kotlin.e2etest.S3TestUtils.createMultiRegionAccessPoint
import aws.sdk.kotlin.e2etest.S3TestUtils.deleteBucketAndAllContents
import aws.sdk.kotlin.e2etest.S3TestUtils.deleteMultiRegionAccessPoint
import aws.sdk.kotlin.e2etest.S3TestUtils.getAccountId
import aws.sdk.kotlin.e2etest.S3TestUtils.getMultiRegionAccessPointArn
import aws.sdk.kotlin.e2etest.S3TestUtils.getTestBucket
import aws.sdk.kotlin.e2etest.S3TestUtils.multiRegionAccessPointWasCreated
import aws.sdk.kotlin.services.s3.S3Client
import aws.sdk.kotlin.services.s3.deleteObject
import aws.sdk.kotlin.services.s3.putObject
import aws.sdk.kotlin.services.s3.withConfig
import aws.sdk.kotlin.services.s3control.S3ControlClient
import aws.smithy.kotlin.runtime.auth.awssigning.UnsupportedSigningAlgorithmException
import aws.smithy.kotlin.runtime.auth.awssigning.crt.CrtAwsSigner
import aws.smithy.kotlin.runtime.http.auth.SigV4AsymmetricAuthScheme
import kotlinx.coroutines.runBlocking
import org.junit.jupiter.api.AfterAll
import org.junit.jupiter.api.BeforeAll
import org.junit.jupiter.api.TestInstance
import kotlin.test.Test
import kotlin.test.assertEquals
import kotlin.test.assertFailsWith

// FIXME SDK-KT-214 or re-enable after next release
//
// import aws.sdk.kotlin.e2etest.S3TestUtils.createMultiRegionAccessPoint
// import aws.sdk.kotlin.e2etest.S3TestUtils.deleteBucketAndAllContents
// import aws.sdk.kotlin.e2etest.S3TestUtils.deleteMultiRegionAccessPoint
// import aws.sdk.kotlin.e2etest.S3TestUtils.getAccountId
// import aws.sdk.kotlin.e2etest.S3TestUtils.getMultiRegionAccessPointArn
// import aws.sdk.kotlin.e2etest.S3TestUtils.getTestBucket
// import aws.sdk.kotlin.e2etest.S3TestUtils.multiRegionAccessPointWasCreated
// import aws.sdk.kotlin.services.s3.S3Client
// import aws.sdk.kotlin.services.s3.deleteObject
// import aws.sdk.kotlin.services.s3.putObject
// import aws.sdk.kotlin.services.s3.withConfig
// import aws.sdk.kotlin.services.s3control.S3ControlClient
// import aws.smithy.kotlin.runtime.auth.awssigning.UnsupportedSigningAlgorithmException
// import aws.smithy.kotlin.runtime.auth.awssigning.crt.CrtAwsSigner
// import aws.smithy.kotlin.runtime.http.auth.SigV4AsymmetricAuthScheme
// import kotlinx.coroutines.runBlocking
// import org.junit.jupiter.api.AfterAll
// import org.junit.jupiter.api.BeforeAll
// import org.junit.jupiter.api.Disabled
// import org.junit.jupiter.api.TestInstance
// import org.junit.jupiter.api.condition.EnabledIfSystemProperty
// import kotlin.test.Test
// import kotlin.test.assertEquals
// import kotlin.test.assertFailsWith
//
// @TestInstance(TestInstance.Lifecycle.PER_CLASS)
// class MutliRegionAccessPointTest {
// private val s3West = S3Client { region = "us-west-2" }
// private val s3East = s3West.withConfig { region = "us-east-2" }
// private val s3SigV4a = s3West.withConfig { authSchemes = listOf(SigV4AsymmetricAuthScheme(CrtAwsSigner)) }
// private val s3Control = S3ControlClient { region = "us-west-2" }
//
// private val multiRegionAccessPoint = "aws-sdk-for-kotlin-test-multi-region-access-point"
// private val objectKey = "test.txt"
//
// private lateinit var accountId: String
// private lateinit var multiRegionAccessPointArn: String
// private lateinit var usWestBucket: String
// private lateinit var usEastBucket: String
//
// @BeforeAll
// private fun setUp(): Unit = runBlocking {
// accountId = getAccountId()
// usWestBucket = getTestBucket(s3West, "us-west-2", accountId)
// usEastBucket = getTestBucket(s3East, "us-east-2", accountId)
//
// createMultiRegionAccessPoint(
// s3Control,
// multiRegionAccessPoint,
// usWestBucket,
// usEastBucket,
// accountId,
// )
//
// multiRegionAccessPointArn =
// getMultiRegionAccessPointArn(
// s3Control,
// multiRegionAccessPoint,
// accountId,
// )
// }
//
// @AfterAll
// private fun cleanUp(): Unit = runBlocking {
// if (multiRegionAccessPointWasCreated(s3Control, multiRegionAccessPoint, accountId)) {
// deleteMultiRegionAccessPoint(s3Control, multiRegionAccessPoint, accountId)
// }
//
// deleteBucketAndAllContents(s3West, usWestBucket)
// deleteBucketAndAllContents(s3East, usEastBucket)
//
// s3West.close()
// s3East.close()
// s3SigV4a.close()
// s3Control.close()
// }
//
// @Test
// fun testMultiRegionAccessPointOperation(): Unit = runBlocking {
// s3SigV4a.putObject {
// bucket = multiRegionAccessPointArn
// key = objectKey
// }
//
// s3SigV4a.deleteObject {
// bucket = multiRegionAccessPointArn
// key = objectKey
// }
// }
//
// @Test
// fun testUnsupportedSigningAlgorithm(): Unit = runBlocking {
// val ex = assertFailsWith<UnsupportedSigningAlgorithmException> {
// s3West.putObject {
// bucket = multiRegionAccessPointArn
// key = objectKey
// }
// }
//
// assertEquals(
// ex.message,
// "SIGV4A support is not yet implemented for the default signer. For more information on how to enable it with the CRT signer, please refer to: https://a.co/3sf8533",
// )
// }
// }
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
class MutliRegionAccessPointTest {
private val s3West = S3Client { region = "us-west-2" }
private val s3East = s3West.withConfig { region = "us-east-2" }
private val s3SigV4a = s3West.withConfig { authSchemes = listOf(SigV4AsymmetricAuthScheme(CrtAwsSigner)) }
private val s3Control = S3ControlClient { region = "us-west-2" }

private val multiRegionAccessPoint = "aws-sdk-for-kotlin-test-multi-region-access-point"
private val objectKey = "test.txt"

private lateinit var accountId: String
private lateinit var multiRegionAccessPointArn: String
private lateinit var usWestBucket: String
private lateinit var usEastBucket: String

@BeforeAll
private fun setUp(): Unit = runBlocking {
accountId = getAccountId()
usWestBucket = getTestBucket(s3West, "us-west-2", accountId)
usEastBucket = getTestBucket(s3East, "us-east-2", accountId)

createMultiRegionAccessPoint(
s3Control,
multiRegionAccessPoint,
usWestBucket,
usEastBucket,
accountId,
)

multiRegionAccessPointArn =
getMultiRegionAccessPointArn(
s3Control,
multiRegionAccessPoint,
accountId,
)
}

@AfterAll
private fun cleanUp(): Unit = runBlocking {
if (multiRegionAccessPointWasCreated(s3Control, multiRegionAccessPoint, accountId)) {
deleteMultiRegionAccessPoint(s3Control, multiRegionAccessPoint, accountId)
}

deleteBucketAndAllContents(s3West, usWestBucket)
deleteBucketAndAllContents(s3East, usEastBucket)

s3West.close()
s3East.close()
s3SigV4a.close()
s3Control.close()
}

@Test
fun testMultiRegionAccessPointOperation(): Unit = runBlocking {
s3SigV4a.putObject {
bucket = multiRegionAccessPointArn
key = objectKey
}

s3SigV4a.deleteObject {
bucket = multiRegionAccessPointArn
key = objectKey
}
}

@Test
fun testUnsupportedSigningAlgorithm(): Unit = runBlocking {
val ex = assertFailsWith<UnsupportedSigningAlgorithmException> {
s3West.putObject {
bucket = multiRegionAccessPointArn
key = objectKey
}
}

assertEquals(
ex.message,
"SIGV4A support is not yet implemented for the default signer. For more information on how to enable it with the CRT signer, please refer to: https://a.co/3sf8533",
)
}
}
Loading

0 comments on commit 75179c7

Please sign in to comment.