Skip to content

Commit a6e994d

Browse files
atierianatierian
authored
test: exclude unsupported ap-northeast-3 region for PredictionsTransformerV2 E2E test (#3041)
1 parent 805c7b4 commit a6e994d

File tree

2 files changed

+48
-27
lines changed

2 files changed

+48
-27
lines changed

‎codebuild_specs/e2e_workflow.yml‎

Lines changed: 36 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1718,99 +1718,108 @@ batch:
17181718
depend-on:
17191719
- publish_to_local_registry
17201720
- identifier: >-
1721-
NonModelAuthV2Function_TransformerOptionsV2_PredictionsTransformerV2Tests_DefaultValueTransformer_PerFieldAuthV2TransformerWith
1721+
NonModelAuthV2Function_TransformerOptionsV2_DefaultValueTransformer_PerFieldAuthV2TransformerWithFF_PerFieldAuthV2Transformer
17221722
buildspec: codebuild_specs/graphql_e2e_tests.yml
17231723
env:
17241724
compute-type: BUILD_GENERAL1_LARGE
17251725
variables:
17261726
NODE_OPTIONS: '--max-old-space-size=14848'
17271727
TEST_SUITE: >-
1728-
src/__tests__/NonModelAuthV2Function.e2e.test.ts|src/__tests__/TransformerOptionsV2.e2e.test.ts|src/__tests__/PredictionsTransformerV2Tests.e2e.test.ts|src/__tests__/DefaultValueTransformer.e2e.test.ts|src/__tests__/PerFieldAuthV2TransformerWithFF.e2e.test.ts
1729-
CLI_REGION: ap-northeast-3
1728+
src/__tests__/NonModelAuthV2Function.e2e.test.ts|src/__tests__/TransformerOptionsV2.e2e.test.ts|src/__tests__/DefaultValueTransformer.e2e.test.ts|src/__tests__/PerFieldAuthV2TransformerWithFF.e2e.test.ts|src/__tests__/PerFieldAuthV2Transformer.e2e.test.ts
1729+
CLI_REGION: ap-south-1
17301730
depend-on:
17311731
- publish_to_local_registry
17321732
- identifier: >-
1733-
PerFieldAuthV2Transformer_BelongsToTransformerV2_RelationalWithAuthV2WithFF_IndexWithAuthV2_IndexWithAuthV2WithFF
1733+
BelongsToTransformerV2_RelationalWithAuthV2WithFF_IndexWithAuthV2_IndexWithAuthV2WithFF_SubscriptionsWithAuthV2WithFF
17341734
buildspec: codebuild_specs/graphql_e2e_tests.yml
17351735
env:
17361736
compute-type: BUILD_GENERAL1_LARGE
17371737
variables:
17381738
NODE_OPTIONS: '--max-old-space-size=14848'
17391739
TEST_SUITE: >-
1740-
src/__tests__/PerFieldAuthV2Transformer.e2e.test.ts|src/__tests__/BelongsToTransformerV2.e2e.test.ts|src/__tests__/RelationalWithAuthV2WithFF.e2e.test.ts|src/__tests__/IndexWithAuthV2.e2e.test.ts|src/__tests__/IndexWithAuthV2WithFF.e2e.test.ts
1741-
CLI_REGION: ap-south-1
1740+
src/__tests__/BelongsToTransformerV2.e2e.test.ts|src/__tests__/RelationalWithAuthV2WithFF.e2e.test.ts|src/__tests__/IndexWithAuthV2.e2e.test.ts|src/__tests__/IndexWithAuthV2WithFF.e2e.test.ts|src/__tests__/SubscriptionsWithAuthV2WithFF.e2e.test.ts
1741+
CLI_REGION: ap-southeast-1
17421742
depend-on:
17431743
- publish_to_local_registry
17441744
- identifier: >-
1745-
SubscriptionsWithAuthV2WithFF_MultiAuthV2Transformer_ModelTransformer_SubscriptionsWithAuthV2_RelationalWithAuthV2
1745+
MultiAuthV2Transformer_ModelTransformer_SubscriptionsWithAuthV2_RelationalWithAuthV2_MapsToTransformer
17461746
buildspec: codebuild_specs/graphql_e2e_tests.yml
17471747
env:
17481748
compute-type: BUILD_GENERAL1_LARGE
17491749
variables:
17501750
NODE_OPTIONS: '--max-old-space-size=14848'
17511751
TEST_SUITE: >-
1752-
src/__tests__/SubscriptionsWithAuthV2WithFF.e2e.test.ts|src/__tests__/MultiAuthV2Transformer.e2e.test.ts|src/__tests__/ModelTransformer.e2e.test.ts|src/__tests__/SubscriptionsWithAuthV2.e2e.test.ts|src/__tests__/RelationalWithAuthV2.e2e.test.ts
1753-
CLI_REGION: ap-southeast-1
1752+
src/__tests__/MultiAuthV2Transformer.e2e.test.ts|src/__tests__/ModelTransformer.e2e.test.ts|src/__tests__/SubscriptionsWithAuthV2.e2e.test.ts|src/__tests__/RelationalWithAuthV2.e2e.test.ts|src/__tests__/MapsToTransformer.e2e.test.ts
1753+
CLI_REGION: ap-southeast-2
17541754
depend-on:
17551755
- publish_to_local_registry
17561756
- identifier: >-
1757-
MapsToTransformer_MultiAuthV2TransformerWithFF_AuthV2Transformer_AuthV2ExhaustiveT1B_AuthV2ExhaustiveT1A
1757+
MultiAuthV2TransformerWithFF_AuthV2Transformer_AuthV2ExhaustiveT1B_AuthV2ExhaustiveT1A_AuthV2TransformerWithFF
17581758
buildspec: codebuild_specs/graphql_e2e_tests.yml
17591759
env:
17601760
compute-type: BUILD_GENERAL1_LARGE
17611761
variables:
17621762
NODE_OPTIONS: '--max-old-space-size=14848'
17631763
TEST_SUITE: >-
1764-
src/__tests__/MapsToTransformer.e2e.test.ts|src/__tests__/MultiAuthV2TransformerWithFF.e2e.test.ts|src/__tests__/AuthV2Transformer.e2e.test.ts|src/__tests__/AuthV2ExhaustiveT1B.test.ts|src/__tests__/AuthV2ExhaustiveT1A.test.ts
1765-
CLI_REGION: ap-southeast-2
1764+
src/__tests__/MultiAuthV2TransformerWithFF.e2e.test.ts|src/__tests__/AuthV2Transformer.e2e.test.ts|src/__tests__/AuthV2ExhaustiveT1B.test.ts|src/__tests__/AuthV2ExhaustiveT1A.test.ts|src/__tests__/AuthV2TransformerWithFF.e2e.test.ts
1765+
CLI_REGION: ca-central-1
17661766
depend-on:
17671767
- publish_to_local_registry
17681768
- identifier: >-
1769-
AuthV2TransformerWithFF_SubscriptionsRuntimeFiltering_AuthV2ExhaustiveT2A_AuthV2ExhaustiveT1C_AuthV2ExhaustiveT1D
1769+
SubscriptionsRuntimeFiltering_AuthV2ExhaustiveT2A_AuthV2ExhaustiveT1C_AuthV2ExhaustiveT1D_AuthV2ExhaustiveT2B
17701770
buildspec: codebuild_specs/graphql_e2e_tests.yml
17711771
env:
17721772
compute-type: BUILD_GENERAL1_LARGE
17731773
variables:
17741774
NODE_OPTIONS: '--max-old-space-size=14848'
17751775
TEST_SUITE: >-
1776-
src/__tests__/AuthV2TransformerWithFF.e2e.test.ts|src/__tests__/SubscriptionsRuntimeFiltering.e2e.test.ts|src/__tests__/AuthV2ExhaustiveT2A.test.ts|src/__tests__/AuthV2ExhaustiveT1C.test.ts|src/__tests__/AuthV2ExhaustiveT1D.test.ts
1777-
CLI_REGION: ca-central-1
1776+
src/__tests__/SubscriptionsRuntimeFiltering.e2e.test.ts|src/__tests__/AuthV2ExhaustiveT2A.test.ts|src/__tests__/AuthV2ExhaustiveT1C.test.ts|src/__tests__/AuthV2ExhaustiveT1D.test.ts|src/__tests__/AuthV2ExhaustiveT2B.test.ts
1777+
CLI_REGION: eu-central-1
17781778
depend-on:
17791779
- publish_to_local_registry
17801780
- identifier: >-
1781-
AuthV2ExhaustiveT2B_AuthV2ExhaustiveT2D_AuthV2ExhaustiveT2C_RelationalWithAuthV2Redacted_RelationalWithAuthV2NonRedacted
1781+
AuthV2ExhaustiveT2D_AuthV2ExhaustiveT2C_RelationalWithAuthV2Redacted_RelationalWithAuthV2NonRedacted_AuthV2TransformerIAM
17821782
buildspec: codebuild_specs/graphql_e2e_tests.yml
17831783
env:
17841784
compute-type: BUILD_GENERAL1_LARGE
17851785
variables:
17861786
NODE_OPTIONS: '--max-old-space-size=14848'
17871787
TEST_SUITE: >-
1788-
src/__tests__/AuthV2ExhaustiveT2B.test.ts|src/__tests__/AuthV2ExhaustiveT2D.test.ts|src/__tests__/AuthV2ExhaustiveT2C.test.ts|src/__tests__/RelationalWithAuthV2Redacted.e2e.test.ts|src/__tests__/RelationalWithAuthV2NonRedacted.e2e.test.ts
1789-
CLI_REGION: eu-central-1
1788+
src/__tests__/AuthV2ExhaustiveT2D.test.ts|src/__tests__/AuthV2ExhaustiveT2C.test.ts|src/__tests__/RelationalWithAuthV2Redacted.e2e.test.ts|src/__tests__/RelationalWithAuthV2NonRedacted.e2e.test.ts|src/__tests__/AuthV2TransformerIAM.test.ts
1789+
CLI_REGION: eu-north-1
17901790
depend-on:
17911791
- publish_to_local_registry
17921792
- identifier: >-
1793-
AuthV2TransformerIAM_AuthV2ExhaustiveT3D_AuthV2ExhaustiveT3C_AuthV2ExhaustiveT3B_AuthV2ExhaustiveT3A
1793+
AuthV2ExhaustiveT3D_AuthV2ExhaustiveT3C_AuthV2ExhaustiveT3B_AuthV2ExhaustiveT3A_SearchableModelTransformerV2
17941794
buildspec: codebuild_specs/graphql_e2e_tests.yml
17951795
env:
17961796
compute-type: BUILD_GENERAL1_LARGE
17971797
variables:
17981798
NODE_OPTIONS: '--max-old-space-size=14848'
17991799
TEST_SUITE: >-
1800-
src/__tests__/AuthV2TransformerIAM.test.ts|src/__tests__/AuthV2ExhaustiveT3D.test.ts|src/__tests__/AuthV2ExhaustiveT3C.test.ts|src/__tests__/AuthV2ExhaustiveT3B.test.ts|src/__tests__/AuthV2ExhaustiveT3A.test.ts
1801-
CLI_REGION: eu-north-1
1800+
src/__tests__/AuthV2ExhaustiveT3D.test.ts|src/__tests__/AuthV2ExhaustiveT3C.test.ts|src/__tests__/AuthV2ExhaustiveT3B.test.ts|src/__tests__/AuthV2ExhaustiveT3A.test.ts|src/__tests__/SearchableModelTransformerV2.e2e.test.ts
1801+
CLI_REGION: eu-west-2
18021802
depend-on:
18031803
- publish_to_local_registry
1804-
- identifier: >-
1805-
SearchableModelTransformerV2_SearchableWithAuthV2WithFF_SearchableWithAuthV2
1804+
- identifier: SearchableWithAuthV2WithFF_SearchableWithAuthV2
18061805
buildspec: codebuild_specs/graphql_e2e_tests.yml
18071806
env:
18081807
compute-type: BUILD_GENERAL1_LARGE
18091808
variables:
18101809
NODE_OPTIONS: '--max-old-space-size=14848'
18111810
TEST_SUITE: >-
1812-
src/__tests__/SearchableModelTransformerV2.e2e.test.ts|src/__tests__/SearchableWithAuthV2WithFF.e2e.test.ts|src/__tests__/SearchableWithAuthV2.e2e.test.ts
1813-
CLI_REGION: eu-west-2
1811+
src/__tests__/SearchableWithAuthV2WithFF.e2e.test.ts|src/__tests__/SearchableWithAuthV2.e2e.test.ts
1812+
CLI_REGION: eu-west-3
1813+
depend-on:
1814+
- publish_to_local_registry
1815+
- identifier: PredictionsTransformerV2Tests
1816+
buildspec: codebuild_specs/graphql_e2e_tests.yml
1817+
env:
1818+
compute-type: BUILD_GENERAL1_MEDIUM
1819+
variables:
1820+
NODE_OPTIONS: '--max-old-space-size=6656'
1821+
TEST_SUITE: src/__tests__/PredictionsTransformerV2Tests.e2e.test.ts
1822+
CLI_REGION: ap-northeast-2
18141823
depend-on:
18151824
- publish_to_local_registry
18161825
- identifier: FunctionTransformerTestsV2
@@ -1820,7 +1829,7 @@ batch:
18201829
variables:
18211830
NODE_OPTIONS: '--max-old-space-size=6656'
18221831
TEST_SUITE: src/__tests__/FunctionTransformerTestsV2.e2e.test.ts
1823-
CLI_REGION: ap-northeast-3
1832+
CLI_REGION: ap-south-1
18241833
USE_PARENT_ACCOUNT: 1
18251834
depend-on:
18261835
- publish_to_local_registry
@@ -1831,7 +1840,7 @@ batch:
18311840
variables:
18321841
NODE_OPTIONS: '--max-old-space-size=6656'
18331842
TEST_SUITE: src/__tests__/HttpTransformerV2.e2e.test.ts
1834-
CLI_REGION: ap-northeast-3
1843+
CLI_REGION: ap-south-1
18351844
depend-on:
18361845
- publish_to_local_registry
18371846
- identifier: cleanup_e2e_resources

‎scripts/split-e2e-tests.ts‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,8 @@ const RUN_SOLO: (string | RegExp)[] = [
154154
'src/__tests__/generations/generation.test.ts',
155155
// Conversation tests
156156
'src/__tests__/conversations/conversation.test.ts',
157+
// Predictions tests
158+
'src/__tests__/PredictionsTransformerV2Tests.e2e.test.ts',
157159
];
158160

159161
const RUN_IN_ALL_REGIONS = [
@@ -184,6 +186,11 @@ const RUN_IN_COGNITO_REGIONS: (string | RegExp)[] = [
184186
/src\/__tests__\/AuthV2ExhaustiveT3C.test.ts/,
185187
];
186188

189+
const TEST_REGION_EXCLUSIONS: Record<string, string[]> = {
190+
// Rekognition is not supported in ap-northeast-3
191+
'src/__tests__/PredictionsTransformerV2Tests.e2e.test.ts': ['ap-northeast-3'],
192+
};
193+
187194
const RUN_IN_V1_TRANSFORMER_REGIONS = ['src/__tests__/schema-searchable.test.ts'];
188195

189196
const DEBUG_FLAG = '--debug';
@@ -350,6 +357,11 @@ const setJobRegion = (test: string, job: CandidateJob, jobIdx: number, useBetaLa
350357
const filterCandidateRegions = (test: string, candidateRegions: string[], useBetaLayer: boolean): string[] => {
351358
let resolvedRegions = [...candidateRegions];
352359

360+
const excludedRegions = TEST_REGION_EXCLUSIONS[test];
361+
if (excludedRegions) {
362+
resolvedRegions = resolvedRegions.filter((region) => !excludedRegions.includes(region));
363+
}
364+
353365
// Parent E2E account does not have opt-in regions. Choose non-opt-in region.
354366
const shouldUseParentAccount = USE_PARENT_ACCOUNT.some((usesParent) => test.startsWith(usesParent));
355367

0 commit comments

Comments
 (0)