Chore(logging): rename aws_logging_cloudwatch to amplify_logging_cloudwatch_dart

.github/dependabot.yaml

@@ -129,20 +129,6 @@ updates:
       test:
         patterns:
           - "test"
-  - package-ecosystem: "pub"
-    directory: "infra"
-    schedule:
-      interval: "daily"
-    ignore:
-      # Ignore patch version bumps
-      - dependency-name: "*"
-        update-types:
-          - "version-update:semver-patch"
-      # Ignore all repo packages
-      - dependency-name: "amplify_core"
-      - dependency-name: "aws_common"
-      - dependency-name: "amplify_lints"
-      - dependency-name: "aws_signature_v4"
   - package-ecosystem: "pub"
     directory: "actions"
     schedule:
@@ -207,6 +193,20 @@ updates:
       - dependency-name: "amplify_datastore_plugin_interface"
       - dependency-name: "amplify_storage_s3"
       - dependency-name: "amplify_storage_s3_dart"
+  - package-ecosystem: "pub"
+    directory: "infra"
+    schedule:
+      interval: "daily"
+    ignore:
+      # Ignore patch version bumps
+      - dependency-name: "*"
+        update-types:
+          - "version-update:semver-patch"
+      # Ignore all repo packages
+      - dependency-name: "amplify_core"
+      - dependency-name: "aws_common"
+      - dependency-name: "amplify_lints"
+      - dependency-name: "aws_signature_v4"
   - package-ecosystem: "pub"
     directory: "packages/aft"
     schedule:
@@ -1806,7 +1806,7 @@ updates:
         patterns:
           - "build_web_compilers"
   - package-ecosystem: "pub"
-    directory: "packages/logging_cloudwatch/amplify_logging_cloudwatch"
+    directory: "packages/logging/amplify_logging_cloudwatch"
     schedule:
       interval: "daily"
     ignore:
@@ -1819,7 +1819,7 @@ updates:
       - dependency-name: "aws_common"
       - dependency-name: "amplify_lints"
       - dependency-name: "aws_signature_v4"
-      - dependency-name: "aws_logging_cloudwatch"
+      - dependency-name: "amplify_logging_cloudwatch_dart"
       - dependency-name: "amplify_db_common_dart"
       - dependency-name: "smithy"
       - dependency-name: "smithy_aws"
@@ -1844,7 +1844,7 @@ updates:
         patterns:
           - "test"
   - package-ecosystem: "pub"
-    directory: "packages/logging_cloudwatch/amplify_logging_cloudwatch/example"
+    directory: "packages/logging/amplify_logging_cloudwatch/example"
     schedule:
       interval: "daily"
     ignore:
@@ -1873,9 +1873,9 @@ updates:
       - dependency-name: "amplify_flutter"
       - dependency-name: "amplify_authenticator"
       - dependency-name: "amplify_logging_cloudwatch"
-      - dependency-name: "aws_logging_cloudwatch"
+      - dependency-name: "amplify_logging_cloudwatch_dart"
   - package-ecosystem: "pub"
-    directory: "packages/logging_cloudwatch/amplify_logging_cloudwatch/example"
+    directory: "packages/logging/amplify_logging_cloudwatch/example"
     schedule:
       interval: "daily"
     ignore:
@@ -1904,9 +1904,9 @@ updates:
       - dependency-name: "amplify_flutter"
       - dependency-name: "amplify_authenticator"
       - dependency-name: "amplify_logging_cloudwatch"
-      - dependency-name: "aws_logging_cloudwatch"
+      - dependency-name: "amplify_logging_cloudwatch_dart"
   - package-ecosystem: "pub"
-    directory: "packages/logging_cloudwatch/aws_logging_cloudwatch"
+    directory: "packages/logging/amplify_logging_cloudwatch_dart"
     schedule:
       interval: "daily"
     ignore:
@@ -1952,7 +1952,7 @@ updates:
         patterns:
           - "test"
   - package-ecosystem: "pub"
-    directory: "packages/logging_cloudwatch/aws_logging_cloudwatch/example"
+    directory: "packages/logging/amplify_logging_cloudwatch_dart/example"
     schedule:
       interval: "daily"
     ignore:
@@ -1961,7 +1961,7 @@ updates:
         update-types:
           - "version-update:semver-patch"
       # Ignore all repo packages
-      - dependency-name: "aws_logging_cloudwatch"
+      - dependency-name: "amplify_logging_cloudwatch_dart"
       - dependency-name: "amplify_core"
       - dependency-name: "aws_common"
       - dependency-name: "amplify_lints"
