From b7279e4144b202e21e9b8cd419553a60856ec932 Mon Sep 17 00:00:00 2001
From: Dillon Nys <nydillon@amazon.com>
Date: Tue, 29 Aug 2023 16:57:14 -0700
Subject: [PATCH] chore(aft): Fix analysis issues

---
 .../aft/lib/src/commands/amplify_command.dart | 22 -------------------
 .../generate/generate_goldens_command.dart    |  4 ++--
 .../generate/generate_sdk_command.dart        |  4 ++--
 packages/aft/lib/src/constraints_checker.dart |  2 +-
 .../aft/test/config/config_loader_test.dart   |  4 ++--
 5 files changed, 7 insertions(+), 29 deletions(-)

diff --git a/packages/aft/lib/src/commands/amplify_command.dart b/packages/aft/lib/src/commands/amplify_command.dart
index 32d9633a88..7588340e16 100644
--- a/packages/aft/lib/src/commands/amplify_command.dart
+++ b/packages/aft/lib/src/commands/amplify_command.dart
@@ -14,8 +14,6 @@ import 'package:git/git.dart' as git;
 import 'package:meta/meta.dart';
 import 'package:path/path.dart' as p;
 import 'package:pub_semver/pub_semver.dart';
-import 'package:yaml/yaml.dart';
-import 'package:yaml_edit/yaml_edit.dart';
 
 /// Base class for all commands in this package providing common functionality.
 abstract class AmplifyCommand extends Command<void>
@@ -202,23 +200,3 @@ abstract class AmplifyCommand extends Command<void>
     httpClient.close();
   }
 }
-
-extension on YamlEditor {
-  /// Merges [node] into `this` at the given [path].
-  ///
-  /// This differs from [update] in that it recurses into the tree to only add
-  /// or override leaf nodes (i.e. [YamlScalar] values) for maps.
-  ///
-  /// Lists cannot be safely merged, so they are overridden as with [update].
-  void merge(YamlNode node, [List<Object?> path = const []]) {
-    if (node is YamlMap) {
-      for (final key in node.keys) {
-        merge(node.nodes[key]!, [...path, key]);
-      }
-      return;
-    } else if (node is YamlList) {
-      safePrint('WARNING: Cannot merge YAML list values');
-    }
-    update(path, node);
-  }
-}
diff --git a/packages/aft/lib/src/commands/generate/generate_goldens_command.dart b/packages/aft/lib/src/commands/generate/generate_goldens_command.dart
index 600d47a116..b793524cce 100644
--- a/packages/aft/lib/src/commands/generate/generate_goldens_command.dart
+++ b/packages/aft/lib/src/commands/generate/generate_goldens_command.dart
@@ -176,8 +176,8 @@ class GenerateGoldensCommand extends AmplifyCommand {
           'software.amazon.smithy:smithy-aws-traits:$latestVersion',
           'software.amazon.smithy:smithy-mqtt-traits:$latestVersion',
           'software.amazon.smithy:smithy-protocol-test-traits:$latestVersion',
-          'software.amazon.smithy:smithy-validation-model:$latestVersion'
-        ]
+          'software.amazon.smithy:smithy-validation-model:$latestVersion',
+        ],
       }),
     );
     final smithyVersion = File(p.join(goldensRoot, 'smithy-version'));
diff --git a/packages/aft/lib/src/commands/generate/generate_sdk_command.dart b/packages/aft/lib/src/commands/generate/generate_sdk_command.dart
index 359b78c2ff..919264b7c0 100644
--- a/packages/aft/lib/src/commands/generate/generate_sdk_command.dart
+++ b/packages/aft/lib/src/commands/generate/generate_sdk_command.dart
@@ -312,7 +312,7 @@ class GenerateSdkCommand extends AmplifyCommand with GlobOptions {
                 (p) => p
                   ..toThis = true
                   ..name = 'service',
-              )
+              ),
             ]),
         ),
       )
@@ -323,7 +323,7 @@ class GenerateSdkCommand extends AmplifyCommand with GlobOptions {
             ..docs.add('/// The SigV4 service name, used in signing.')
             ..name = 'service'
             ..type = refer('String'),
-        )
+        ),
       ]);
 
     final modelsDir = await _modelsDirForRef('master');
diff --git a/packages/aft/lib/src/constraints_checker.dart b/packages/aft/lib/src/constraints_checker.dart
index 6854f69e51..2a7019a7e2 100644
--- a/packages/aft/lib/src/constraints_checker.dart
+++ b/packages/aft/lib/src/constraints_checker.dart
@@ -318,7 +318,7 @@ final class PublishConstraintsChecker extends ConstraintsChecker {
             package: package,
             dependencyPath: [
               package.dependencyType(repoDependency)!.key,
-              repoDependency.name
+              repoDependency.name,
             ],
             expectedConstraint: package.isPublishable
                 ? repoDependency.currentConstraint
diff --git a/packages/aft/test/config/config_loader_test.dart b/packages/aft/test/config/config_loader_test.dart
index 0263773cea..7c4dcb993d 100644
--- a/packages/aft/test/config/config_loader_test.dart
+++ b/packages/aft/test/config/config_loader_test.dart
@@ -87,8 +87,8 @@ aft:
         d.dir('packages', [
           d.dir('my_pkg', [
             d.file('pubspec.yaml', packagePubspec),
-          ])
-        ])
+          ]),
+        ]),
       ]).create();
 
       final rootDirectory = p.normalize(d.path('repo'));