From 966f11fd5cc589dc61ecfbfa174880c605a34973 Mon Sep 17 00:00:00 2001
From: Raj Kamal Singh <1133322+raj-k-singh@users.noreply.github.com>
Date: Fri, 14 Feb 2025 18:49:52 +0530
Subject: [PATCH] chore: enable AWS integrations for all (#7111)

* chore: enable AWS integrations for all

* chore: don't show either of configure/enable for a service when not in ctx of a cloud account

* chore: remove AWS integration feature flag
---
 ee/query-service/model/plans.go               | 21 ------------
 frontend/src/constants/features.ts            |  1 -
 .../ServicesSection/ServiceDetails.tsx        | 33 ++++++++++---------
 .../pages/Integrations/IntegrationsList.tsx   | 14 ++------
 pkg/query-service/model/featureSet.go         |  1 -
 5 files changed, 19 insertions(+), 51 deletions(-)

diff --git a/ee/query-service/model/plans.go b/ee/query-service/model/plans.go
index 9579a700ad..6dbfa8ba56 100644
--- a/ee/query-service/model/plans.go
+++ b/ee/query-service/model/plans.go
@@ -157,13 +157,6 @@ var BasicPlan = basemodel.FeatureSet{
 		UsageLimit: -1,
 		Route:      "",
 	},
-	basemodel.Feature{
-		Name:       basemodel.AWSIntegration,
-		Active:     false,
-		Usage:      0,
-		UsageLimit: -1,
-		Route:      "",
-	},
 }
 
 var ProPlan = basemodel.FeatureSet{
@@ -286,13 +279,6 @@ var ProPlan = basemodel.FeatureSet{
 		UsageLimit: -1,
 		Route:      "",
 	},
-	basemodel.Feature{
-		Name:       basemodel.AWSIntegration,
-		Active:     false,
-		Usage:      0,
-		UsageLimit: -1,
-		Route:      "",
-	},
 }
 
 var EnterprisePlan = basemodel.FeatureSet{
@@ -429,11 +415,4 @@ var EnterprisePlan = basemodel.FeatureSet{
 		UsageLimit: -1,
 		Route:      "",
 	},
-	basemodel.Feature{
-		Name:       basemodel.AWSIntegration,
-		Active:     false,
-		Usage:      0,
-		UsageLimit: -1,
-		Route:      "",
-	},
 }
diff --git a/frontend/src/constants/features.ts b/frontend/src/constants/features.ts
index a2e4ac54fe..9a2550ec0b 100644
--- a/frontend/src/constants/features.ts
+++ b/frontend/src/constants/features.ts
@@ -23,5 +23,4 @@ export enum FeatureKeys {
 	PREMIUM_SUPPORT = 'PREMIUM_SUPPORT',
 	QUERY_BUILDER_SEARCH_V2 = 'QUERY_BUILDER_SEARCH_V2',
 	ANOMALY_DETECTION = 'ANOMALY_DETECTION',
-	AWS_INTEGRATION = 'AWS_INTEGRATION',
 }
diff --git a/frontend/src/container/CloudIntegrationPage/ServicesSection/ServiceDetails.tsx b/frontend/src/container/CloudIntegrationPage/ServicesSection/ServiceDetails.tsx
index 392854bd09..0eb547fbc5 100644
--- a/frontend/src/container/CloudIntegrationPage/ServicesSection/ServiceDetails.tsx
+++ b/frontend/src/container/CloudIntegrationPage/ServicesSection/ServiceDetails.tsx
@@ -115,22 +115,23 @@ function ServiceDetails(): JSX.Element | null {
 						<ServiceStatus serviceStatus={serviceDetailsData.status} />
 					)}
 
