chore(infra): Api migrate to Gen 2 E2E #5043

Equartey · 2024-06-20T22:10:11Z

Description of changes:

Adds Gen 2 API category backend
Enables Gen 2 API integration tests

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

Jordan-Nelson

Left a few questions. Will review the rest later

.gitignore

Jordan-Nelson · 2024-06-26T21:31:06Z

infra-gen2/backends/api/apiMultiAuth/amplify/backend.ts

+// extract L1 CfnUserPool resources
+const { cfnUserPool } = backend.auth.resources.cfnResources;
+// modify cfnUserPool policies directly
+cfnUserPool.policies = {


Q: What is the default? Why do we need to change it? Can that change not be made in Gen 2?

What is the default?

8 Chars, 1 lower, 1 upper, 1 symbol

Why do we need to change it?

To match the current pattern and password generator methods we have.

Can that change not be made in Gen 2?

This is the recommended way when using Gen 2.

The current generatePassword method used in integ tests inlcudes a UUID, an upper case character, and a symbol. That should always meet those requirements. Am I missing something?

amplify-flutter/packages/test/amplify_test/lib/src/mock_data.dart

Lines 62 to 65 in 7cca276

String generatePassword() =>

uuid() +

uppercaseLetters[random.nextInt(uppercaseLetters.length)] +

symbols[random.nextInt(symbols.length)];

Ah, this function wasn't being called. Previously it was just a uuid for the password. Updated.

infra-gen2/backends/api/apiMultiAuth/package.json

packages/api/amplify_api/example/lib/models/gen2/Blog.dart

.gitignore

.gitattributes

infra-gen2/backends/api/apiMultiAuth/amplify/auth/pre-sign-up-handler.ts

Jordan-Nelson · 2024-07-02T16:17:40Z

infra-gen2/backends/api/apiMultiAuth/amplify/backend.ts

+// extract L1 CfnUserPool resources
+const { cfnUserPool } = backend.auth.resources.cfnResources;
+// modify cfnUserPool policies directly
+cfnUserPool.policies = {


The current generatePassword method used in integ tests inlcudes a UUID, an upper case character, and a symbol. That should always meet those requirements. Am I missing something?

amplify-flutter/packages/test/amplify_test/lib/src/mock_data.dart

Lines 62 to 65 in 7cca276

String generatePassword() =>

uuid() +

uppercaseLetters[random.nextInt(uppercaseLetters.length)] +

symbols[random.nextInt(symbols.length)];

Jordan-Nelson · 2024-07-02T16:35:39Z

packages/amplify_core/lib/amplify_core.dart

@@ -18,6 +18,7 @@ export 'src/category/amplify_categories.dart';

 /// Config
 export 'src/config/amplify_config.dart';
+export 'src/config/amplify_outputs/amplify_outputs.dart';


Note: I think merge conflicts are causing changes to show in this PR that are not part of the PR. I am going to ignore files that I don't think are intended to be part of the PR and we re-review once the PR is updated.

packages/api/amplify_api/example/integration_test/graphql/api_key_test.dart

packages/api/amplify_api/example/integration_test/util.dart

packages/api/amplify_api/example/integration_test/graphql/iam_test.dart

Jordan-Nelson · 2024-07-16T18:12:57Z

packages/api/amplify_api/example/integration_test/graphql/iam_test.dart

-        final req = ModelQueries.list<Blog>(Blog.classType);
+        final req = ModelQueries.list<Blog>(
+          Blog.classType,
+          authorizationMode: APIAuthorizationType.iam,


Q: Is this change expected? Does gen 2 default to a different auth mode than gen 1?

It's unclear why this is necessary now, but it appears to be more accurate since these models have multiple authentication modes and an explicit mode should have been defined from the start.

packages/api/amplify_api/example/integration_test/util.dart

infra-gen2/tool/deploy_gen2.dart

Equartey force-pushed the chore/api-integ-gen2 branch from 5c1108f to 007a014 Compare June 25, 2024 21:53

Equartey changed the title ~~Chore/api integ gen2~~ chore(infra-gen2): Gen 2 infra Jun 25, 2024

Equartey changed the title ~~chore(infra-gen2): Gen 2 infra~~ chore(infra): Api migrate to Gen 2 E2E Jun 25, 2024

Equartey force-pushed the chore/api-integ-gen2 branch from d0499c8 to 16d1a13 Compare June 26, 2024 20:51

Equartey marked this pull request as ready for review June 26, 2024 20:51

Equartey requested a review from a team as a code owner June 26, 2024 20:51

Jordan-Nelson reviewed Jun 26, 2024

View reviewed changes

Base automatically changed from feat/config-gen2 to main June 27, 2024 16:16

Jordan-Nelson reviewed Jul 2, 2024

View reviewed changes

Jordan-Nelson force-pushed the chore/api-integ-gen2 branch from ff69629 to b2977db Compare July 2, 2024 18:14

Equartey force-pushed the chore/api-integ-gen2 branch 2 times, most recently from b9a3607 to c3c0860 Compare July 12, 2024 20:04

Jordan-Nelson previously approved these changes Jul 16, 2024

View reviewed changes

Equartey dismissed Jordan-Nelson’s stale review via 1c00269 July 16, 2024 19:07

Jordan-Nelson previously approved these changes Jul 16, 2024

View reviewed changes

NikaHsn previously approved these changes Jul 16, 2024

View reviewed changes

infra-gen2/tool/deploy_gen2.dart Outdated Show resolved Hide resolved

infra-gen2/tool/deploy_gen2.dart Show resolved Hide resolved

Equartey dismissed stale reviews from NikaHsn and Jordan-Nelson via e9ad65a July 18, 2024 14:17

Equartey and others added 12 commits July 18, 2024 09:17

chore(infra): Api migrate to Gen 2 E2E

077d190

fix: git update-index --chmod=+x

e2d65b4

fix: code review

6ecd0ae

chore: allow existing amplify_outputs/amplifyconfiguration files

b301ea0

wip: remove gen 1 refactor

abd3fcc

fix for infra-common js building

1a2ef99

fix cpk tests

601633b

add custom rest api cdk stack

0c93487

Consolidate pull backend script into original

286013b

rest api backend now mirrors gen 1

960458d

update bootstrap command to include gen2 formatted config entrypoint

c6f6d6d

actions clean

ac57a27

Equartey added 4 commits July 18, 2024 09:17

fix: config typo

9cd8662

skip test on web for unauthed user failing cors

ddc5cee

small refactor to configure method

d9e68a2

refactor copy/upload to accept list of files

61b6f3c

Equartey force-pushed the chore/api-integ-gen2 branch from e9ad65a to 61b6f3c Compare July 18, 2024 14:18

Jordan-Nelson approved these changes Jul 18, 2024

View reviewed changes

NikaHsn approved these changes Jul 18, 2024

View reviewed changes

Equartey merged commit 46d9ad2 into main Jul 18, 2024
78 checks passed

Equartey deleted the chore/api-integ-gen2 branch July 18, 2024 17:04

tyllark pushed a commit to tyllark/amplify-flutter that referenced this pull request Aug 14, 2024

chore(infra): Api migrate to Gen 2 E2E (aws-amplify#5043)

1442fed

tyllark pushed a commit that referenced this pull request Aug 20, 2024

chore(infra): Api migrate to Gen 2 E2E (#5043)

f245f04

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore(infra): Api migrate to Gen 2 E2E #5043

chore(infra): Api migrate to Gen 2 E2E #5043

Equartey commented Jun 20, 2024 •

edited

Loading

Jordan-Nelson left a comment

Jordan-Nelson Jun 26, 2024

Equartey Jun 27, 2024

Jordan-Nelson Jul 2, 2024

Equartey Jul 9, 2024

Jordan-Nelson Jul 2, 2024

Jordan-Nelson Jul 2, 2024

Jordan-Nelson Jul 16, 2024

Equartey Jul 16, 2024

	String generatePassword() =>
	uuid() +
	uppercaseLetters[random.nextInt(uppercaseLetters.length)] +
	symbols[random.nextInt(symbols.length)];

chore(infra): Api migrate to Gen 2 E2E #5043

chore(infra): Api migrate to Gen 2 E2E #5043

Conversation

Equartey commented Jun 20, 2024 • edited Loading

Jordan-Nelson left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Equartey commented Jun 20, 2024 •

edited

Loading