Fix tests

Author: Dillon Nys

mono_repo/lib/src/commands/github/action_info.dart

@@ -39,7 +39,7 @@ enum ActionInfo implements Comparable<ActionInfo> {
   Step usage({
     required String name,
     String? id,
-    Map<String, dynamic>? withContent,
+    Map<String, String>? withContent,
   }) {
     final step = Step.uses(
       uses: '$repo@$version',
@@ -65,7 +65,7 @@ Job _coverageCompletionJob() => Job(
           withContent: {
             // https://docs.github.com/en/actions/security-guides/automatic-token-authentication#using-the-github_token-in-a-workflow
             'github-token': r'${{ secrets.GITHUB_TOKEN }}',
-            'parallel-finished': true
+            'parallel-finished': 'true'
           },
         )
       ],

mono_repo/lib/src/commands/github/github_yaml.dart

@@ -462,7 +462,7 @@ class _CommandEntry extends _CommandEntryBase implements GitHubActionOverrides {
   final Map<String, String>? env;
 
   @override
-  final Map<String, dynamic>? withContent;
+  final Map<String, String>? withContent;
 
   @override
   final String? shell;

mono_repo/lib/src/commands/github/overrides.dart

@@ -16,7 +16,7 @@ abstract class GitHubActionOverrides {
   ///
   /// A map of key-value pairs which are passed to the action's `with`
   /// parameter.
-  Map<String, dynamic>? get withContent;
+  Map<String, String>? get withContent;
 
   /// The condition on which to run this action.
   String? get ifContent;

mono_repo/lib/src/commands/github/step.dart

@@ -37,15 +37,17 @@ class Step implements GitHubActionOverrides, YamlLike {
   final String? uses;
   @override
   @JsonKey(name: 'with')
-  final Map<String, dynamic>? withContent;
+  final Map<String, String>? withContent;
 
   @override
   final String? shell;
 
   @override
+  @JsonKey(name: 'continue-on-error')
   final bool? continueOnError;
 
   @override
+  @JsonKey(name: 'timeout-minutes')
   final int? timeoutMinutes;
 
   Step._({
@@ -61,13 +63,6 @@ class Step implements GitHubActionOverrides, YamlLike {
     this.continueOnError,
     this.timeoutMinutes,
   }) {
-    if (name == null) {
-      throw ArgumentError.value(
-        name,
-        'name',
-        '`name` must be defined.',
-      );
-    }
     if (run == null) {
       if (uses == null) {
         throw ArgumentError.value(
@@ -93,25 +88,35 @@ class Step implements GitHubActionOverrides, YamlLike {
     }
   }
 
-  Step.fromOverrides(GitHubActionOverrides overrides)
-      : this._(
-          id: overrides.id,
-          name: overrides.name,
-          uses: overrides.uses,
-          withContent: overrides.withContent,
-          workingDirectory: overrides.workingDirectory,
-          run: overrides.run,
-          env: overrides.env,
-          shell: overrides.shell,
-          ifContent: overrides.ifContent,
-          continueOnError: overrides.continueOnError,
-          timeoutMinutes: overrides.timeoutMinutes,
-        );
+  factory Step.fromOverrides(GitHubActionOverrides overrides) {
+    if (overrides.uses != null) {
+      return Step._(
+        id: overrides.id,
+        name: overrides.name,
+        uses: overrides.uses,
+        withContent: overrides.withContent,
+        ifContent: overrides.ifContent,
+        continueOnError: overrides.continueOnError,
+        timeoutMinutes: overrides.timeoutMinutes,
+      );
+    }
+    return Step._(
+      id: overrides.id,
+      name: overrides.name,
+      run: overrides.run,
+      workingDirectory: overrides.workingDirectory,
+      env: overrides.env,
+      shell: overrides.shell,
+      ifContent: overrides.ifContent,
+      continueOnError: overrides.continueOnError,
+      timeoutMinutes: overrides.timeoutMinutes,
+    );
+  }
 
   Step.run({
     this.id,
     required String this.name,
-    required this.run,
+    required String this.run,
     this.ifContent,
     this.workingDirectory,
     this.env,
@@ -124,7 +129,7 @@ class Step implements GitHubActionOverrides, YamlLike {
   Step.uses({
     this.id,
     required String this.name,
-    required this.uses,
+    required String this.uses,
     this.withContent,
     this.ifContent,
     this.continueOnError,

mono_repo/lib/src/commands/github/step.g.dart

@@ -158,7 +158,6 @@ class GitHubActionConfig implements GitHubActionOverrides {
     this.env,
     this.continueOnError,
     this.timeoutMinutes,
-    this.otherConfig,
   }) : assert(
           run != null || uses != null,
           'Either `run` or `uses` must be specified',
@@ -176,11 +175,8 @@ class GitHubActionConfig implements GitHubActionOverrides {
   @override
   final String? uses;
 
-  /// The command identifier for this step, used in caching.
-  String get command => (run ?? uses)!;
-
   @override
-  final Map<String, dynamic>? withContent;
+  final Map<String, String>? withContent;
 
   @override
   final String? ifContent;
@@ -200,9 +196,6 @@ class GitHubActionConfig implements GitHubActionOverrides {
   @override
   final int? timeoutMinutes;
 
-  /// Configuration options not defined by one of the other keys.
-  final Map<String, dynamic>? otherConfig;
-
   factory GitHubActionConfig.fromJson(Map json) {
     // Create a copy of unmodifiable `json`.
     json = Map.of(json);
@@ -223,7 +216,7 @@ class GitHubActionConfig implements GitHubActionOverrides {
       throw CheckedFromJsonException(
         json,
         'id',
-        'ActionConfig',
+        'GitHubActionConfig',
         'Invalid `id` parameter. See GitHub docs for more info: '
             'https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsid',
       );
@@ -233,7 +226,7 @@ class GitHubActionConfig implements GitHubActionOverrides {
       throw CheckedFromJsonException(
         json,
         'name',
-        'ActionConfig',
+        'GitHubActionConfig',
         'Invalid `name` parameter. See GitHub docs for more info: '
             'https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsname',
       );
@@ -243,7 +236,7 @@ class GitHubActionConfig implements GitHubActionOverrides {
       throw CheckedFromJsonException(
         json,
         'run',
-        'ActionConfig',
+        'GitHubActionConfig',
         'Invalid `run` parameter. See GitHub docs for more info: '
             'https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun',
       );
@@ -253,7 +246,7 @@ class GitHubActionConfig implements GitHubActionOverrides {
       throw CheckedFromJsonException(
         json,
         'uses',
-        'ActionConfig',
+        'GitHubActionConfig',
         'Invalid `uses` parameter. See GitHub docs for more info: '
             'https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsuses',
       );
@@ -263,7 +256,7 @@ class GitHubActionConfig implements GitHubActionOverrides {
       throw CheckedFromJsonException(
         json,
         'with',
-        'ActionConfig',
+        'GitHubActionConfig',
         'Invalid `with` parameter. See GitHub docs for more info: '
             'https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepswith',
       );
@@ -273,7 +266,7 @@ class GitHubActionConfig implements GitHubActionOverrides {
       throw CheckedFromJsonException(
         json,
         'if',
-        'ActionConfig',
+        'GitHubActionConfig',
         'Invalid `if` parameter. See GitHub docs for more info: '
             'https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsif',
       );
@@ -283,7 +276,7 @@ class GitHubActionConfig implements GitHubActionOverrides {
       throw CheckedFromJsonException(
         json,
         'working-directory',
-        'ActionConfig',
+        'GitHubActionConfig',
         'Invalid `working-directory` parameter. See GitHub docs for more info: '
             'https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun',
       );
@@ -293,7 +286,7 @@ class GitHubActionConfig implements GitHubActionOverrides {
       throw CheckedFromJsonException(
         json,
         'shell',
-        'ActionConfig',
+        'GitHubActionConfig',
         'Invalid `shell` parameter. See GitHub docs for more info: '
             'https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsshell',
       );
@@ -303,7 +296,7 @@ class GitHubActionConfig implements GitHubActionOverrides {
       throw CheckedFromJsonException(
         json,
         'env',
-        'ActionConfig',
+        'GitHubActionConfig',
         'Invalid `env` parameter. See GitHub docs for more info: '
             'https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsenv',
       );
@@ -313,7 +306,7 @@ class GitHubActionConfig implements GitHubActionOverrides {
       throw CheckedFromJsonException(
         json,
         'continue-on-error',
-        'ActionConfig',
+        'GitHubActionConfig',
         'Invalid `continue-on-error` parameter. See GitHub docs for more info: '
             'https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepscontinue-on-error',
       );
@@ -323,7 +316,7 @@ class GitHubActionConfig implements GitHubActionOverrides {
       throw CheckedFromJsonException(
         json,
         'timeout-minutes',
-        'ActionConfig',
+        'GitHubActionConfig',
         'Invalid `timeout-minutes` parameter. See GitHub docs for more info: '
             'https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepstimeout-minutes',
       );
@@ -333,23 +326,30 @@ class GitHubActionConfig implements GitHubActionOverrides {
       throw CheckedFromJsonException(
         json,
         'run,uses',
-        'ActionConfig',
+        'GitHubActionConfig',
         'Either `run` or `uses` must be specified',
       );
     }
+    if (json.isNotEmpty) {
+      throw CheckedFromJsonException(
+        json,
+        json.keys.join(','),
+        'GitHubActionConfig',
+        'Invalid keys',
+      );
+    }
 
     return GitHubActionConfig(
       id: id,
       uses: uses,
       run: run,
-      withContent: withContent?.cast(),
+      withContent: toEnvMap(withContent),
       ifContent: ifContent,
       workingDirectory: workingDirectory,
       shell: shell,
       env: toEnvMap(env),
       continueOnError: continueOnError,
       timeoutMinutes: timeoutMinutes?.toInt(),
-      otherConfig: json.cast(),
     );
   }
 }

mono_repo/lib/src/github_config.dart

@@ -11,7 +11,7 @@ import 'package_flavor.dart';
 abstract class TaskType implements Comparable<TaskType> {
   static const command = _CommandTask();
   const factory TaskType.githubAction(GitHubActionConfig config) =
-      GitHubActionTaskType;
+      _GitHubActionTaskType;
 
   static const _values = <TaskType>[
     _FormatTask(),
@@ -49,10 +49,13 @@ abstract class TaskType implements Comparable<TaskType> {
       yield val.name;
       yield* val.alternates;
     }
+    yield _GitHubActionTaskType._name;
   }
 
-  static final prettyTaskList =
-      TaskType._values.map((t) => '`${t.name}`').join(', ');
+  static final prettyTaskList = [
+    ...TaskType._values.map((t) => '`${t.name}`'),
+    '`${_GitHubActionTaskType._name}`',
+  ].join(', ');
 
   static TaskType taskFromName(String input) => TaskType._values.singleWhere(
         (element) =>
@@ -154,21 +157,23 @@ class _TestWithCoverageTask extends TaskType {
           'github-token': r'${{ secrets.GITHUB_TOKEN }}',
           'path-to-lcov': '$packageDirectory/coverage/lcov.info',
           'flag-name': 'coverage_$countString',
-          'parallel': true,
+          'parallel': 'true',
         },
       ),
     ];
   }
 }
 
-class GitHubActionTaskType extends TaskType {
-  const GitHubActionTaskType(this.overrides) : super._('github_action');
+class _GitHubActionTaskType extends TaskType {
+  const _GitHubActionTaskType(this.overrides) : super._(_name);
+
+  static const _name = 'github_action';
 
   @override
   final GitHubActionConfig overrides;
 
   @override
-  List<String> commandValue(PackageFlavor flavor, String? args) {
-    throw UnimplementedError();
-  }
+  List<String> commandValue(PackageFlavor flavor, String? args) => [
+        if (overrides.run != null) overrides.run!,
+      ];
 }