@@ -1978,7 +1978,7 @@ updates:
         patterns:
           - "build_web_compilers"
   - package-ecosystem: "pub"
-    directory: "packages/logging_cloudwatch/aws_logging_cloudwatch/example"
+    directory: "packages/logging/amplify_logging_cloudwatch_dart/example"
     schedule:
       interval: "daily"
     ignore:
@@ -1987,7 +1987,7 @@ updates:
         update-types:
           - "version-update:semver-patch"
       # Ignore all repo packages
-      - dependency-name: "aws_logging_cloudwatch"
+      - dependency-name: "amplify_logging_cloudwatch_dart"
       - dependency-name: "amplify_core"
       - dependency-name: "aws_common"
       - dependency-name: "amplify_lints"

.github/workflows/amplify_logging_cloudwatch.yaml

@@ -21,12 +21,12 @@ on:
       - 'packages/aws_signature_v4/pubspec.yaml'
       - 'packages/common/amplify_db_common_dart/lib/**/*.dart'
       - 'packages/common/amplify_db_common_dart/pubspec.yaml'
-      - 'packages/logging_cloudwatch/amplify_logging_cloudwatch/**/*.dart'
-      - 'packages/logging_cloudwatch/amplify_logging_cloudwatch/**/*.yaml'
-      - 'packages/logging_cloudwatch/amplify_logging_cloudwatch/lib/**/*'
-      - 'packages/logging_cloudwatch/amplify_logging_cloudwatch/test/**/*'
-      - 'packages/logging_cloudwatch/aws_logging_cloudwatch/lib/**/*.dart'
-      - 'packages/logging_cloudwatch/aws_logging_cloudwatch/pubspec.yaml'
+      - 'packages/logging/amplify_logging_cloudwatch/**/*.dart'
+      - 'packages/logging/amplify_logging_cloudwatch/**/*.yaml'
+      - 'packages/logging/amplify_logging_cloudwatch/lib/**/*'
+      - 'packages/logging/amplify_logging_cloudwatch/test/**/*'
+      - 'packages/logging/amplify_logging_cloudwatch_dart/lib/**/*.dart'
+      - 'packages/logging/amplify_logging_cloudwatch_dart/pubspec.yaml'
       - 'packages/smithy/smithy/lib/**/*.dart'
       - 'packages/smithy/smithy/pubspec.yaml'
       - 'packages/smithy/smithy_aws/lib/**/*.dart'
@@ -48,12 +48,12 @@ on:
       - 'packages/aws_signature_v4/pubspec.yaml'
       - 'packages/common/amplify_db_common_dart/lib/**/*.dart'
       - 'packages/common/amplify_db_common_dart/pubspec.yaml'
-      - 'packages/logging_cloudwatch/amplify_logging_cloudwatch/**/*.dart'
-      - 'packages/logging_cloudwatch/amplify_logging_cloudwatch/**/*.yaml'
-      - 'packages/logging_cloudwatch/amplify_logging_cloudwatch/lib/**/*'
-      - 'packages/logging_cloudwatch/amplify_logging_cloudwatch/test/**/*'
-      - 'packages/logging_cloudwatch/aws_logging_cloudwatch/lib/**/*.dart'
-      - 'packages/logging_cloudwatch/aws_logging_cloudwatch/pubspec.yaml'
+      - 'packages/logging/amplify_logging_cloudwatch/**/*.dart'
+      - 'packages/logging/amplify_logging_cloudwatch/**/*.yaml'
+      - 'packages/logging/amplify_logging_cloudwatch/lib/**/*'
+      - 'packages/logging/amplify_logging_cloudwatch/test/**/*'
+      - 'packages/logging/amplify_logging_cloudwatch_dart/lib/**/*.dart'
+      - 'packages/logging/amplify_logging_cloudwatch_dart/pubspec.yaml'
       - 'packages/smithy/smithy/lib/**/*.dart'
       - 'packages/smithy/smithy/pubspec.yaml'
       - 'packages/smithy/smithy_aws/lib/**/*.dart'
@@ -81,5 +81,5 @@ jobs:
     secrets: inherit
     with:
       package-name: amplify_logging_cloudwatch
-      working-directory: packages/logging_cloudwatch/amplify_logging_cloudwatch
+      working-directory: packages/logging/amplify_logging_cloudwatch
       has-goldens: false

