Skip to content

armgit / floci

Public Imported from GitHub
0

Light, fluffy, and always free - The AWS Local Emulator alternative

test(compat): take the partition and region from TestFixtures in five more suites (#5025)

Hector Venturadfe2117fed11
diff --git a/.github/ci/compat-partition-allowlist-cn-north-1.txt b/.github/ci/compat-partition-allowlist-cn-north-1.txt
index d811f0b993..c387cab1b8 100644
--- a/.github/ci/compat-partition-allowlist-cn-north-1.txt
+++ b/.github/ci/compat-partition-allowlist-cn-north-1.txt
@@ -16,10 +16,6 @@ ApiGatewayOpenApiImportCompatibilityTest#sdkImportAndPutResolveAwsVariables
ApiGatewayV2ManagementTest#createApi
ApiGatewayV2WebSocketAndExtendedOpsTest#getTagsEmpty
ApiGatewayV2WebSocketAndExtendedOpsTest#tagging
-AppSyncTest#createDataSource_hasDataSourceArn
-AppSyncTest#createFunction_hasFunctionArn
-AppSyncTest#createGraphqlApi
-AppSyncTest#createResolver_hasResolverArn
AthenaTest#listTagsForResourceReturnsTagsSetOnCreation
CloudFormationAcmCertificateTest#certificateOptionsFollowTheTemplateThroughCreateAndUpdate
CloudFormationEventBusTest#createsValidatesUpdatesAndDeletesEventBusThroughAwsSdk
@@ -31,33 +27,18 @@ CloudHsmV2Test#testFullLifecycle
CloudTrailTest#describeTrailsByName
CloudWatchLogsCrossAccountPolicyTest#destinationAndAccountPolicyOperationsUseAwsSdk
CloudWatchLogsDescribeLogGroupsTest#returnsAwsLogGroupArnFields
-CloudWatchLogsMetricFilterTest#quietDefaultsDriveASumAlarmWithoutLaterIngestion
-CloudWatchLogsMetricFilterTest#recordedDefaultsAndQuietTrafficReadIdenticallyOverJsonAndQuery
-CloudWatchLogsMetricFilterTest#recordedExtractionAndOrdinaryDimensionSeriesReadIdenticallyOverJsonAndQuery
-CloudWatchLogsMetricFilterTest#recordedSystemDimensionsDoNotAttachToPatternNonmatchDefaults
CodeDeployTest#tagAndListTags
CodeDeployTest#untagResource
DmsTest#replicationSubnetGroupLifecycleUsesAwsSdkWireContract
-Ec2DescribeSpotPriceHistoryTest#describeSpotPriceHistoryFiltersByInstanceTypeAvailabilityZoneAndProductDescription
-Ec2DescribeSpotPriceHistoryTest#describeSpotPriceHistoryFiltersUsingGenericFilters
-Ec2DescribeSpotPriceHistoryTest#describeSpotPriceHistoryPriceIsBelowOnDemandAndMonotonicWithCapacity
-Ec2DescribeSpotPriceHistoryTest#describeSpotPriceHistoryReturnsPricesForWindowsPlatform
-Ec2DescribeSpotPriceHistoryTest#describeSpotPriceHistoryReturnsStableIdenticalPrices
EcrTest#createRepository
EksTest#fargateProfileLifecycle
GlueCatalogTest#createDatabaseWithTags_tagsReturnedByResourceGroupsTaggingApi
GuardDutyTest#detectorLifecycleUsesAwsSdkWireShapes
-IamTest#generateAndGetServiceLastAccessedDetails
-IamTest#getServiceLastAccessedDetailsWithEntitiesDescribesReachingEntities
-IamTest#listPoliciesGrantingServiceAccessEchoesEachRequestedNamespace
IotTest#domainConfigurationLifecycle
MacieOrganizationAdministrationTest#organizationAdministrationUsesAwsSdk
NeptuneTest#createCluster
NeptuneTest#createInstance
OrganizationsTest#testFullLifecycle
-PipesTest#batchSizeInSourceParameters
-PipesTest#filterCriteriaFiltersMessages
-PipesTest#sqsToSqsForwarding
RdsIamTokenCompatTest#sdkGeneratedTokenIsAccepted
RdsJdbcCompatTest#connectWithIamAuthToken
RdsJdbcCompatTest#modifyKeepsProxyReachableAndDeleteReleasesPort
diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/AppSyncTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/AppSyncTest.java
index ca95afe51e..614e4c809b 100644
--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/AppSyncTest.java
+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/AppSyncTest.java
@@ -55,7 +55,7 @@ class AppSyncTest {
assertThat(apiId).isNotBlank();
assertThat(resp.graphqlApi().name()).isEqualTo("sdk-test-api");
assertThat(resp.graphqlApi().authenticationType()).isEqualTo(AuthenticationType.API_KEY);
- assertThat(resp.graphqlApi().arn()).contains("arn:aws:appsync:");
+ assertThat(resp.graphqlApi().arn()).startsWith("arn:" + TestFixtures.partition() + ":appsync:");
}
@Test
@@ -621,7 +621,7 @@ class AppSyncTest {
.build());
assertThat(resp.dataSource().dataSourceArn()).isNotNull();
- assertThat(resp.dataSource().dataSourceArn()).contains("arn:aws:appsync:");
+ assertThat(resp.dataSource().dataSourceArn()).startsWith("arn:" + TestFixtures.partition() + ":appsync:");
assertThat(resp.dataSource().dataSourceArn()).contains("/datasources/arn-check-ds");
client.deleteDataSource(r -> r.apiId(apiId).name("arn-check-ds"));
@@ -638,7 +638,7 @@ class AppSyncTest {
.build());
assertThat(resp.resolver().resolverArn()).isNotNull();
- assertThat(resp.resolver().resolverArn()).contains("arn:aws:appsync:");
+ assertThat(resp.resolver().resolverArn()).startsWith("arn:" + TestFixtures.partition() + ":appsync:");
assertThat(resp.resolver().resolverArn()).contains("/types/Query/resolvers/resolverArnCheck");
client.deleteResolver(r -> r.apiId(apiId).typeName("Query").fieldName("resolverArnCheck"));
@@ -654,7 +654,8 @@ class AppSyncTest {
.build());
assertThat(resp.functionConfiguration().functionArn()).isNotNull();
- assertThat(resp.functionConfiguration().functionArn()).contains("arn:aws:appsync:");
+ assertThat(resp.functionConfiguration().functionArn())
+ .startsWith("arn:" + TestFixtures.partition() + ":appsync:");
client.deleteFunction(r -> r.apiId(apiId).functionId(resp.functionConfiguration().functionId()));
}
diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/CloudWatchLogsMetricFilterTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/CloudWatchLogsMetricFilterTest.java
index 2d5e688f91..9cb17a1bd6 100644
--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/CloudWatchLogsMetricFilterTest.java
+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/CloudWatchLogsMetricFilterTest.java
@@ -353,7 +353,7 @@ class CloudWatchLogsMetricFilterTest {
private static List<Dimension> dimensions(JsonNode values, String account) {
List<Dimension> dimensions = new ArrayList<>();
values.fields().forEachRemaining(e -> dimensions.add(Dimension.builder().name(e.getKey()).value(
- e.getKey().equals("@aws.region") ? "us-east-1"
+ e.getKey().equals("@aws.region") ? TestFixtures.region().id()
: e.getValue().asText().replace("<CALLER_ACCOUNT>", account)).build()));
return dimensions;
}
diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/Ec2DescribeSpotPriceHistoryTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/Ec2DescribeSpotPriceHistoryTest.java
index 14d73a6809..9ed33a6339 100644
--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/Ec2DescribeSpotPriceHistoryTest.java
+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/Ec2DescribeSpotPriceHistoryTest.java
@@ -19,6 +19,9 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
class Ec2DescribeSpotPriceHistoryTest {
+ private static final String ZONE_A = TestFixtures.region().id() + "a";
+ private static final String ZONE_B = TestFixtures.region().id() + "b";
+
@Test
void describeSpotPriceHistoryReturnsEntriesForKnownInstanceTypesWithoutFilters() {
try (Ec2Client ec2 = TestFixtures.ec2Client()) {
@@ -42,14 +45,14 @@ class Ec2DescribeSpotPriceHistoryTest {
DescribeSpotPriceHistoryRequest.builder()
.instanceTypes(InstanceType.M5_LARGE)
.productDescriptions("Linux/UNIX")
- .availabilityZone("us-east-1a")
+ .availabilityZone(ZONE_A)
.build());
assertThat(response.spotPriceHistory()).hasSize(1);
SpotPrice entry = response.spotPriceHistory().get(0);
assertThat(entry.instanceType()).isEqualTo(InstanceType.M5_LARGE);
assertThat(entry.productDescriptionAsString()).isEqualTo("Linux/UNIX");
- assertThat(entry.availabilityZone()).isEqualTo("us-east-1a");
+ assertThat(entry.availabilityZone()).isEqualTo(ZONE_A);
assertThat(Double.parseDouble(entry.spotPrice())).isPositive();
}
}
@@ -61,7 +64,7 @@ class Ec2DescribeSpotPriceHistoryTest {
DescribeSpotPriceHistoryRequest.builder()
.filters(
Filter.builder().name("instance-type").values("t3.micro").build(),
- Filter.builder().name("availability-zone").values("us-east-1b").build(),
+ Filter.builder().name("availability-zone").values(ZONE_B).build(),
Filter.builder().name("product-description").values("Linux/UNIX*").build()
)
.build());
@@ -69,7 +72,7 @@ class Ec2DescribeSpotPriceHistoryTest {
assertThat(response.spotPriceHistory()).isNotEmpty();
for (SpotPrice entry : response.spotPriceHistory()) {
assertThat(entry.instanceTypeAsString()).isEqualTo("t3.micro");
- assertThat(entry.availabilityZone()).isEqualTo("us-east-1b");
+ assertThat(entry.availabilityZone()).isEqualTo(ZONE_B);
assertThat(entry.productDescriptionAsString()).startsWith("Linux/UNIX");
}
}
@@ -94,7 +97,7 @@ class Ec2DescribeSpotPriceHistoryTest {
DescribeSpotPriceHistoryRequest request = DescribeSpotPriceHistoryRequest.builder()
.instanceTypes(InstanceType.M5_LARGE)
.productDescriptions("Linux/UNIX")
- .availabilityZone("us-east-1a")
+ .availabilityZone(ZONE_A)
.build();
DescribeSpotPriceHistoryResponse firstResponse = ec2.describeSpotPriceHistory(request);
@@ -114,7 +117,7 @@ class Ec2DescribeSpotPriceHistoryTest {
DescribeSpotPriceHistoryRequest.builder()
.instanceTypes(InstanceType.T3_MICRO, InstanceType.T3_SMALL, InstanceType.M5_LARGE)
.productDescriptions("Linux/UNIX")
- .availabilityZone("us-east-1a")
+ .availabilityZone(ZONE_A)
.build());
List<SpotPrice> items = response.spotPriceHistory();
@@ -195,14 +198,14 @@ class Ec2DescribeSpotPriceHistoryTest {
DescribeSpotPriceHistoryRequest.builder()
.instanceTypes(InstanceType.M5_LARGE)
.productDescriptions("Windows")
- .availabilityZone("us-east-1a")
+ .availabilityZone(ZONE_A)
.build());
assertThat(response.spotPriceHistory()).hasSize(1);
SpotPrice entry = response.spotPriceHistory().get(0);
assertThat(entry.instanceType()).isEqualTo(InstanceType.M5_LARGE);
assertThat(entry.productDescriptionAsString()).isEqualTo("Windows");
- assertThat(entry.availabilityZone()).isEqualTo("us-east-1a");
+ assertThat(entry.availabilityZone()).isEqualTo(ZONE_A);
assertThat(Double.parseDouble(entry.spotPrice())).isPositive();
}
}
diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/IamTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/IamTest.java
index bc98fb6fc0..3ee946059d 100644
--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/IamTest.java
+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/IamTest.java
@@ -118,7 +118,7 @@ class IamTest {
private static final String ROLE_NAME = "sdk-test-role";
private static final String POLICY_NAME = "sdk-test-policy";
private static final String INSTANCE_PROFILE_NAME = "sdk-test-profile";
- private static final String AWS_MANAGED_POLICY_PREFIX = "arn:aws:iam::aws:policy/";
+ private static final String AWS_MANAGED_POLICY_PREFIX = TestFixtures.globalArn("iam", "aws", "policy/");
private static final String ADMIN_POLICY_ARN = AWS_MANAGED_POLICY_PREFIX + "AdministratorAccess";
private static final String READ_ONLY_POLICY_ARN = AWS_MANAGED_POLICY_PREFIX + "ReadOnlyAccess";
private static final String LAMBDA_BASIC_POLICY_ARN =
@@ -491,7 +491,7 @@ class IamTest {
@Order(24)
void simulatePrincipalPolicy() {
SimulatePrincipalPolicyResponse response = iam.simulatePrincipalPolicy(SimulatePrincipalPolicyRequest.builder()
- .policySourceArn("arn:aws:iam::000000000000:user/" + USER_NAME)
+ .policySourceArn(TestFixtures.globalArn("iam", "000000000000", "user/" + USER_NAME))
.actionNames("s3:GetObject", "ec2:RunInstances")
.resourceArns("*")
.build());
@@ -817,7 +817,7 @@ class IamTest {
void generateAndGetServiceLastAccessedDetails() {
GenerateServiceLastAccessedDetailsResponse generated = iam.generateServiceLastAccessedDetails(
GenerateServiceLastAccessedDetailsRequest.builder()
- .arn("arn:aws:iam::000000000000:user/" + USER_NAME).build());
+ .arn(TestFixtures.globalArn("iam", "000000000000", "user/" + USER_NAME)).build());
assertThat(generated.jobId()).hasSize(36);
@@ -842,7 +842,7 @@ class IamTest {
void getServiceLastAccessedDetailsWithEntitiesDescribesReachingEntities() {
GenerateServiceLastAccessedDetailsResponse generated = iam.generateServiceLastAccessedDetails(
GenerateServiceLastAccessedDetailsRequest.builder()
- .arn("arn:aws:iam::000000000000:user/" + USER_NAME).build());
+ .arn(TestFixtures.globalArn("iam", "000000000000", "user/" + USER_NAME)).build());
GetServiceLastAccessedDetailsWithEntitiesResponse details =
iam.getServiceLastAccessedDetailsWithEntities(
@@ -874,7 +874,7 @@ class IamTest {
void listPoliciesGrantingServiceAccessEchoesEachRequestedNamespace() {
ListPoliciesGrantingServiceAccessResponse response = iam.listPoliciesGrantingServiceAccess(
ListPoliciesGrantingServiceAccessRequest.builder()
- .arn("arn:aws:iam::000000000000:user/" + USER_NAME)
+ .arn(TestFixtures.globalArn("iam", "000000000000", "user/" + USER_NAME))
.serviceNamespaces("s3", "dynamodb").build());
assertThat(response.policiesGrantingServiceAccess())
diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/MetricFilterQueryAssertions.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/MetricFilterQueryAssertions.java
index c22d04272a..4ea640a8cb 100644
--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/MetricFilterQueryAssertions.java
+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/MetricFilterQueryAssertions.java
@@ -9,7 +9,6 @@ import software.amazon.awssdk.auth.signer.Aws4Signer;
import software.amazon.awssdk.auth.signer.params.Aws4SignerParams;
import software.amazon.awssdk.http.SdkHttpFullRequest;
import software.amazon.awssdk.http.SdkHttpMethod;
-import software.amazon.awssdk.regions.Region;
import software.amazon.awssdk.services.cloudwatch.model.Dimension;
import java.io.ByteArrayInputStream;
@@ -116,7 +115,7 @@ final class MetricFilterQueryAssertions {
.method(SdkHttpMethod.POST).putHeader("Content-Type", "application/x-www-form-urlencoded")
.contentStreamProvider(() -> new ByteArrayInputStream(bytes)).build(),
Aws4SignerParams.builder().awsCredentials(AwsBasicCredentials.create("test", "test"))
- .signingRegion(Region.US_EAST_1).signingName("monitoring").build());
+ .signingRegion(TestFixtures.region()).signingName("monitoring").build());
HttpRequest.Builder request = HttpRequest.newBuilder(TestFixtures.endpoint()).timeout(Duration.ofSeconds(10))
.POST(HttpRequest.BodyPublishers.ofByteArray(bytes));
signed.headers().forEach((name, values) -> {
diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/PipesTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/PipesTest.java
index 31e5f6dab2..6d7c9438ee 100644
--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/PipesTest.java
+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/PipesTest.java
@@ -13,8 +13,7 @@ import static org.assertj.core.api.Assertions.*;
class PipesTest {
private static final String ACCOUNT_ID = "000000000000";
- private static final String REGION = "us-east-1";
- private static final String ROLE_ARN = "arn:aws:iam::" + ACCOUNT_ID + ":role/pipe-role";
+ private static final String ROLE_ARN = TestFixtures.globalArn("iam", ACCOUNT_ID, "role/pipe-role");
private static PipesClient pipes;
private static SqsClient sqs;
@@ -25,11 +24,11 @@ class PipesTest {
private static String tgtQueueUrl;
private static String sqsArn(String queueName) {
- return "arn:aws:sqs:" + REGION + ":" + ACCOUNT_ID + ":" + queueName;
+ return TestFixtures.arn("sqs", ACCOUNT_ID, queueName);
}
private static String kinesisArn(String streamName) {
- return "arn:aws:kinesis:" + REGION + ":" + ACCOUNT_ID + ":stream/" + streamName;
+ return TestFixtures.arn("kinesis", ACCOUNT_ID, "stream/" + streamName);
}
@BeforeAll