Merge remote-tracking branch 'aws/next' into feat/aft/changlog

Author: Dillon Nys

.github/composite_actions/setup_firefox/action.yaml

@@ -4,10 +4,10 @@ description: Install Firefox and Geckodriver
 runs:
   using: "composite"
   steps:
-    - uses: browser-actions/setup-firefox@c990ef23a9bedbbe657b163aaf0f3b7c608ea9f0 # latest
+    - uses: browser-actions/setup-firefox@c990ef23a9bedbbe657b163aaf0f3b7c608ea9f0 # master
     - shell: bash
       run: firefox --version
-    - uses: browser-actions/setup-geckodriver@1605d95d4e5e7f5e3706e1e6f9c839d3834159db # latest
+    - uses: browser-actions/setup-geckodriver@1605d95d4e5e7f5e3706e1e6f9c839d3834159db # master
     - shell: bash
       run: geckodriver --version
     - name: Virtual X Display 

.github/dependabot.yaml

@@ -32,15 +32,15 @@ updates:
     schedule:
       interval: "daily"
   - package-ecosystem: "pub"
-    directory: "packages/amplify_authenticator/"
+    directory: "packages/authenticator/amplify_authenticator/"
     schedule:
       interval: "daily"
   - package-ecosystem: "pub"
-    directory: "packages/amplify_authenticator/example/"
+    directory: "packages/authenticator/amplify_authenticator/example/"
     schedule:
       interval: "daily"
   - package-ecosystem: "pub"
-    directory: "packages/amplify_authenticator/example/.dart_tool/flutter_gen/"
+    directory: "packages/authenticator/amplify_authenticator/example/.dart_tool/flutter_gen/"
     schedule:
       interval: "daily"
   - package-ecosystem: "pub"

.github/workflows/amplify_authenticator.yaml

@@ -8,14 +8,14 @@ on:
       - next
   pull_request:
     paths:
-      - 'packages/amplify_authenticator/**/*.dart'
-      - 'packages/amplify_authenticator/**/*.yaml'
-      - 'packages/amplify_authenticator/lib/**/*'
-      - 'packages/amplify_authenticator/test/**/*'
+      - 'packages/authenticator/amplify_authenticator/**/*.dart'
+      - 'packages/authenticator/amplify_authenticator/**/*.yaml'
+      - 'packages/authenticator/amplify_authenticator/lib/**/*'
+      - 'packages/authenticator/amplify_authenticator/test/**/*'
       - '.github/workflows/flutter_vm.yaml'
       - '.github/workflows/amplify_authenticator.yaml'
   schedule:
-    - cron: "0 0 * * 0" # Every Sunday at 00:00
+    - cron: '0 0 * * 0' # Every Sunday at 00:00
 defaults:
   run:
     shell: bash
@@ -25,4 +25,4 @@ jobs:
   test:
     uses: ./.github/workflows/flutter_vm.yaml
     with:
-      working-directory: packages/amplify_authenticator
+      working-directory: packages/authenticator/amplify_authenticator

infra/lib/auth/stack.ts

@@ -23,7 +23,6 @@ import * as iam from "aws-cdk-lib/aws-iam";
 import * as kms from "aws-cdk-lib/aws-kms";
 import * as lambda from "aws-cdk-lib/aws-lambda";
 import * as lambda_nodejs from "aws-cdk-lib/aws-lambda-nodejs";