.github/workflows/aws_logging_cloudwatch.yaml → .github/workflows/amplify_logging_cloudwatch_dart.yaml

@@ -1,13 +1,13 @@
 # Generated with aft. To update, run: `aft generate workflows`
-name: aws_logging_cloudwatch
+name: amplify_logging_cloudwatch_dart
 on:
   push:
     branches:
       - main
       - stable
     paths:
       - '.github/composite_actions/setup_firefox/action.yaml'
-      - '.github/workflows/aws_logging_cloudwatch.yaml'
+      - '.github/workflows/amplify_logging_cloudwatch_dart.yaml'
       - '.github/workflows/dart_dart2js.yaml'
       - '.github/workflows/dart_ddc.yaml'
       - '.github/workflows/dart_native.yaml'
@@ -22,18 +22,18 @@ on:
       - 'packages/aws_signature_v4/pubspec.yaml'
       - 'packages/common/amplify_db_common_dart/lib/**/*.dart'
       - 'packages/common/amplify_db_common_dart/pubspec.yaml'
-      - 'packages/logging_cloudwatch/aws_logging_cloudwatch/**/*.dart'
-      - 'packages/logging_cloudwatch/aws_logging_cloudwatch/**/*.yaml'
-      - 'packages/logging_cloudwatch/aws_logging_cloudwatch/lib/**/*'
-      - 'packages/logging_cloudwatch/aws_logging_cloudwatch/test/**/*'
+      - 'packages/logging/amplify_logging_cloudwatch_dart/**/*.dart'
+      - 'packages/logging/amplify_logging_cloudwatch_dart/**/*.yaml'
+      - 'packages/logging/amplify_logging_cloudwatch_dart/lib/**/*'
+      - 'packages/logging/amplify_logging_cloudwatch_dart/test/**/*'
       - 'packages/smithy/smithy/lib/**/*.dart'
       - 'packages/smithy/smithy/pubspec.yaml'
       - 'packages/smithy/smithy_aws/lib/**/*.dart'
       - 'packages/smithy/smithy_aws/pubspec.yaml'
   pull_request:
     paths:
       - '.github/composite_actions/setup_firefox/action.yaml'
-      - '.github/workflows/aws_logging_cloudwatch.yaml'
+      - '.github/workflows/amplify_logging_cloudwatch_dart.yaml'
       - '.github/workflows/dart_dart2js.yaml'
       - '.github/workflows/dart_ddc.yaml'
       - '.github/workflows/dart_native.yaml'
@@ -48,10 +48,10 @@ on:
       - 'packages/aws_signature_v4/pubspec.yaml'
       - 'packages/common/amplify_db_common_dart/lib/**/*.dart'
       - 'packages/common/amplify_db_common_dart/pubspec.yaml'
-      - 'packages/logging_cloudwatch/aws_logging_cloudwatch/**/*.dart'
-      - 'packages/logging_cloudwatch/aws_logging_cloudwatch/**/*.yaml'
-      - 'packages/logging_cloudwatch/aws_logging_cloudwatch/lib/**/*'
-      - 'packages/logging_cloudwatch/aws_logging_cloudwatch/test/**/*'
+      - 'packages/logging/amplify_logging_cloudwatch_dart/**/*.dart'
+      - 'packages/logging/amplify_logging_cloudwatch_dart/**/*.yaml'
+      - 'packages/logging/amplify_logging_cloudwatch_dart/lib/**/*'
+      - 'packages/logging/amplify_logging_cloudwatch_dart/test/**/*'
       - 'packages/smithy/smithy/lib/**/*.dart'
       - 'packages/smithy/smithy/pubspec.yaml'
       - 'packages/smithy/smithy_aws/lib/**/*.dart'
@@ -78,26 +78,26 @@ jobs:
     uses: ./.github/workflows/dart_vm.yaml
     secrets: inherit
     with:
-      package-name: aws_logging_cloudwatch
-      working-directory: packages/logging_cloudwatch/aws_logging_cloudwatch
+      package-name: amplify_logging_cloudwatch_dart
+      working-directory: packages/logging/amplify_logging_cloudwatch_dart
   native_test:
     needs: test
     uses: ./.github/workflows/dart_native.yaml
     secrets: inherit 
     with:
-      package-name: aws_logging_cloudwatch
-      working-directory: packages/logging_cloudwatch/aws_logging_cloudwatch
+      package-name: amplify_logging_cloudwatch_dart
+      working-directory: packages/logging/amplify_logging_cloudwatch_dart
   ddc_test:
     needs: test
     uses: ./.github/workflows/dart_ddc.yaml
     secrets: inherit
     with:
