PR Comments

aws-amplify · Oct 3, 2023 · c46f99b · c46f99b
1 parent ca44362
commit c46f99b
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 27 deletions.
diff --git a/.github/composite_actions/log_cw_metric/action.yaml b/.github/composite_actions/log_cw_metric/action.yaml
@@ -5,9 +5,6 @@ inputs:
   job-status:
     description: Used to determine if we track success or failure.
     required: true
-  job-identifier:
-    description: For differentiating jobs of a run.
-    required: true
   github-token:
     required: true
     description: Github token for requesting failing steps.
@@ -28,9 +25,6 @@ inputs:
   category:
     description: analytics, api, authenticator, etc.
     required: true
-  workflow-name:
-    description: The Github Action workflow.yaml file name.  ie "AmplifyCanaries".
-    required: true
 
   # FlutterDart Workflows Metric Dimensions
   framework:

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/composite_actions/log_cw_metric_wrapper/action.yaml b/.github/composite_actions/log_cw_metric_wrapper/action.yaml
@@ -81,7 +81,6 @@ runs:
       uses: ./.github/composite_actions/log_cw_metric
       with:
         job-status: ${{ inputs.job-status }}
-        job-identifier: ${{ inputs.job-identifier }}
         github-token: ${{ inputs.github-token }}
 
         metric-name: "github_metric_1.0"

diff --git a/actions/bin/log_cw_metric.yaml b/actions/bin/log_cw_metric.yaml
@@ -5,9 +5,6 @@ inputs:
   job-status:
     description: Used to determine if we track success or failure.
     required: true
-  job-identifier:
-    description: For differentiating jobs of a run.
-    required: true
   github-token:
     required: true
     description: Github token for requesting failing steps.
@@ -28,9 +25,6 @@ inputs:
   category:
     description: analytics, api, authenticator, etc.
     required: true
-  workflow-name:
-    description: The Github Action workflow.yaml file name.  ie "AmplifyCanaries".
-    required: true
 
   # FlutterDart Workflows Metric Dimensions
   framework:

diff --git a/actions/lib/src/githubJobs/github_jobs.dart b/actions/lib/src/githubJobs/github_jobs.dart
@@ -1,3 +1,6 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
 import 'package:json_annotation/json_annotation.dart';
 
 part 'github_jobs.g.dart';

diff --git a/actions/lib/src/node/actions/http_request.dart b/actions/lib/src/node/actions/http_request.dart
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import 'dart:js_interop';
-import 'dart:js_util';
 
 @JS()
 extension type HttpClient._(JSObject it) {
@@ -13,12 +12,12 @@ extension type HttpClient._(JSObject it) {
   ]);
 
   @JS('getJson')
-  external JSPromise _getJson(String requestUrl, dynamic headers);
+  external JSPromise _getJson(String requestUrl, [JSObject headers]);
 
   Future<Map<String, Object?>> getJson(String requestUrl, {
-    Map<String, String>? headers,
+    Map<String, String> headers = const {},
   }  ) async {
-    final jsHeaders = jsify(headers); 
+    final jsHeaders = headers.jsify() as JSObject; 
     final response = await _getJson(requestUrl, jsHeaders).toDart;
     final result = response as TypedResponse<JSObject>;
     if (result.statusCode != 200) {