-import * as wafv2 from "aws-cdk-lib/aws-wafv2";
 import { Construct } from "constructs";
 import * as path from "path";
 import {
@@ -47,9 +46,9 @@ export type AuthIntegrationTestStackEnvironmentProps =
 export interface AuthBaseEnvironmentProps
   extends IntegrationTestStackEnvironmentProps {
   /**
-   * The shared WAF.
+   * Associates `resourceArn` with the shared WAF.
    */
-  waf: wafv2.CfnWebACL;
+  associateWithWaf: (resourceArn: string) => void;
 
   /**
    * The type of environment to build.
@@ -135,7 +134,7 @@ class AuthIntegrationTestStackEnvironment extends IntegrationTestStackEnvironmen
   ) {
     super(scope, baseName, props);
 
-    const { waf } = props;
+    const { associateWithWaf } = props;
 
     // Create the GraphQL API for admin actions
 
@@ -325,15 +324,8 @@ class AuthIntegrationTestStackEnvironment extends IntegrationTestStackEnvironmen
       }
     );
 
-    new wafv2.CfnWebACLAssociation(this, "WAFAppSyncAssociation", {
-      resourceArn: graphQLApi.arn,
-      webAclArn: waf.attrArn,
-    });
-
-    new wafv2.CfnWebACLAssociation(this, "WAFCognitoAssociation", {
-      resourceArn: userPool.userPoolArn,
-      webAclArn: waf.attrArn,
-    });
+    associateWithWaf(graphQLApi.arn);
+    associateWithWaf(userPool.userPoolArn);
 
     // Create the DynamoDB table to store MFA codes for AppSync subscriptions
 

infra/lib/stack.ts

@@ -71,6 +71,23 @@ export class AmplifyFlutterIntegStack extends cdk.Stack {
       },
     });
 
+    const wafAssociations: wafv2.CfnWebACLAssociation[] = [];
+
+    // Creates a WAF association on `this` so that they can be chained later
+    // and do not block the concurrent creation of environments.
+    const associateWithWaf = (resourceArn: string) => {
+      wafAssociations.push(
+        new wafv2.CfnWebACLAssociation(
+          this,
+          `WAFAssociation${wafAssociations.length}`,
+          {
+            resourceArn,
+            webAclArn: waf.attrArn,
+          }
+        )
+      );
+    };
+
     // The Analytics stack
     const analytics = new AnalyticsIntegrationTestStack(this, [
       { environmentName: "main" },
@@ -81,16 +98,16 @@ export class AmplifyFlutterIntegStack extends cdk.Stack {
     const customDomain = this.node.tryGetContext("domainName");
     if (customDomain) {
       customDomainEnv.push({
-        waf,
+        associateWithWaf,
         type: "CUSTOM_AUTHORIZER_IAM",
         environmentName: "custom-authorizer-custom-domain",
         customDomain,
       });
     }
     const auth = new AuthIntegrationTestStack(this, [
-      { waf, type: "FULL", environmentName: "main" },
+      { associateWithWaf, type: "FULL", environmentName: "main" },
       {
-        waf,
+        associateWithWaf,
         type: "FULL",
         environmentName: "device-tracking-always",
         deviceTracking: {
@@ -101,7 +118,7 @@ export class AmplifyFlutterIntegStack extends cdk.Stack {
         },
       },
       {
-        waf,
+        associateWithWaf,
         type: "FULL",
         environmentName: "device-tracking-opt-in",
         deviceTracking: {
@@ -112,20 +129,20 @@ export class AmplifyFlutterIntegStack extends cdk.Stack {
         },
       },
       {
-        waf,
+        associateWithWaf,
         type: "FULL",
         environmentName: "sign-in-with-phone",
         signInAliases: {
           phone: true,
         },
       },
       {
-        waf,
+        associateWithWaf,
         type: "CUSTOM_AUTHORIZER_USER_POOLS",
         environmentName: "custom-authorizer-user-pools",
       },
       {
-        waf,
+        associateWithWaf,
         type: "CUSTOM_AUTHORIZER_IAM",
         environmentName: "custom-authorizer-iam",
       },
@@ -158,6 +175,13 @@ export class AmplifyFlutterIntegStack extends cdk.Stack {
     this.outputAmplifyConfig(analytics);
     this.outputAmplifyConfig(auth);
     this.outputAmplifyConfig(storage);
+
+    // Chain the creation of WAF associations since the API call `AssociateWebACL`
+    // has a fixed rate limit which can easily be exceeded when deploying concurrent
+    // stacks and their WAF associations.
+    wafAssociations.forEach((assoc, index) => {
+      if (index > 0) assoc.addDependsOn(wafAssociations[index - 1]);
+    });
   }
 
   /**

packages/aft/lib/src/commands/generate/generate_sdk_command.dart

@@ -13,6 +13,7 @@
 // limitations under the License.
 
 import 'dart:async';
+import 'dart:convert';
 import 'dart:io';
 
 import 'package:aft/aft.dart';
@@ -78,10 +79,17 @@ class GenerateSdkCommand extends AmplifyCommand {
       ['checkout', ref],
       processWorkingDir: cloneDir.path,
     );
-    logger.verbose('Successfully cloned models');
+    logger.info('Successfully cloned models');
+    return cloneDir;
+  }
+
+  /// Organizes model files from [baseDir] into a new temporary directory.
+  ///
+  /// Returns the new directory.
+  Future<Directory> _organizeModels(Directory baseDir) async {
     final modelsDir = await Directory.systemTemp.createTemp('models');
-    logger.verbose('Organizing models in ${modelsDir.path}');
-    final services = cloneDir.list(followLinks: false).whereType<Directory>();
+    logger.debug('Organizing models in ${modelsDir.path}');
+    final services = baseDir.list(followLinks: false).whereType<Directory>();
     await for (final serviceDir in services) {
       final serviceName = p.basename(serviceDir.path);
       final artifacts = await serviceDir.list().whereType<Directory>().toList();
@@ -116,12 +124,13 @@ class GenerateSdkCommand extends AmplifyCommand {
     final modelsPath = args['models'] as String?;
     final Directory modelsDir;
     if (modelsPath != null) {
-      modelsDir = Directory(modelsPath);
+      modelsDir = await _organizeModels(Directory(modelsPath));
       if (!await modelsDir.exists()) {
         exitError('Model directory ($modelsDir) does not exist');
       }
     } else {
-      modelsDir = await _downloadModels(config.ref);
+      final cloneDir = await _downloadModels(config.ref);
+      modelsDir = await _organizeModels(cloneDir);
     }
 
     final outputPath = args['output'] as String;
@@ -174,15 +183,15 @@ class GenerateSdkCommand extends AmplifyCommand {
     }
 
     // Generate SDK for combined operations
-    final libraries = generateForAst(
+    final output = generateForAst(
       smithyAst,
       packageName: packageName,
       basePath: outputPath,
       includeShapes: includeShapes,
     );
 
     final dependencies = <String>{};
-    for (final library in libraries) {
+    for (final library in output.values.expand((out) => out.libraries)) {
       final smithyLibrary = library.smithyLibrary;
       final outPath = p.join(
         'lib',
@@ -195,6 +204,33 @@ class GenerateSdkCommand extends AmplifyCommand {
       await outFile.writeAsString(output);
     }
 
+    for (final plugin in config.plugins) {
+      logger.info('Running plugin $plugin...');
+      final generatedShapes = ShapeMap(
+        Map.fromEntries(
+          output.values.expand((out) => out.context.shapes.entries),
+        ),
+      );
+      final generatedAst = SmithyAst(
+        (b) => b
+          ..shapes = generatedShapes
+          ..metadata.replace(smithyAst.metadata)
+          ..version = smithyAst.version,
+      );
+      final pluginCmd = await Process.start(
+        'dart',
+        [
+          plugin,
+          jsonEncode(generatedAst),
+        ],
+        mode: verbose ? ProcessStartMode.inheritStdio : ProcessStartMode.normal,
+      );
+      final exitCode = await pluginCmd.exitCode;
+      if (exitCode != 0) {
+        exitError('`dart $plugin <AST>` failed: $exitCode.');
+      }
+    }
+
     // Run built_value generator
     final buildRunnerCmd = await Process.start(
       'dart',
@@ -204,11 +240,8 @@ class GenerateSdkCommand extends AmplifyCommand {
         'build',
         '--delete-conflicting-outputs',
       ],
+      mode: verbose ? ProcessStartMode.inheritStdio : ProcessStartMode.normal,
     );
-    if (verbose) {
-      unawaited(buildRunnerCmd.stdout.pipe(stdout));
-      unawaited(buildRunnerCmd.stderr.pipe(stderr));
-    }
     final exitCode = await buildRunnerCmd.exitCode;
     if (exitCode != 0) {
       exitError('`dart run build_runner build` failed: $exitCode.');

packages/aft/lib/src/models.dart

@@ -482,6 +482,7 @@ class SdkConfig
   const SdkConfig({
     this.ref = 'master',
     required this.apis,
+    this.plugins = const [],
   });
 
   factory SdkConfig.fromJson(Map<Object?, Object?>? json) =>
@@ -492,12 +493,13 @@ class SdkConfig
   /// Defaults to `master`.
   final String ref;
   final Map<String, List<ShapeId>?> apis;
+  final List<String> plugins;
 
   @override
   Map<String, Object?> toJson() => _$SdkConfigToJson(this);
 
   @override
-  List<Object?> get props => [apis];
+  List<Object?> get props => [ref, apis, plugins];
 
   @override
   String get runtimeTypeName => 'SdkConfig';

packages/aft/lib/src/models.g.dart

@@ -94,7 +94,7 @@ class AmplifyHybridImpl extends AmplifyClassImpl {
       } else if (plugin is APIPluginInterface) {
         await API.addPlugin(plugin, authProviderRepo: authProviderRepo);
       } else {
-        throw AmplifyException(
+        throw PluginError(
           'The type of plugin ${plugin.runtimeType} is not yet supported '
           'in Amplify.',
           recoverySuggestion:
@@ -105,7 +105,7 @@ class AmplifyHybridImpl extends AmplifyClassImpl {
       return;
     } on Exception catch (e) {
       safePrint('Amplify plugin was not added');
-      throw AmplifyException(
+      throw PluginError(
         'Amplify plugin ${plugin.runtimeType} was not added successfully.',
         recoverySuggestion: AmplifyExceptionMessages.missingRecoverySuggestion,
         underlyingException: e,