-      package-name: aws_logging_cloudwatch
-      working-directory: packages/logging_cloudwatch/aws_logging_cloudwatch
+      package-name: amplify_logging_cloudwatch_dart
+      working-directory: packages/logging/amplify_logging_cloudwatch_dart
   dart2js_test:
     needs: test
     uses: ./.github/workflows/dart_dart2js.yaml
     secrets: inherit
     with:
-      package-name: aws_logging_cloudwatch
-      working-directory: packages/logging_cloudwatch/aws_logging_cloudwatch
+      package-name: amplify_logging_cloudwatch_dart
+      working-directory: packages/logging/amplify_logging_cloudwatch_dart

.github/workflows/amplify_logging_cloudwatch_example.yaml

@@ -32,14 +32,14 @@ on:
       - 'packages/common/amplify_db_common/pubspec.yaml'
       - 'packages/common/amplify_db_common_dart/lib/**/*.dart'
       - 'packages/common/amplify_db_common_dart/pubspec.yaml'
-      - 'packages/logging_cloudwatch/amplify_logging_cloudwatch/example/**/*.dart'
-      - 'packages/logging_cloudwatch/amplify_logging_cloudwatch/example/**/*.yaml'
-      - 'packages/logging_cloudwatch/amplify_logging_cloudwatch/example/lib/**/*'
-      - 'packages/logging_cloudwatch/amplify_logging_cloudwatch/example/test/**/*'
-      - 'packages/logging_cloudwatch/amplify_logging_cloudwatch/lib/**/*.dart'
-      - 'packages/logging_cloudwatch/amplify_logging_cloudwatch/pubspec.yaml'
-      - 'packages/logging_cloudwatch/aws_logging_cloudwatch/lib/**/*.dart'
-      - 'packages/logging_cloudwatch/aws_logging_cloudwatch/pubspec.yaml'
+      - 'packages/logging/amplify_logging_cloudwatch/example/**/*.dart'
+      - 'packages/logging/amplify_logging_cloudwatch/example/**/*.yaml'
+      - 'packages/logging/amplify_logging_cloudwatch/example/lib/**/*'
+      - 'packages/logging/amplify_logging_cloudwatch/example/test/**/*'
+      - 'packages/logging/amplify_logging_cloudwatch/lib/**/*.dart'
+      - 'packages/logging/amplify_logging_cloudwatch/pubspec.yaml'
+      - 'packages/logging/amplify_logging_cloudwatch_dart/lib/**/*.dart'
+      - 'packages/logging/amplify_logging_cloudwatch_dart/pubspec.yaml'
       - 'packages/secure_storage/amplify_secure_storage/lib/**/*.dart'
       - 'packages/secure_storage/amplify_secure_storage/pubspec.yaml'
       - 'packages/secure_storage/amplify_secure_storage_dart/lib/**/*.dart'
@@ -82,14 +82,14 @@ on:
       - 'packages/common/amplify_db_common/pubspec.yaml'
       - 'packages/common/amplify_db_common_dart/lib/**/*.dart'
       - 'packages/common/amplify_db_common_dart/pubspec.yaml'
-      - 'packages/logging_cloudwatch/amplify_logging_cloudwatch/example/**/*.dart'
-      - 'packages/logging_cloudwatch/amplify_logging_cloudwatch/example/**/*.yaml'
-      - 'packages/logging_cloudwatch/amplify_logging_cloudwatch/example/lib/**/*'
-      - 'packages/logging_cloudwatch/amplify_logging_cloudwatch/example/test/**/*'
-      - 'packages/logging_cloudwatch/amplify_logging_cloudwatch/lib/**/*.dart'
-      - 'packages/logging_cloudwatch/amplify_logging_cloudwatch/pubspec.yaml'
-      - 'packages/logging_cloudwatch/aws_logging_cloudwatch/lib/**/*.dart'
-      - 'packages/logging_cloudwatch/aws_logging_cloudwatch/pubspec.yaml'
+      - 'packages/logging/amplify_logging_cloudwatch/example/**/*.dart'
+      - 'packages/logging/amplify_logging_cloudwatch/example/**/*.yaml'
+      - 'packages/logging/amplify_logging_cloudwatch/example/lib/**/*'
+      - 'packages/logging/amplify_logging_cloudwatch/example/test/**/*'
+      - 'packages/logging/amplify_logging_cloudwatch/lib/**/*.dart'
+      - 'packages/logging/amplify_logging_cloudwatch/pubspec.yaml'
+      - 'packages/logging/amplify_logging_cloudwatch_dart/lib/**/*.dart'
+      - 'packages/logging/amplify_logging_cloudwatch_dart/pubspec.yaml'
       - 'packages/secure_storage/amplify_secure_storage/lib/**/*.dart'
       - 'packages/secure_storage/amplify_secure_storage/pubspec.yaml'
       - 'packages/secure_storage/amplify_secure_storage_dart/lib/**/*.dart'
