diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml index fa5168a26f..b73ca59f5f 100644 --- a/.github/dependabot.yaml +++ b/.github/dependabot.yaml @@ -21,12 +21,13 @@ updates: - dependency-name: "aws_common" - dependency-name: "amplify_lints" - dependency-name: "aws_signature_v4" + - dependency-name: "smithy" + - dependency-name: "smithy_codegen" + - dependency-name: "smithy_aws" - dependency-name: "amplify_db_common_dart" - dependency-name: "amplify_secure_storage_dart" - dependency-name: "worker_bee" - dependency-name: "worker_bee_builder" - - dependency-name: "smithy" - - dependency-name: "smithy_aws" - dependency-name: "amplify_db_common" - dependency-name: "amplify_secure_storage" - dependency-name: "amplify_api" @@ -34,7 +35,6 @@ updates: - dependency-name: "amplify_flutter" - dependency-name: "amplify_auth_cognito" - dependency-name: "amplify_auth_cognito_dart" - - dependency-name: "smithy_codegen" - dependency-name: "amplify_authenticator" - dependency-name: "amplify_datastore" - dependency-name: "amplify_datastore_plugin_interface" @@ -53,6 +53,9 @@ updates: - dependency-name: "aws_common" - dependency-name: "amplify_lints" - dependency-name: "aws_signature_v4" + - dependency-name: "smithy" + - dependency-name: "smithy_codegen" + - dependency-name: "smithy_aws" - package-ecosystem: "pub" directory: "packages/aft" schedule: @@ -81,6 +84,9 @@ updates: - dependency-name: "aws_common" - dependency-name: "amplify_lints" - dependency-name: "aws_signature_v4" + - dependency-name: "smithy" + - dependency-name: "smithy_codegen" + - dependency-name: "smithy_aws" - dependency-name: "amplify_secure_storage" - dependency-name: "amplify_secure_storage_dart" - dependency-name: "worker_bee" @@ -100,12 +106,13 @@ updates: - dependency-name: "aws_common" - dependency-name: "amplify_lints" - dependency-name: "aws_signature_v4" + - dependency-name: "smithy" + - dependency-name: "smithy_codegen" + - dependency-name: "smithy_aws" - dependency-name: "amplify_db_common_dart" - dependency-name: "amplify_secure_storage_dart" - dependency-name: "worker_bee" - dependency-name: "worker_bee_builder" - - dependency-name: "smithy" - - dependency-name: "smithy_aws" - dependency-name: "amplify_db_common" - dependency-name: "amplify_secure_storage" - dependency-name: "amplify_api" @@ -113,7 +120,6 @@ updates: - dependency-name: "amplify_flutter" - dependency-name: "amplify_auth_cognito" - dependency-name: "amplify_auth_cognito_dart" - - dependency-name: "smithy_codegen" - dependency-name: "amplify_datastore" - dependency-name: "amplify_datastore_plugin_interface" - dependency-name: "amplify_storage_s3" @@ -130,6 +136,9 @@ updates: - dependency-name: "aws_common" - dependency-name: "amplify_lints" - dependency-name: "aws_signature_v4" + - dependency-name: "smithy" + - dependency-name: "smithy_codegen" + - dependency-name: "smithy_aws" - package-ecosystem: "pub" directory: "packages/amplify_core/doc" schedule: @@ -145,12 +154,13 @@ updates: - dependency-name: "aws_common" - dependency-name: "amplify_lints" - dependency-name: "aws_signature_v4" + - dependency-name: "smithy" + - dependency-name: "smithy_codegen" + - dependency-name: "smithy_aws" - dependency-name: "amplify_db_common_dart" - dependency-name: "amplify_secure_storage_dart" - dependency-name: "worker_bee" - dependency-name: "worker_bee_builder" - - dependency-name: "smithy" - - dependency-name: "smithy_aws" - dependency-name: "amplify_db_common" - dependency-name: "amplify_secure_storage" - dependency-name: "amplify_api" @@ -158,7 +168,6 @@ updates: - dependency-name: "amplify_flutter" - dependency-name: "amplify_auth_cognito" - dependency-name: "amplify_auth_cognito_dart" - - dependency-name: "smithy_codegen" - dependency-name: "amplify_datastore" - dependency-name: "amplify_datastore_plugin_interface" - dependency-name: "amplify_storage_s3" @@ -177,6 +186,9 @@ updates: - dependency-name: "aws_common" - dependency-name: "amplify_lints" - dependency-name: "aws_signature_v4" + - dependency-name: "smithy" + - dependency-name: "smithy_codegen" + - dependency-name: "smithy_aws" - package-ecosystem: "gradle" directory: "packages/amplify_datastore/android" schedule: @@ -206,6 +218,9 @@ updates: - dependency-name: "aws_common" - dependency-name: "amplify_lints" - dependency-name: "aws_signature_v4" + - dependency-name: "smithy" + - dependency-name: "smithy_codegen" + - dependency-name: "smithy_aws" - dependency-name: "amplify_flutter" - dependency-name: "amplify_secure_storage" - dependency-name: "amplify_secure_storage_dart" @@ -216,9 +231,6 @@ updates: - dependency-name: "amplify_auth_cognito_dart" - dependency-name: "amplify_analytics_pinpoint_dart" - dependency-name: "amplify_db_common_dart" - - dependency-name: "smithy" - - dependency-name: "smithy_aws" - - dependency-name: "smithy_codegen" - package-ecosystem: "pub" directory: "packages/amplify_datastore_plugin_interface" schedule: @@ -232,6 +244,9 @@ updates: - dependency-name: "aws_common" - dependency-name: "amplify_lints" - dependency-name: "aws_signature_v4" + - dependency-name: "smithy" + - dependency-name: "smithy_codegen" + - dependency-name: "smithy_aws" - package-ecosystem: "pub" directory: "packages/amplify_lints" schedule: @@ -291,12 +306,13 @@ updates: - dependency-name: "aws_common" - dependency-name: "amplify_lints" - dependency-name: "aws_signature_v4" + - dependency-name: "smithy" + - dependency-name: "smithy_codegen" + - dependency-name: "smithy_aws" - dependency-name: "amplify_db_common_dart" - dependency-name: "amplify_secure_storage_dart" - dependency-name: "worker_bee" - dependency-name: "worker_bee_builder" - - dependency-name: "smithy" - - dependency-name: "smithy_aws" - dependency-name: "amplify_db_common" - dependency-name: "amplify_secure_storage" - package-ecosystem: "gradle" @@ -328,12 +344,13 @@ updates: - dependency-name: "aws_common" - dependency-name: "amplify_lints" - dependency-name: "aws_signature_v4" + - dependency-name: "smithy" + - dependency-name: "smithy_codegen" + - dependency-name: "smithy_aws" - dependency-name: "amplify_db_common_dart" - dependency-name: "amplify_secure_storage_dart" - dependency-name: "worker_bee" - dependency-name: "worker_bee_builder" - - dependency-name: "smithy" - - dependency-name: "smithy_aws" - dependency-name: "amplify_db_common" - dependency-name: "amplify_secure_storage" - dependency-name: "amplify_api" @@ -341,7 +358,6 @@ updates: - dependency-name: "amplify_flutter" - dependency-name: "amplify_auth_cognito" - dependency-name: "amplify_auth_cognito_dart" - - dependency-name: "smithy_codegen" - package-ecosystem: "pub" directory: "packages/analytics/amplify_analytics_pinpoint_dart" schedule: @@ -355,12 +371,13 @@ updates: - dependency-name: "aws_common" - dependency-name: "amplify_lints" - dependency-name: "aws_signature_v4" + - dependency-name: "smithy" + - dependency-name: "smithy_codegen" + - dependency-name: "smithy_aws" - dependency-name: "amplify_db_common_dart" - dependency-name: "amplify_secure_storage_dart" - dependency-name: "worker_bee" - dependency-name: "worker_bee_builder" - - dependency-name: "smithy" - - dependency-name: "smithy_aws" - package-ecosystem: "pub" directory: "packages/api/amplify_api" schedule: @@ -375,6 +392,9 @@ updates: - dependency-name: "aws_common" - dependency-name: "amplify_lints" - dependency-name: "aws_signature_v4" + - dependency-name: "smithy" + - dependency-name: "smithy_codegen" + - dependency-name: "smithy_aws" - dependency-name: "amplify_flutter" - dependency-name: "amplify_secure_storage" - dependency-name: "amplify_secure_storage_dart" @@ -395,6 +415,9 @@ updates: - dependency-name: "aws_common" - dependency-name: "amplify_lints" - dependency-name: "aws_signature_v4" + - dependency-name: "smithy" + - dependency-name: "smithy_codegen" + - dependency-name: "smithy_aws" - dependency-name: "amplify_flutter" - dependency-name: "amplify_secure_storage" - dependency-name: "amplify_secure_storage_dart" @@ -404,11 +427,8 @@ updates: - dependency-name: "amplify_analytics_pinpoint" - dependency-name: "amplify_analytics_pinpoint_dart" - dependency-name: "amplify_db_common_dart" - - dependency-name: "smithy" - - dependency-name: "smithy_aws" - dependency-name: "amplify_db_common" - dependency-name: "amplify_auth_cognito_dart" - - dependency-name: "smithy_codegen" - dependency-name: "amplify_authenticator" - package-ecosystem: "pub" directory: "packages/api/amplify_api_dart" @@ -423,6 +443,9 @@ updates: - dependency-name: "aws_common" - dependency-name: "amplify_lints" - dependency-name: "aws_signature_v4" + - dependency-name: "smithy" + - dependency-name: "smithy_codegen" + - dependency-name: "smithy_aws" - package-ecosystem: "pub" directory: "packages/auth/amplify_auth_cognito" schedule: @@ -438,16 +461,16 @@ updates: - dependency-name: "aws_common" - dependency-name: "amplify_lints" - dependency-name: "aws_signature_v4" + - dependency-name: "smithy" + - dependency-name: "smithy_codegen" + - dependency-name: "smithy_aws" - dependency-name: "amplify_db_common_dart" - dependency-name: "amplify_secure_storage_dart" - dependency-name: "worker_bee" - dependency-name: "worker_bee_builder" - - dependency-name: "smithy" - - dependency-name: "smithy_aws" - dependency-name: "amplify_db_common" - dependency-name: "amplify_secure_storage" - dependency-name: "amplify_auth_cognito_dart" - - dependency-name: "smithy_codegen" - dependency-name: "amplify_flutter" - package-ecosystem: "gradle" directory: "packages/auth/amplify_auth_cognito/android" @@ -478,6 +501,9 @@ updates: - dependency-name: "aws_common" - dependency-name: "amplify_lints" - dependency-name: "aws_signature_v4" + - dependency-name: "smithy" + - dependency-name: "smithy_codegen" + - dependency-name: "smithy_aws" - dependency-name: "amplify_flutter" - dependency-name: "amplify_secure_storage" - dependency-name: "amplify_secure_storage_dart" @@ -487,11 +513,8 @@ updates: - dependency-name: "amplify_analytics_pinpoint" - dependency-name: "amplify_analytics_pinpoint_dart" - dependency-name: "amplify_db_common_dart" - - dependency-name: "smithy" - - dependency-name: "smithy_aws" - dependency-name: "amplify_db_common" - dependency-name: "amplify_auth_cognito_dart" - - dependency-name: "smithy_codegen" - dependency-name: "amplify_authenticator" - dependency-name: "amplify_native_legacy_wrapper" - package-ecosystem: "pub" @@ -508,13 +531,13 @@ updates: - dependency-name: "aws_common" - dependency-name: "amplify_lints" - dependency-name: "aws_signature_v4" + - dependency-name: "smithy" + - dependency-name: "smithy_codegen" + - dependency-name: "smithy_aws" - dependency-name: "amplify_db_common_dart" - dependency-name: "amplify_secure_storage_dart" - dependency-name: "worker_bee" - dependency-name: "worker_bee_builder" - - dependency-name: "smithy" - - dependency-name: "smithy_aws" - - dependency-name: "smithy_codegen" - package-ecosystem: "pub" directory: "packages/auth/amplify_auth_cognito_dart/example" schedule: @@ -530,13 +553,13 @@ updates: - dependency-name: "aws_common" - dependency-name: "amplify_lints" - dependency-name: "aws_signature_v4" + - dependency-name: "smithy" + - dependency-name: "smithy_codegen" + - dependency-name: "smithy_aws" - dependency-name: "amplify_db_common_dart" - dependency-name: "amplify_secure_storage_dart" - dependency-name: "worker_bee" - dependency-name: "worker_bee_builder" - - dependency-name: "smithy" - - dependency-name: "smithy_aws" - - dependency-name: "smithy_codegen" - dependency-name: "example_common" - dependency-name: "amplify_api_dart" - package-ecosystem: "pub" @@ -553,14 +576,14 @@ updates: - dependency-name: "aws_common" - dependency-name: "amplify_lints" - dependency-name: "aws_signature_v4" + - dependency-name: "smithy" + - dependency-name: "smithy_codegen" + - dependency-name: "smithy_aws" - dependency-name: "amplify_db_common_dart" - dependency-name: "amplify_secure_storage_dart" - dependency-name: "worker_bee" - dependency-name: "worker_bee_builder" - - dependency-name: "smithy" - - dependency-name: "smithy_aws" - dependency-name: "amplify_auth_cognito_dart" - - dependency-name: "smithy_codegen" - package-ecosystem: "pub" directory: "packages/authenticator/amplify_authenticator" schedule: @@ -577,16 +600,16 @@ updates: - dependency-name: "aws_common" - dependency-name: "amplify_lints" - dependency-name: "aws_signature_v4" + - dependency-name: "smithy" + - dependency-name: "smithy_codegen" + - dependency-name: "smithy_aws" - dependency-name: "amplify_db_common_dart" - dependency-name: "amplify_secure_storage_dart" - dependency-name: "worker_bee" - dependency-name: "worker_bee_builder" - - dependency-name: "smithy" - - dependency-name: "smithy_aws" - dependency-name: "amplify_db_common" - dependency-name: "amplify_secure_storage" - dependency-name: "amplify_auth_cognito_dart" - - dependency-name: "smithy_codegen" - dependency-name: "amplify_flutter" - package-ecosystem: "pub" directory: "packages/authenticator/amplify_authenticator/example" @@ -604,16 +627,16 @@ updates: - dependency-name: "aws_common" - dependency-name: "amplify_lints" - dependency-name: "aws_signature_v4" + - dependency-name: "smithy" + - dependency-name: "smithy_codegen" + - dependency-name: "smithy_aws" - dependency-name: "amplify_db_common_dart" - dependency-name: "amplify_secure_storage_dart" - dependency-name: "worker_bee" - dependency-name: "worker_bee_builder" - - dependency-name: "smithy" - - dependency-name: "smithy_aws" - dependency-name: "amplify_db_common" - dependency-name: "amplify_secure_storage" - dependency-name: "amplify_auth_cognito_dart" - - dependency-name: "smithy_codegen" - dependency-name: "amplify_flutter" - dependency-name: "amplify_authenticator" - dependency-name: "amplify_api" @@ -635,16 +658,16 @@ updates: - dependency-name: "aws_common" - dependency-name: "amplify_lints" - dependency-name: "aws_signature_v4" + - dependency-name: "smithy" + - dependency-name: "smithy_codegen" + - dependency-name: "smithy_aws" - dependency-name: "amplify_db_common_dart" - dependency-name: "amplify_secure_storage_dart" - dependency-name: "worker_bee" - dependency-name: "worker_bee_builder" - - dependency-name: "smithy" - - dependency-name: "smithy_aws" - dependency-name: "amplify_db_common" - dependency-name: "amplify_secure_storage" - dependency-name: "amplify_auth_cognito_dart" - - dependency-name: "smithy_codegen" - dependency-name: "amplify_flutter" - package-ecosystem: "pub" directory: "packages/aws_common" @@ -707,6 +730,9 @@ updates: - dependency-name: "aws_common" - dependency-name: "amplify_lints" - dependency-name: "aws_signature_v4" + - dependency-name: "smithy" + - dependency-name: "smithy_codegen" + - dependency-name: "smithy_aws" - package-ecosystem: "gradle" directory: "packages/common/amplify_db_common/android" schedule: @@ -736,6 +762,9 @@ updates: - dependency-name: "aws_common" - dependency-name: "amplify_lints" - dependency-name: "aws_signature_v4" + - dependency-name: "smithy" + - dependency-name: "smithy_codegen" + - dependency-name: "smithy_aws" - package-ecosystem: "pub" directory: "packages/common/amplify_db_common_dart" schedule: @@ -749,6 +778,9 @@ updates: - dependency-name: "aws_common" - dependency-name: "amplify_lints" - dependency-name: "aws_signature_v4" + - dependency-name: "smithy" + - dependency-name: "smithy_codegen" + - dependency-name: "smithy_aws" - package-ecosystem: "pub" directory: "packages/common/amplify_db_common_dart/example" schedule: @@ -763,6 +795,9 @@ updates: - dependency-name: "aws_common" - dependency-name: "amplify_lints" - dependency-name: "aws_signature_v4" + - dependency-name: "smithy" + - dependency-name: "smithy_codegen" + - dependency-name: "smithy_aws" - dependency-name: "example_common" - package-ecosystem: "pub" directory: "packages/example_common" @@ -798,6 +833,9 @@ updates: - dependency-name: "aws_common" - dependency-name: "amplify_lints" - dependency-name: "aws_signature_v4" + - dependency-name: "smithy" + - dependency-name: "smithy_codegen" + - dependency-name: "smithy_aws" - dependency-name: "amplify_secure_storage" - dependency-name: "amplify_secure_storage_dart" - dependency-name: "worker_bee" @@ -830,6 +868,9 @@ updates: - dependency-name: "aws_common" - dependency-name: "amplify_lints" - dependency-name: "aws_signature_v4" + - dependency-name: "smithy" + - dependency-name: "smithy_codegen" + - dependency-name: "smithy_aws" - dependency-name: "amplify_secure_storage" - dependency-name: "amplify_secure_storage_dart" - dependency-name: "worker_bee" @@ -849,17 +890,17 @@ updates: - dependency-name: "aws_common" - dependency-name: "amplify_lints" - dependency-name: "aws_signature_v4" + - dependency-name: "smithy" + - dependency-name: "smithy_codegen" + - dependency-name: "smithy_aws" - dependency-name: "amplify_db_common_dart" - dependency-name: "amplify_secure_storage_dart" - dependency-name: "worker_bee" - dependency-name: "worker_bee_builder" - - dependency-name: "smithy" - - dependency-name: "smithy_aws" - dependency-name: "amplify_db_common" - dependency-name: "amplify_secure_storage" - dependency-name: "amplify_auth_cognito" - dependency-name: "amplify_auth_cognito_dart" - - dependency-name: "smithy_codegen" - dependency-name: "amplify_flutter" - dependency-name: "amplify_push_notifications" - package-ecosystem: "pub" @@ -878,16 +919,16 @@ updates: - dependency-name: "aws_common" - dependency-name: "amplify_lints" - dependency-name: "aws_signature_v4" + - dependency-name: "smithy" + - dependency-name: "smithy_codegen" + - dependency-name: "smithy_aws" - dependency-name: "amplify_db_common_dart" - dependency-name: "amplify_secure_storage_dart" - dependency-name: "worker_bee" - dependency-name: "worker_bee_builder" - - dependency-name: "smithy" - - dependency-name: "smithy_aws" - dependency-name: "amplify_db_common" - dependency-name: "amplify_secure_storage" - dependency-name: "amplify_auth_cognito_dart" - - dependency-name: "smithy_codegen" - dependency-name: "amplify_flutter" - dependency-name: "amplify_push_notifications_pinpoint" - dependency-name: "amplify_push_notifications" @@ -1251,11 +1292,12 @@ updates: - dependency-name: "aws_common" - dependency-name: "amplify_lints" - dependency-name: "aws_signature_v4" + - dependency-name: "smithy" + - dependency-name: "smithy_codegen" + - dependency-name: "smithy_aws" - dependency-name: "amplify_db_common" - dependency-name: "amplify_db_common_dart" - dependency-name: "amplify_storage_s3_dart" - - dependency-name: "smithy" - - dependency-name: "smithy_aws" - package-ecosystem: "pub" directory: "packages/storage/amplify_storage_s3/example" schedule: @@ -1272,16 +1314,16 @@ updates: - dependency-name: "aws_common" - dependency-name: "amplify_lints" - dependency-name: "aws_signature_v4" + - dependency-name: "smithy" + - dependency-name: "smithy_codegen" + - dependency-name: "smithy_aws" - dependency-name: "amplify_db_common_dart" - dependency-name: "amplify_secure_storage_dart" - dependency-name: "worker_bee" - dependency-name: "worker_bee_builder" - - dependency-name: "smithy" - - dependency-name: "smithy_aws" - dependency-name: "amplify_db_common" - dependency-name: "amplify_secure_storage" - dependency-name: "amplify_auth_cognito_dart" - - dependency-name: "smithy_codegen" - dependency-name: "amplify_flutter" - dependency-name: "amplify_authenticator" - dependency-name: "amplify_storage_s3" @@ -1299,9 +1341,10 @@ updates: - dependency-name: "aws_common" - dependency-name: "amplify_lints" - dependency-name: "aws_signature_v4" - - dependency-name: "amplify_db_common_dart" - dependency-name: "smithy" + - dependency-name: "smithy_codegen" - dependency-name: "smithy_aws" + - dependency-name: "amplify_db_common_dart" - package-ecosystem: "pub" directory: "packages/storage/amplify_storage_s3_dart/example" schedule: @@ -1317,13 +1360,13 @@ updates: - dependency-name: "aws_common" - dependency-name: "amplify_lints" - dependency-name: "aws_signature_v4" + - dependency-name: "smithy" + - dependency-name: "smithy_codegen" + - dependency-name: "smithy_aws" - dependency-name: "amplify_db_common_dart" - dependency-name: "amplify_secure_storage_dart" - dependency-name: "worker_bee" - dependency-name: "worker_bee_builder" - - dependency-name: "smithy" - - dependency-name: "smithy_aws" - - dependency-name: "smithy_codegen" - dependency-name: "amplify_storage_s3_dart" - dependency-name: "example_common" - package-ecosystem: "pub" @@ -1341,6 +1384,9 @@ updates: - dependency-name: "aws_common" - dependency-name: "amplify_lints" - dependency-name: "aws_signature_v4" + - dependency-name: "smithy" + - dependency-name: "smithy_codegen" + - dependency-name: "smithy_aws" - dependency-name: "amplify_flutter" - dependency-name: "amplify_secure_storage" - dependency-name: "amplify_secure_storage_dart" @@ -1350,11 +1396,8 @@ updates: - dependency-name: "amplify_analytics_pinpoint" - dependency-name: "amplify_analytics_pinpoint_dart" - dependency-name: "amplify_db_common_dart" - - dependency-name: "smithy" - - dependency-name: "smithy_aws" - dependency-name: "amplify_db_common" - dependency-name: "amplify_auth_cognito_dart" - - dependency-name: "smithy_codegen" - package-ecosystem: "pub" directory: "packages/test/amplify_integration_test" schedule: @@ -1370,13 +1413,13 @@ updates: - dependency-name: "aws_common" - dependency-name: "amplify_lints" - dependency-name: "aws_signature_v4" + - dependency-name: "smithy" + - dependency-name: "smithy_codegen" + - dependency-name: "smithy_aws" - dependency-name: "amplify_db_common_dart" - dependency-name: "amplify_secure_storage_dart" - dependency-name: "worker_bee" - dependency-name: "worker_bee_builder" - - dependency-name: "smithy" - - dependency-name: "smithy_aws" - - dependency-name: "smithy_codegen" - package-ecosystem: "pub" directory: "packages/test/amplify_test" schedule: @@ -1390,6 +1433,9 @@ updates: - dependency-name: "aws_common" - dependency-name: "amplify_lints" - dependency-name: "aws_signature_v4" + - dependency-name: "smithy" + - dependency-name: "smithy_codegen" + - dependency-name: "smithy_aws" - package-ecosystem: "pub" directory: "packages/worker_bee/e2e" schedule: diff --git a/.github/workflows/amplify_analytics_pinpoint.yaml b/.github/workflows/amplify_analytics_pinpoint.yaml index 57a35924b4..05ea070c46 100644 --- a/.github/workflows/amplify_analytics_pinpoint.yaml +++ b/.github/workflows/amplify_analytics_pinpoint.yaml @@ -35,6 +35,8 @@ on: - 'packages/smithy/smithy/pubspec.yaml' - 'packages/smithy/smithy_aws/lib/**/*.dart' - 'packages/smithy/smithy_aws/pubspec.yaml' + - 'packages/smithy/smithy_codegen/lib/**/*.dart' + - 'packages/smithy/smithy_codegen/pubspec.yaml' - 'packages/worker_bee/worker_bee/lib/**/*.dart' - 'packages/worker_bee/worker_bee/pubspec.yaml' - 'packages/worker_bee/worker_bee_builder/lib/**/*.dart' diff --git a/.github/workflows/amplify_analytics_pinpoint_dart.yaml b/.github/workflows/amplify_analytics_pinpoint_dart.yaml index 15405d408f..e4aaa2db68 100644 --- a/.github/workflows/amplify_analytics_pinpoint_dart.yaml +++ b/.github/workflows/amplify_analytics_pinpoint_dart.yaml @@ -33,6 +33,8 @@ on: - 'packages/smithy/smithy/pubspec.yaml' - 'packages/smithy/smithy_aws/lib/**/*.dart' - 'packages/smithy/smithy_aws/pubspec.yaml' + - 'packages/smithy/smithy_codegen/lib/**/*.dart' + - 'packages/smithy/smithy_codegen/pubspec.yaml' - 'packages/worker_bee/worker_bee/lib/**/*.dart' - 'packages/worker_bee/worker_bee/pubspec.yaml' - 'packages/worker_bee/worker_bee_builder/lib/**/*.dart' diff --git a/.github/workflows/amplify_api.yaml b/.github/workflows/amplify_api.yaml index e6c9532692..5bb703f414 100644 --- a/.github/workflows/amplify_api.yaml +++ b/.github/workflows/amplify_api.yaml @@ -29,6 +29,12 @@ on: - 'packages/secure_storage/amplify_secure_storage/pubspec.yaml' - 'packages/secure_storage/amplify_secure_storage_dart/lib/**/*.dart' - 'packages/secure_storage/amplify_secure_storage_dart/pubspec.yaml' + - 'packages/smithy/smithy/lib/**/*.dart' + - 'packages/smithy/smithy/pubspec.yaml' + - 'packages/smithy/smithy_aws/lib/**/*.dart' + - 'packages/smithy/smithy_aws/pubspec.yaml' + - 'packages/smithy/smithy_codegen/lib/**/*.dart' + - 'packages/smithy/smithy_codegen/pubspec.yaml' - 'packages/worker_bee/worker_bee/lib/**/*.dart' - 'packages/worker_bee/worker_bee/pubspec.yaml' - 'packages/worker_bee/worker_bee_builder/lib/**/*.dart' diff --git a/.github/workflows/amplify_api_dart.yaml b/.github/workflows/amplify_api_dart.yaml index a6e788299f..875cb0b381 100644 --- a/.github/workflows/amplify_api_dart.yaml +++ b/.github/workflows/amplify_api_dart.yaml @@ -25,6 +25,12 @@ on: - 'packages/aws_common/pubspec.yaml' - 'packages/aws_signature_v4/lib/**/*.dart' - 'packages/aws_signature_v4/pubspec.yaml' + - 'packages/smithy/smithy/lib/**/*.dart' + - 'packages/smithy/smithy/pubspec.yaml' + - 'packages/smithy/smithy_aws/lib/**/*.dart' + - 'packages/smithy/smithy_aws/pubspec.yaml' + - 'packages/smithy/smithy_codegen/lib/**/*.dart' + - 'packages/smithy/smithy_codegen/pubspec.yaml' schedule: - cron: "0 0 * * 0" # Every Sunday at 00:00 defaults: diff --git a/.github/workflows/amplify_core.yaml b/.github/workflows/amplify_core.yaml index 424d512add..74138c723a 100644 --- a/.github/workflows/amplify_core.yaml +++ b/.github/workflows/amplify_core.yaml @@ -23,6 +23,12 @@ on: - 'packages/aws_common/pubspec.yaml' - 'packages/aws_signature_v4/lib/**/*.dart' - 'packages/aws_signature_v4/pubspec.yaml' + - 'packages/smithy/smithy/lib/**/*.dart' + - 'packages/smithy/smithy/pubspec.yaml' + - 'packages/smithy/smithy_aws/lib/**/*.dart' + - 'packages/smithy/smithy_aws/pubspec.yaml' + - 'packages/smithy/smithy_codegen/lib/**/*.dart' + - 'packages/smithy/smithy_codegen/pubspec.yaml' schedule: - cron: "0 0 * * 0" # Every Sunday at 00:00 defaults: diff --git a/.github/workflows/amplify_datastore.yaml b/.github/workflows/amplify_datastore.yaml index 2f9baf05a2..79c0e40aaa 100644 --- a/.github/workflows/amplify_datastore.yaml +++ b/.github/workflows/amplify_datastore.yaml @@ -23,6 +23,12 @@ on: - 'packages/aws_common/pubspec.yaml' - 'packages/aws_signature_v4/lib/**/*.dart' - 'packages/aws_signature_v4/pubspec.yaml' + - 'packages/smithy/smithy/lib/**/*.dart' + - 'packages/smithy/smithy/pubspec.yaml' + - 'packages/smithy/smithy_aws/lib/**/*.dart' + - 'packages/smithy/smithy_aws/pubspec.yaml' + - 'packages/smithy/smithy_codegen/lib/**/*.dart' + - 'packages/smithy/smithy_codegen/pubspec.yaml' schedule: - cron: "0 0 * * 0" # Every Sunday at 00:00 defaults: diff --git a/.github/workflows/amplify_datastore_plugin_interface.yaml b/.github/workflows/amplify_datastore_plugin_interface.yaml index 478b407b90..6601c5d796 100644 --- a/.github/workflows/amplify_datastore_plugin_interface.yaml +++ b/.github/workflows/amplify_datastore_plugin_interface.yaml @@ -21,6 +21,12 @@ on: - 'packages/aws_common/pubspec.yaml' - 'packages/aws_signature_v4/lib/**/*.dart' - 'packages/aws_signature_v4/pubspec.yaml' + - 'packages/smithy/smithy/lib/**/*.dart' + - 'packages/smithy/smithy/pubspec.yaml' + - 'packages/smithy/smithy_aws/lib/**/*.dart' + - 'packages/smithy/smithy_aws/pubspec.yaml' + - 'packages/smithy/smithy_codegen/lib/**/*.dart' + - 'packages/smithy/smithy_codegen/pubspec.yaml' schedule: - cron: "0 0 * * 0" # Every Sunday at 00:00 defaults: diff --git a/.github/workflows/amplify_db_common.yaml b/.github/workflows/amplify_db_common.yaml index bd851e3a18..2fac7e33b3 100644 --- a/.github/workflows/amplify_db_common.yaml +++ b/.github/workflows/amplify_db_common.yaml @@ -23,6 +23,12 @@ on: - 'packages/common/amplify_db_common/test/**/*' - 'packages/common/amplify_db_common_dart/lib/**/*.dart' - 'packages/common/amplify_db_common_dart/pubspec.yaml' + - 'packages/smithy/smithy/lib/**/*.dart' + - 'packages/smithy/smithy/pubspec.yaml' + - 'packages/smithy/smithy_aws/lib/**/*.dart' + - 'packages/smithy/smithy_aws/pubspec.yaml' + - 'packages/smithy/smithy_codegen/lib/**/*.dart' + - 'packages/smithy/smithy_codegen/pubspec.yaml' schedule: - cron: "0 0 * * 0" # Every Sunday at 00:00 defaults: diff --git a/.github/workflows/amplify_db_common_dart.yaml b/.github/workflows/amplify_db_common_dart.yaml index e0fd7ecd8f..e942eb3351 100644 --- a/.github/workflows/amplify_db_common_dart.yaml +++ b/.github/workflows/amplify_db_common_dart.yaml @@ -25,6 +25,12 @@ on: - 'packages/common/amplify_db_common_dart/**/*.yaml' - 'packages/common/amplify_db_common_dart/lib/**/*' - 'packages/common/amplify_db_common_dart/test/**/*' + - 'packages/smithy/smithy/lib/**/*.dart' + - 'packages/smithy/smithy/pubspec.yaml' + - 'packages/smithy/smithy_aws/lib/**/*.dart' + - 'packages/smithy/smithy_aws/pubspec.yaml' + - 'packages/smithy/smithy_codegen/lib/**/*.dart' + - 'packages/smithy/smithy_codegen/pubspec.yaml' schedule: - cron: "0 0 * * 0" # Every Sunday at 00:00 defaults: diff --git a/.github/workflows/amplify_flutter.yaml b/.github/workflows/amplify_flutter.yaml index 318bcc1ccc..1b5e415714 100644 --- a/.github/workflows/amplify_flutter.yaml +++ b/.github/workflows/amplify_flutter.yaml @@ -25,6 +25,12 @@ on: - 'packages/secure_storage/amplify_secure_storage/pubspec.yaml' - 'packages/secure_storage/amplify_secure_storage_dart/lib/**/*.dart' - 'packages/secure_storage/amplify_secure_storage_dart/pubspec.yaml' + - 'packages/smithy/smithy/lib/**/*.dart' + - 'packages/smithy/smithy/pubspec.yaml' + - 'packages/smithy/smithy_aws/lib/**/*.dart' + - 'packages/smithy/smithy_aws/pubspec.yaml' + - 'packages/smithy/smithy_codegen/lib/**/*.dart' + - 'packages/smithy/smithy_codegen/pubspec.yaml' - 'packages/worker_bee/worker_bee/lib/**/*.dart' - 'packages/worker_bee/worker_bee/pubspec.yaml' - 'packages/worker_bee/worker_bee_builder/lib/**/*.dart' diff --git a/.github/workflows/amplify_push_notifications.yaml b/.github/workflows/amplify_push_notifications.yaml index bcf2fd4e6d..d91f4ec467 100644 --- a/.github/workflows/amplify_push_notifications.yaml +++ b/.github/workflows/amplify_push_notifications.yaml @@ -28,6 +28,12 @@ on: - 'packages/secure_storage/amplify_secure_storage/pubspec.yaml' - 'packages/secure_storage/amplify_secure_storage_dart/lib/**/*.dart' - 'packages/secure_storage/amplify_secure_storage_dart/pubspec.yaml' + - 'packages/smithy/smithy/lib/**/*.dart' + - 'packages/smithy/smithy/pubspec.yaml' + - 'packages/smithy/smithy_aws/lib/**/*.dart' + - 'packages/smithy/smithy_aws/pubspec.yaml' + - 'packages/smithy/smithy_codegen/lib/**/*.dart' + - 'packages/smithy/smithy_codegen/pubspec.yaml' - 'packages/worker_bee/worker_bee/lib/**/*.dart' - 'packages/worker_bee/worker_bee/pubspec.yaml' - 'packages/worker_bee/worker_bee_builder/lib/**/*.dart' diff --git a/.github/workflows/amplify_storage_s3.yaml b/.github/workflows/amplify_storage_s3.yaml index 8e0248b197..2217a5073c 100644 --- a/.github/workflows/amplify_storage_s3.yaml +++ b/.github/workflows/amplify_storage_s3.yaml @@ -25,6 +25,8 @@ on: - 'packages/smithy/smithy/pubspec.yaml' - 'packages/smithy/smithy_aws/lib/**/*.dart' - 'packages/smithy/smithy_aws/pubspec.yaml' + - 'packages/smithy/smithy_codegen/lib/**/*.dart' + - 'packages/smithy/smithy_codegen/pubspec.yaml' - 'packages/storage/amplify_storage_s3/**/*.dart' - 'packages/storage/amplify_storage_s3/**/*.yaml' - 'packages/storage/amplify_storage_s3/lib/**/*' diff --git a/.github/workflows/amplify_storage_s3_dart.yaml b/.github/workflows/amplify_storage_s3_dart.yaml index 5cbd58608c..66c0b8768d 100644 --- a/.github/workflows/amplify_storage_s3_dart.yaml +++ b/.github/workflows/amplify_storage_s3_dart.yaml @@ -24,6 +24,8 @@ on: - 'packages/smithy/smithy/pubspec.yaml' - 'packages/smithy/smithy_aws/lib/**/*.dart' - 'packages/smithy/smithy_aws/pubspec.yaml' + - 'packages/smithy/smithy_codegen/lib/**/*.dart' + - 'packages/smithy/smithy_codegen/pubspec.yaml' - 'packages/storage/amplify_storage_s3_dart/**/*.dart' - 'packages/storage/amplify_storage_s3_dart/**/*.yaml' - 'packages/storage/amplify_storage_s3_dart/lib/**/*' diff --git a/packages/amplify_core/lib/src/config/api/appsync/api_config.dart b/packages/amplify_core/lib/src/config/api/appsync/api_config.dart index 7304ce5db9..de4b96e314 100644 --- a/packages/amplify_core/lib/src/config/api/appsync/api_config.dart +++ b/packages/amplify_core/lib/src/config/api/appsync/api_config.dart @@ -10,8 +10,8 @@ class AWSApiConfig with AWSEquatable, AWSSerializable { const AWSApiConfig({ required this.endpointType, required this.endpoint, - required this.region, - required this.authorizationType, + this.region, + this.authorizationType = APIAuthorizationType.none, this.apiKey, }); @@ -19,7 +19,7 @@ class AWSApiConfig with AWSEquatable, AWSSerializable { _$AWSApiConfigFromJson(json); final EndpointType endpointType; final String endpoint; - final String region; + final String? region; final APIAuthorizationType authorizationType; final String? apiKey; diff --git a/packages/amplify_core/lib/src/config/aws_amplify_config.dart b/packages/amplify_core/lib/src/config/aws_amplify_config.dart index a7ce042502..c0f53dee79 100644 --- a/packages/amplify_core/lib/src/config/aws_amplify_config.dart +++ b/packages/amplify_core/lib/src/config/aws_amplify_config.dart @@ -10,6 +10,7 @@ import 'package:amplify_core/src/generated/src/amplify_configuration_service/com import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; import 'package:built_value/standard_json_plugin.dart'; +import 'package:collection/collection.dart'; part 'aws_amplify_config.g.dart'; @@ -51,24 +52,67 @@ abstract class AWSAmplifyConfig ); } if (config.api?.awsPlugin case final apiConfig?) { - b.api.apis.addAll( - apiConfig.endpoints.map((key, api) { - // TODO(dnys1): multi-auth - final endpoint = switch (api.endpointType) { - EndpointType.graphQL => AWSApiEndpointConfig.appSync( - endpoint: Uri.parse(api.endpoint), - region: api.region, - authMode: api.authorizationType.asAWSAuthMode(api.apiKey), - ), - EndpointType.rest => AWSApiEndpointConfig.apiGateway( - endpoint: Uri.parse(api.endpoint), - region: api.region, - authMode: api.authorizationType.asAWSAuthMode(api.apiKey), - ), - }; - return MapEntry(key, endpoint); - }), - ); + final endpoints = Map.of(apiConfig.endpoints); + while (endpoints.isNotEmpty) { + var apiName = endpoints.keys.first; + final cliEndpoint = endpoints.remove(apiName)!; + final defaultAuthMode = cliEndpoint.defaultAuthMode; + final endpoint = Uri.parse(cliEndpoint.endpoint); + final config = + switch ((cliEndpoint.endpointType, cliEndpoint.region)) { + (EndpointType.graphQL, final region?) => () { + // Fix API name if it follows multi-auth naming of `_` + for (final authType in APIAuthorizationType.values) { + final suffix = '_${authType.rawValue}'; + if (apiName.endsWith(suffix)) { + apiName = apiName.replaceAll(RegExp('$suffix\$'), ''); + break; + } + } + // Search for additional authorization modes. + final additionalAuthModes = { + // When an API key is specified but is not the primary auth mode. + if (cliEndpoint.apiKey case final apiKey? + when cliEndpoint.authorizationType != + APIAuthorizationType.apiKey) + AWSApiAuthorizationMode.apiKey(apiKey), + }; + // Check for other APIs which have the same endpoint but different auth modes. + for (final authType in APIAuthorizationType.values) { + final secondaryEndpoint = endpoints.entries.firstWhereOrNull( + (api) => + api.value.endpoint == cliEndpoint.endpoint && + api.value.endpointType == cliEndpoint.endpointType && + api.value.region == cliEndpoint.region && + api.value.authorizationType == authType, + ); + if (secondaryEndpoint != null) { + additionalAuthModes + .add(secondaryEndpoint.value.defaultAuthMode); + endpoints.remove(secondaryEndpoint.key); + } + } + return AWSApiEndpointConfig.appSync( + endpoint: endpoint, + region: region, + authMode: defaultAuthMode, + additionalAuthModes: additionalAuthModes.toList(), + ); + }(), + (EndpointType.rest, final region?) => + AWSApiEndpointConfig.apiGateway( + endpoint: endpoint, + region: region, + authMode: defaultAuthMode, + ), + (EndpointType.rest, null) => + AWSApiEndpointConfig.rest(endpoint: endpoint), + _ => throw ArgumentError( + 'Invalid endpoint configuration: $cliEndpoint', + ), + }; + b.api.apis[apiName] = config; + } } if (config.auth?.awsPlugin case final authConfig?) { b.auth = AWSAuthConfigCognito$( @@ -654,39 +698,74 @@ abstract class AWSAmplifyConfig ApiConfig? api; if (this.api?.apis case final apis?) { + final endpoints = {}; + void addEndpoint(String name, AWSApiEndpointConfig endpointConfig) { + final endpoint = switch (endpointConfig) { + AWSApiEndpointConfigAppSync$(:final appSync) => core.AWSApiConfig( + endpointType: EndpointType.graphQL, + endpoint: appSync.endpoint.toString(), + region: appSync.region, + authorizationType: appSync.authMode.asCli, + apiKey: switch (appSync.authMode) { + AWSApiAuthorizationModeApiKey$(:final apiKey) => apiKey, + _ => null, + }, + ), + AWSApiEndpointConfigApiGateway$(:final apiGateway) => + core.AWSApiConfig( + endpointType: EndpointType.rest, + endpoint: apiGateway.endpoint.toString(), + region: apiGateway.region, + authorizationType: apiGateway.authMode.asCli, + apiKey: switch (apiGateway.authMode) { + AWSApiAuthorizationModeApiKey$(:final apiKey) => apiKey, + _ => null, + }, + ), + AWSApiEndpointConfigRest$(:final rest) => core.AWSApiConfig( + endpointType: EndpointType.rest, + endpoint: rest.endpoint.toString(), + authorizationType: APIAuthorizationType.none, + ), + _ => throw ArgumentError( + 'Unsupported CLI endpoint type: $endpointConfig', + ), + }; + + // Add a multi-auth config as `_` for each additional + // authorization mode. + if (endpointConfig + case AWSApiEndpointConfigAppSync$( + appSync: AWSAppSyncEndpointConfig(:final additionalAuthModes?) + ) when additionalAuthModes.isNotEmpty) { + for (final authMode in additionalAuthModes) { + final authType = authMode.asCli.rawValue; + addEndpoint( + '${name}_$authType', + AWSApiEndpointConfigAppSync$( + endpointConfig.appSync.rebuild( + (b) => b + ..authMode = authMode + ..additionalAuthModes.clear(), + ), + ), + ); + } + // Correct name for multi-auth scheme. + final suffix = '_${endpoint.authorizationType.rawValue}'; + if (!name.endsWith(suffix)) { + name = '$name$suffix'; + } + } + endpoints[name] = endpoint; + } + + for (final MapEntry(key: name, value: endpointConfig) in apis.entries) { + addEndpoint(name, endpointConfig); + } api = ApiConfig( plugins: { - AWSApiPluginConfig.pluginKey: AWSApiPluginConfig({ - for (final MapEntry(key: name, value: endpointConfig) - in apis.entries) - name: switch (endpointConfig) { - AWSApiEndpointConfigAppSync$(:final appSync) => - core.AWSApiConfig( - endpointType: EndpointType.graphQL, - endpoint: appSync.endpoint.toString(), - region: appSync.region, - authorizationType: appSync.authMode.asCli, - apiKey: switch (appSync.authMode) { - AWSApiAuthorizationModeApiKey$(:final apiKey) => apiKey, - _ => null, - }, - ), - AWSApiEndpointConfigApiGateway$(:final apiGateway) => - core.AWSApiConfig( - endpointType: EndpointType.rest, - endpoint: apiGateway.endpoint.toString(), - region: apiGateway.region, - authorizationType: apiGateway.authMode.asCli, - apiKey: switch (apiGateway.authMode) { - AWSApiAuthorizationModeApiKey$(:final apiKey) => apiKey, - _ => null, - }, - ), - _ => throw ArgumentError( - 'Unsupported CLI endpoint type: $endpointConfig', - ), - } - }) + AWSApiPluginConfig.pluginKey: AWSApiPluginConfig(endpoints), }, ); } @@ -956,18 +1035,17 @@ extension on T { R? let(R Function(T) fn) => fn(this); } -extension on APIAuthorizationType { - AWSApiAuthorizationMode asAWSAuthMode(String? apiKey) { - return switch (this) { - APIAuthorizationType.apiKey => AWSApiAuthorizationMode.apiKey(apiKey!), - APIAuthorizationType.iam => const AWSApiAuthorizationMode.iam(), - APIAuthorizationType.userPools => - const AWSApiAuthorizationMode.userPools(), - APIAuthorizationType.oidc => const AWSApiAuthorizationMode.oidc(), - APIAuthorizationType.function => const AWSApiAuthorizationMode.function(), - APIAuthorizationType.none => const AWSApiAuthorizationMode.none(), - }; - } +extension on core.AWSApiConfig { + AWSApiAuthorizationMode get defaultAuthMode => switch (authorizationType) { + APIAuthorizationType.apiKey => AWSApiAuthorizationMode.apiKey(apiKey!), + APIAuthorizationType.iam => const AWSApiAuthorizationMode.iam(), + APIAuthorizationType.userPools => + const AWSApiAuthorizationMode.userPools(), + APIAuthorizationType.oidc => const AWSApiAuthorizationMode.oidc(), + APIAuthorizationType.function => + const AWSApiAuthorizationMode.function(), + APIAuthorizationType.none => const AWSApiAuthorizationMode.none(), + }; } extension on AWSApiAuthorizationMode { diff --git a/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/common/serializers.dart b/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/common/serializers.dart index 7745e47845..02d7c0f1f9 100644 --- a/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/common/serializers.dart +++ b/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/common/serializers.dart @@ -1,5 +1,5 @@ // Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas library amplify_core.amplify_configuration_service.common.serializers; // ignore_for_file: no_leading_underscores_for_library_prefixes diff --git a/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/amplify_logging_constraints.dart b/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/amplify_logging_constraints.dart index 731fee9f4f..a4182d6caf 100644 --- a/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/amplify_logging_constraints.dart +++ b/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/amplify_logging_constraints.dart @@ -1,5 +1,5 @@ // Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas library amplify_core.amplify_configuration_service.model.amplify_logging_constraints; // ignore_for_file: no_leading_underscores_for_library_prefixes diff --git a/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/amplify_sub_category.dart b/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/amplify_sub_category.dart index fa87458987..6dc3e34d03 100644 --- a/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/amplify_sub_category.dart +++ b/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/amplify_sub_category.dart @@ -1,5 +1,5 @@ // Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas library amplify_core.amplify_configuration_service.model.amplify_sub_category; // ignore_for_file: no_leading_underscores_for_library_prefixes @@ -7,16 +7,12 @@ import 'package:smithy/smithy.dart' as _i1; class AmplifySubCategory extends _i1.SmithyEnum { const AmplifySubCategory._( - int index, - String name, - String value, - ) : super( - index, - name, - value, - ); - - const AmplifySubCategory._sdkUnknown(String value) : super.sdkUnknown(value); + super.index, + super.name, + super.value, + ); + + const AmplifySubCategory._sdkUnknown(super.value) : super.sdkUnknown(); static const inappMessaging = AmplifySubCategory._( 0, diff --git a/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_analytics_config.dart b/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_analytics_config.dart index 4246d62950..8c4198b91d 100644 --- a/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_analytics_config.dart +++ b/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_analytics_config.dart @@ -1,5 +1,5 @@ // Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas library amplify_core.amplify_configuration_service.model.aws_analytics_config; // ignore_for_file: no_leading_underscores_for_library_prefixes diff --git a/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_analytics_pinpoint_config.dart b/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_analytics_pinpoint_config.dart index 276b87539d..a7c08f9b10 100644 --- a/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_analytics_pinpoint_config.dart +++ b/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_analytics_pinpoint_config.dart @@ -1,5 +1,5 @@ // Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas library amplify_core.amplify_configuration_service.model.aws_analytics_pinpoint_config; // ignore_for_file: no_leading_underscores_for_library_prefixes diff --git a/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_api_authorization_mode.dart b/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_api_authorization_mode.dart index be5d2e2c92..7584702e15 100644 --- a/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_api_authorization_mode.dart +++ b/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_api_authorization_mode.dart @@ -1,5 +1,5 @@ // Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas library amplify_core.amplify_configuration_service.model.aws_api_authorization_mode; // ignore_for_file: no_leading_underscores_for_library_prefixes diff --git a/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_api_config.dart b/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_api_config.dart index 614fc410cf..547bdd566c 100644 --- a/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_api_config.dart +++ b/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_api_config.dart @@ -1,5 +1,5 @@ // Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas library amplify_core.amplify_configuration_service.model.aws_api_config; // ignore_for_file: no_leading_underscores_for_library_prefixes diff --git a/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_api_endpoint_config.dart b/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_api_endpoint_config.dart index 7af4dcfa5d..6c053e5ccc 100644 --- a/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_api_endpoint_config.dart +++ b/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_api_endpoint_config.dart @@ -1,5 +1,5 @@ // Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas library amplify_core.amplify_configuration_service.model.aws_api_endpoint_config; // ignore_for_file: no_leading_underscores_for_library_prefixes diff --git a/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_api_gateway_endpoint_config.dart b/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_api_gateway_endpoint_config.dart index c48bf3a95e..e38c1d4681 100644 --- a/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_api_gateway_endpoint_config.dart +++ b/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_api_gateway_endpoint_config.dart @@ -1,5 +1,5 @@ // Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas library amplify_core.amplify_configuration_service.model.aws_api_gateway_endpoint_config; // ignore_for_file: no_leading_underscores_for_library_prefixes diff --git a/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_app_sync_endpoint_config.dart b/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_app_sync_endpoint_config.dart index b9d89ee37c..1ceb6e36ee 100644 --- a/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_app_sync_endpoint_config.dart +++ b/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_app_sync_endpoint_config.dart @@ -1,5 +1,5 @@ // Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas library amplify_core.amplify_configuration_service.model.aws_app_sync_endpoint_config; // ignore_for_file: no_leading_underscores_for_library_prefixes diff --git a/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_auth_cognito_config.dart b/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_auth_cognito_config.dart index 2f01303cb5..22b2fece8f 100644 --- a/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_auth_cognito_config.dart +++ b/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_auth_cognito_config.dart @@ -1,5 +1,5 @@ // Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas library amplify_core.amplify_configuration_service.model.aws_auth_cognito_config; // ignore_for_file: no_leading_underscores_for_library_prefixes diff --git a/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_auth_config.dart b/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_auth_config.dart index 9e7cb47d51..0f41803a25 100644 --- a/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_auth_config.dart +++ b/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_auth_config.dart @@ -1,5 +1,5 @@ // Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas library amplify_core.amplify_configuration_service.model.aws_auth_config; // ignore_for_file: no_leading_underscores_for_library_prefixes diff --git a/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_auth_hosted_ui_config.dart b/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_auth_hosted_ui_config.dart index 7044ab2a40..fe8115892f 100644 --- a/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_auth_hosted_ui_config.dart +++ b/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_auth_hosted_ui_config.dart @@ -1,5 +1,5 @@ // Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas library amplify_core.amplify_configuration_service.model.aws_auth_hosted_ui_config; // ignore_for_file: no_leading_underscores_for_library_prefixes diff --git a/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_auth_identity_pool_config.dart b/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_auth_identity_pool_config.dart index 2671f04201..478dd6a081 100644 --- a/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_auth_identity_pool_config.dart +++ b/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_auth_identity_pool_config.dart @@ -1,5 +1,5 @@ // Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas library amplify_core.amplify_configuration_service.model.aws_auth_identity_pool_config; // ignore_for_file: no_leading_underscores_for_library_prefixes diff --git a/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_auth_mfa_configuration.dart b/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_auth_mfa_configuration.dart index 88ceb87473..d0827997a9 100644 --- a/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_auth_mfa_configuration.dart +++ b/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_auth_mfa_configuration.dart @@ -1,5 +1,5 @@ // Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas library amplify_core.amplify_configuration_service.model.aws_auth_mfa_configuration; // ignore_for_file: no_leading_underscores_for_library_prefixes diff --git a/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_auth_password_protection_settings.dart b/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_auth_password_protection_settings.dart index cec35545f0..6bc299b9f2 100644 --- a/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_auth_password_protection_settings.dart +++ b/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_auth_password_protection_settings.dart @@ -1,5 +1,5 @@ // Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas library amplify_core.amplify_configuration_service.model.aws_auth_password_protection_settings; // ignore_for_file: no_leading_underscores_for_library_prefixes diff --git a/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_auth_provider.dart b/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_auth_provider.dart index bb89031719..b6a3480001 100644 --- a/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_auth_provider.dart +++ b/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_auth_provider.dart @@ -1,5 +1,5 @@ // Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas library amplify_core.amplify_configuration_service.model.aws_auth_provider; // ignore_for_file: no_leading_underscores_for_library_prefixes diff --git a/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_auth_provider_custom.dart b/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_auth_provider_custom.dart index 9e69b9d350..2481efe7f1 100644 --- a/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_auth_provider_custom.dart +++ b/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_auth_provider_custom.dart @@ -1,5 +1,5 @@ // Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas library amplify_core.amplify_configuration_service.model.aws_auth_provider_custom; // ignore_for_file: no_leading_underscores_for_library_prefixes diff --git a/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_auth_provider_oidc.dart b/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_auth_provider_oidc.dart index 31f8612ae3..7fee4523da 100644 --- a/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_auth_provider_oidc.dart +++ b/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_auth_provider_oidc.dart @@ -1,5 +1,5 @@ // Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas library amplify_core.amplify_configuration_service.model.aws_auth_provider_oidc; // ignore_for_file: no_leading_underscores_for_library_prefixes diff --git a/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_auth_provider_saml.dart b/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_auth_provider_saml.dart index 198e0052cc..dae811b941 100644 --- a/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_auth_provider_saml.dart +++ b/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_auth_provider_saml.dart @@ -1,5 +1,5 @@ // Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas library amplify_core.amplify_configuration_service.model.aws_auth_provider_saml; // ignore_for_file: no_leading_underscores_for_library_prefixes diff --git a/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_auth_user_pool_config.dart b/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_auth_user_pool_config.dart index e893352b37..1146b7b115 100644 --- a/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_auth_user_pool_config.dart +++ b/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_auth_user_pool_config.dart @@ -1,5 +1,5 @@ // Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas library amplify_core.amplify_configuration_service.model.aws_auth_user_pool_config; // ignore_for_file: no_leading_underscores_for_library_prefixes diff --git a/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_auth_username_attribute.dart b/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_auth_username_attribute.dart index 7a582ea1f2..f575bfb93f 100644 --- a/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_auth_username_attribute.dart +++ b/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_auth_username_attribute.dart @@ -1,5 +1,5 @@ // Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas library amplify_core.amplify_configuration_service.model.aws_auth_username_attribute; // ignore_for_file: no_leading_underscores_for_library_prefixes @@ -8,17 +8,12 @@ import 'package:smithy/smithy.dart' as _i1; class AWSAuthUsernameAttribute extends _i1.SmithyEnum { const AWSAuthUsernameAttribute._( - int index, - String name, - String value, - ) : super( - index, - name, - value, - ); - - const AWSAuthUsernameAttribute._sdkUnknown(String value) - : super.sdkUnknown(value); + super.index, + super.name, + super.value, + ); + + const AWSAuthUsernameAttribute._sdkUnknown(super.value) : super.sdkUnknown(); static const email = AWSAuthUsernameAttribute._( 0, diff --git a/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_logging_cloud_watch_config.dart b/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_logging_cloud_watch_config.dart index ce7a5b9e72..9c8e34a9ff 100644 --- a/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_logging_cloud_watch_config.dart +++ b/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_logging_cloud_watch_config.dart @@ -1,5 +1,5 @@ // Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas library amplify_core.amplify_configuration_service.model.aws_logging_cloud_watch_config; // ignore_for_file: no_leading_underscores_for_library_prefixes diff --git a/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_logging_config.dart b/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_logging_config.dart index ac9be2399d..b11f77238c 100644 --- a/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_logging_config.dart +++ b/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_logging_config.dart @@ -1,5 +1,5 @@ // Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas library amplify_core.amplify_configuration_service.model.aws_logging_config; // ignore_for_file: no_leading_underscores_for_library_prefixes diff --git a/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_notifications_config.dart b/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_notifications_config.dart index ec345a0091..99a8c19cda 100644 --- a/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_notifications_config.dart +++ b/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_notifications_config.dart @@ -1,5 +1,5 @@ // Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas library amplify_core.amplify_configuration_service.model.aws_notifications_config; // ignore_for_file: no_leading_underscores_for_library_prefixes diff --git a/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_push_notifications_config.dart b/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_push_notifications_config.dart index 6ea88cb438..1f772bde96 100644 --- a/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_push_notifications_config.dart +++ b/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_push_notifications_config.dart @@ -1,5 +1,5 @@ // Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas library amplify_core.amplify_configuration_service.model.aws_push_notifications_config; // ignore_for_file: no_leading_underscores_for_library_prefixes diff --git a/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_push_notifications_pinpoint_config.dart b/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_push_notifications_pinpoint_config.dart index 7d61a85fc3..d0b6d509a4 100644 --- a/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_push_notifications_pinpoint_config.dart +++ b/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_push_notifications_pinpoint_config.dart @@ -1,5 +1,5 @@ // Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas library amplify_core.amplify_configuration_service.model.aws_push_notifications_pinpoint_config; // ignore_for_file: no_leading_underscores_for_library_prefixes diff --git a/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_rest_endpoint_config.dart b/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_rest_endpoint_config.dart index fc2667e630..5699cf9f09 100644 --- a/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_rest_endpoint_config.dart +++ b/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_rest_endpoint_config.dart @@ -1,5 +1,5 @@ // Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas library amplify_core.amplify_configuration_service.model.aws_rest_endpoint_config; // ignore_for_file: no_leading_underscores_for_library_prefixes diff --git a/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_storage_config.dart b/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_storage_config.dart index e04a26e90e..49f83e44ae 100644 --- a/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_storage_config.dart +++ b/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_storage_config.dart @@ -1,5 +1,5 @@ // Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas library amplify_core.amplify_configuration_service.model.aws_storage_config; // ignore_for_file: no_leading_underscores_for_library_prefixes diff --git a/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_storage_s3_bucket.dart b/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_storage_s3_bucket.dart index 3211152dd2..69ee439e9b 100644 --- a/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_storage_s3_bucket.dart +++ b/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_storage_s3_bucket.dart @@ -1,5 +1,5 @@ // Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas library amplify_core.amplify_configuration_service.model.aws_storage_s3_bucket; // ignore_for_file: no_leading_underscores_for_library_prefixes diff --git a/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_storage_s3_config.dart b/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_storage_s3_config.dart index 4a89442b57..6f06a5e5e2 100644 --- a/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_storage_s3_config.dart +++ b/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/aws_storage_s3_config.dart @@ -1,5 +1,5 @@ // Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas library amplify_core.amplify_configuration_service.model.aws_storage_s3_config; // ignore_for_file: no_leading_underscores_for_library_prefixes diff --git a/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/logging_remote_configuration.dart b/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/logging_remote_configuration.dart index 19ee7cf7ee..fc4a3ef8e4 100644 --- a/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/logging_remote_configuration.dart +++ b/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/logging_remote_configuration.dart @@ -1,5 +1,5 @@ // Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas library amplify_core.amplify_configuration_service.model.logging_remote_configuration; // ignore_for_file: no_leading_underscores_for_library_prefixes diff --git a/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/user_log_level.dart b/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/user_log_level.dart index e625a08a49..9a68c26cd7 100644 --- a/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/user_log_level.dart +++ b/packages/amplify_core/lib/src/generated/src/amplify_configuration_service/model/user_log_level.dart @@ -1,5 +1,5 @@ // Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas library amplify_core.amplify_configuration_service.model.user_log_level; // ignore_for_file: no_leading_underscores_for_library_prefixes diff --git a/packages/amplify_core/test/config/cli_config_test.dart b/packages/amplify_core/test/config/cli_config_test.dart index 2d6970dbb2..1c27c0163e 100644 --- a/packages/amplify_core/test/config/cli_config_test.dart +++ b/packages/amplify_core/test/config/cli_config_test.dart @@ -68,14 +68,14 @@ const expected = { api: ApiConfig( plugins: { AWSApiPluginConfig.pluginKey: AWSApiPluginConfig({ - 'API_KEY': AWSApiConfig( + 'myApi_API_KEY': AWSApiConfig( endpointType: EndpointType.graphQL, endpoint: GRAPHQL_ENDPOINT, region: REGION, authorizationType: APIAuthorizationType.apiKey, apiKey: API_KEY, ), - 'AWS_IAM': AWSApiConfig( + 'myApi_AWS_IAM': AWSApiConfig( endpointType: EndpointType.graphQL, endpoint: GRAPHQL_ENDPOINT, region: REGION, diff --git a/packages/amplify_core/test/config/testdata/cli_generated.dart b/packages/amplify_core/test/config/testdata/cli_generated.dart index 7973bcc41e..f88e7eeea0 100644 --- a/packages/amplify_core/test/config/testdata/cli_generated.dart +++ b/packages/amplify_core/test/config/testdata/cli_generated.dart @@ -152,14 +152,14 @@ const _v4api = ''' "api": { "plugins": { "awsAPIPlugin": { - "API_KEY": { + "myApi_API_KEY": { "endpointType": "GraphQL", "endpoint": "$GRAPHQL_ENDPOINT", "region": "$REGION", "authorizationType": "API_KEY", "apiKey": "$API_KEY" }, - "AWS_IAM": { + "myApi_AWS_IAM": { "endpointType": "GraphQL", "endpoint": "$GRAPHQL_ENDPOINT", "region": "$REGION", @@ -334,14 +334,14 @@ const _v5api = ''' "api": { "plugins": { "awsAPIPlugin": { - "API_KEY": { + "myApi_API_KEY": { "endpointType": "GraphQL", "endpoint": "$GRAPHQL_ENDPOINT", "region": "$REGION", "authorizationType": "API_KEY", "apiKey": "$API_KEY" }, - "AWS_IAM": { + "myApi_AWS_IAM": { "endpointType": "GraphQL", "endpoint": "$GRAPHQL_ENDPOINT", "region": "$REGION", @@ -516,14 +516,14 @@ const _v6api = ''' "api": { "plugins": { "awsAPIPlugin": { - "API_KEY": { + "myApi_API_KEY": { "endpointType": "GraphQL", "endpoint": "$GRAPHQL_ENDPOINT", "region": "$REGION", "authorizationType": "API_KEY", "apiKey": "$API_KEY" }, - "AWS_IAM": { + "myApi_AWS_IAM": { "endpointType": "GraphQL", "endpoint": "$GRAPHQL_ENDPOINT", "region": "$REGION", @@ -698,14 +698,14 @@ const _v7api = ''' "api": { "plugins": { "awsAPIPlugin": { - "API_KEY": { + "myApi_API_KEY": { "endpointType": "GraphQL", "endpoint": "$GRAPHQL_ENDPOINT", "region": "$REGION", "authorizationType": "API_KEY", "apiKey": "$API_KEY" }, - "AWS_IAM": { + "myApi_AWS_IAM": { "endpointType": "GraphQL", "endpoint": "$GRAPHQL_ENDPOINT", "region": "$REGION", @@ -880,14 +880,14 @@ const _vlatestapi = ''' "api": { "plugins": { "awsAPIPlugin": { - "API_KEY": { + "myApi_API_KEY": { "endpointType": "GraphQL", "endpoint": "$GRAPHQL_ENDPOINT", "region": "$REGION", "authorizationType": "API_KEY", "apiKey": "$API_KEY" }, - "AWS_IAM": { + "myApi_AWS_IAM": { "endpointType": "GraphQL", "endpoint": "$GRAPHQL_ENDPOINT", "region": "$REGION", diff --git a/packages/amplify_core/test/config/testdata/generate/generate.js b/packages/amplify_core/test/config/testdata/generate/generate.js index 07987cf754..2e3896d4f2 100644 --- a/packages/amplify_core/test/config/testdata/generate/generate.js +++ b/packages/amplify_core/test/config/testdata/generate/generate.js @@ -92,10 +92,10 @@ const testVectors = [ metadata: { ...defaultMetadata, api: { - API_KEY: { + myApi_API_KEY: { ...makeAppSyncConfig(API_KEY_AUTH_TYPE) }, - AWS_IAM: { + myApi_AWS_IAM: { ...makeAppSyncConfig(IAM_AUTH_TYPE) }, REST: { diff --git a/packages/api/amplify_api/example/android/build.gradle b/packages/api/amplify_api/example/android/build.gradle index cadf1cf06c..ce647a433b 100644 --- a/packages/api/amplify_api/example/android/build.gradle +++ b/packages/api/amplify_api/example/android/build.gradle @@ -26,6 +26,6 @@ subprojects { project.evaluationDependsOn(':app') } -task clean(type: Delete) { +tasks.register("clean", Delete) { delete rootProject.buildDir } diff --git a/packages/api/amplify_api_dart/lib/src/api_plugin_impl.dart b/packages/api/amplify_api_dart/lib/src/api_plugin_impl.dart index 531388ec95..067d1637e5 100644 --- a/packages/api/amplify_api_dart/lib/src/api_plugin_impl.dart +++ b/packages/api/amplify_api_dart/lib/src/api_plugin_impl.dart @@ -82,22 +82,12 @@ class AmplifyAPIDart extends APIPluginInterface with AWSDebuggable { } for (final MapEntry(key: apiName, value: endpointConfig) in apiConfig.apis.entries) { - switch (endpointConfig) { - case AWSApiEndpointConfigApiGateway$( - appSync: AWSApiGatewayEndpointConfig(:final endpoint) - ) || - AWSApiEndpointConfigAppSync$( - appSync: AWSAppSyncEndpointConfig(:final endpoint) - ): - if (endpoint.scheme != 'https') { - throw ConfigurationError( - 'Non-HTTPS endpoint found for "$apiName" which is not supported.', - recoverySuggestion: - 'Ensure the configured endpoint for "$apiName" utilizes https.', - ); - } - case _: - break; + if (endpointConfig.endpoint.scheme != 'https') { + throw ConfigurationError( + 'Non-HTTPS endpoint found for "$apiName" which is not supported.', + recoverySuggestion: + 'Ensure the configured endpoint for "$apiName" utilizes https.', + ); } } _apiConfig = apiConfig; @@ -114,31 +104,11 @@ class AmplifyAPIDart extends APIPluginInterface with AWSDebuggable { /// Register OIDC/Lambda set to _authProviders in constructor. void _registerApiPluginAuthProviders() { _apiConfig.apis.forEach((apiName, endpointConfig) { - switch (endpointConfig) { - // Check the presence of apiKey (not auth type) because other modes might - // have a key if not the primary auth mode. - case AWSApiEndpointConfigApiGateway$( - apiGateway: AWSApiGatewayEndpointConfig( - authMode: AWSApiAuthorizationModeApiKey$ _ - ) - ) || - AWSApiEndpointConfigAppSync$( - appSync: AWSAppSyncEndpointConfig( - authMode: AWSApiAuthorizationModeApiKey$ _ - ) - ): - case AWSApiEndpointConfigAppSync$( - appSync: AWSAppSyncEndpointConfig(:final additionalAuthModes?) - ) - when additionalAuthModes - .whereType() - .isNotEmpty: - _authProviderRepo.registerAuthProvider( - APIAuthorizationType.apiKey.authProviderToken, - AppSyncApiKeyAuthProvider(), - ); - case _: - break; + if (endpointConfig.apiKey != null) { + _authProviderRepo.registerAuthProvider( + APIAuthorizationType.apiKey.authProviderToken, + AppSyncApiKeyAuthProvider(), + ); } }); @@ -194,13 +164,15 @@ class AmplifyAPIDart extends APIPluginInterface with AWSDebuggable { } WebSocketBloc _webSocketBloc({String? apiName}) { - final endpoint = _apiConfig.getEndpoint( - type: EndpointType.graphQL, - apiName: apiName, - ) as AWSApiEndpointConfigAppSync$; + final endpoint = _apiConfig + .getEndpoint( + type: EndpointType.graphQL, + apiName: apiName, + ) + .config; return _webSocketBlocPool[endpoint.name] ??= - createWebSocketBloc(endpoint.appSync) + createWebSocketBloc(endpoint.appSync!) ..stream.listen((event) { _emitHubEvent(event); if (event is PendingDisconnect) { diff --git a/packages/api/amplify_api_dart/lib/src/decorators/authorize_http_request.dart b/packages/api/amplify_api_dart/lib/src/decorators/authorize_http_request.dart index e86af9a7e9..48bd98c59f 100644 --- a/packages/api/amplify_api_dart/lib/src/decorators/authorize_http_request.dart +++ b/packages/api/amplify_api_dart/lib/src/decorators/authorize_http_request.dart @@ -33,7 +33,7 @@ Future authorizeHttpRequest( ), authType, ); - final apiKey = endpointConfig.defaultAuthorizationMode?.apiKey; + final apiKey = endpointConfig.apiKey; if (apiKey == null) { throw ConfigurationError( 'Auth mode is API Key, but no API Key was found in config.', diff --git a/packages/api/amplify_api_dart/lib/src/util/amplify_api_config.dart b/packages/api/amplify_api_dart/lib/src/util/amplify_api_config.dart index 4465066b7b..39048825c9 100644 --- a/packages/api/amplify_api_dart/lib/src/util/amplify_api_config.dart +++ b/packages/api/amplify_api_dart/lib/src/util/amplify_api_config.dart @@ -97,13 +97,13 @@ extension AWSApiEndpointConfigHelpers on AWSApiEndpointConfig { AWSApiEndpointConfigAppSync$ _ => EndpointType.graphQL, AWSApiEndpointConfigApiGateway$ _ || AWSApiEndpointConfigRest$ _ => - EndpointType.graphQL, + EndpointType.rest, _ => throw ArgumentError('Invalid API: $this'), }; /// The default API authorization mode. - AWSApiAuthorizationMode? get defaultAuthorizationMode => switch (this) { - AWSApiEndpointConfigRest$ _ => null, + AWSApiAuthorizationMode get defaultAuthorizationMode => switch (this) { + AWSApiEndpointConfigRest$ _ => const AWSApiAuthorizationMode.none(), AWSApiEndpointConfigApiGateway$( apiGateway: AWSApiGatewayEndpointConfig(:final authMode) ) || @@ -116,15 +116,39 @@ extension AWSApiEndpointConfigHelpers on AWSApiEndpointConfig { /// The default API authorization type. APIAuthorizationType get defaultAuthorizationType => - switch (defaultAuthorizationMode) { - null => APIAuthorizationType.none, - final authMode => authMode.authorizationType, - }; + defaultAuthorizationMode.authorizationType; + + /// All the auth modes for the API. + Iterable get allAuthModes sync* { + yield defaultAuthorizationMode; + if (appSync case AWSAppSyncEndpointConfig(:final additionalAuthModes?)) { + yield* additionalAuthModes; + } + } /// The API key for the endpoint. - String? get apiKey => switch (defaultAuthorizationMode) { - AWSApiAuthorizationModeApiKey$(:final apiKey) => apiKey, - _ => null, + String? get apiKey { + for (final authMode in allAuthModes) { + if (authMode case AWSApiAuthorizationModeApiKey$(:final apiKey)) { + return apiKey; + } + } + return null; + } + + /// The endpoint of the API. + Uri get endpoint => switch (this) { + AWSApiEndpointConfigAppSync$( + appSync: AWSAppSyncEndpointConfig(:final endpoint) + ) || + AWSApiEndpointConfigApiGateway$( + apiGateway: AWSApiGatewayEndpointConfig(:final endpoint) + ) || + AWSApiEndpointConfigRest$( + rest: AWSRestEndpointConfig(:final endpoint) + ) => + endpoint, + _ => throw ArgumentError('Invalid endpoint config: $this'), }; } diff --git a/packages/auth/amplify_auth_cognito/example/integration_test/custom_authorizer_test.dart b/packages/auth/amplify_auth_cognito/example/integration_test/custom_authorizer_test.dart index 3b6ff9fb6d..60c2246e91 100644 --- a/packages/auth/amplify_auth_cognito/example/integration_test/custom_authorizer_test.dart +++ b/packages/auth/amplify_auth_cognito/example/integration_test/custom_authorizer_test.dart @@ -234,7 +234,7 @@ void main() { ), ); final scope = AWSCredentialScope( - region: restApi.region, + region: restApi.region!, service: AWSService.apiGatewayManagementApi, ); final signedRequest = await signer.sign( diff --git a/packages/notifications/push/amplify_push_notifications/lib/src/amplify_push_notifications_impl.dart b/packages/notifications/push/amplify_push_notifications/lib/src/amplify_push_notifications_impl.dart index 255aa9d01f..2264faddd6 100644 --- a/packages/notifications/push/amplify_push_notifications/lib/src/amplify_push_notifications_impl.dart +++ b/packages/notifications/push/amplify_push_notifications/lib/src/amplify_push_notifications_impl.dart @@ -234,7 +234,7 @@ abstract class AmplifyPushNotifications // Config is securely stored to be used to re-configure Amplify in the background processor function when the app is killed await _amplifySecureStorage.write( key: configSecureStorageKey, - value: jsonEncode(config), + value: jsonEncode(config!.toCli().toJson()), ); } diff --git a/packages/smithy/smithy_codegen/lib/src/generate.dart b/packages/smithy/smithy_codegen/lib/src/generate.dart index 9fe9e828de..653edd36e9 100644 --- a/packages/smithy/smithy_codegen/lib/src/generate.dart +++ b/packages/smithy/smithy_codegen/lib/src/generate.dart @@ -11,6 +11,7 @@ const List _ignoredRules = [ 'avoid_unused_constructor_parameters', 'deprecated_member_use_from_same_package', 'non_constant_identifier_names', + 'require_trailing_commas', ]; /// Header which prefixes all generated files. diff --git a/packages/smithy/smithy_codegen/lib/src/generator/enum_generator.dart b/packages/smithy/smithy_codegen/lib/src/generator/enum_generator.dart index 5e361751fb..e53dbb841b 100644 --- a/packages/smithy/smithy_codegen/lib/src/generator/enum_generator.dart +++ b/packages/smithy/smithy_codegen/lib/src/generator/enum_generator.dart @@ -81,27 +81,20 @@ class EnumGenerator extends LibraryGenerator { ..requiredParameters.addAll([ Parameter( (p) => p - ..name = 'index' - ..type = DartTypes.core.int, + ..toSuper = true + ..name = 'index', ), Parameter( (p) => p - ..name = 'name' - ..type = DartTypes.core.string, + ..toSuper = true + ..name = 'name', ), Parameter( (p) => p - ..name = 'value' - ..type = valueType, + ..toSuper = true + ..name = 'value', ), - ]) - ..initializers.add( - refer('super').call([ - refer('index'), - refer('name'), - refer('value'), - ]).code, - ), + ]), ); /// The `sdkUnknown` constructor for values which do not match the @@ -117,14 +110,12 @@ class EnumGenerator extends LibraryGenerator { ..requiredParameters.add( Parameter( (p) => p - ..name = 'value' - ..type = valueType, + ..toSuper = true + ..name = 'value', ), ) ..initializers.add( - refer('super').property('sdkUnknown').call([ - refer('value'), - ]).code, + refer('super').property('sdkUnknown').call([]).code, ), );