Light, fluffy, and always free - The AWS Local Emulator alternative
test(compat): take the partition and region from TestFixtures in SES and SSO Admin tests (#5017)
Hector Venturafa30cd7834c1
diff --git a/.github/ci/compat-partition-allowlist-cn-north-1.txt b/.github/ci/compat-partition-allowlist-cn-north-1.txtindex 3cb7bd075a..d811f0b993 100644--- a/.github/ci/compat-partition-allowlist-cn-north-1.txt+++ b/.github/ci/compat-partition-allowlist-cn-north-1.txt@@ -8,7 +8,8 @@# The test pins commercial values: an ARN built as arn:aws:<svc>:us-east-1:..., an# expected arn:aws: prefix, a us-east-1 availability zone or host, or a client created with# Region.US_EAST_1 next to the cn-north-1 fixture clients. Floci answers correctly; the-# test should take the partition and region from TestFixtures.+# test should take the partition and region from TestFixtures (region(), partition(), arn(),+# globalArn()).AcmTest#testImportCertificateAcmTest#testRequestCertificateApiGatewayOpenApiImportCompatibilityTest#sdkImportAndPutResolveAwsVariables@@ -67,32 +68,7 @@ S3TablesTest#createsAndGetsTableBucketS3VectorsTest#createIndexS3VectorsTest#createVectorBucketSecretsManagerTest#rotateSecretStub-SesConfigurationSetEventDestinationTest#v2_eventBridgeDefaultBusAcceptedAndInvalidBusRejected(String, String)[1]-SesConfigurationSetEventDestinationTest#v2_eventBridgeDefaultBusAcceptedAndInvalidBusRejected(String, String)[2]-SesConfigurationSetEventDestinationTest#v2_eventBridgeDefaultBusAcceptedAndInvalidBusRejected(String, String)[3]SesEventPublishingTest#-SesTagResourceTest#contactList_createWithTags_visibleViaListTagsAndGet-SesTagResourceTest#contactList_tagAndUntag_lifecycle-SesTagResourceTest#customVerificationEmailTemplate_createWithTags_tagAndUntag_lifecycle-SesTagResourceTest#dedicatedIpPool_createWithTags_tagAndUntag_lifecycle-SesTagResourceTest#emailIdentity_createWithTags_visibleViaListTagsAndGet-SesTagResourceTest#emailIdentity_tagAndUntag_lifecycle-SesTagResourceTest#emailTemplate_createWithTags_visibleViaListTagsAndGet-SesTagResourceTest#emailTemplate_tagAndUntag_lifecycle-SesTagResourceTest#tagResource_addsTagsAndListReflectsThem-SesTagResourceTest#tagResource_existingKeyReplacesValue-SesTagResourceTest#tagResource_unknownConfigurationSet_throwsNotFound-SesTagResourceTest#untagResource_removesSpecifiedKeys-SsoAdminAccountAssignmentTest#createApplicationAssignmentUsesAwsSdk-SsoAdminAccountAssignmentTest#createApplicationUsesAwsSdk-SsoAdminAccountAssignmentTest#createInstanceUsesAwsSdk-SsoAdminAccountAssignmentTest#createTrustedTokenIssuerUsesAwsSdk-SsoAdminAccountAssignmentTest#deleteApplicationAccessScopeUsesAwsSdk-SsoAdminAccountAssignmentTest#deleteApplicationAssignmentUsesAwsSdk-SsoAdminAccountAssignmentTest#deleteApplicationAuthenticationMethodUsesAwsSdk-SsoAdminAccountAssignmentTest#deleteApplicationGrantUsesAwsSdk-SsoAdminAccountAssignmentTest#deleteApplicationUsesAwsSdk-SsoAdminAccountAssignmentTest#deleteInstanceUsesAwsSdkSsoOidcTest#createTokenWithIamUsesAwsSdk# The test exercises something that does not exist in China, and Floci answers as AWSdiff --git a/compatibility-tests/sdk-test-java/src/main/java/com/floci/test/TestFixtures.java b/compatibility-tests/sdk-test-java/src/main/java/com/floci/test/TestFixtures.javaindex 2a348e9193..4201c11164 100644--- a/compatibility-tests/sdk-test-java/src/main/java/com/floci/test/TestFixtures.java+++ b/compatibility-tests/sdk-test-java/src/main/java/com/floci/test/TestFixtures.java@@ -3,6 +3,7 @@ package com.floci.test;import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;import software.amazon.awssdk.regions.Region;+import software.amazon.awssdk.regions.RegionMetadata;import software.amazon.awssdk.services.account.AccountClient;import software.amazon.awssdk.services.accessanalyzer.AccessAnalyzerClient;import software.amazon.awssdk.services.redshiftserverless.RedshiftServerlessClient;@@ -206,6 +207,36 @@ public final class TestFixtures {return "aws".equalsIgnoreCase(System.getenv("FLOCI_TARGET"));}+ /** The region every fixture client signs for, for tests that build or compare region-scoped values. */+ public static Region region() {+ return REGION;+ }++ /**+ * The partition of {@link #region()} ({@code aws}, {@code aws-cn}, {@code aws-us-gov}, ...), from+ * the SDK's own region metadata, so a test pins the partition its clients actually sign in. A region+ * the SDK does not know is taken as commercial.+ */+ public static String partition() {+ RegionMetadata metadata = REGION.metadata();+ return metadata == null ? "aws" : metadata.partition().id();+ }++ /** A regional ARN in the fixture partition and region. */+ public static String arn(String service, String accountId, String resource) {+ return arn(service, REGION.id(), accountId, resource);+ }++ /** A regional ARN in the fixture partition and the given region of that partition. */+ public static String arn(String service, String region, String accountId, String resource) {+ return "arn:" + partition() + ":" + service + ":" + region + ":" + accountId + ":" + resource;+ }++ /** A regionless ARN (IAM, SSO, Organizations, ...) in the fixture partition. */+ public static String globalArn(String service, String accountId, String resource) {+ return "arn:" + partition() + ":" + service + "::" + accountId + ":" + resource;+ }+/*** Generate a unique name for test resources.*/diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesConfigurationSetEventDestinationTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesConfigurationSetEventDestinationTest.javaindex 0ce4802ffc..70277c5b53 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesConfigurationSetEventDestinationTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesConfigurationSetEventDestinationTest.java@@ -8,9 +8,11 @@ import org.junit.jupiter.api.Order;import org.junit.jupiter.api.Test;import org.junit.jupiter.api.TestMethodOrder;import org.junit.jupiter.params.ParameterizedTest;-import org.junit.jupiter.params.provider.CsvSource;+import org.junit.jupiter.params.provider.Arguments;+import org.junit.jupiter.params.provider.MethodSource;import software.amazon.awssdk.awscore.exception.AwsServiceException;+import software.amazon.awssdk.regions.Region;import software.amazon.awssdk.services.ses.SesClient;import software.amazon.awssdk.services.sesv2.SesV2Client;import software.amazon.awssdk.services.sesv2.model.BadRequestException;@@ -26,6 +28,9 @@ import software.amazon.awssdk.services.sesv2.model.GetConfigurationSetEventDestiimport software.amazon.awssdk.services.sesv2.model.SnsDestination;import software.amazon.awssdk.services.sesv2.model.UpdateConfigurationSetEventDestinationRequest;+import java.util.Optional;+import java.util.stream.Stream;+import static org.assertj.core.api.Assertions.assertThat;import static org.assertj.core.api.Assertions.assertThatThrownBy;@@ -45,10 +50,10 @@ class SesConfigurationSetEventDestinationTest {private static String v1CsName;private static String v2CsName;private static final String ED_NAME = "ed-sns";- private static final String TOPIC_ARN = "arn:aws:sns:us-east-1:000000000000:ses-events";- private static final String TOPIC_ARN_2 = "arn:aws:sns:us-east-1:000000000000:ses-events-2";- private static final String DEFAULT_BUS_ARN = "arn:aws:events:us-east-1:000000000000:event-bus/default";- private static final String CUSTOM_BUS_ARN = "arn:aws:events:us-east-1:000000000000:event-bus/custom";+ private static final String TOPIC_ARN = TestFixtures.arn("sns", "000000000000", "ses-events");+ private static final String TOPIC_ARN_2 = TestFixtures.arn("sns", "000000000000", "ses-events-2");+ private static final String DEFAULT_BUS_ARN = TestFixtures.arn("events", "000000000000", "event-bus/default");+ private static final String CUSTOM_BUS_ARN = TestFixtures.arn("events", "000000000000", "event-bus/custom");@BeforeAllstatic void setup() {@@ -230,12 +235,28 @@ class SesConfigurationSetEventDestinationTest {.isEqualTo(404);}+ /**+ * Event buses SES v2 must refuse: a custom bus, or the default bus of another account or region.+ * The other-region case needs a second region in the fixture partition, which a single-region+ * partition (aws-eusc, aws-iso-e) does not have, so it is the only case left out there.+ */+ static Stream<Arguments> rejectedEventBuses() {+ Optional<String> otherRegion = Region.regions().stream()+ .filter(region -> !region.isGlobalRegion() && !region.equals(TestFixtures.region()))+ .filter(region -> region.metadata() != null+ && region.metadata().partition().id().equals(TestFixtures.partition()))+ .map(Region::id)+ .sorted()+ .findFirst();+ Stream<Arguments> always = Stream.of(+ Arguments.of("custom", CUSTOM_BUS_ARN),+ Arguments.of("mismatched-account", TestFixtures.arn("events", "111111111111", "event-bus/default")));+ return Stream.concat(always, otherRegion.stream().map(region -> Arguments.of("mismatched-region",+ TestFixtures.arn("events", region, "000000000000", "event-bus/default"))));+ }+@ParameterizedTest(name = "{0}")- @CsvSource({- "custom," + CUSTOM_BUS_ARN,- "mismatched-account,arn:aws:events:us-east-1:111111111111:event-bus/default",- "mismatched-region,arn:aws:events:us-west-2:000000000000:event-bus/default"- })+ @MethodSource("rejectedEventBuses")@Order(9)void v2_eventBridgeDefaultBusAcceptedAndInvalidBusRejected(String caseName, String rejectedBusArn) {String destinationName = "ed-eventbridge-" + caseName;diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesTagResourceTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesTagResourceTest.javaindex bec9e6f73a..6ae5be0091 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesTagResourceTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SesTagResourceTest.java@@ -66,18 +66,18 @@ class SesTagResourceTest {sesV2 = TestFixtures.sesV2Client();String suffix = TestFixtures.uniqueName();configSetName = "sdk-tag-cs-" + suffix;- configSetArn = "arn:aws:ses:us-east-1:000000000000:configuration-set/" + configSetName;+ configSetArn = TestFixtures.arn("ses", "000000000000", "configuration-set/" + configSetName);templateName = "sdk-tag-tpl-" + suffix;- templateArn = "arn:aws:ses:us-east-1:000000000000:template/" + templateName;+ templateArn = TestFixtures.arn("ses", "000000000000", "template/" + templateName);identityValue = "sdk-tag-id-" + suffix + "@example.com";- identityArn = "arn:aws:ses:us-east-1:000000000000:identity/" + identityValue;+ identityArn = TestFixtures.arn("ses", "000000000000", "identity/" + identityValue);contactListName = "sdk-tag-cl-" + suffix;- contactListArn = "arn:aws:ses:us-east-1:000000000000:contact-list/" + contactListName;+ contactListArn = TestFixtures.arn("ses", "000000000000", "contact-list/" + contactListName);cvetFrom = "sdk-tag-cvet-sender-" + suffix + "@example.com";cvetName = "sdk-tag-cvet-" + suffix;- cvetArn = "arn:aws:ses:us-east-1:000000000000:custom-verification-email-template/" + cvetName;+ cvetArn = TestFixtures.arn("ses", "000000000000", "custom-verification-email-template/" + cvetName);poolName = "sdk-tag-pool-" + suffix;- poolArn = "arn:aws:ses:us-east-1:000000000000:dedicated-ip-pool/" + poolName;+ poolArn = TestFixtures.arn("ses", "000000000000", "dedicated-ip-pool/" + poolName);tenantName = "sdk-tag-tenant-" + suffix;sesV2.createConfigurationSet(CreateConfigurationSetRequest.builder()@@ -202,7 +202,8 @@ class SesTagResourceTest {@Test@Order(5)void tagResource_unknownConfigurationSet_throwsNotFound() {- String missingArn = "arn:aws:ses:us-east-1:000000000000:configuration-set/missing-" + TestFixtures.uniqueName();+ String missingArn = TestFixtures.arn("ses", "000000000000",+ "configuration-set/missing-" + TestFixtures.uniqueName());assertThatThrownBy(() -> sesV2.tagResource(TagResourceRequest.builder().resourceArn(missingArn).tags(Tag.builder().key("k").value("v").build())diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SsoAdminAccountAssignmentTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SsoAdminAccountAssignmentTest.javaindex 149c93c41a..ebd96a0840 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SsoAdminAccountAssignmentTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/SsoAdminAccountAssignmentTest.java@@ -82,6 +82,9 @@ import static org.junit.jupiter.api.Assumptions.assumeFalse;@DisplayName("IAM Identity Center account assignments")class SsoAdminAccountAssignmentTest {+ /** The AWS-owned custom application provider, in the partition the fixture clients sign in. */+ private static final String CUSTOM_PROVIDER = TestFixtures.globalArn("sso", "aws", "applicationProvider/custom");+@Test@DisplayName("adds an IAM Identity Center Region through the AWS SDK")void addRegionUsesAwsSdk() {@@ -189,7 +192,7 @@ class SsoAdminAccountAssignmentTest {String instanceArn = sso.listInstances(request -> {}).instances().get(0).instanceArn();CreateApplicationResponse created = sso.createApplication(request -> request.instanceArn(instanceArn)- .applicationProviderArn("arn:aws:sso::aws:applicationProvider/custom")+ .applicationProviderArn(CUSTOM_PROVIDER).name("Floci OAuth SDK").clientToken("sdk-create-application-token").status("DISABLED")@@ -201,12 +204,13 @@ class SsoAdminAccountAssignmentTest {.tags(tag -> tag.key("Environment").value("test")));assertThat(created.applicationArn()).matches(- "arn:aws:sso::000000000000:application/ssoins-7223b02a5d9f7c8e/apl-[0-9a-f]{16}");+ TestFixtures.globalArn("sso", "000000000000",+ "application/ssoins-7223b02a5d9f7c8e/apl-[0-9a-f]{16}"));assertThat(created.identityStoreArn())- .isEqualTo("arn:aws:identitystore::000000000000:identitystore/d-9067f2a3c1");+ .isEqualTo(TestFixtures.globalArn("identitystore", "000000000000", "identitystore/d-9067f2a3c1"));CreateApplicationResponse replay = sso.createApplication(request -> request.instanceArn(instanceArn)- .applicationProviderArn("arn:aws:sso::aws:applicationProvider/custom")+ .applicationProviderArn(CUSTOM_PROVIDER).name("Floci OAuth SDK").clientToken("sdk-create-application-token").status("DISABLED")@@ -243,7 +247,7 @@ class SsoAdminAccountAssignmentTest {.containsExactly("Environment=prod");CreateApplicationResponse replayAfterTagging = sso.createApplication(request -> request.instanceArn(instanceArn)- .applicationProviderArn("arn:aws:sso::aws:applicationProvider/custom")+ .applicationProviderArn(CUSTOM_PROVIDER).name("Floci OAuth SDK").clientToken("sdk-create-application-token").status("DISABLED")@@ -271,18 +275,18 @@ class SsoAdminAccountAssignmentTest {assertThat(described.statusAsString()).isEqualTo("ENABLED");assertThat(described.instanceArn()).isEqualTo(instanceArn);assertThat(described.applicationAccount()).isEqualTo("000000000000");- assertThat(described.applicationProviderArn()).isEqualTo("arn:aws:sso::aws:applicationProvider/custom");+ assertThat(described.applicationProviderArn()).isEqualTo(CUSTOM_PROVIDER);assertThat(described.portalOptions().signInOptions().originAsString()).isEqualTo("IDENTITY_CENTER");DescribeApplicationProviderResponse provider = sso.describeApplicationProvider(request -> request- .applicationProviderArn("arn:aws:sso::aws:applicationProvider/custom"));- assertThat(provider.applicationProviderArn()).isEqualTo("arn:aws:sso::aws:applicationProvider/custom");+ .applicationProviderArn(CUSTOM_PROVIDER));+ assertThat(provider.applicationProviderArn()).isEqualTo(CUSTOM_PROVIDER);assertThat(provider.federationProtocolAsString()).isEqualTo("OAUTH");ListApplicationProvidersResponse providers = sso.listApplicationProviders(request -> {});assertThat(providers.applicationProviders()).singleElement().satisfies(applicationProvider -> {assertThat(applicationProvider.applicationProviderArn())- .isEqualTo("arn:aws:sso::aws:applicationProvider/custom");+ .isEqualTo(CUSTOM_PROVIDER);assertThat(applicationProvider.federationProtocolAsString()).isEqualTo("OAUTH");});@@ -290,7 +294,7 @@ class SsoAdminAccountAssignmentTest {.instanceArn(instanceArn).filter(filter -> filter.applicationAccount("000000000000")- .applicationProvider("arn:aws:sso::aws:applicationProvider/custom")));+ .applicationProvider(CUSTOM_PROVIDER)));assertThat(applications.applications()).anySatisfy(application ->assertThat(application.applicationArn()).isEqualTo(created.applicationArn()));@@ -351,7 +355,7 @@ class SsoAdminAccountAssignmentTest {String instanceArn = sso.listInstances(request -> {}).instances().get(0).instanceArn();String applicationArn = sso.createApplication(request -> request.instanceArn(instanceArn)- .applicationProviderArn("arn:aws:sso::aws:applicationProvider/custom")+ .applicationProviderArn(CUSTOM_PROVIDER).name("SDK Assignment App").clientToken("sdk-assignment-app-token")).applicationArn();@@ -408,7 +412,7 @@ class SsoAdminAccountAssignmentTest {String instanceArn = sso.listInstances(request -> {}).instances().get(0).instanceArn();String applicationArn = sso.createApplication(request -> request.instanceArn(instanceArn)- .applicationProviderArn("arn:aws:sso::aws:applicationProvider/custom")+ .applicationProviderArn(CUSTOM_PROVIDER).name("SDK Delete Assignment App")).applicationArn();String principalId = "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee";@@ -439,7 +443,7 @@ class SsoAdminAccountAssignmentTest {String instanceArn = sso.listInstances(request -> {}).instances().get(0).instanceArn();String applicationArn = sso.createApplication(request -> request.instanceArn(instanceArn)- .applicationProviderArn("arn:aws:sso::aws:applicationProvider/custom")+ .applicationProviderArn(CUSTOM_PROVIDER).name("SDK Delete Authentication Method")).applicationArn();@@ -498,7 +502,7 @@ class SsoAdminAccountAssignmentTest {String instanceArn = sso.listInstances(request -> {}).instances().get(0).instanceArn();String applicationArn = sso.createApplication(request -> request.instanceArn(instanceArn)- .applicationProviderArn("arn:aws:sso::aws:applicationProvider/custom")+ .applicationProviderArn(CUSTOM_PROVIDER).name("SDK Delete Grant")).applicationArn();@@ -572,7 +576,8 @@ class SsoAdminAccountAssignmentTest {.jwksRetrievalOption("OPEN_ID_DISCOVERY"))));assertThat(created.trustedTokenIssuerArn()).matches(- "arn:aws:sso::000000000000:trustedTokenIssuer/ssoins-[0-9a-f]{16}/tti-[0-9a-f-]{36}");+ TestFixtures.globalArn("sso", "000000000000",+ "trustedTokenIssuer/ssoins-[0-9a-f]{16}/tti-[0-9a-f-]{36}"));CreateTrustedTokenIssuerResponse replay = sso.createTrustedTokenIssuer(request -> request.instanceArn(instanceArn).name("SdkIssuer")@@ -710,7 +715,7 @@ class SsoAdminAccountAssignmentTest {assertThat(listed).hasSize(1);assertThat(listed.get(0).instanceArn()).isEqualTo(instanceArn);assertThat(listed.get(0).ownerAccountId()).isEqualTo("333344445555");- assertThat(listed.get(0).primaryRegion()).isEqualTo("us-east-1");+ assertThat(listed.get(0).primaryRegion()).isEqualTo(TestFixtures.region().id());}}@@ -740,7 +745,7 @@ class SsoAdminAccountAssignmentTest {.instanceArn();sso.createApplication(request -> request.instanceArn(instanceArn)- .applicationProviderArn("arn:aws:sso::aws:applicationProvider/custom")+ .applicationProviderArn(CUSTOM_PROVIDER).name("SdkDisposableApplication"));DeleteInstanceResponse deleted = sso.deleteInstance(request -> request.instanceArn(instanceArn));@@ -758,7 +763,7 @@ class SsoAdminAccountAssignmentTest {String instanceArn = sso.listInstances(request -> {}).instances().get(0).instanceArn();String applicationArn = sso.createApplication(request -> request.instanceArn(instanceArn)- .applicationProviderArn("arn:aws:sso::aws:applicationProvider/custom")+ .applicationProviderArn(CUSTOM_PROVIDER).name("SdkDeleteApplicationScope")).applicationArn();@@ -782,7 +787,7 @@ class SsoAdminAccountAssignmentTest {String instanceArn = sso.listInstances(request -> {}).instances().get(0).instanceArn();String applicationArn = sso.createApplication(request -> request.instanceArn(instanceArn)- .applicationProviderArn("arn:aws:sso::aws:applicationProvider/custom")+ .applicationProviderArn(CUSTOM_PROVIDER).name("SdkDeleteApplication")).applicationArn();@@ -962,13 +967,13 @@ class SsoAdminAccountAssignmentTest {.instanceArn(instanceArn).permissionSetArn(permissionSetArn).permissionsBoundary(boundary -> boundary- .managedPolicyArn("arn:aws:iam::aws:policy/PowerUserAccess")));+ .managedPolicyArn(TestFixtures.globalArn("iam", "aws", "policy/PowerUserAccess"))));assertThat(response.sdkHttpResponse().isSuccessful()).isTrue();GetPermissionsBoundaryForPermissionSetResponse boundary = sso.getPermissionsBoundaryForPermissionSet(request -> request.instanceArn(instanceArn).permissionSetArn(permissionSetArn));assertThat(boundary.permissionsBoundary().managedPolicyArn())- .isEqualTo("arn:aws:iam::aws:policy/PowerUserAccess");+ .isEqualTo(TestFixtures.globalArn("iam", "aws", "policy/PowerUserAccess"));DeletePermissionsBoundaryFromPermissionSetResponse deleted = sso.deletePermissionsBoundaryFromPermissionSet(request -> request.instanceArn(instanceArn).permissionSetArn(permissionSetArn));@@ -1102,7 +1107,7 @@ class SsoAdminAccountAssignmentTest {sso.attachManagedPolicyToPermissionSet(request -> request.instanceArn(instanceArn).permissionSetArn(permissionSetArn)- .managedPolicyArn("arn:aws:iam::aws:policy/" + policy));+ .managedPolicyArn(TestFixtures.globalArn("iam", "aws", "policy/" + policy)));}ListManagedPoliciesInPermissionSetResponse firstPolicies = sso.listManagedPoliciesInPermissionSet(request -> request.instanceArn(instanceArn)