@@ -127,5 +127,5 @@ jobs:
     secrets: inherit
     with:
       package-name: amplify_logging_cloudwatch_example
-      working-directory: packages/logging_cloudwatch/amplify_logging_cloudwatch/example
+      working-directory: packages/logging/amplify_logging_cloudwatch/example
       has-goldens: false

packages/aft/test/config/package_selector_test.dart

@@ -44,8 +44,8 @@ void main() {
             'packages/common/amplify_db_common/example',
             'packages/common/amplify_db_common_dart/example',
             'packages/example_common/example',
-            'packages/logging_cloudwatch/amplify_logging_cloudwatch/example',
-            'packages/logging_cloudwatch/aws_logging_cloudwatch/example',
+            'packages/logging/amplify_logging_cloudwatch/example',
+            'packages/logging/amplify_logging_cloudwatch_dart/example',
             'packages/notifications/push/amplify_push_notifications/example',
             'packages/notifications/push/amplify_push_notifications_pinpoint/example',
             'packages/secure_storage/amplify_secure_storage/example',
@@ -136,7 +136,7 @@ void main() {
           'packages/analytics/amplify_analytics_pinpoint/example',
           'packages/api/amplify_api/example',
           'packages/common/amplify_db_common/example',
-          'packages/logging_cloudwatch/amplify_logging_cloudwatch/example',
+          'packages/logging/amplify_logging_cloudwatch/example',
           'packages/notifications/push/amplify_push_notifications/example',
           'packages/notifications/push/amplify_push_notifications_pinpoint/example',
           'packages/secure_storage/amplify_secure_storage/example',

packages/logging_cloudwatch/amplify_logging_cloudwatch/example/lib/amplifyconfiguration_logging.dart → packages/logging/amplify_logging_cloudwatch/example/lib/amplifyconfiguration_logging.dart

@@ -1,13 +1,11 @@
 const loggingconfig = '''{
+      "plugins": {
+        "cloudWatchLoggerPluginConfiguration": {
             "enable": true,
-            "logGroupName": "<log-group>",
-            "region": "<region>",
+            "logGroupName": "test-logging-log-group",
+            "region": "us-west-2",
             "localStoreMaxSizeInMB": 5,
             "flushIntervalInSeconds": 60,
-            "defaultRemoteConfiguration": {
-                "endpoint": "https://<restApiId>.execute-api.<region>.amazonaws.com/prod/loggingconstraints",
-                "refreshIntervalInSeconds": 1200
-            },
             "loggingConstraints": {
                 "defaultLogLevel": "ERROR",
                 "categoryLogLevel": {
@@ -24,4 +22,6 @@ const loggingconfig = '''{
                     }
                 }
             }
+        }
+      }
 }''';

packages/logging_cloudwatch/amplify_logging_cloudwatch/example/lib/main.dart → packages/logging/amplify_logging_cloudwatch/example/lib/main.dart

@@ -39,7 +39,7 @@ class _MyAppState extends State<MyApp> {
             MacOSSecureStorageOptions(useDataProtection: false),
       ),
     );
-    final loggingPlugin = AmplifyCloudWatchLoggerPlugin(
+    final loggingPlugin = AmplifyLoggingCloudwatch(
       CloudWatchPluginConfig.fromJson(
         jsonDecode(loggingconfig) as Map<String, dynamic>,
       ),

packages/logging_cloudwatch/amplify_logging_cloudwatch/lib/amplify_logging_cloudwatch.dart → packages/logging/amplify_logging_cloudwatch/lib/amplify_logging_cloudwatch.dart

@@ -1,4 +1,4 @@
 /// amplify_logging_cloudwatch
 library amplify_logging_cloudwatch;
 
-export 'src/amplify_cloudwatch_logger_plugin.dart';
+export 'src/amplify_logging_cloudwatch_impl.dart';