fix(repo): empty matrix job id and secrets typo

* fix(repo): empty matrix job identifier Ensure empty / null matrix does not pollute job identifier. * fix(repo): secrets typo
aws-amplify · Oct 11, 2023 · bac5e96 · bac5e96
1 parent 957da6f
commit bac5e96
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 12 deletions.
diff --git a/.github/composite_actions/log_cw_metric/dist/main.cjs b/.github/composite_actions/log_cw_metric/dist/main.cjs
diff --git a/.github/composite_actions/log_cw_metric/dist/main.cjs.map b/.github/composite_actions/log_cw_metric/dist/main.cjs.map
diff --git a/.github/workflows/amplify_datastore_ios.yaml b/.github/workflows/amplify_datastore_ios.yaml
@@ -32,7 +32,7 @@ concurrency:
 jobs:
   ios:
     uses: ./.github/workflows/flutter_ios.yaml
-    secrets: inhert
+    secrets: inherit
     with:
       example-directory: packages/amplify_datastore/example
       package-name: amplify_datastore

diff --git a/.github/workflows/amplify_db_common_ios.yaml b/.github/workflows/amplify_db_common_ios.yaml
@@ -32,7 +32,7 @@ concurrency:
 jobs:
   ios:
     uses: ./.github/workflows/flutter_ios.yaml
-    secrets: inhert
+    secrets: inherit
     with:
       example-directory: packages/common/amplify_db_common/example
       package-name: amplify_db_common

diff --git a/.github/workflows/amplify_native_legacy_wrapper_ios.yaml b/.github/workflows/amplify_native_legacy_wrapper_ios.yaml
@@ -32,7 +32,7 @@ concurrency:
 jobs:
   ios:
     uses: ./.github/workflows/flutter_ios.yaml
-    secrets: inhert
+    secrets: inherit
     with:
       example-directory: packages/amplify_native_legacy_wrapper/example
       package-name: amplify_native_legacy_wrapper

diff --git a/.github/workflows/amplify_push_notifications_ios.yaml b/.github/workflows/amplify_push_notifications_ios.yaml
@@ -32,7 +32,7 @@ concurrency:
 jobs:
   ios:
     uses: ./.github/workflows/flutter_ios.yaml
-    secrets: inhert
+    secrets: inherit
     with:
       example-directory: packages/notifications/push/amplify_push_notifications/example
       package-name: amplify_push_notifications

diff --git a/.github/workflows/amplify_secure_storage_ios.yaml b/.github/workflows/amplify_secure_storage_ios.yaml
@@ -32,7 +32,7 @@ concurrency:
 jobs:
   ios:
     uses: ./.github/workflows/flutter_ios.yaml
-    secrets: inhert
+    secrets: inherit
     with:
       example-directory: packages/secure_storage/amplify_secure_storage/example
       package-name: amplify_secure_storage

diff --git a/actions/bin/log_cw_metric.dart b/actions/bin/log_cw_metric.dart
@@ -21,7 +21,7 @@ Future<void> logMetric() async {
 
   // Parse the matrix string (input is raw json string with " and \n)
   String? parseMatrixInput(String matrixRawInput) {
-    if (matrixRawInput.isEmpty) {
+    if (matrixRawInput.isEmpty || matrixRawInput == '{}') {
       return null;
     }
 
@@ -40,7 +40,7 @@ Future<void> logMetric() async {
   final matrixValues = parseMatrixInput(matrixRawInput);
 
   final jobIdentifier =
-      ('${github.context.job} ${matrixValues == null ? '' : '($matrixValues)'}')
+      ('${github.context.job} ${(matrixValues == null || matrixValues.isEmpty) ? '' : '($matrixValues)'}')
           .trim();
 
   core.info('Job identifier: $jobIdentifier');

diff --git a/packages/aft/lib/src/commands/generate/generate_workflows_command.dart b/packages/aft/lib/src/commands/generate/generate_workflows_command.dart
@@ -575,7 +575,7 @@ concurrency:
 jobs:
   ios:
     uses: ./.github/workflows/$iosWorkflow
-    secrets: inhert
+    secrets: inherit
     with:
       example-directory: $repoRelativePath/example
       package-name: ${package.name}