Changes for v1.1.12 (#1596)

Author: andrewmarriott-aws

CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.1.12] - 2025-05-13
+    
+### Security
+  
+* Removed CloudWatch Alarm toggling to improve security posture
+
 ## [1.1.11] - 2025-03-12
 
 ### Security

frontend/public/locales/en-US/common.json

@@ -180,8 +180,6 @@
     "upgrade": "Upgrade",
     "confirm": "Confirm",
     "addPlugin": "Add Plugin",
-    "enableAll": "Enable All",
-    "disableAll": "Disable All",
     "viewAlarms": "View Alarms",
     "refreshMetadata": "Refresh Metadata",
     "clearFilters": "Clear filters",

frontend/public/locales/zh-CN/common.json

@@ -180,8 +180,6 @@
     "upgrade": "升级",
     "confirm": "确认",
     "addPlugin": "添加插件",
-    "enableAll": "全部启用",
-    "disableAll": "全部禁用",
     "viewAlarms": "查看告警",
     "refreshMetadata": "刷新元数据",
     "clearFilters": "清理筛选",

frontend/src/apis/resource.ts

@@ -131,27 +131,6 @@ const getAlarmList = async (params: {
   return result;
 };
 
-const disableAlarms = async (data: {
-  region: string;
-  alarmNames: string[];
-}) => {
-  const result: any = await apiRequest(
-    'post',
-    `/env/cloudwatch/alarms/disable`,
-    data
-  );
-  return result;
-};
-
-const enableAlarms = async (data: { region: string; alarmNames: string[] }) => {
-  const result: any = await apiRequest(
-    'post',
-    `/env/cloudwatch/alarms/enable`,
-    data
-  );
-  return result;
-};
-
 const checkServicesAvailable = async (params: { region: string }) => {
   const result: any = await apiRequest(
     'get',
@@ -182,7 +161,5 @@ export {
   getVPCList,
   getSTSUploadRole,
   getAlarmList,
-  disableAlarms,
-  enableAlarms,
   checkServicesAvailable,
 };

frontend/src/pages/pipelines/detail/comps/AlarmTable.tsx

@@ -22,7 +22,7 @@ import {
   StatusIndicatorProps,
   Table,
 } from '@cloudscape-design/components';
-import { disableAlarms, enableAlarms, getAlarmList } from 'apis/resource';
+import {getAlarmList } from 'apis/resource';
 import React, { useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { buildAlarmsLink } from 'ts/url';
@@ -49,8 +49,6 @@ const AlarmTable: React.FC<AlarmTableProps> = (props: AlarmTableProps) => {
   const [currentPage, setCurrentPage] = useState(1);
   const [totalCount, setTotalCount] = useState(0);
   const [alarmList, setAlarmList] = useState<IAlarm[]>([]);
-  const [loadingEnable, setLoadingEnable] = useState(false);
-  const [loadingDisable, setLoadingDisable] = useState(false);
 
   const listAlarms = async () => {
     setLoadingData(true);
@@ -71,46 +69,6 @@ const AlarmTable: React.FC<AlarmTableProps> = (props: AlarmTableProps) => {
     }
   };
 
-  const enableAlarm = async (item?: IAlarm) => {
-    setLoadingEnable(true);
-    try {
-      const alarmNames = item
-        ? [item?.AlarmName]
-        : selectedItems.map((item) => item.AlarmName);
-      const resData: ApiResponse<null> = await enableAlarms({
-        region,
-        alarmNames,
-      });
-      if (resData.success) {
-        setSelectedItems([]);
-        listAlarms();
-        setLoadingEnable(false);
-      }
-    } catch (error) {
-      setLoadingEnable(false);
-    }
-  };
-
-  const disableAlarm = async (item?: IAlarm) => {
-    setLoadingDisable(true);
-    try {
-      const alarmNames = item
-        ? [item?.AlarmName]
-        : selectedItems.map((item) => item.AlarmName);
-      const resData: ApiResponse<null> = await disableAlarms({
-        region,
-        alarmNames,
-      });
-      if (resData.success) {
-        setSelectedItems([]);
-        listAlarms();
-        setLoadingDisable(false);
-      }
-    } catch (error) {
-      setLoadingDisable(false);
-    }
-  };
-
   useEffect(() => {
     listAlarms();
   }, [currentPage]);
@@ -234,24 +192,6 @@ const AlarmTable: React.FC<AlarmTableProps> = (props: AlarmTableProps) => {
                       listAlarms();
                     }}
                   />
-                  <Button
-                    loading={loadingEnable}
-                    disabled={selectedItems.length <= 0}
-                    onClick={() => {
-                      enableAlarm();
-                    }}
-                  >
-                    {t('button.enableAll')}
-                  </Button>
-                  <Button
-                    loading={loadingDisable}
-                    disabled={selectedItems.length <= 0}
-                    onClick={() => {
-                      disableAlarm();
-                    }}
-                  >
-                    {t('button.disableAll')}
-                  </Button>
                   <Button
                     href={buildAlarmsLink(region, projectId)}
                     iconAlign="right"

solution-manifest.yaml

@@ -1,7 +1,7 @@
 ---
 id: SO0219
 name: clickstream-analytics-on-aws
-version: v1.1.11
+version: v1.1.12
 cloudformation_templates:
   - template: cloudfront-s3-control-plane-stack-global.template.json
     main_template: true

src/control-plane/backend/click-stream-api.ts

@@ -481,8 +481,6 @@ export class ClickStreamApiConstruct extends Construct {
           'secretsmanager:ListSecrets',
           'secretsmanager:GetSecretValue',
           'cloudwatch:DescribeAlarms',
-          'cloudwatch:EnableAlarmActions',
-          'cloudwatch:DisableAlarmActions',
           'events:PutRule',
           'events:ListTargetsByRule',
           'events:PutTargets',

src/control-plane/backend/lambda/api/config/dictionary.json

@@ -6,7 +6,7 @@
       "dist_output_bucket": "solutions-reference",
       "target": "latest",
       "prefix": "",
-      "version": "v1.1.11"
+      "version": "v1.1.12"
     }
   },
   {

src/control-plane/backend/lambda/api/router/environment.ts

@@ -12,7 +12,7 @@
  */
 
 import express from 'express';
-import { body, header, query } from 'express-validator';
+import { header, query } from 'express-validator';
 import { defaultAssumeRoleTypeValid, defaultPageValueValid, defaultRegionValueValid, defaultSubnetTypeValid, isRequestIdExisted, isValidEmpty, validate } from '../common/request-valid';
 import { EnvironmentServ } from '../service/environment';
 
@@ -220,24 +220,6 @@ router_env.get(
     return environmentServ.alarms(req, res, next);
   });
 
-router_env.post(
-  '/cloudwatch/alarms/disable',
-  validate([
-    body('region').custom(isValidEmpty),
-  ]),
-  async (req: express.Request, res: express.Response, next: express.NextFunction) => {
-    return environmentServ.alarmsDisable(req, res, next);
-  });
-
-router_env.post(
-  '/cloudwatch/alarms/enable',
-  validate([
-    body('region').custom(isValidEmpty),
-  ]),
-  async (req: express.Request, res: express.Response, next: express.NextFunction) => {
-    return environmentServ.alarmsEnable(req, res, next);
-  });
-
 router_env.get(
   '/ping',
   async (req: express.Request, res: express.Response, next: express.NextFunction) => {

src/control-plane/backend/lambda/api/service/environment.ts

@@ -20,7 +20,7 @@ import { paginateData } from '../common/utils';
 import { CPipeline } from '../model/pipeline';
 import { ListCertificates } from '../store/aws/acm';
 import { pingServiceResource } from '../store/aws/cloudformation';
-import { describeAlarmsByProjectId, disableAlarms, enableAlarms } from '../store/aws/cloudwatch';
+import { describeAlarmsByProjectId } from '../store/aws/cloudwatch';
 import { describeVpcs, listRegions, describeSubnetsWithType, describeVpcs3AZ, describeVpcSecurityGroups } from '../store/aws/ec2';
 import { listRoles } from '../store/aws/iam';
 import { listMSKCluster } from '../store/aws/kafka';
@@ -260,32 +260,6 @@ export class EnvironmentServ {
     }
   }
 
-  public async alarmsDisable(req: any, res: any, next: any) {
-    try {
-      const {
-        region,
-        alarmNames,
-      } = req.body;
-      const result = await disableAlarms(region, alarmNames);
-      return res.json(new ApiSuccess(result));
-    } catch (error) {
-      next(error);
-    }
-  }
-
-  public async alarmsEnable(req: any, res: any, next: any) {
-    try {
-      const {
-        region,
-        alarmNames,
-      } = req.body;
-      const result = await enableAlarms(region, alarmNames);
-      return res.json(new ApiSuccess(result));
-    } catch (error) {
-      next(error);
-    }
-  }
-
   public async servicesPing(req: any, res: any, next: any) {
     try {
       const {