-					{!!cloudAccountId && isAnySignalConfigured ? (
-						<Button
-							className="configure-button configure-button--default"
-							onClick={(): void => setIsConfigureServiceModalOpen(true)}
-						>
-							Configure ({enabledSignals}/{totalSupportedSignals})
-						</Button>
-					) : (
-						<Button
-							type="primary"
-							className="configure-button configure-button--primary"
-							onClick={(): void => setIsConfigureServiceModalOpen(true)}
-						>
-							Enable Service
-						</Button>
-					)}
+					{!!cloudAccountId &&
+						(isAnySignalConfigured ? (
+							<Button
+								className="configure-button configure-button--default"
+								onClick={(): void => setIsConfigureServiceModalOpen(true)}
+							>
+								Configure ({enabledSignals}/{totalSupportedSignals})
+							</Button>
+						) : (
+							<Button
+								type="primary"
+								className="configure-button configure-button--primary"
+								onClick={(): void => setIsConfigureServiceModalOpen(true)}
+							>
+								Enable Service
+							</Button>
+						))}
 				</div>
 			</div>
 			<div className="service-details__overview">
diff --git a/frontend/src/pages/Integrations/IntegrationsList.tsx b/frontend/src/pages/Integrations/IntegrationsList.tsx
index 89be2c7ec0..44e913165f 100644
--- a/frontend/src/pages/Integrations/IntegrationsList.tsx
+++ b/frontend/src/pages/Integrations/IntegrationsList.tsx
@@ -4,10 +4,8 @@ import './Integrations.styles.scss';
 
 import { Color } from '@signozhq/design-tokens';
 import { Button, List, Typography } from 'antd';
-import { FeatureKeys } from 'constants/features';
 import { useGetAllIntegrations } from 'hooks/Integrations/useGetAllIntegrations';
 import { MoveUpRight, RotateCw } from 'lucide-react';
-import { useAppContext } from 'providers/App/App';
 import { Dispatch, SetStateAction, useMemo } from 'react';
 import { IntegrationsProps } from 'types/api/integrations/types';
 import { isCloudUser } from 'utils/app';
@@ -46,18 +44,10 @@ function IntegrationsList(props: IntegrationsListProps): JSX.Element {
 		refetch,
 	} = useGetAllIntegrations();
 
-	const { featureFlags } = useAppContext();
-	const isAwsIntegrationEnabled =
-		featureFlags?.find((flag) => flag.name === FeatureKeys.AWS_INTEGRATION)
-			?.active || false;
-
 	const filteredDataList = useMemo(() => {
 		let integrationsList: IntegrationsProps[] = [];
 
-		if (
-			isAwsIntegrationEnabled &&
-			AWS_INTEGRATION.title.toLowerCase().includes(searchTerm.toLowerCase())
-		) {
+		if (AWS_INTEGRATION.title.toLowerCase().includes(searchTerm.toLowerCase())) {
 			integrationsList.push(AWS_INTEGRATION);
 		}
 
@@ -72,7 +62,7 @@ function IntegrationsList(props: IntegrationsListProps): JSX.Element {
 		}
 
 		return integrationsList;
-	}, [data?.data.data.integrations, isAwsIntegrationEnabled, searchTerm]);
+	}, [data?.data.data.integrations, searchTerm]);
 
 	const loading = isLoading || isFetching || isRefetching;
 
diff --git a/pkg/query-service/model/featureSet.go b/pkg/query-service/model/featureSet.go
index 9a0b1daccc..d6c986619c 100644
--- a/pkg/query-service/model/featureSet.go
+++ b/pkg/query-service/model/featureSet.go
@@ -24,7 +24,6 @@ const AlertChannelOpsgenie = "ALERT_CHANNEL_OPSGENIE"
 const AlertChannelEmail = "ALERT_CHANNEL_EMAIL"
 const AnomalyDetection = "ANOMALY_DETECTION"
 const HostsInfraMonitoring = "HOSTS_INFRA_MONITORING"
-const AWSIntegration = "AWS_INTEGRATION"
 
 var BasicPlan = FeatureSet{
 	Feature{