From 7b4c7c17cb20e7cb7ef05e5986eae755603e1bb1 Mon Sep 17 00:00:00 2001
From: Vieltojarvi <lvielto@amazon.com>
Date: Tue, 17 Jun 2025 14:16:13 -0700
Subject: [PATCH 1/3] chore: add warnings for pinpoint categories

---
 .../src/commands/analytics/add.ts                           | 3 +++
 .../src/commands/analytics/push.ts                          | 3 +++
 .../src/commands/analytics/update.ts                        | 2 ++
 .../src/commands/notifications/add.ts                       | 4 ++++
 .../src/commands/notifications/configure.ts                 | 6 +++++-
 .../src/commands/notifications/status.ts                    | 4 ++++
 6 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/packages/amplify-category-analytics/src/commands/analytics/add.ts b/packages/amplify-category-analytics/src/commands/analytics/add.ts
index 0729dabff85..46b1e265e60 100644
--- a/packages/amplify-category-analytics/src/commands/analytics/add.ts
+++ b/packages/amplify-category-analytics/src/commands/analytics/add.ts
@@ -16,6 +16,9 @@ let options: $TSAny;
 export const run = async (context: $TSContext): Promise<$TSAny> => {
   const { amplify } = context;
   const servicesMetadata = amplify.readJsonFile(`${__dirname}/../../provider-utils/supported-services.json`);
+  printer.warn(`Amazon Pinpoint is reaching end of life on October 30, 2026 and no longer accepts new customers as of May 20, 2025.
+    It is recommended you use Kinesis for event collection and mobile analytics instead.`);
+
   return amplify
     .serviceSelectionPrompt(context, category, servicesMetadata, 'Select an Analytics provider')
     .then((result) => {
diff --git a/packages/amplify-category-analytics/src/commands/analytics/push.ts b/packages/amplify-category-analytics/src/commands/analytics/push.ts
index d40f3a3bb78..6032fc0e2ad 100644
--- a/packages/amplify-category-analytics/src/commands/analytics/push.ts
+++ b/packages/amplify-category-analytics/src/commands/analytics/push.ts
@@ -1,4 +1,5 @@
 import { $TSAny, $TSContext } from '@aws-amplify/amplify-cli-core';
+import { printer } from '@aws-amplify/amplify-prompts';
 
 const subcommand = 'push';
 const category = 'analytics';
@@ -11,6 +12,8 @@ export const run = async (context: $TSContext): Promise<$TSAny> => {
   const { amplify, parameters } = context;
   const resourceName = parameters.first;
   context.amplify.constructExeInfo(context);
+  printer.warn(`Amazon Pinpoint is reaching end of life on October 30, 2026 and no longer accepts new customers as of May 20, 2025.
+      If you are using Pinpoint, we recommended you use Kinesis for event collection and mobile analytics instead.`);
   return amplify.pushResources(context, category, resourceName);
 };
 
diff --git a/packages/amplify-category-analytics/src/commands/analytics/update.ts b/packages/amplify-category-analytics/src/commands/analytics/update.ts
index 30fdf160397..6e1220d577b 100644
--- a/packages/amplify-category-analytics/src/commands/analytics/update.ts
+++ b/packages/amplify-category-analytics/src/commands/analytics/update.ts
@@ -12,6 +12,8 @@ const category = 'analytics';
 export const run = async (context: $TSContext): Promise<$TSAny> => {
   const { amplify } = context;
   const servicesMetadata = amplify.readJsonFile(`${__dirname}/../../provider-utils/supported-services.json`);
+  printer.warn(`Amazon Pinpoint is reaching end of life on October 30, 2026 and no longer accepts new customers as of May 20, 2025.
+    If you are using Pinpoint, we recommended you use Kinesis for event collection and mobile analytics instead.`);
 
   return amplify
     .serviceSelectionPrompt(context, category, servicesMetadata)
diff --git a/packages/amplify-category-notifications/src/commands/notifications/add.ts b/packages/amplify-category-notifications/src/commands/notifications/add.ts
index 49651e419ec..b2c245adbb7 100644
--- a/packages/amplify-category-notifications/src/commands/notifications/add.ts
+++ b/packages/amplify-category-notifications/src/commands/notifications/add.ts
@@ -57,6 +57,10 @@ export const run = async (context: $TSContext): Promise<$TSContext> => {
     });
   }
 
+  printer.warn(`Amazon Pinpoint is reaching end of life on October 30, 2026 and no longer accepts new customers as of May 20, 2025.
+    It is recommended you use use AWS End User Messaging for push notifications and SMS, Amazon Simple Email Service for sending emails, Amazon Connect for campaigns, journeys, endpoints, and engagement analytics.
+    For more information see: https://docs.aws.amazon.com/pinpoint/latest/userguide/migrate.html`);
+
   const availableChannels: Array<string> = getAvailableChannels();
   const disabledChannels: Array<string> = await getDisabledChannelsFromAmplifyMeta();
 
diff --git a/packages/amplify-category-notifications/src/commands/notifications/configure.ts b/packages/amplify-category-notifications/src/commands/notifications/configure.ts
index a196ae41a5e..7644647f189 100644
--- a/packages/amplify-category-notifications/src/commands/notifications/configure.ts
+++ b/packages/amplify-category-notifications/src/commands/notifications/configure.ts
@@ -1,5 +1,5 @@
 import { $TSContext, AmplifyError } from '@aws-amplify/amplify-cli-core';
-import { prompter } from '@aws-amplify/amplify-prompts';
+import { prompter, printer } from '@aws-amplify/amplify-prompts';
 import * as pinpointHelper from '../../pinpoint-helper';
 import * as notificationManager from '../../notifications-manager';
 import { IChannelAPIResponse } from '../../channel-types';
@@ -25,6 +25,10 @@ export const alias = 'update';
  * @returns context with notifications metadata updated
  */
 export const run = async (context: $TSContext): Promise<$TSContext> => {
+  printer.warn(`Amazon Pinpoint is reaching end of life on October 30, 2026 and no longer accepts new customers as of May 20, 2025.
+      It is recommended you use use AWS End User Messaging for push notifications and SMS, Amazon Simple Email Service for sending emails, Amazon Connect for campaigns, journeys, endpoints, and engagement analytics.
+      For more information see: https://docs.aws.amazon.com/pinpoint/latest/userguide/migrate.html`);
+
   const availableChannelViewNames = getAvailableChannelViewNames();
   let channelViewName = context.parameters.first ? getChannelViewName(context.parameters.first) : undefined;
 
diff --git a/packages/amplify-category-notifications/src/commands/notifications/status.ts b/packages/amplify-category-notifications/src/commands/notifications/status.ts
index e5f4bb5fcf8..c42a812bccc 100644
--- a/packages/amplify-category-notifications/src/commands/notifications/status.ts
+++ b/packages/amplify-category-notifications/src/commands/notifications/status.ts
@@ -21,6 +21,10 @@ const viewStyles = {
 };
 
 const getDeployedStyledStatus = (deployedChannel: string, deployedChannels: IChannelAvailability, configuredState: string): string => {
+  printer.warn(`Amazon Pinpoint is reaching end of life on October 30, 2026 and no longer accepts new customers as of May 20, 2025.
+    It is recommended you use use AWS End User Messaging for push notifications and SMS, Amazon Simple Email Service for sending emails, Amazon Connect for campaigns, journeys, endpoints, and engagement analytics.
+    For more information see: https://docs.aws.amazon.com/pinpoint/latest/userguide/migrate.html`);
+
   if (deployedChannels.enabledChannels.includes(deployedChannel)) {
     if (configuredState === 'Enabled') {
       return viewStyles.deployed('Deployed');

From a953af18610bbf38b732b0926a19d3ee76426c52 Mon Sep 17 00:00:00 2001
From: aws-amplify-bot <aws@amazon.com>
Date: Tue, 17 Jun 2025 14:34:34 -0700
Subject: [PATCH 2/3] chore: updated warning messages, added warnings for
 interactions

---
 .../amplify-category-analytics/src/commands/analytics/add.ts   | 2 +-
 .../amplify-category-analytics/src/commands/analytics/push.ts  | 2 +-
 .../src/commands/analytics/update.ts                           | 2 +-
 .../src/commands/interactions/push.js                          | 3 +++
 .../src/commands/interactions/update.js                        | 3 +++
 .../src/commands/notifications/add.ts                          | 2 +-
 .../src/commands/notifications/configure.ts                    | 2 +-
 .../src/commands/notifications/status.ts                       | 2 +-
 8 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/packages/amplify-category-analytics/src/commands/analytics/add.ts b/packages/amplify-category-analytics/src/commands/analytics/add.ts
index 46b1e265e60..745ca4cffd1 100644
--- a/packages/amplify-category-analytics/src/commands/analytics/add.ts
+++ b/packages/amplify-category-analytics/src/commands/analytics/add.ts
@@ -17,7 +17,7 @@ export const run = async (context: $TSContext): Promise<$TSAny> => {
   const { amplify } = context;
   const servicesMetadata = amplify.readJsonFile(`${__dirname}/../../provider-utils/supported-services.json`);
   printer.warn(`Amazon Pinpoint is reaching end of life on October 30, 2026 and no longer accepts new customers as of May 20, 2025.
-    It is recommended you use Kinesis for event collection and mobile analytics instead.`);
+    It is recommended you use Kinesis for event collection and mobile analytics instead.\n`);
 
   return amplify
     .serviceSelectionPrompt(context, category, servicesMetadata, 'Select an Analytics provider')
diff --git a/packages/amplify-category-analytics/src/commands/analytics/push.ts b/packages/amplify-category-analytics/src/commands/analytics/push.ts
index 6032fc0e2ad..bab2721b345 100644
--- a/packages/amplify-category-analytics/src/commands/analytics/push.ts
+++ b/packages/amplify-category-analytics/src/commands/analytics/push.ts
@@ -13,7 +13,7 @@ export const run = async (context: $TSContext): Promise<$TSAny> => {
   const resourceName = parameters.first;
   context.amplify.constructExeInfo(context);
   printer.warn(`Amazon Pinpoint is reaching end of life on October 30, 2026 and no longer accepts new customers as of May 20, 2025.
-      If you are using Pinpoint, we recommended you use Kinesis for event collection and mobile analytics instead.`);
+      If you are using Pinpoint, it is recommended you use Kinesis for event collection and mobile analytics instead.\n`);
   return amplify.pushResources(context, category, resourceName);
 };
 
diff --git a/packages/amplify-category-analytics/src/commands/analytics/update.ts b/packages/amplify-category-analytics/src/commands/analytics/update.ts
index 6e1220d577b..bc974fdaaff 100644
--- a/packages/amplify-category-analytics/src/commands/analytics/update.ts
+++ b/packages/amplify-category-analytics/src/commands/analytics/update.ts
@@ -13,7 +13,7 @@ export const run = async (context: $TSContext): Promise<$TSAny> => {
   const { amplify } = context;
   const servicesMetadata = amplify.readJsonFile(`${__dirname}/../../provider-utils/supported-services.json`);
   printer.warn(`Amazon Pinpoint is reaching end of life on October 30, 2026 and no longer accepts new customers as of May 20, 2025.
-    If you are using Pinpoint, we recommended you use Kinesis for event collection and mobile analytics instead.`);
+    If you are using Pinpoint, it is recommended you use Kinesis for event collection and mobile analytics instead.\n`);
 
   return amplify
     .serviceSelectionPrompt(context, category, servicesMetadata)
diff --git a/packages/amplify-category-interactions/src/commands/interactions/push.js b/packages/amplify-category-interactions/src/commands/interactions/push.js
index 60a74b236ba..40b58fca5a5 100644
--- a/packages/amplify-category-interactions/src/commands/interactions/push.js
+++ b/packages/amplify-category-interactions/src/commands/interactions/push.js
@@ -7,6 +7,9 @@ module.exports = {
     const { amplify, parameters } = context;
     const resourceName = parameters.first;
     context.amplify.constructExeInfo(context);
+    context.print
+      .warning(`Amazon Lex V1 is reaching end of life on September 15, 2025 and no longer allows creation of new bots as of March 31, 2025. 
+      It is recommended that you migrate your bot to Amazon Lex V2 before September 15.`);
     return amplify.pushResources(context, category, resourceName).catch((err) => {
       context.print.info(err.stack);
       context.print.error('There was an error pushing the interactions resource');
diff --git a/packages/amplify-category-interactions/src/commands/interactions/update.js b/packages/amplify-category-interactions/src/commands/interactions/update.js
index c957401e3eb..f7231e34ca7 100644
--- a/packages/amplify-category-interactions/src/commands/interactions/update.js
+++ b/packages/amplify-category-interactions/src/commands/interactions/update.js
@@ -7,6 +7,9 @@ module.exports = {
   alias: ['configure'],
   run: async (context) => {
     const { amplify } = context;
+    context.print
+      .warning(`Amazon Lex V1 is reaching end of life on September 15, 2025 and no longer allows creation of new bots as of March 31, 2025. 
+      It is recommended that you migrate your bot to Amazon Lex V2 before September 15.`);
 
     return amplify
       .serviceSelectionPrompt(context, category, servicesMetadata)
diff --git a/packages/amplify-category-notifications/src/commands/notifications/add.ts b/packages/amplify-category-notifications/src/commands/notifications/add.ts
index b2c245adbb7..a40db02ee9b 100644
--- a/packages/amplify-category-notifications/src/commands/notifications/add.ts
+++ b/packages/amplify-category-notifications/src/commands/notifications/add.ts
@@ -59,7 +59,7 @@ export const run = async (context: $TSContext): Promise<$TSContext> => {
 
   printer.warn(`Amazon Pinpoint is reaching end of life on October 30, 2026 and no longer accepts new customers as of May 20, 2025.
     It is recommended you use use AWS End User Messaging for push notifications and SMS, Amazon Simple Email Service for sending emails, Amazon Connect for campaigns, journeys, endpoints, and engagement analytics.
-    For more information see: https://docs.aws.amazon.com/pinpoint/latest/userguide/migrate.html`);
+    For more information see: https://docs.aws.amazon.com/pinpoint/latest/userguide/migrate.html \n`);
 
   const availableChannels: Array<string> = getAvailableChannels();
   const disabledChannels: Array<string> = await getDisabledChannelsFromAmplifyMeta();
diff --git a/packages/amplify-category-notifications/src/commands/notifications/configure.ts b/packages/amplify-category-notifications/src/commands/notifications/configure.ts
index 7644647f189..a7b0e29b3f4 100644
--- a/packages/amplify-category-notifications/src/commands/notifications/configure.ts
+++ b/packages/amplify-category-notifications/src/commands/notifications/configure.ts
@@ -27,7 +27,7 @@ export const alias = 'update';
 export const run = async (context: $TSContext): Promise<$TSContext> => {
   printer.warn(`Amazon Pinpoint is reaching end of life on October 30, 2026 and no longer accepts new customers as of May 20, 2025.
       It is recommended you use use AWS End User Messaging for push notifications and SMS, Amazon Simple Email Service for sending emails, Amazon Connect for campaigns, journeys, endpoints, and engagement analytics.
-      For more information see: https://docs.aws.amazon.com/pinpoint/latest/userguide/migrate.html`);
+      For more information see: https://docs.aws.amazon.com/pinpoint/latest/userguide/migrate.html \n`);
 
   const availableChannelViewNames = getAvailableChannelViewNames();
   let channelViewName = context.parameters.first ? getChannelViewName(context.parameters.first) : undefined;
diff --git a/packages/amplify-category-notifications/src/commands/notifications/status.ts b/packages/amplify-category-notifications/src/commands/notifications/status.ts
index c42a812bccc..96ea86558b6 100644
--- a/packages/amplify-category-notifications/src/commands/notifications/status.ts
+++ b/packages/amplify-category-notifications/src/commands/notifications/status.ts
@@ -23,7 +23,7 @@ const viewStyles = {
 const getDeployedStyledStatus = (deployedChannel: string, deployedChannels: IChannelAvailability, configuredState: string): string => {
   printer.warn(`Amazon Pinpoint is reaching end of life on October 30, 2026 and no longer accepts new customers as of May 20, 2025.
     It is recommended you use use AWS End User Messaging for push notifications and SMS, Amazon Simple Email Service for sending emails, Amazon Connect for campaigns, journeys, endpoints, and engagement analytics.
-    For more information see: https://docs.aws.amazon.com/pinpoint/latest/userguide/migrate.html`);
+    For more information see: https://docs.aws.amazon.com/pinpoint/latest/userguide/migrate.html \n`);
 
   if (deployedChannels.enabledChannels.includes(deployedChannel)) {
     if (configuredState === 'Enabled') {

From 6f7b04801792a2cc28b35009c52d298709c41855 Mon Sep 17 00:00:00 2001
From: aws-amplify-bot <aws@amazon.com>
Date: Tue, 17 Jun 2025 14:37:13 -0700
Subject: [PATCH 3/3] chore: update warnings

---
 .../src/commands/interactions/push.js                           | 2 +-
 .../src/commands/interactions/update.js                         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/amplify-category-interactions/src/commands/interactions/push.js b/packages/amplify-category-interactions/src/commands/interactions/push.js
index 40b58fca5a5..a6d8213dd15 100644
--- a/packages/amplify-category-interactions/src/commands/interactions/push.js
+++ b/packages/amplify-category-interactions/src/commands/interactions/push.js
@@ -9,7 +9,7 @@ module.exports = {
     context.amplify.constructExeInfo(context);
     context.print
       .warning(`Amazon Lex V1 is reaching end of life on September 15, 2025 and no longer allows creation of new bots as of March 31, 2025. 
-      It is recommended that you migrate your bot to Amazon Lex V2 before September 15.`);
+      It is recommended that you migrate your bot to Amazon Lex V2 before September 15. \n`);
     return amplify.pushResources(context, category, resourceName).catch((err) => {
       context.print.info(err.stack);
       context.print.error('There was an error pushing the interactions resource');
diff --git a/packages/amplify-category-interactions/src/commands/interactions/update.js b/packages/amplify-category-interactions/src/commands/interactions/update.js
index f7231e34ca7..aa69066de2a 100644
--- a/packages/amplify-category-interactions/src/commands/interactions/update.js
+++ b/packages/amplify-category-interactions/src/commands/interactions/update.js
@@ -9,7 +9,7 @@ module.exports = {
     const { amplify } = context;
     context.print
       .warning(`Amazon Lex V1 is reaching end of life on September 15, 2025 and no longer allows creation of new bots as of March 31, 2025. 
-      It is recommended that you migrate your bot to Amazon Lex V2 before September 15.`);
+      It is recommended that you migrate your bot to Amazon Lex V2 before September 15. \n`);
 
     return amplify
       .serviceSelectionPrompt(context, category, servicesMetadata)