fix(user): return 400 instead of 501 for protected user states

ErrIfRoot, ErrIfDeleted and ErrIfPending used TypeUnsupported, which maps
to 501. That code means the server lacks the functionality, which is how
the noop providers use it for edition gating. These guards are business
rules present in every build, so 501 was never accurate.

They now use TypeInvalidInput, matching ErrIfNotPending which already
did. No status code expresses "permanently rejected for every caller",
so the meaning stays in the machine readable error code that each guard
already carries.

Assisted-by: Claude Fable 5

docs/api/openapi.yml

@@ -23421,6 +23421,12 @@ paths:
       responses:
         "204":
           description: No Content
+        "400":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/RenderErrorResponse'
+          description: Bad Request
         "401":
           content:
             application/json:
@@ -23767,6 +23773,12 @@ paths:
       responses:
         "200":
           description: OK
+        "400":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/RenderErrorResponse'
+          description: Bad Request
         "401":
           content:
             application/json:
@@ -23819,6 +23831,12 @@ paths:
       responses:
         "204":
           description: No Content
+        "400":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/RenderErrorResponse'
+          description: Bad Request
         "401":
           content:
             application/json:
@@ -23906,6 +23924,12 @@ paths:
       responses:
         "204":
           description: No Content
+        "400":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/RenderErrorResponse'
+          description: Bad Request
         "401":
           content:
             application/json:

frontend/src/AppRoutes/routes.ts

@@ -527,13 +527,6 @@ const routes: AppRoutes[] = [
 		key: 'AI_OBSERVABILITY_OVERVIEW',
 		isPrivate: true,
 	},
-	{
-		path: ROUTES.AI_OBSERVABILITY_EXPLORER,
-		exact: true,
-		component: LLMObservabilityPage,
-		key: 'AI_OBSERVABILITY_EXPLORER',
-		isPrivate: true,
-	},
 	{
 		path: ROUTES.AI_OBSERVABILITY_CONFIGURATION,
 		exact: true,

frontend/src/assets/Logos/gcp.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 128 128"><path fill="#ea4535" d="M80.6 40.3h.4l-.2-.2 14-14v-.3c-11.8-10.4-28.1-14-43.2-9.5C36.5 20.8 24.9 32.8 20.7 48c.2-.1.5-.2.8-.2 5.2-3.4 11.4-5.4 17.9-5.4 2.2 0 4.3.2 6.4.6.1-.1.2-.1.3-.1 9-9.9 24.2-11.1 34.6-2.6h-.1z"/><path fill="#557ebf" d="M108.1 47.8c-2.3-8.5-7.1-16.2-13.8-22.1L80 39.9c6 4.9 9.5 12.3 9.3 20v2.5c16.9 0 16.9 25.2 0 25.2H63.9v20h-.1l.1.2h25.4c14.6.1 27.5-9.3 31.8-23.1 4.3-13.8-1-28.8-13-36.9z"/><path fill="#36a852" d="M39 107.9h26.3V87.7H39c-1.9 0-3.7-.4-5.4-1.1l-15.2 14.6v.2c6 4.3 13.2 6.6 20.7 6.6z"/><path fill="#f9bc15" d="M40.2 41.9c-14.9.1-28.1 9.3-32.9 22.8-4.8 13.6 0 28.5 11.8 37.3l15.6-14.9c-8.6-3.7-10.6-14.5-4-20.8 6.6-6.4 17.8-4.4 21.7 3.8L68 55.2C61.4 46.9 51.1 42 40.2 42.1z"/></svg>

frontend/src/components/CloudIntegrations/CloudServiceDataCollected/CloudServiceDataCollected.styles.scss

@@ -23,13 +23,6 @@
 			font-weight: 400;
 			line-height: 20px; /* 142.857% */
 			letter-spacing: -0.07px;
-
-			.cloud-service-data-collected-table-heading-info {
-				display: inline-flex;
-				align-items: center;
-				color: var(--l3-foreground);
-				cursor: help;
-			}
 		}
 
 		.cloud-service-data-collected-table-logs {
@@ -39,9 +32,3 @@
 		}
 	}
 }
-
-.cloud-service-data-collected-table-tooltip {
-	max-width: 280px;
-	white-space: normal;
-	word-break: break-word;
-}

frontend/src/components/CloudIntegrations/CloudServiceDataCollected/CloudServiceDataCollected.tsx

@@ -3,19 +3,16 @@ import {
 	CloudintegrationtypesCollectedLogAttributeDTO,
 	CloudintegrationtypesCollectedMetricDTO,
 } from 'api/generated/services/sigNoz.schemas';
-import { BarChart, Info, ScrollText } from '@signozhq/icons';
-import { TooltipProvider, TooltipSimple } from '@signozhq/ui/tooltip';
+import { BarChart, ScrollText } from '@signozhq/icons';
 
 import './CloudServiceDataCollected.styles.scss';
 
 function CloudServiceDataCollected({
 	logsData,
 	metricsData,
-	metricsInfoTooltip,
 }: {
 	logsData: CloudintegrationtypesCollectedLogAttributeDTO[] | null | undefined;
 	metricsData: CloudintegrationtypesCollectedMetricDTO[] | null | undefined;
-	metricsInfoTooltip?: string;
 }): JSX.Element {
 	const logsColumns = [
 		{
@@ -87,25 +84,6 @@ function CloudServiceDataCollected({
 					<div className="cloud-service-data-collected-table-heading">
 						<BarChart size={14} />
 						Metrics
-						{metricsInfoTooltip && (
-							<TooltipProvider>
-								<TooltipSimple
-									title={metricsInfoTooltip}
-									side="top"
-									tooltipContentProps={{
-										className: 'cloud-service-data-collected-table-tooltip',
-									}}
-								>
-									<span
-										className="cloud-service-data-collected-table-heading-info"
-										aria-label="About the metrics listed below"
-										data-testid="data-collected-metrics-info"
-									>
-										<Info size={12} />
-									</span>
-								</TooltipSimple>
-							</TooltipProvider>
-						)}
 					</div>
 					<Table
 						columns={metricsColumns}
@@ -119,8 +97,4 @@ function CloudServiceDataCollected({
 	);
 }
 
-CloudServiceDataCollected.defaultProps = {
-	metricsInfoTooltip: undefined,
-};
-
 export default CloudServiceDataCollected;

frontend/src/constants/routes.ts

@@ -92,7 +92,6 @@ const ROUTES = {
 	AI_OBSERVABILITY_ATTRIBUTE_MAPPING: '/ai-observability/attribute-mapping',
 	AI_OBSERVABILITY_BASE: '/ai-observability',
 	AI_OBSERVABILITY_OVERVIEW: '/ai-observability/overview',
-	AI_OBSERVABILITY_EXPLORER: '/ai-observability/explorer',
 	AI_OBSERVABILITY_CONFIGURATION: '/ai-observability/configuration',
 } as const;
 

frontend/src/container/Integrations/CloudIntegration/AmazonWebServices/AccountActions/AccountActions.tsx

@@ -17,12 +17,9 @@ import { ChevronDown, Dot, PencilLine, Plug, Plus } from '@signozhq/icons';
 
 import AzureCloudAccountSetupModal from '../../AzureCloudServices/AddNewAccount/CloudAccountSetupModal';
 import AzureAccountSettingsModal from '../../AzureCloudServices/EditAccount/AccountSettingsModal';
-import GcpCloudAccountSetupDrawer from '../../GoogleCloudPlatform/AddNewAccount/CloudAccountSetupDrawer';
-import GcpAccountSettingsDrawer from '../../GoogleCloudPlatform/EditAccount/AccountSettingsDrawer';
 import {
 	mapAccountDtoToAwsCloudAccount,
 	mapAccountDtoToAzureCloudAccount,
-	mapAccountDtoToGcpCloudAccount,
 } from '../../mapCloudAccountFromDto';
 import AwsCloudAccountSetupModal from '../AddNewAccount/CloudAccountSetupModal';
 import AwsAccountSettingsModal from '../EditAccount/AccountSettingsModal';
@@ -159,18 +156,6 @@ function AccountActions({ type }: { type: IntegrationType }): JSX.Element {
 			});
 		}
 
-		if (type === IntegrationType.GCP_SERVICES) {
-			raw.forEach((account) => {
-				if (!account) {
-					return;
-				}
-				const mapped = mapAccountDtoToGcpCloudAccount(account);
-				if (mapped) {
-					mappedAccounts.push(mapped);
-				}
-			});
-		}
-
 		return mappedAccounts;
 	}, [listAccountsResponse, type]);
 
@@ -222,23 +207,13 @@ function AccountActions({ type }: { type: IntegrationType }): JSX.Element {
 	// log telemetry event when an account is viewed.
 	useEffect(() => {
 		if (activeAccount) {
-			const { config } = activeAccount;
-			let enabledRegions: string[];
-			if ('regions' in config) {
-				// AWS
-				enabledRegions = config.regions;
-			} else if ('resource_groups' in config) {
-				// Azure
-				enabledRegions = config.resource_groups;
-			} else {
-				// GCP
-				enabledRegions = config.project_ids;
-			}
-
 			logEvent(`${type} Integration: Account viewed`, {
 				cloudAccountId: activeAccount?.cloud_account_id,
 				status: activeAccount?.status,
-				enabledRegions,
+				enabledRegions:
+					'regions' in activeAccount.config
+						? activeAccount.config.regions
+						: activeAccount.config.resource_groups,
 			});
 		}
 	}, [activeAccount, type]);
@@ -285,11 +260,6 @@ function AccountActions({ type }: { type: IntegrationType }): JSX.Element {
 							onClose={(): void => setIsIntegrationModalOpen(false)}
 						/>
 					)}
-					{type === IntegrationType.GCP_SERVICES && (
-						<GcpCloudAccountSetupDrawer
-							onClose={(): void => setIsIntegrationModalOpen(false)}
-						/>
-					)}
 				</>
 			)}
 
@@ -311,13 +281,6 @@ function AccountActions({ type }: { type: IntegrationType }): JSX.Element {
 							setActiveAccount={setActiveAccount}
 						/>
 					)}
-					{type === IntegrationType.GCP_SERVICES && (
-						<GcpAccountSettingsDrawer
-							onClose={(): void => setIsAccountSettingsModalOpen(false)}
-							account={activeAccount}
-							setActiveAccount={setActiveAccount}
-						/>
-					)}
 				</>
 			)}
 		</div>

frontend/src/container/Integrations/CloudIntegration/AmazonWebServices/ServiceDetails/ServiceDetails.tsx

@@ -46,34 +46,14 @@ const EMPTY_FORM_VALUES: ServiceConfigFormValues = {
 	s3BucketsByRegion: {},
 };
 
-const GCP_METRICS_INFO_TOOLTIP =
-	'These are suggested metrics for your OpenTelemetry Collector Configuration. The metrics you actually receive may vary based on the metrics listed in your collector config.';
-
-function getIntegrationServiceConfig(
-	type: IntegrationType,
-	serviceDetailsData?: ServiceDetailsData,
-):
-	| { logs?: { enabled?: boolean }; metrics?: { enabled?: boolean } }
-	| undefined {
-	const config = serviceDetailsData?.cloudIntegrationService?.config;
-
-	if (type === IntegrationType.AWS_SERVICES) {
-		return config?.aws;
-	}
-	if (type === IntegrationType.GCP_SERVICES) {
-		return config?.gcp;
-	}
-	return config?.azure;
-}
-
 function getInitialFormValues(
 	type: IntegrationType,
 	serviceDetailsData?: ServiceDetailsData,
 ): ServiceConfigFormValues {
-	const integrationConfig = getIntegrationServiceConfig(
-		type,
-		serviceDetailsData,
-	);
+	const integrationConfig =
+		type === IntegrationType.AWS_SERVICES
+			? serviceDetailsData?.cloudIntegrationService?.config?.aws
+			: serviceDetailsData?.cloudIntegrationService?.config?.azure;
 
 	return {
 		logsEnabled: integrationConfig?.logs?.enabled || false,
@@ -118,21 +98,16 @@ function getServiceConfigPayload({
 		};
 	}
 
-	// Azure and GCP share the same simple logs/metrics enable-flag shape.
-	const signalConfig = {
-		logs: {
-			enabled: isLogsSupported ? logsEnabled : false,
-		},
-		metrics: {
-			enabled: isMetricsSupported ? metricsEnabled : false,
+	return {
+		azure: {
+			logs: {
+				enabled: isLogsSupported ? logsEnabled : false,
+			},
+			metrics: {
+				enabled: isMetricsSupported ? metricsEnabled : false,
+			},
 		},
 	};
-
-	if (type === IntegrationType.GCP_SERVICES) {
-		return { gcp: signalConfig };
-	}
-
-	return { azure: signalConfig };
 }
 
 function ServiceDetails({
@@ -187,10 +162,10 @@ function ServiceDetails({
 		? isAccountServiceLoading
 		: isReadOnlyServiceLoading;
 
-	const integrationConfig = getIntegrationServiceConfig(
-		type,
-		serviceDetailsData,
-	);
+	const integrationConfig =
+		type === IntegrationType.AWS_SERVICES
+			? serviceDetailsData?.cloudIntegrationService?.config?.aws
+			: serviceDetailsData?.cloudIntegrationService?.config?.azure;
 	const isServiceEnabledInPersistedConfig =
 		Boolean(integrationConfig?.logs?.enabled) ||
 		Boolean(integrationConfig?.metrics?.enabled);
@@ -502,11 +477,6 @@ function ServiceDetails({
 				<CloudServiceDataCollected
 					logsData={serviceDetailsData?.dataCollected?.logs || []}
 					metricsData={serviceDetailsData?.dataCollected?.metrics || []}
-					metricsInfoTooltip={
-						type === IntegrationType.GCP_SERVICES
-							? GCP_METRICS_INFO_TOOLTIP
-							: undefined
-					}
 				/>
 			</div>
 		);

frontend/src/container/Integrations/CloudIntegration/AzureCloudServices/EditAccount/AccountSettingsModal.tsx

@@ -36,12 +36,8 @@ function AccountSettingsModal({
 
 	const queryClient = useQueryClient();
 
-	// `account.config` is the shared per-provider union (Azure | AWS | GCP).
-	// Narrow to Azure by `resource_groups` (Azure-only) rather than
-	// `deployment_region`, which GCP also has — so it no longer identifies
-	// Azure uniquely.
 	const azureConfig = useMemo(
-		() => ('resource_groups' in account.config ? account.config : null),
+		() => ('deployment_region' in account.config ? account.config : null),
 		[account.config],
 	);
 

frontend/src/container/Integrations/CloudIntegration/GoogleCloudPlatform/AddNewAccount/CloudAccountSetupDrawer.module.scss

@@ -1,142 +0,0 @@
-.setupDrawer {
-	--dialog-header-padding: var(--spacing-10) var(--spacing-12);
-	--dialog-footer-padding: var(--spacing-8) var(--spacing-12);
-
-	// Input and ComboboxSimple default to --border borders, inherited text and
-	// --muted-foreground placeholders; the drawer wants the dimmer --l2-border with
-	// brighter values and duller placeholders. Backgrounds are left alone — both
-	// components default to transparent and every field sits on an --l2-background
-	// surface already. Focus borders stay at their per-component defaults.
-	--input-border-color: var(--l2-border);
-	--input-hover-border-color: var(--l2-border);
-	--input-foreground: var(--l1-foreground);
-	--input-placeholder-color: var(--l3-foreground);
-	--combobox-trigger-border-color: var(--l2-border);
-
-	// Bounded flex column so the header/footer stay put and only the body
-	// scrolls when content overflows.
-	display: flex;
-	flex-direction: column;
-	overflow: hidden;
-
-	[data-slot='drawer-header'],
-	[data-slot='drawer-footer'] {
-		flex-shrink: 0;
-	}
-
-	// The drawer body renders inside [data-slot='drawer-description'] — this is
-	// the only region allowed to scroll.
-	[data-slot='drawer-description'] {
-		display: flex;
-		flex: 1 1 auto;
-		flex-direction: column;
-		gap: var(--spacing-10);
-		min-height: 0;
-		padding: var(--spacing-10) var(--spacing-12);
-		overflow-y: auto;
-	}
-
-	[data-slot='select-content'] {
-		width: var(--radix-select-trigger-width);
-	}
-
-	[data-slot='combobox-content'] {
-		z-index: 5;
-		background: var(--l1-background);
-		border: 1px solid var(--l2-border);
-		border-radius: var(--radius-2);
-	}
-
-	// Selected region value: bright, like every other field's text.
-	[data-slot='combobox-value'] {
-		color: var(--l1-foreground);
-	}
-
-	// Empty trigger (.regionEmpty, set from the RHF value): dull the placeholder text.
-	.regionEmpty [data-slot='combobox-value'] {
-		color: var(--l3-foreground);
-	}
-}
-
-.title {
-	h3 {
-		margin: 0;
-		font-size: var(--periscope-font-size-medium);
-		font-weight: var(--font-weight-semibold);
-	}
-}
-
-.footerContainer {
-	display: flex;
-	flex-direction: column;
-	gap: var(--spacing-4);
-	width: 100%;
-}
-
-.footer {
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-	width: 100%;
-	padding: 0;
-}
-
-.drawerSection {
-	composes: drawerSection from './shared.module.scss';
-}
-
-.mono {
-	composes: mono from './shared.module.scss';
-}
-
-.fullWidth {
-	width: 100%;
-}
-
-.fieldError {
-	composes: fieldError from './shared.module.scss';
-}
-
-.projectIdsSelect {
-	:global(.ant-select-selector) {
-		min-height: 36px;
-		background: var(--l2-background);
-		border: 1px solid var(--l2-border) !important;
-	}
-
-	&:hover :global(.ant-select-selector),
-	&:global(.ant-select-focused) :global(.ant-select-selector) {
-		border-color: var(--l2-border);
-		box-shadow: none;
-	}
-
-	// antd defaults to 14px; pin to 13px to line up with the Input/Combobox fields.
-	:global(.ant-select-selection-placeholder),
-	:global(.ant-select-selection-search-input),
-	:global(.ant-select-selection-item) {
-		font-size: var(--periscope-font-size-base);
-	}
-
-	:global(.ant-select-selection-placeholder) {
-		color: var(--l3-foreground);
-	}
-
-	:global(.ant-select-selection-search-input) {
-		color: var(--l1-foreground);
-	}
-
-	:global(.ant-select-selection-item) {
-		color: var(--l1-foreground);
-		background: var(--l2-background);
-		border: 1px solid var(--l2-border);
-		border-radius: var(--radius-2);
-	}
-
-	:global(.ant-select-selection-item-remove) {
-		color: var(--l3-foreground);
-
-		&:hover {
-			color: var(--l1-foreground);
-		}
-	}
-}

frontend/src/container/Integrations/CloudIntegration/GoogleCloudPlatform/AddNewAccount/CloudAccountSetupDrawer.tsx

@@ -1,288 +0,0 @@
-import { useEffect, useState } from 'react';
-import { Button } from '@signozhq/ui/button';
-import { Callout } from '@signozhq/ui/callout';
-import { ComboboxSimple } from '@signozhq/ui/combobox';
-import { DrawerWrapper } from '@signozhq/ui/drawer';
-import { Input } from '@signozhq/ui/input';
-import { Typography } from '@signozhq/ui/typography';
-import { Select } from 'antd';
-import cx from 'classnames';
-import { GCP_REGIONS } from 'container/Integrations/constants';
-import { IntegrationModalProps } from 'container/Integrations/HeroSection/types';
-import { useCloudAccountSetupDrawer } from 'hooks/integration/gcp/useCloudAccountSetupDrawer';
-import { Controller, useForm } from 'react-hook-form';
-import { popupContainer } from 'utils/selectPopupContainer';
-
-import ConnectionSecretsFields from './ConnectionSecretsFields';
-import FieldLabel from './FieldLabel';
-import FlowSelector from './FlowSelector';
-import SetupGuideCallout from './SetupGuideCallout';
-import { GcpSetupFormValues, SetupFlow } from './types';
-
-import styles from './CloudAccountSetupDrawer.module.scss';
-
-const REGION_ITEMS = GCP_REGIONS.map((region) => ({
-	value: region.value,
-	label: `${region.label} (${region.value})`,
-}));
-
-const DEFAULT_VALUES: GcpSetupFormValues = {
-	accountName: '',
-	deploymentProjectId: '',
-	deploymentRegion: '',
-	projectIds: [],
-	sigNozApiUrl: '',
-	sigNozApiKey: '',
-	ingestionUrl: '',
-	ingestionKey: '',
-};
-
-function CloudAccountSetupDrawer({
-	onClose,
-}: IntegrationModalProps): JSX.Element {
-	const {
-		isLoading,
-		connectAccount,
-		handleClose,
-		connectionParams,
-		isConnectionParamsLoading,
-		submitError,
-		clearSubmitError,
-	} = useCloudAccountSetupDrawer({ onClose });
-
-	const { control, handleSubmit, setValue } = useForm<GcpSetupFormValues>({
-		defaultValues: DEFAULT_VALUES,
-	});
-
-	const [flow, setFlow] = useState<SetupFlow>('manual');
-
-	// Pre-fill the deployment/ingestion fields with the fetched credentials.
-	useEffect(() => {
-		if (!connectionParams) {
-			return;
-		}
-		setValue('sigNozApiUrl', connectionParams.sigNozApiUrl);
-		setValue('sigNozApiKey', connectionParams.sigNozApiKey);
-		setValue('ingestionUrl', connectionParams.ingestionUrl);
-		setValue('ingestionKey', connectionParams.ingestionKey);
-	}, [connectionParams, setValue]);
-
-	const footer = (
-		<div className={styles.footerContainer}>
-			{submitError && (
-				<Callout
-					type="error"
-					size="small"
-					showIcon
-					action="dismissible"
-					onClick={clearSubmitError}
-					title="Failed to connect GCP account"
-					testId="gcp-connect-error"
-				>
-					{submitError}
-				</Callout>
-			)}
-			<div className={styles.footer}>
-				<Button
-					variant="outlined"
-					color="secondary"
-					onClick={handleClose}
-					testId="gcp-cancel-btn"
-				>
-					Cancel
-				</Button>
-				<Button
-					variant="solid"
-					color="primary"
-					onClick={handleSubmit(connectAccount)}
-					loading={isLoading}
-					disabled={isConnectionParamsLoading}
-					testId="gcp-connect-account-btn"
-				>
-					Connect Account
-				</Button>
-			</div>
-		</div>
-	);
-
-	return (
-		<DrawerWrapper
-			open={true}
-			className={styles.setupDrawer}
-			onOpenChange={(open): void => {
-				if (!open) {
-					handleClose();
-				}
-			}}
-			direction="right"
-			showCloseButton
-			title="Connect Google Cloud Platform"
-			width="base"
-			footer={footer}
-			drawerHeaderProps={{ className: styles.title }}
-		>
-			<FlowSelector value={flow} onChange={setFlow} />
-			<SetupGuideCallout />
-			<div className={styles.drawerSection}>
-				<FieldLabel
-					htmlFor="gcp-account-name-input"
-					label="Account Name"
-					tooltip="A label to identify this group of GCP projects (org ID, billing email, or any descriptive name)"
-					required
-				/>
-				<Controller
-					name="accountName"
-					control={control}
-					rules={{ required: 'Please enter an account name' }}
-					render={({ field, fieldState }): JSX.Element => (
-						<>
-							<Input
-								id="gcp-account-name-input"
-								className={styles.fullWidth}
-								placeholder="e.g. my-org or billing@company.com"
-								value={field.value}
-								onChange={(e): void => field.onChange(e.target.value)}
-								testId="gcp-account-name-input"
-							/>
-							{fieldState.error && (
-								<Typography.Text
-									as="span"
-									size="small"
-									role="alert"
-									className={styles.fieldError}
-								>
-									{fieldState.error.message}
-								</Typography.Text>
-							)}
-						</>
-					)}
-				/>
-			</div>
-			<div className={styles.drawerSection}>
-				<FieldLabel
-					htmlFor="gcp-deployment-project-id-input"
-					label="Deployment Project ID"
-					tooltip="The GCP project that hosts your OTel Collector deployment — often separate from the projects you actually monitor"
-					required
-				/>
-				<Controller
-					name="deploymentProjectId"
-					control={control}
-					rules={{ required: 'Please enter the deployment project ID' }}
-					render={({ field, fieldState }): JSX.Element => (
-						<>
-							<Input
-								id="gcp-deployment-project-id-input"
-								className={cx(styles.fullWidth, styles.mono)}
-								placeholder="e.g. my-deployment-project-123"
-								value={field.value}
-								onChange={(e): void => field.onChange(e.target.value)}
-								testId="gcp-deployment-project-id-input"
-							/>
-							{fieldState.error && (
-								<Typography.Text
-									as="span"
-									size="small"
-									role="alert"
-									className={styles.fieldError}
-								>
-									{fieldState.error.message}
-								</Typography.Text>
-							)}
-						</>
-					)}
-				/>
-			</div>
-			<div className={styles.drawerSection}>
-				<FieldLabel
-					htmlFor="gcp-deployment-region-select"
-					label="Deployment Region"
-					tooltip="The GCP region where your OTel Collector will be deployed"
-					required
-				/>
-				<Controller
-					name="deploymentRegion"
-					control={control}
-					rules={{ required: 'Please select a region' }}
-					render={({ field, fieldState }): JSX.Element => (
-						<>
-							<ComboboxSimple
-								id="gcp-deployment-region-select"
-								className={cx(styles.fullWidth, {
-									[styles.regionEmpty]: !field.value,
-								})}
-								items={REGION_ITEMS}
-								value={field.value}
-								onChange={(value): void => field.onChange(value as string)}
-								placeholder="Select a region..."
-								inputPlaceholder="Search regions…"
-								withPortal={false}
-								testId="gcp-deployment-region-select"
-							/>
-							{fieldState.error && (
-								<Typography.Text
-									as="span"
-									size="small"
-									role="alert"
-									className={styles.fieldError}
-								>
-									{fieldState.error.message}
-								</Typography.Text>
-							)}
-						</>
-					)}
-				/>
-			</div>
-			<div className={styles.drawerSection}>
-				<FieldLabel
-					htmlFor="gcp-project-ids-select"
-					label="Projects to Monitor"
-					tooltip="Enter each GCP project ID then press Enter"
-					required
-				/>
-				<Controller
-					name="projectIds"
-					control={control}
-					rules={{
-						validate: (value): true | string =>
-							value.length > 0 || 'Please add at least one project ID',
-					}}
-					render={({ field, fieldState }): JSX.Element => (
-						<>
-							<Select
-								id="gcp-project-ids-select"
-								className={cx(styles.fullWidth, styles.projectIdsSelect)}
-								mode="tags"
-								value={field.value}
-								onChange={(value): void => field.onChange(value)}
-								placeholder="Add project IDs…"
-								tokenSeparators={[',', ' ']}
-								notFoundContent={null}
-								suffixIcon={null}
-								getPopupContainer={popupContainer}
-								data-testid="gcp-project-ids-select"
-							/>
-							{fieldState.error && (
-								<Typography.Text
-									as="span"
-									size="small"
-									role="alert"
-									className={styles.fieldError}
-								>
-									{fieldState.error.message}
-								</Typography.Text>
-							)}
-						</>
-					)}
-				/>
-			</div>
-			<ConnectionSecretsFields
-				control={control}
-				isLoading={isConnectionParamsLoading}
-				connectionParams={connectionParams}
-			/>
-		</DrawerWrapper>
-	);
-}
-
-export default CloudAccountSetupDrawer;

frontend/src/container/Integrations/CloudIntegration/GoogleCloudPlatform/AddNewAccount/ConnectionSecretsFields.module.scss

@@ -1,71 +0,0 @@
-.drawerSurface {
-	composes: drawerSurface from './shared.module.scss';
-}
-
-.drawerSurfaceHead {
-	composes: drawerSurfaceHead from './shared.module.scss';
-}
-
-.drawerSection {
-	composes: drawerSection from './shared.module.scss';
-}
-
-.headLabel {
-	display: flex;
-	justify-content: center;
-	align-items: center;
-	gap: var(--spacing-2);
-}
-
-.mono {
-	composes: mono from './shared.module.scss';
-}
-
-.fieldError {
-	composes: fieldError from './shared.module.scss';
-}
-
-.fullWidth {
-	width: 100%;
-}
-
-.secretsBody {
-	display: flex;
-	flex-direction: column;
-	gap: var(--spacing-6);
-}
-
-.skeletonLabel :global(.ant-skeleton-input) {
-	width: 120px;
-	min-width: 120px;
-	height: 14px;
-}
-
-.skeletonInput :global(.ant-skeleton-input) {
-	width: 100%;
-	min-width: 100%;
-	height: 36px;
-}
-
-.readonlyField {
-	display: flex;
-	gap: var(--spacing-2);
-	align-items: center;
-	height: 36px;
-	padding: 0 var(--spacing-2) 0 var(--spacing-4);
-	background: var(--l2-background);
-	border: 1px solid var(--l2-border);
-	border-radius: var(--radius-2);
-}
-
-.readonlyValue {
-	flex: 1 1 auto;
-	min-width: 0;
-	overflow: hidden;
-	// Match the other fields' value text: 13px and the brighter --l1-foreground.
-	font-size: var(--periscope-font-size-base);
-	color: var(--l2-foreground);
-	text-overflow: ellipsis;
-	white-space: nowrap;
-	cursor: not-allowed;
-}

frontend/src/container/Integrations/CloudIntegration/GoogleCloudPlatform/AddNewAccount/ConnectionSecretsFields.tsx

@@ -1,193 +0,0 @@
-import { Lock } from '@signozhq/icons';
-import { Input } from '@signozhq/ui/input';
-import { toast } from '@signozhq/ui/sonner';
-import { Typography } from '@signozhq/ui/typography';
-import { Skeleton } from 'antd';
-import { CloudintegrationtypesCredentialsDTO } from 'api/generated/services/sigNoz.schemas';
-import cx from 'classnames';
-import CopyButton from 'periscope/components/CopyButton/CopyButton';
-import { Control, Controller } from 'react-hook-form';
-
-import FieldLabel from './FieldLabel';
-import { GcpSetupFormValues } from './types';
-import { SecretFieldType, validateSecretValue } from './validators';
-import styles from './ConnectionSecretsFields.module.scss';
-
-type CredentialField = keyof CloudintegrationtypesCredentialsDTO;
-
-interface FieldConfig {
-	name: CredentialField;
-	label: string;
-	tooltip: string;
-	placeholder: string;
-	testId: string;
-	type: SecretFieldType;
-}
-
-const FIELDS: FieldConfig[] = [
-	{
-		name: 'sigNozApiUrl',
-		label: 'SigNoz API URL',
-		tooltip: 'Base URL of your SigNoz instance the collector reports to',
-		placeholder: 'https://<tenant>.signoz.cloud',
-		testId: 'gcp-signoz-api-url-input',
-		type: 'url',
-	},
-	{
-		name: 'sigNozApiKey',
-		label: 'SigNoz API Key',
-		tooltip: 'API key used to authenticate with your SigNoz instance',
-		placeholder: 'Enter SigNoz API key',
-		testId: 'gcp-signoz-api-key-input',
-		type: 'text',
-	},
-	{
-		name: 'ingestionUrl',
-		label: 'Ingestion URL',
-		tooltip: 'OTLP ingestion endpoint your OTel Collector sends telemetry to',
-		placeholder: 'https://ingest.<region>.signoz.cloud',
-		testId: 'gcp-ingestion-url-input',
-		type: 'url',
-	},
-	{
-		name: 'ingestionKey',
-		label: 'Ingestion Key',
-		tooltip: 'Ingestion key that authorizes telemetry sent to SigNoz',
-		placeholder: 'Enter ingestion key',
-		testId: 'gcp-ingestion-key-input',
-		type: 'text',
-	},
-];
-
-interface ConnectionSecretsFieldsProps {
-	control: Control<GcpSetupFormValues>;
-	isLoading: boolean;
-	connectionParams?: CloudintegrationtypesCredentialsDTO;
-}
-
-function ConnectionSecretsFields({
-	control,
-	isLoading,
-	connectionParams,
-}: ConnectionSecretsFieldsProps): JSX.Element {
-	const hasMissingValue = FIELDS.some(
-		(field) => !connectionParams?.[field.name],
-	);
-
-	return (
-		<div className={styles.drawerSurface}>
-			<div className={styles.drawerSurfaceHead}>
-				<Typography.Text weight="bold" size="base">
-					Deployment details &amp; ingestion secrets
-				</Typography.Text>
-				{!hasMissingValue && (
-					<div className={styles.headLabel}>
-						<Lock size={12} />
-						<Typography.Text as="span" size="small" className={styles.headLabel}>
-							Auto-filled by SigNoz
-						</Typography.Text>
-					</div>
-				)}
-			</div>
-
-			{isLoading ? (
-				<div className={styles.secretsBody} data-testid="gcp-secrets-skeleton">
-					{FIELDS.map((field) => (
-						<div key={field.name} className={styles.drawerSection}>
-							<Skeleton.Input active size="small" className={styles.skeletonLabel} />
-							<Skeleton.Input active block className={styles.skeletonInput} />
-						</div>
-					))}
-				</div>
-			) : (
-				<div className={styles.secretsBody}>
-					{FIELDS.map((field) => {
-						// Backend-provided values are read-only — the user can't edit them, so
-						// show a truncated value with a copy button. Missing values (enterprise)
-						// stay editable inputs with no copy button.
-						const providedValue = connectionParams?.[field.name];
-						if (providedValue) {
-							return (
-								<div key={field.name} className={styles.drawerSection}>
-									<FieldLabel
-										htmlFor={field.testId}
-										label={field.label}
-										tooltip={field.tooltip}
-									/>
-									<div className={styles.readonlyField}>
-										<Typography.Text
-											as="span"
-											id={field.testId}
-											className={cx(styles.readonlyValue, styles.mono)}
-											title={providedValue}
-											testId={field.testId}
-										>
-											{providedValue}
-										</Typography.Text>
-										<CopyButton
-											value={providedValue}
-											size={12}
-											ariaLabel={`Copy ${field.label}`}
-											testId={`${field.testId}-copy`}
-											onCopy={(): void => {
-												toast.success(`${field.label} copied to clipboard`, {
-													position: 'bottom-right',
-												});
-											}}
-										/>
-									</div>
-								</div>
-							);
-						}
-
-						return (
-							<div key={field.name} className={styles.drawerSection}>
-								<FieldLabel
-									htmlFor={field.testId}
-									label={field.label}
-									tooltip={field.tooltip}
-								/>
-								<Controller
-									name={field.name}
-									control={control}
-									rules={{
-										validate: (value): true | string =>
-											validateSecretValue(field.label, field.type, value),
-									}}
-									render={({ field: rhfField, fieldState }): JSX.Element => (
-										<>
-											<Input
-												id={field.testId}
-												className={cx(styles.fullWidth, styles.mono)}
-												placeholder={field.placeholder}
-												value={rhfField.value}
-												onChange={(e): void => rhfField.onChange(e.target.value)}
-												testId={field.testId}
-											/>
-											{fieldState.error && (
-												<Typography.Text
-													as="span"
-													size="small"
-													role="alert"
-													className={styles.fieldError}
-												>
-													{fieldState.error.message}
-												</Typography.Text>
-											)}
-										</>
-									)}
-								/>
-							</div>
-						);
-					})}
-				</div>
-			)}
-		</div>
-	);
-}
-
-ConnectionSecretsFields.defaultProps = {
-	connectionParams: undefined,
-};
-
-export default ConnectionSecretsFields;

frontend/src/container/Integrations/CloudIntegration/GoogleCloudPlatform/AddNewAccount/FieldLabel.module.scss

@@ -1,22 +0,0 @@
-.fieldLabel {
-	display: inline-flex;
-	align-items: center;
-	gap: var(--spacing-2);
-}
-
-.required {
-	composes: required from './shared.module.scss';
-}
-
-.infoTrigger {
-	display: inline-flex;
-	align-items: center;
-	color: var(--l3-foreground);
-	cursor: help;
-}
-
-.tooltipContent {
-	max-width: 240px;
-	white-space: normal;
-	word-break: break-word;
-}

frontend/src/container/Integrations/CloudIntegration/GoogleCloudPlatform/AddNewAccount/FieldLabel.tsx

@@ -1,49 +0,0 @@
-import { Info } from '@signozhq/icons';
-import { TooltipSimple } from '@signozhq/ui/tooltip';
-
-import styles from './FieldLabel.module.scss';
-
-interface FieldLabelProps {
-	htmlFor: string;
-	label: string;
-	tooltip: string;
-	required?: boolean;
-}
-
-function FieldLabel({
-	htmlFor,
-	label,
-	tooltip,
-	required,
-}: FieldLabelProps): JSX.Element {
-	return (
-		<label className={styles.fieldLabel} htmlFor={htmlFor}>
-			{label}
-
-			<TooltipSimple
-				title={tooltip}
-				side="top"
-				tooltipContentProps={{ className: styles.tooltipContent }}
-			>
-				<span
-					className={styles.infoTrigger}
-					aria-label={`${label} help`}
-					data-testid={`${htmlFor}-tooltip`}
-				>
-					<Info size={12} />
-				</span>
-			</TooltipSimple>
-			{required && (
-				<span className={styles.required} aria-hidden="true">
-					*
-				</span>
-			)}
-		</label>
-	);
-}
-
-FieldLabel.defaultProps = {
-	required: false,
-};
-
-export default FieldLabel;

frontend/src/container/Integrations/CloudIntegration/GoogleCloudPlatform/AddNewAccount/FlowSelector.module.scss

@@ -1,84 +0,0 @@
-.drawerSection {
-	composes: drawerSection from './shared.module.scss';
-}
-
-.drawerSurface {
-	composes: drawerSurface from './shared.module.scss';
-}
-
-.drawerSurfaceHead {
-	composes: drawerSurfaceHead from './shared.module.scss';
-}
-
-.flowRadioGroup {
-	--radio-group-item-border-color: var(--l2-border);
-
-	display: flex;
-	flex-direction: column;
-	gap: var(--spacing-4);
-	width: 100%;
-
-	.flowRadio {
-		display: flex;
-		flex-direction: row;
-		align-items: flex-start;
-		justify-content: flex-start;
-		gap: var(--spacing-5);
-		width: 100%;
-		padding: var(--spacing-5) var(--spacing-6);
-		margin: 0;
-		border: 1px solid transparent;
-		border-radius: var(--radius-2);
-		box-sizing: border-box;
-		cursor: pointer;
-		transition:
-			background-color 0.12s ease,
-			border-color 0.12s ease;
-
-		> button[role='radio'] {
-			flex: 0 0 16px;
-			width: 16px;
-			height: 16px;
-			margin-top: 3px;
-		}
-
-		> label {
-			flex: 1 1 auto;
-			min-width: 0;
-			display: block;
-			text-align: left;
-			cursor: pointer;
-			font-size: inherit;
-			font-weight: inherit;
-			color: inherit;
-		}
-
-		&.flowRadioManual:has(button[data-state='checked']) {
-			background: color-mix(in srgb, var(--accent-primary) 10%, transparent);
-			border-color: color-mix(in srgb, var(--accent-primary) 30%, transparent);
-		}
-
-		&:hover {
-			background: var(--l3-background-hover);
-		}
-
-		&:has(button[disabled]) {
-			cursor: not-allowed;
-			opacity: 0.55;
-
-			&:hover {
-				background: var(--l3-background);
-			}
-		}
-	}
-}
-
-.flowRadioTitle {
-	display: flex;
-	gap: var(--spacing-2);
-	align-items: center;
-}
-
-.flowRadioDesc {
-	margin-top: var(--spacing-2);
-}

frontend/src/container/Integrations/CloudIntegration/GoogleCloudPlatform/AddNewAccount/FlowSelector.tsx

@@ -1,76 +0,0 @@
-import { Badge } from '@signozhq/ui/badge';
-import { RadioGroup, RadioGroupItem } from '@signozhq/ui/radio-group';
-import { Typography } from '@signozhq/ui/typography';
-import cx from 'classnames';
-
-import { SetupFlow } from './types';
-import styles from './FlowSelector.module.scss';
-
-interface FlowSelectorProps {
-	value: SetupFlow;
-	onChange: (flow: SetupFlow) => void;
-}
-
-function FlowSelector({ value, onChange }: FlowSelectorProps): JSX.Element {
-	return (
-		<div className={cx(styles.drawerSection, styles.drawerSurface)}>
-			<div className={styles.drawerSurfaceHead}>
-				<Typography.Text weight="bold" size="base">
-					Connection method
-				</Typography.Text>
-			</div>
-
-			<RadioGroup
-				value={value}
-				onChange={(next): void => onChange(next as SetupFlow)}
-				className={styles.flowRadioGroup}
-			>
-				<RadioGroupItem
-					value="manual"
-					containerClassName={cx(styles.flowRadio, styles.flowRadioManual)}
-					testId="gcp-flow-manual"
-				>
-					<div className={styles.flowRadioTitle}>
-						<Typography.Text weight="semibold" size="base">
-							Connect Manually
-						</Typography.Text>
-					</div>
-					<Typography.Text
-						as="p"
-						size="small"
-						color="muted"
-						className={styles.flowRadioDesc}
-					>
-						Deploy your own OTel Collector.
-					</Typography.Text>
-				</RadioGroupItem>
-
-				<RadioGroupItem
-					value="agent"
-					containerClassName={styles.flowRadio}
-					testId="gcp-flow-agent"
-					disabled
-				>
-					<div className={styles.flowRadioTitle}>
-						<Typography.Text weight="semibold" size="base">
-							Connect via Agent
-						</Typography.Text>
-						<Badge color="robin" variant="default">
-							Soon
-						</Badge>
-					</div>
-					<Typography.Text
-						as="p"
-						size="small"
-						color="muted"
-						className={styles.flowRadioDesc}
-					>
-						SigNoz deploys and manages the collector for you.
-					</Typography.Text>
-				</RadioGroupItem>
-			</RadioGroup>
-		</div>
-	);
-}
-
-export default FlowSelector;

frontend/src/container/Integrations/CloudIntegration/GoogleCloudPlatform/AddNewAccount/SetupGuideCallout.module.scss

@@ -1,13 +0,0 @@
-.guideLink {
-	display: inline-flex;
-	align-items: center;
-	gap: var(--spacing-2);
-	color: var(--callout-primary-title);
-	font-size: var(--periscope-font-size-base);
-	text-decoration: none;
-
-	&:hover {
-		color: var(--accent-primary);
-		text-decoration: underline;
-	}
-}

frontend/src/container/Integrations/CloudIntegration/GoogleCloudPlatform/AddNewAccount/SetupGuideCallout.tsx

@@ -1,31 +0,0 @@
-import { ArrowUpRight, KeyRound } from '@signozhq/icons';
-import { Callout } from '@signozhq/ui/callout';
-import { Typography } from '@signozhq/ui/typography';
-
-import styles from './SetupGuideCallout.module.scss';
-
-const GCP_INTEGRATION_DOCS_URL =
-	'https://signoz.io/docs/integrations/gcp/gcp-integration/';
-
-function SetupGuideCallout(): JSX.Element {
-	return (
-		<Callout icon={<KeyRound />} testId="gcp-setup-guide-callout">
-			<Typography.Text as="span" size="base">
-				Please go through our GCP integration guide, which covers all prerequisites
-				— service account, IAM roles, and resource setup.
-			</Typography.Text>
-			<a
-				className={styles.guideLink}
-				href={GCP_INTEGRATION_DOCS_URL}
-				target="_blank"
-				rel="noopener noreferrer"
-				data-testid="gcp-setup-guide-link"
-			>
-				GCP integration guide
-				<ArrowUpRight size={12} />
-			</a>
-		</Callout>
-	);
-}
-
-export default SetupGuideCallout;

frontend/src/container/Integrations/CloudIntegration/GoogleCloudPlatform/AddNewAccount/shared.module.scss

@@ -1,36 +0,0 @@
-.drawerSection {
-	display: flex;
-	flex-direction: column;
-	gap: var(--spacing-3);
-}
-
-.drawerSection > label {
-	font-size: var(--periscope-font-size-normal);
-	color: var(--l2-foreground);
-}
-
-.required {
-	color: var(--accent-cherry);
-}
-
-.fieldError {
-	font-size: var(--periscope-font-size-small);
-	color: var(--accent-cherry);
-}
-
-.drawerSurface {
-	padding: var(--spacing-7);
-	border-radius: 6px;
-	border: 1px solid var(--l2-border);
-}
-
-.drawerSurfaceHead {
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-	margin-bottom: var(--spacing-5);
-}
-
-.mono {
-	font-family: var(--font-family-mono);
-}

frontend/src/container/Integrations/CloudIntegration/GoogleCloudPlatform/AddNewAccount/types.ts

@@ -1,12 +0,0 @@
-export type SetupFlow = 'manual' | 'agent';
-
-export interface GcpSetupFormValues {
-	accountName: string;
-	deploymentProjectId: string;
-	deploymentRegion: string;
-	projectIds: string[];
-	sigNozApiUrl: string;
-	sigNozApiKey: string;
-	ingestionUrl: string;
-	ingestionKey: string;
-}

frontend/src/container/Integrations/CloudIntegration/GoogleCloudPlatform/AddNewAccount/validators.ts

@@ -1,24 +0,0 @@
-export type SecretFieldType = 'url' | 'text';
-
-export function isValidUrl(value: string): boolean {
-	try {
-		return Boolean(new URL(value));
-	} catch {
-		return false;
-	}
-}
-
-export function validateSecretValue(
-	label: string,
-	type: SecretFieldType,
-	value: string | undefined,
-): true | string {
-	const trimmed = value?.trim();
-	if (!trimmed) {
-		return `Please enter the ${label}`;
-	}
-	if (type === 'url' && !isValidUrl(trimmed)) {
-		return `Please enter a valid URL for ${label}`;
-	}
-	return true;
-}

frontend/src/container/Integrations/CloudIntegration/GoogleCloudPlatform/EditAccount/AccountSettingsDrawer.module.scss

@@ -1,64 +0,0 @@
-.body {
-	display: flex;
-	flex-direction: column;
-	gap: 17px;
-	border-radius: 3px;
-}
-
-.connectedAccountDetails {
-	display: flex;
-	flex-direction: column;
-	gap: var(--spacing-4);
-}
-
-.connectedAccountDetailsTitle {
-	color: var(--l1-foreground);
-	font-size: 14px;
-	font-weight: var(--font-weight-medium);
-	line-height: var(--line-height-20);
-	letter-spacing: -0.07px;
-}
-
-.accountId {
-	color: var(--l2-foreground);
-	font-size: 12px;
-	line-height: 18px;
-	letter-spacing: -0.06px;
-}
-
-.accountIdValue {
-	font-family: 'Geist Mono';
-	font-size: 12px;
-	font-weight: var(--font-weight-bold);
-	line-height: 18px;
-	letter-spacing: -0.06px;
-}
-
-.regionSelector {
-	display: flex;
-	flex-direction: column;
-	gap: var(--spacing-2);
-}
-
-.regionSelectorTitle {
-	color: var(--l1-foreground);
-	font-size: 14px;
-	font-weight: var(--font-weight-medium);
-	line-height: var(--line-height-20);
-	letter-spacing: -0.07px;
-}
-
-.regionSelectorDescription {
-	color: var(--l2-foreground);
-	font-size: 12px;
-	line-height: 18px;
-	letter-spacing: -0.06px;
-}
-
-.footer {
-	display: flex;
-	flex-direction: row;
-	gap: var(--spacing-5);
-	justify-content: space-between;
-	width: 100%;
-}

frontend/src/container/Integrations/CloudIntegration/GoogleCloudPlatform/EditAccount/AccountSettingsDrawer.tsx

@@ -1,156 +0,0 @@
-import { Dispatch, SetStateAction, useMemo } from 'react';
-import { useQueryClient } from 'react-query';
-import { Save } from '@signozhq/icons';
-import { Button } from '@signozhq/ui/button';
-import { DrawerWrapper } from '@signozhq/ui/drawer';
-import { Form, Select } from 'antd';
-import { invalidateListAccounts } from 'api/generated/services/cloudintegration';
-import { INTEGRATION_TYPES } from 'container/Integrations/constants';
-import { CloudAccount } from 'container/Integrations/types';
-import { useAccountSettingsDrawer } from 'hooks/integration/gcp/useAccountSettingsDrawer';
-
-import RemoveIntegrationAccount from '../../RemoveAccount/RemoveIntegrationAccount';
-
-import styles from './AccountSettingsDrawer.module.scss';
-
-interface AccountSettingsDrawerProps {
-	onClose: () => void;
-	account: CloudAccount;
-	setActiveAccount: Dispatch<SetStateAction<CloudAccount | null>>;
-}
-
-function AccountSettingsDrawer({
-	onClose,
-	account,
-	setActiveAccount,
-}: AccountSettingsDrawerProps): JSX.Element {
-	const {
-		form,
-		isLoading,
-		projectIds,
-		isSaveDisabled,
-		setProjectIds,
-		handleSubmit,
-		handleClose,
-	} = useAccountSettingsDrawer({ onClose, account, setActiveAccount });
-
-	const queryClient = useQueryClient();
-
-	const gcpConfig = useMemo(
-		() => ('project_ids' in account.config ? account.config : null),
-		[account.config],
-	);
-
-	return (
-		<DrawerWrapper
-			open={true}
-			title="Account Settings"
-			direction="right"
-			showCloseButton
-			onOpenChange={(open): void => {
-				if (!open) {
-					handleClose();
-				}
-			}}
-			width="wide"
-			footer={
-				<div className={styles.footer}>
-					<RemoveIntegrationAccount
-						accountId={account?.id}
-						onRemoveIntegrationAccountSuccess={(): void => {
-							void invalidateListAccounts(queryClient, {
-								cloudProvider: INTEGRATION_TYPES.GCP,
-							});
-							setActiveAccount(null);
-							handleClose();
-						}}
-						cloudProvider={INTEGRATION_TYPES.GCP}
-					/>
-					<Button
-						variant="solid"
-						color="secondary"
-						disabled={isSaveDisabled}
-						onClick={handleSubmit}
-						loading={isLoading}
-						prefix={<Save size={14} />}
-						data-testid="gcp-update-account-btn"
-					>
-						Update Changes
-					</Button>
-				</div>
-			}
-		>
-			<Form
-				form={form}
-				layout="vertical"
-				initialValues={{
-					projectIds: gcpConfig?.project_ids || [],
-				}}
-			>
-				<div className={styles.body}>
-					<div className={styles.connectedAccountDetails}>
-						<div className={styles.connectedAccountDetailsTitle}>
-							Connected Account details
-						</div>
-						<div className={styles.accountId}>
-							Account Name:{' '}
-							<span className={styles.accountIdValue}>
-								{account?.providerAccountId}
-							</span>
-						</div>
-					</div>
-
-					{gcpConfig?.deployment_project_id && (
-						<div className={styles.regionSelector}>
-							<div className={styles.regionSelectorTitle}>Deployment project ID</div>
-							<div className={styles.regionSelectorDescription}>
-								{gcpConfig.deployment_project_id}
-							</div>
-						</div>
-					)}
-
-					{gcpConfig?.deployment_region && (
-						<div className={styles.regionSelector}>
-							<div className={styles.regionSelectorTitle}>Deployment region</div>
-							<div className={styles.regionSelectorDescription}>
-								{gcpConfig.deployment_region}
-							</div>
-						</div>
-					)}
-
-					<div className={styles.regionSelector}>
-						<div className={styles.regionSelectorTitle}>Projects to monitor</div>
-						<div className={styles.regionSelectorDescription}>
-							Update the GCP project IDs that should be monitored.
-						</div>
-
-						<Form.Item
-							name="projectIds"
-							rules={[
-								{
-									required: true,
-									type: 'array',
-									min: 1,
-									message: 'Please add at least one project ID',
-								},
-							]}
-						>
-							<Select
-								mode="tags"
-								value={projectIds}
-								tokenSeparators={[',']}
-								onChange={(values): void => {
-									setProjectIds(values);
-									form.setFieldValue('projectIds', values);
-								}}
-								data-testid="gcp-edit-project-ids-select"
-							/>
-						</Form.Item>
-					</div>
-				</div>
-			</Form>
-		</DrawerWrapper>
-	);
-}
-
-export default AccountSettingsDrawer;

frontend/src/container/Integrations/CloudIntegration/GoogleCloudPlatform/__tests__/AccountSettingsDrawer.test.tsx

@@ -1,230 +0,0 @@
-import { render, screen, waitFor, within } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
-import { toast } from '@signozhq/ui/sonner';
-import { TooltipProvider } from '@signozhq/ui/tooltip';
-import { server } from 'mocks-server/server';
-import { rest, RestRequest } from 'msw';
-import MockQueryClientProvider from 'providers/test/MockQueryClientProvider';
-
-import AccountSettingsDrawer from '../EditAccount/AccountSettingsDrawer';
-import {
-	GCP_ACCOUNT_ID,
-	GCP_ACCOUNT_URL,
-	GCP_ACCOUNTS_URL,
-	gcpAccount,
-	gcpAccountConfig,
-	listAccountsResponse,
-} from './mockData';
-
-// `useAccountSettingsDrawer` imports logEvent by relative path, which the
-// jest.config moduleNameMapper (keyed on the `api/common/logEvent` alias) does
-// not intercept — so mock the resolved module directly.
-jest.mock('../../../../../api/common/logEvent', () => ({
-	__esModule: true,
-	default: jest.fn(),
-}));
-
-jest.mock('@signozhq/ui/sonner', () => ({
-	...jest.requireActual('@signozhq/ui/sonner'),
-	toast: {
-		success: jest.fn(),
-		error: jest.fn(),
-	},
-}));
-
-const onClose = jest.fn();
-const setActiveAccount = jest.fn();
-
-const renderDrawer = (): void => {
-	render(
-		<MockQueryClientProvider>
-			<TooltipProvider>
-				<AccountSettingsDrawer
-					onClose={onClose}
-					account={gcpAccount}
-					setActiveAccount={setActiveAccount}
-				/>
-			</TooltipProvider>
-		</MockQueryClientProvider>,
-	);
-};
-
-/** The antd tags Select renders its text input inside the testId wrapper. */
-const getProjectIdsInput = (): HTMLElement =>
-	within(screen.getByTestId('gcp-edit-project-ids-select')).getByRole(
-		'combobox',
-	);
-
-/** Each selected tag carries an antd "close" icon that removes it. */
-const getProjectIdTagRemoveButtons = (): HTMLElement[] =>
-	within(screen.getByTestId('gcp-edit-project-ids-select')).queryAllByLabelText(
-		'close',
-	);
-
-describe('GCP AccountSettingsDrawer', () => {
-	let updatePayload: Record<string, unknown> | null;
-
-	beforeEach(() => {
-		updatePayload = null;
-
-		server.use(
-			rest.get(GCP_ACCOUNTS_URL, (_req, res, ctx) =>
-				res(ctx.status(200), ctx.json(listAccountsResponse)),
-			),
-			rest.put(GCP_ACCOUNT_URL, async (req: RestRequest, res, ctx) => {
-				updatePayload = await req.json();
-				return res(ctx.status(204));
-			}),
-		);
-	});
-
-	it('renders the connected account details and existing project IDs', () => {
-		renderDrawer();
-
-		expect(screen.getByText(gcpAccount.providerAccountId)).toBeInTheDocument();
-		expect(
-			screen.getByText(gcpAccountConfig.deployment_project_id),
-		).toBeInTheDocument();
-		expect(
-			screen.getByText(gcpAccountConfig.deployment_region),
-		).toBeInTheDocument();
-
-		gcpAccountConfig.project_ids.forEach((projectId) => {
-			expect(screen.getByTitle(projectId)).toBeInTheDocument();
-		});
-	});
-
-	it('keeps save disabled until the project IDs actually change', async () => {
-		const user = userEvent.setup();
-		renderDrawer();
-
-		expect(screen.getByTestId('gcp-update-account-btn')).toBeDisabled();
-
-		await user.type(getProjectIdsInput(), 'project-c,');
-
-		await waitFor(() => {
-			expect(screen.getByTestId('gcp-update-account-btn')).toBeEnabled();
-		});
-	});
-
-	it('sends the updated project IDs while preserving the immutable deployment fields', async () => {
-		const user = userEvent.setup();
-		renderDrawer();
-
-		await user.type(getProjectIdsInput(), 'project-c,');
-		await waitFor(() => {
-			expect(screen.getByTestId('gcp-update-account-btn')).toBeEnabled();
-		});
-		await user.click(screen.getByTestId('gcp-update-account-btn'));
-
-		await waitFor(() => {
-			expect(updatePayload).not.toBeNull();
-		});
-
-		expect(updatePayload).toStrictEqual({
-			config: {
-				gcp: {
-					deploymentRegion: gcpAccountConfig.deployment_region,
-					deploymentProjectId: gcpAccountConfig.deployment_project_id,
-					projectIds: ['project-a', 'project-b', 'project-c'],
-				},
-			},
-		});
-
-		await waitFor(() => {
-			expect(setActiveAccount).toHaveBeenCalledWith({
-				...gcpAccount,
-				config: {
-					deployment_region: gcpAccountConfig.deployment_region,
-					deployment_project_id: gcpAccountConfig.deployment_project_id,
-					project_ids: ['project-a', 'project-b', 'project-c'],
-				},
-			});
-		});
-		expect(onClose).toHaveBeenCalledTimes(1);
-		expect(toast.success).toHaveBeenCalledWith(
-			'Account settings updated successfully',
-			expect.anything(),
-		);
-	});
-
-	it('blocks the update and shows a validation error when every project ID is removed', async () => {
-		const user = userEvent.setup();
-		renderDrawer();
-
-		// Strip every tag via its remove icon; the list shrinks as we go.
-		while (getProjectIdTagRemoveButtons().length > 0) {
-			// eslint-disable-next-line no-await-in-loop
-			await user.click(getProjectIdTagRemoveButtons()[0]);
-		}
-
-		await waitFor(() => {
-			expect(screen.getByTestId('gcp-update-account-btn')).toBeEnabled();
-		});
-		await user.click(screen.getByTestId('gcp-update-account-btn'));
-
-		await waitFor(() => {
-			expect(
-				screen.getByText('Please add at least one project ID'),
-			).toBeInTheDocument();
-		});
-		expect(updatePayload).toBeNull();
-		expect(onClose).not.toHaveBeenCalled();
-	});
-
-	it('surfaces a toast and keeps the drawer open when the update fails', async () => {
-		server.use(
-			rest.put(GCP_ACCOUNT_URL, (_req, res, ctx) =>
-				res(
-					ctx.status(500),
-					ctx.json({ status: 'error', error: { message: 'update failed' } }),
-				),
-			),
-		);
-
-		const user = userEvent.setup();
-		renderDrawer();
-
-		await user.type(getProjectIdsInput(), 'project-c,');
-		await waitFor(() => {
-			expect(screen.getByTestId('gcp-update-account-btn')).toBeEnabled();
-		});
-		await user.click(screen.getByTestId('gcp-update-account-btn'));
-
-		await waitFor(() => {
-			expect(toast.error).toHaveBeenCalledWith(
-				'Failed to update account settings',
-				expect.anything(),
-			);
-		});
-		expect(setActiveAccount).not.toHaveBeenCalled();
-		expect(onClose).not.toHaveBeenCalled();
-	});
-
-	it('disconnects the account with the GCP-specific confirmation copy', async () => {
-		let disconnectedId: string | null = null;
-		server.use(
-			rest.delete(`${GCP_ACCOUNTS_URL}/:id`, (req, res, ctx) => {
-				disconnectedId = req.params.id as string;
-				return res(ctx.status(204));
-			}),
-		);
-
-		const user = userEvent.setup();
-		renderDrawer();
-
-		await user.click(screen.getByRole('button', { name: /disconnect/i }));
-
-		await expect(
-			screen.findByText(/manually tear down/i),
-		).resolves.toBeInTheDocument();
-
-		await user.click(screen.getByRole('button', { name: /remove account/i }));
-
-		await waitFor(() => {
-			expect(disconnectedId).toBe(GCP_ACCOUNT_ID);
-		});
-		expect(setActiveAccount).toHaveBeenCalledWith(null);
-		expect(onClose).toHaveBeenCalledTimes(1);
-	});
-});

frontend/src/container/Integrations/CloudIntegration/GoogleCloudPlatform/__tests__/CloudAccountSetupDrawer.test.tsx

@@ -1,210 +0,0 @@
-import { render, screen, waitFor } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
-import { TooltipProvider } from '@signozhq/ui/tooltip';
-import { server } from 'mocks-server/server';
-import { rest, RestRequest } from 'msw';
-import MockQueryClientProvider from 'providers/test/MockQueryClientProvider';
-
-import CloudAccountSetupDrawer from '../AddNewAccount/CloudAccountSetupDrawer';
-import {
-	checkInResponse,
-	CLOUD_INTEGRATION_ID,
-	connectionCredentials,
-	connectionCredentialsResponse,
-	createAccountResponse,
-	GCP_ACCOUNTS_URL,
-	GCP_CHECK_IN_URL,
-	GCP_CREDENTIALS_URL,
-} from './mockData';
-
-// `useCloudAccountSetupDrawer` imports logEvent by relative path, which the
-// jest.config moduleNameMapper (keyed on the `api/common/logEvent` alias) does
-// not intercept — so mock the resolved module directly.
-jest.mock('../../../../../api/common/logEvent', () => ({
-	__esModule: true,
-	default: jest.fn(),
-}));
-
-const onClose = jest.fn();
-
-const renderDrawer = (): void => {
-	render(
-		<MockQueryClientProvider>
-			<TooltipProvider>
-				<CloudAccountSetupDrawer onClose={onClose} />
-			</TooltipProvider>
-		</MockQueryClientProvider>,
-	);
-};
-
-describe('GCP CloudAccountSetupDrawer', () => {
-	let createAccountPayload: Record<string, unknown> | null;
-	let checkInPayload: Record<string, unknown> | null;
-
-	beforeEach(() => {
-		createAccountPayload = null;
-		checkInPayload = null;
-
-		server.use(
-			rest.get(GCP_CREDENTIALS_URL, (_req, res, ctx) =>
-				res(ctx.status(200), ctx.json(connectionCredentialsResponse)),
-			),
-			// check_in is registered first — it is a more specific path than
-			// /accounts and msw matches handlers in registration order.
-			rest.post(GCP_CHECK_IN_URL, async (req: RestRequest, res, ctx) => {
-				checkInPayload = await req.json();
-				return res(ctx.status(200), ctx.json(checkInResponse));
-			}),
-			rest.post(GCP_ACCOUNTS_URL, async (req: RestRequest, res, ctx) => {
-				createAccountPayload = await req.json();
-				return res(ctx.status(201), ctx.json(createAccountResponse));
-			}),
-		);
-	});
-
-	it('renders SigNoz-provided credentials as read-only fields', async () => {
-		renderDrawer();
-
-		await waitFor(() => {
-			expect(screen.getByTestId('gcp-signoz-api-url-input')).toHaveTextContent(
-				connectionCredentials.sigNozApiUrl,
-			);
-		});
-
-		expect(screen.getByTestId('gcp-signoz-api-key-input')).toHaveTextContent(
-			connectionCredentials.sigNozApiKey,
-		);
-		expect(screen.getByTestId('gcp-ingestion-url-input')).toHaveTextContent(
-			connectionCredentials.ingestionUrl,
-		);
-		expect(screen.getByTestId('gcp-ingestion-key-input')).toHaveTextContent(
-			connectionCredentials.ingestionKey,
-		);
-		expect(screen.getByText('Auto-filled by SigNoz')).toBeInTheDocument();
-	});
-
-	it('blocks submission and surfaces validation errors when the form is empty', async () => {
-		const user = userEvent.setup();
-		renderDrawer();
-
-		await waitFor(() => {
-			expect(screen.getByTestId('gcp-connect-account-btn')).toBeEnabled();
-		});
-
-		await user.click(screen.getByTestId('gcp-connect-account-btn'));
-
-		await waitFor(() => {
-			expect(screen.getByText('Please enter an account name')).toBeInTheDocument();
-		});
-		expect(
-			screen.getByText('Please enter the deployment project ID'),
-		).toBeInTheDocument();
-		expect(screen.getByText('Please select a region')).toBeInTheDocument();
-		expect(
-			screen.getByText('Please add at least one project ID'),
-		).toBeInTheDocument();
-
-		expect(createAccountPayload).toBeNull();
-		expect(onClose).not.toHaveBeenCalled();
-	});
-
-	it('creates the account, checks the agent in, and closes the drawer', async () => {
-		const user = userEvent.setup();
-		renderDrawer();
-
-		await waitFor(() => {
-			expect(screen.getByTestId('gcp-connect-account-btn')).toBeEnabled();
-		});
-
-		await user.type(
-			screen.getByTestId('gcp-account-name-input'),
-			'billing@company.com',
-		);
-		await user.type(
-			screen.getByTestId('gcp-deployment-project-id-input'),
-			'my-deployment-project-123',
-		);
-
-		await user.click(screen.getByTestId('gcp-deployment-region-select'));
-		await user.click(await screen.findByText('Mumbai (asia-south1)'));
-
-		const projectIdsInput = document.querySelector(
-			'#gcp-project-ids-select',
-		) as HTMLInputElement;
-		await user.type(projectIdsInput, 'project-a,project-b,');
-
-		await user.click(screen.getByTestId('gcp-connect-account-btn'));
-
-		await waitFor(() => {
-			expect(createAccountPayload).not.toBeNull();
-		});
-
-		expect(createAccountPayload).toStrictEqual({
-			config: {
-				gcp: {
-					deploymentRegion: 'asia-south1',
-					deploymentProjectId: 'my-deployment-project-123',
-					projectIds: ['project-a', 'project-b'],
-				},
-			},
-			// Backend-provided credentials win over anything in the form.
-			credentials: connectionCredentials,
-		});
-
-		await waitFor(() => {
-			expect(checkInPayload).toStrictEqual({
-				providerAccountId: 'billing@company.com',
-				cloudIntegrationId: CLOUD_INTEGRATION_ID,
-				data: {},
-			});
-		});
-
-		await waitFor(() => {
-			expect(onClose).toHaveBeenCalledTimes(1);
-		});
-	});
-
-	it('shows the backend error inline when account creation fails', async () => {
-		server.use(
-			rest.post(GCP_ACCOUNTS_URL, (_req, res, ctx) =>
-				res(
-					ctx.status(400),
-					ctx.json({
-						status: 'error',
-						error: { message: 'deployment project id is not accessible' },
-					}),
-				),
-			),
-		);
-
-		const user = userEvent.setup();
-		renderDrawer();
-
-		await waitFor(() => {
-			expect(screen.getByTestId('gcp-connect-account-btn')).toBeEnabled();
-		});
-
-		await user.type(screen.getByTestId('gcp-account-name-input'), 'my-org');
-		await user.type(
-			screen.getByTestId('gcp-deployment-project-id-input'),
-			'my-deployment-project-123',
-		);
-		await user.click(screen.getByTestId('gcp-deployment-region-select'));
-		await user.click(await screen.findByText('Mumbai (asia-south1)'));
-
-		const projectIdsInput = document.querySelector(
-			'#gcp-project-ids-select',
-		) as HTMLInputElement;
-		await user.type(projectIdsInput, 'project-a,');
-
-		await user.click(screen.getByTestId('gcp-connect-account-btn'));
-
-		await waitFor(() => {
-			expect(screen.getByTestId('gcp-connect-error')).toHaveTextContent(
-				'deployment project id is not accessible',
-			);
-		});
-		expect(checkInPayload).toBeNull();
-		expect(onClose).not.toHaveBeenCalled();
-	});
-});

frontend/src/container/Integrations/CloudIntegration/GoogleCloudPlatform/__tests__/mockData.ts

@@ -1,65 +0,0 @@
-import { CloudintegrationtypesCredentialsDTO } from 'api/generated/services/sigNoz.schemas';
-import {
-	CloudAccount,
-	GCPCloudAccountConfig,
-} from 'container/Integrations/types';
-
-export const GCP_CREDENTIALS_URL =
-	'http://localhost/api/v1/cloud_integrations/gcp/credentials';
-export const GCP_ACCOUNTS_URL =
-	'http://localhost/api/v1/cloud_integrations/gcp/accounts';
-export const GCP_CHECK_IN_URL =
-	'http://localhost/api/v1/cloud_integrations/gcp/accounts/check_in';
-
-export const CLOUD_INTEGRATION_ID = 'ci-gcp-1234';
-
-export const GCP_ACCOUNT_ID = 'acc-gcp-1';
-export const GCP_ACCOUNT_URL = `${GCP_ACCOUNTS_URL}/${GCP_ACCOUNT_ID}`;
-
-export const gcpAccountConfig: GCPCloudAccountConfig = {
-	deployment_region: 'asia-south1',
-	deployment_project_id: 'my-deployment-project-123',
-	project_ids: ['project-a', 'project-b'],
-};
-
-export const gcpAccount: CloudAccount = {
-	id: GCP_ACCOUNT_ID,
-	cloud_account_id: 'gcp-cloud-1',
-	providerAccountId: 'billing@company.com',
-	config: gcpAccountConfig,
-	status: { integration: { last_heartbeat_ts_ms: 1_700_000_000_000 } },
-};
-
-export const listAccountsResponse = {
-	status: 'success',
-	data: { accounts: [] },
-};
-
-/**
- * Credentials the backend hands out on SigNoz Cloud. When present the drawer
- * renders them read-only and sends them back verbatim on submit.
- */
-export const connectionCredentials: CloudintegrationtypesCredentialsDTO = {
-	sigNozApiUrl: 'https://tenant.signoz.cloud',
-	sigNozApiKey: 'signoz-api-key-abc',
-	ingestionUrl: 'https://ingest.us.signoz.cloud',
-	ingestionKey: 'ingestion-key-xyz',
-};
-
-export const connectionCredentialsResponse = {
-	status: 'success',
-	data: connectionCredentials,
-};
-
-export const createAccountResponse = {
-	status: 'success',
-	data: {
-		id: CLOUD_INTEGRATION_ID,
-		connectionArtifact: {},
-	},
-};
-
-export const checkInResponse = {
-	status: 'success',
-	data: {},
-};

frontend/src/container/Integrations/CloudIntegration/RemoveAccount/RemoveIntegrationAccount.tsx

@@ -60,44 +60,6 @@ function RemoveIntegrationAccount({
 		setIsModalOpen(false);
 	};
 
-	let modalDescription: JSX.Element;
-	if (cloudProvider === INTEGRATION_TYPES.AWS) {
-		modalDescription = (
-			<>
-				Removing this account will remove all components created for sending
-				telemetry to SigNoz in your AWS account within the next ~15 minutes
-				(cloudformation stacks named signoz-integration-telemetry-collection in
-				enabled regions). <br />
-				<br />
-				After that, you can delete the cloudformation stack that was created
-				manually when connecting this account.
-			</>
-		);
-	} else if (cloudProvider === INTEGRATION_TYPES.GCP) {
-		modalDescription = (
-			<>
-				Removing this account will stop SigNoz from monitoring it. <br />
-				<br />
-				Since you manage the GCP resources yourself, remember to manually tear down
-				the OTel collector and Pub/Sub resources you created for this integration if
-				you no longer need them.
-			</>
-		);
-	} else {
-		modalDescription = (
-			<>
-				Removing this account will remove all components created for sending
-				telemetry to SigNoz in your Azure subscription within the next ~15 minutes
-				(deployment stack named signoz-integration-telemetry will be deleted
-				automatically). <br />
-				<br />
-				After that, you have to manually delete &apos;signoz-integration&apos;
-				deployment stack that was created while connecting this account (Takes ~20
-				minutes to delete).
-			</>
-		);
-	}
-
 	return (
 		<div className="remove-integration-account-container">
 			<Button
@@ -122,7 +84,28 @@ function RemoveIntegrationAccount({
 					loading: isRemoveIntegrationLoading,
 				}}
 			>
-				{modalDescription}
+				{cloudProvider === INTEGRATION_TYPES.AWS ? (
+					<>
+						Removing this account will remove all components created for sending
+						telemetry to SigNoz in your AWS account within the next ~15 minutes
+						(cloudformation stacks named signoz-integration-telemetry-collection in
+						enabled regions). <br />
+						<br />
+						After that, you can delete the cloudformation stack that was created
+						manually when connecting this account.
+					</>
+				) : (
+					<>
+						Removing this account will remove all components created for sending
+						telemetry to SigNoz in your Azure subscription within the next ~15 minutes
+						(deployment stack named signoz-integration-telemetry will be deleted
+						automatically). <br />
+						<br />
+						After that, you have to manually delete &apos;signoz-integration&apos;
+						deployment stack that was created while connecting this account (Takes ~20
+						minutes to delete).
+					</>
+				)}
 			</Modal>
 		</div>
 	);

frontend/src/container/Integrations/CloudIntegration/mapCloudAccountFromDto.ts

@@ -47,27 +47,3 @@ export function mapAccountDtoToAzureCloudAccount(
 		providerAccountId: account.providerAccountId,
 	};
 }
-
-export function mapAccountDtoToGcpCloudAccount(
-	account: CloudintegrationtypesAccountDTO,
-): IntegrationCloudAccount | null {
-	if (!account.providerAccountId) {
-		return null;
-	}
-
-	return {
-		id: account.id,
-		cloud_account_id: account.id,
-		config: {
-			deployment_region: account.config?.gcp?.deploymentRegion ?? '',
-			deployment_project_id: account.config?.gcp?.deploymentProjectId ?? '',
-			project_ids: account.config?.gcp?.projectIds ?? [],
-		},
-		status: {
-			integration: {
-				last_heartbeat_ts_ms: account.agentReport?.timestampMillis ?? 0,
-			},
-		},
-		providerAccountId: account.providerAccountId,
-	};
-}

frontend/src/container/Integrations/IntegrationDetailPage/IntegrationDetailPage.tsx

@@ -13,8 +13,8 @@ import { ArrowLeft, MoveUpRight, RotateCw } from '@signozhq/icons';
 import awwSnapUrl from '@/assets/Icons/awwSnap.svg';
 
 import CloudIntegration from '../CloudIntegration/CloudIntegration';
-import { IntegrationType } from '../types';
 import { INTEGRATION_TYPES } from '../constants';
+import { IntegrationType } from '../types';
 import { handleContactSupport } from '../utils';
 import IntegrationDetailContent from './IntegrationDetailContent';
 import IntegrationDetailHeader from './IntegrationDetailHeader';
@@ -24,12 +24,6 @@ import { getConnectionStatesFromConnectionStatus } from './utils';
 
 import './IntegrationDetailPage.styles.scss';
 
-const cloudIntegrationTypeById: Record<string, IntegrationType> = {
-	[INTEGRATION_TYPES.AWS]: IntegrationType.AWS_SERVICES,
-	[INTEGRATION_TYPES.AZURE]: IntegrationType.AZURE_SERVICES,
-	[INTEGRATION_TYPES.GCP]: IntegrationType.GCP_SERVICES,
-};
-
 // eslint-disable-next-line sonarjs/cognitive-complexity
 function IntegrationDetailPage(): JSX.Element {
 	const history = useHistory();
@@ -61,8 +55,19 @@ function IntegrationDetailPage(): JSX.Element {
 		),
 	);
 
-	if (integrationId && cloudIntegrationTypeById[integrationId]) {
-		return <CloudIntegration type={cloudIntegrationTypeById[integrationId]} />;
+	if (
+		integrationId === INTEGRATION_TYPES.AWS ||
+		integrationId === INTEGRATION_TYPES.AZURE
+	) {
+		return (
+			<CloudIntegration
+				type={
+					integrationId === INTEGRATION_TYPES.AWS
+						? IntegrationType.AWS_SERVICES
+						: IntegrationType.AZURE_SERVICES
+				}
+			/>
+		);
 	}
 
 	return (

frontend/src/container/Integrations/constants.ts

@@ -1,8 +1,7 @@
 import awsDarkLogo from '@/assets/Logos/aws-dark.svg';
 import azureOpenaiLogo from '@/assets/Logos/azure-openai.svg';
-import gcpLogo from '@/assets/Logos/gcp.svg';
 
-import { AzureRegion, GCPRegion } from './types';
+import { AzureRegion } from './types';
 
 export const INTEGRATION_TELEMETRY_EVENTS = {
 	INTEGRATIONS_LIST_VISITED: 'Integrations Page: Visited the list page',
@@ -22,7 +21,6 @@ export const INTEGRATION_TELEMETRY_EVENTS = {
 export const INTEGRATION_TYPES = {
 	AWS: 'aws',
 	AZURE: 'azure',
-	GCP: 'gcp',
 };
 
 export const AWS_INTEGRATION = {
@@ -55,26 +53,7 @@ export const AZURE_INTEGRATION = {
 	is_new: true,
 };
 
-export const GCP_INTEGRATION = {
-	id: INTEGRATION_TYPES.GCP,
-	title: 'Google Cloud Platform',
-	description: 'Setup for GCP monitoring with SigNoz',
-	author: {
-		name: 'SigNoz',
-		email: 'integrations@signoz.io',
-		homepage: 'https://signoz.io',
-	},
-	icon: gcpLogo,
-	icon_alt: 'gcp-logo',
-	is_installed: false,
-	is_new: true,
-};
-
-export const ONE_CLICK_INTEGRATIONS = [
-	AWS_INTEGRATION,
-	AZURE_INTEGRATION,
-	GCP_INTEGRATION,
-];
+export const ONE_CLICK_INTEGRATIONS = [AWS_INTEGRATION, AZURE_INTEGRATION];
 
 export const AZURE_REGIONS: AzureRegion[] = [
 	{
@@ -186,66 +165,3 @@ export const AZURE_REGIONS: AzureRegion[] = [
 	{ label: 'West US 2', value: 'westus2', geography: 'United States' },
 	{ label: 'West US 3', value: 'westus3', geography: 'United States' },
 ];
-
-// Source of truth: pkg/types/cloudintegrationtypes/regions.go (GCP regions).
-export const GCP_REGIONS: GCPRegion[] = [
-	{ label: 'Johannesburg', value: 'africa-south1', geography: 'Africa' },
-	{ label: 'Changhua County', value: 'asia-east1', geography: 'APAC' },
-	{ label: 'Hong Kong', value: 'asia-east2', geography: 'APAC' },
-	{ label: 'Tokyo', value: 'asia-northeast1', geography: 'APAC' },
-	{ label: 'Osaka', value: 'asia-northeast2', geography: 'APAC' },
-	{ label: 'Seoul', value: 'asia-northeast3', geography: 'APAC' },
-	{ label: 'Mumbai', value: 'asia-south1', geography: 'APAC' },
-	{ label: 'Delhi', value: 'asia-south2', geography: 'APAC' },
-	{ label: 'Singapore', value: 'asia-southeast1', geography: 'APAC' },
-	{ label: 'Jakarta', value: 'asia-southeast2', geography: 'APAC' },
-	{ label: 'Bangkok', value: 'asia-southeast3', geography: 'APAC' },
-	{ label: 'Sydney', value: 'australia-southeast1', geography: 'APAC' },
-	{ label: 'Melbourne', value: 'australia-southeast2', geography: 'APAC' },
-	{ label: 'Warsaw', value: 'europe-central2', geography: 'Europe' },
-	{ label: 'Hamina', value: 'europe-north1', geography: 'Europe' },
-	{ label: 'Stockholm', value: 'europe-north2', geography: 'Europe' },
-	{ label: 'Madrid', value: 'europe-southwest1', geography: 'Europe' },
-	{ label: 'St. Ghislain', value: 'europe-west1', geography: 'Europe' },
-	{ label: 'London', value: 'europe-west2', geography: 'Europe' },
-	{ label: 'Frankfurt', value: 'europe-west3', geography: 'Europe' },
-	{ label: 'Eemshaven', value: 'europe-west4', geography: 'Europe' },
-	{ label: 'Zurich', value: 'europe-west6', geography: 'Europe' },
-	{ label: 'Milan', value: 'europe-west8', geography: 'Europe' },
-	{ label: 'Paris', value: 'europe-west9', geography: 'Europe' },
-	{ label: 'Berlin', value: 'europe-west10', geography: 'Europe' },
-	{ label: 'Turin', value: 'europe-west12', geography: 'Europe' },
-	{ label: 'Doha', value: 'me-central1', geography: 'Middle East' },
-	{ label: 'Dammam', value: 'me-central2', geography: 'Middle East' },
-	{ label: 'Tel Aviv', value: 'me-west1', geography: 'Middle East' },
-	{
-		label: 'Montréal',
-		value: 'northamerica-northeast1',
-		geography: 'North America',
-	},
-	{
-		label: 'Toronto',
-		value: 'northamerica-northeast2',
-		geography: 'North America',
-	},
-	{
-		label: 'Querétaro',
-		value: 'northamerica-south1',
-		geography: 'North America',
-	},
-	{
-		label: 'São Paulo',
-		value: 'southamerica-east1',
-		geography: 'South America',
-	},
-	{ label: 'Santiago', value: 'southamerica-west1', geography: 'South America' },
-	{ label: 'Council Bluffs', value: 'us-central1', geography: 'North America' },
-	{ label: 'Moncks Corner', value: 'us-east1', geography: 'North America' },
-	{ label: 'Ashburn', value: 'us-east4', geography: 'North America' },
-	{ label: 'Columbus', value: 'us-east5', geography: 'North America' },
-	{ label: 'Dallas', value: 'us-south1', geography: 'North America' },
-	{ label: 'The Dalles', value: 'us-west1', geography: 'North America' },
-	{ label: 'Los Angeles', value: 'us-west2', geography: 'North America' },
-	{ label: 'Salt Lake City', value: 'us-west3', geography: 'North America' },
-	{ label: 'Las Vegas', value: 'us-west4', geography: 'North America' },
-];

frontend/src/container/Integrations/types.ts

@@ -6,7 +6,6 @@ import {
 export enum IntegrationType {
 	AWS_SERVICES = 'aws',
 	AZURE_SERVICES = 'azure',
-	GCP_SERVICES = 'gcp',
 }
 
 interface LogField {
@@ -88,10 +87,7 @@ export interface ServiceData {
 export interface CloudAccount {
 	id: string;
 	cloud_account_id: string;
-	config:
-		| AzureCloudAccountConfig
-		| AWSCloudAccountConfig
-		| GCPCloudAccountConfig;
+	config: AzureCloudAccountConfig | AWSCloudAccountConfig;
 	status: AccountStatus | IServiceStatus;
 	providerAccountId: string;
 }
@@ -101,12 +97,6 @@ export interface AzureCloudAccountConfig {
 	resource_groups: string[];
 }
 
-export interface GCPCloudAccountConfig {
-	deployment_region: string;
-	deployment_project_id: string;
-	project_ids: string[];
-}
-
 export interface AccountStatus {
 	integration: IntegrationStatus;
 }
@@ -121,12 +111,6 @@ export interface AzureRegion {
 	value: string;
 }
 
-export interface GCPRegion {
-	label: string;
-	geography: string;
-	value: string;
-}
-
 export interface UpdateServiceConfigPayload {
 	cloud_account_id: string;
 	config: AzureServicesConfig;

frontend/src/container/LLMObservability/Explorer/Explorer.module.scss

@@ -1,11 +0,0 @@
-.explorer {
-	display: flex;
-	flex-direction: column;
-	gap: var(--spacing-4);
-	padding: var(--spacing-2) var(--spacing-0);
-}
-
-.placeholder {
-	color: var(--l2-foreground);
-	font-size: var(--periscope-font-size-base);
-}

frontend/src/container/LLMObservability/Explorer/Explorer.tsx

@@ -1,14 +0,0 @@
-import styles from './Explorer.module.scss';
-
-// Shell for the AI Observability Explorer tab. Owns the
-// /ai-observability/explorer route and is intentionally empty for now: the
-// query builder + results surface land in a follow-up.
-function Explorer(): JSX.Element {
-	return (
-		<div className={styles.explorer} data-testid="llm-observability-explorer">
-			<div className={styles.placeholder}>Explorer coming soon.</div>
-		</div>
-	);
-}
-
-export default Explorer;

frontend/src/container/LLMObservability/__tests__/LLMObservability.test.tsx

@@ -44,7 +44,6 @@ describe('LLMObservability (integration)', () => {
 		expect(screen.getByTestId('llm-observability-overview')).toBeInTheDocument();
 		expect(screen.getByTestId('llm-overview-dashboard')).toBeInTheDocument();
 		expect(screen.getByRole('tab', { name: 'Overview' })).toBeInTheDocument();
-		expect(screen.getByRole('tab', { name: 'Explorer' })).toBeInTheDocument();
 		expect(
 			screen.getByRole('tab', { name: 'Model pricing' }),
 		).toBeInTheDocument();
@@ -79,27 +78,6 @@ describe('LLMObservability (integration)', () => {
 		);
 	});
 
-	it('navigates to the explorer route when the Explorer tab is clicked', async () => {
-		const user = userEvent.setup({ pointerEventsCheck: 0 });
-		render(<LLMObservability />, undefined, {
-			initialRoute: ROUTES.AI_OBSERVABILITY_OVERVIEW,
-		});
-
-		await user.click(screen.getByRole('tab', { name: 'Explorer' }));
-
-		expect(safeNavigateMock).toHaveBeenCalledWith(
-			ROUTES.AI_OBSERVABILITY_EXPLORER,
-		);
-	});
-
-	it('renders the explorer panel on the explorer route', () => {
-		render(<LLMObservability />, undefined, {
-			initialRoute: ROUTES.AI_OBSERVABILITY_EXPLORER,
-		});
-
-		expect(screen.getByTestId('llm-observability-explorer')).toBeInTheDocument();
-	});
-
 	it('renders the attribute mapping page on the attribute mapping route', () => {
 		render(<LLMObservability />, undefined, {
 			initialRoute: ROUTES.AI_OBSERVABILITY_ATTRIBUTE_MAPPING,

frontend/src/container/LLMObservability/hooks/useLLMObservabilityTabs.tsx

@@ -5,12 +5,10 @@ import ROUTES from 'constants/routes';
 import { useSafeNavigate } from 'hooks/useSafeNavigate';
 
 import LLMObservabilityAttributeMapping from '../AttributeMapping/LLMObservabilityAttributeMapping';
-import Explorer from '../Explorer/Explorer';
 import Overview from '../Overview/Overview';
 import LLMObservabilityModelPricing from '../Settings/ModelPricing/LLMObservabilityModelPricing';
 
 const OVERVIEW_KEY = ROUTES.AI_OBSERVABILITY_OVERVIEW;
-const EXPLORER_KEY = ROUTES.AI_OBSERVABILITY_EXPLORER;
 const CONFIGURATION_KEY = ROUTES.AI_OBSERVABILITY_CONFIGURATION;
 const ATTRIBUTE_MAPPING_KEY = ROUTES.AI_OBSERVABILITY_ATTRIBUTE_MAPPING;
 
@@ -33,8 +31,6 @@ export function useLLMObservabilityTabs(): UseLLMObservabilityTabsResult {
 		activeTab = CONFIGURATION_KEY;
 	} else if (pathname.startsWith(ATTRIBUTE_MAPPING_KEY)) {
 		activeTab = ATTRIBUTE_MAPPING_KEY;
-	} else if (pathname.startsWith(EXPLORER_KEY)) {
-		activeTab = EXPLORER_KEY;
 	}
 
 	const onTabChange = useCallback(
@@ -50,11 +46,6 @@ export function useLLMObservabilityTabs(): UseLLMObservabilityTabsResult {
 			label: 'Overview',
 			children: <Overview />,
 		},
-		{
-			key: EXPLORER_KEY,
-			label: 'Explorer',
-			children: <Explorer />,
-		},
 		{
 			key: CONFIGURATION_KEY,
 			label: 'Model pricing',

frontend/src/container/TopNav/DateTimeSelectionV2/constants.ts

@@ -206,7 +206,6 @@ export const routesToSkip = [
 	ROUTES.AI_OBSERVABILITY_OVERVIEW,
 	ROUTES.AI_OBSERVABILITY_CONFIGURATION,
 	ROUTES.AI_OBSERVABILITY_ATTRIBUTE_MAPPING,
-	ROUTES.AI_OBSERVABILITY_EXPLORER,
 ];
 
 export const routesToDisable = [ROUTES.LOGS_EXPLORER, ROUTES.LIVE_LOGS];

frontend/src/hooks/Integrations/useGetIntegrationStatus.ts

@@ -10,8 +10,7 @@ import {
 export function isOneClickIntegration(integrationId: string): boolean {
 	return (
 		integrationId === INTEGRATION_TYPES.AWS ||
-		integrationId === INTEGRATION_TYPES.AZURE ||
-		integrationId === INTEGRATION_TYPES.GCP
+		integrationId === INTEGRATION_TYPES.AZURE
 	);
 }
 

frontend/src/hooks/integration/azure/useAccountSettingsModal.ts

@@ -39,12 +39,8 @@ export function useAccountSettingsModal({
 }: UseAccountSettingsModalProps): UseAccountSettingsModal {
 	const [form] = Form.useForm();
 	const { mutate: updateAccount, isLoading } = useUpdateAccount();
-	// `account.config` is the shared per-provider union (Azure | AWS | GCP).
-	// Narrow to Azure by `resource_groups` (Azure-only) rather than
-	// `deployment_region`, which GCP also has — so it no longer identifies
-	// Azure uniquely.
 	const accountConfig = useMemo(
-		() => ('resource_groups' in account.config ? account.config : null),
+		() => ('deployment_region' in account.config ? account.config : null),
 		[account.config],
 	);
 	const [resourceGroups, setResourceGroups] = useState<string[]>(

frontend/src/hooks/integration/gcp/useAccountSettingsDrawer.ts

@@ -1,148 +0,0 @@
-import {
-	Dispatch,
-	SetStateAction,
-	useCallback,
-	useEffect,
-	useMemo,
-	useState,
-} from 'react';
-import { toast } from '@signozhq/ui/sonner';
-import { Form } from 'antd';
-import { FormInstance } from 'antd/lib';
-import { useUpdateAccount } from 'api/generated/services/cloudintegration';
-import { INTEGRATION_TYPES } from 'container/Integrations/constants';
-import { CloudAccount } from 'container/Integrations/types';
-import { isEqual } from 'lodash-es';
-
-import logEvent from '../../../api/common/logEvent';
-
-interface UseAccountSettingsDrawerProps {
-	onClose: () => void;
-	account: CloudAccount;
-	setActiveAccount: Dispatch<SetStateAction<CloudAccount | null>>;
-}
-
-interface UseAccountSettingsDrawer {
-	form: FormInstance;
-	isLoading: boolean;
-	projectIds: string[];
-	isSaveDisabled: boolean;
-	setProjectIds: Dispatch<SetStateAction<string[]>>;
-	handleSubmit: () => Promise<void>;
-	handleClose: () => void;
-}
-
-export function useAccountSettingsDrawer({
-	onClose,
-	account,
-	setActiveAccount,
-}: UseAccountSettingsDrawerProps): UseAccountSettingsDrawer {
-	const [form] = Form.useForm();
-	const { mutate: updateAccount, isLoading } = useUpdateAccount();
-	const accountConfig = useMemo(
-		() => ('project_ids' in account.config ? account.config : null),
-		[account.config],
-	);
-	const [projectIds, setProjectIds] = useState<string[]>(
-		accountConfig?.project_ids || [],
-	);
-
-	useEffect(() => {
-		if (!accountConfig) {
-			return;
-		}
-
-		form.setFieldsValue({
-			projectIds: accountConfig.project_ids,
-		});
-		setProjectIds(accountConfig.project_ids);
-	}, [accountConfig, form]);
-
-	const handleSubmit = useCallback(async (): Promise<void> => {
-		try {
-			const values = await form.validateFields();
-
-			if (!accountConfig) {
-				return;
-			}
-
-			updateAccount(
-				{
-					pathParams: {
-						cloudProvider: INTEGRATION_TYPES.GCP,
-						id: account?.id || '',
-					},
-					data: {
-						config: {
-							gcp: {
-								// Deployment region & project ID are immutable in the UI, but the
-								// Updatable GCP DTO requires all three fields to be sent.
-								deploymentRegion: accountConfig.deployment_region,
-								deploymentProjectId: accountConfig.deployment_project_id,
-								projectIds: values.projectIds || [],
-							},
-						},
-					},
-				},
-				{
-					onSuccess: () => {
-						const nextConfig = {
-							deployment_region: accountConfig.deployment_region,
-							deployment_project_id: accountConfig.deployment_project_id,
-							project_ids: values.projectIds || [],
-						};
-
-						setActiveAccount({
-							...account,
-							config: nextConfig,
-						});
-						onClose();
-
-						toast.success('Account settings updated successfully', {
-							position: 'bottom-right',
-						});
-
-						void logEvent('GCP Integration: Account settings updated', {
-							cloudAccountId: account.cloud_account_id,
-							deploymentRegion: nextConfig.deployment_region,
-							projectIds: nextConfig.project_ids,
-						});
-					},
-					onError: (error) => {
-						toast.error('Failed to update account settings', {
-							description: error?.message,
-							position: 'bottom-right',
-						});
-					},
-				},
-			);
-		} catch (error) {
-			console.error('Form submission failed:', error);
-		}
-	}, [form, updateAccount, account, accountConfig, setActiveAccount, onClose]);
-
-	const isSaveDisabled = useMemo(() => {
-		if (!accountConfig) {
-			return true;
-		}
-
-		return isEqual(
-			[...(projectIds || [])].sort(),
-			[...accountConfig.project_ids].sort(),
-		);
-	}, [accountConfig, projectIds]);
-
-	const handleClose = useCallback(() => {
-		onClose();
-	}, [onClose]);
-
-	return {
-		form,
-		isLoading,
-		projectIds,
-		isSaveDisabled,
-		setProjectIds,
-		handleSubmit,
-		handleClose,
-	};
-}

frontend/src/hooks/integration/gcp/useCloudAccountSetupDrawer.ts

@@ -1,165 +0,0 @@
-import { useCallback, useState } from 'react';
-import { useQueryClient } from 'react-query';
-import { toast } from '@signozhq/ui/sonner';
-import {
-	CreateAccountMutationResult,
-	GetConnectionCredentialsQueryResult,
-	invalidateListAccounts,
-	useAgentCheckIn,
-	useCreateAccount,
-	useGetConnectionCredentials,
-} from 'api/generated/services/cloudintegration';
-import {
-	CloudintegrationtypesCredentialsDTO,
-	CloudintegrationtypesPostableAccountDTO,
-	RenderErrorResponseDTO,
-} from 'api/generated/services/sigNoz.schemas';
-import { ErrorType } from 'api/generatedAPIInstance';
-import { INTEGRATION_TYPES } from 'container/Integrations/constants';
-import { GcpSetupFormValues } from 'container/Integrations/CloudIntegration/GoogleCloudPlatform/AddNewAccount/types';
-import useAxiosError from 'hooks/useAxiosError';
-import { toAPIError } from 'utils/errorUtils';
-
-import logEvent from '../../../api/common/logEvent';
-
-interface UseCloudAccountSetupDrawerProps {
-	onClose: () => void;
-}
-
-interface UseCloudAccountSetupDrawer {
-	isLoading: boolean;
-	connectAccount: (values: GcpSetupFormValues) => Promise<void>;
-	handleClose: () => void;
-	connectionParams?: CloudintegrationtypesCredentialsDTO;
-	isConnectionParamsLoading: boolean;
-	submitError: string | null;
-	clearSubmitError: () => void;
-}
-
-export function useCloudAccountSetupDrawer({
-	onClose,
-}: UseCloudAccountSetupDrawerProps): UseCloudAccountSetupDrawer {
-	const queryClient = useQueryClient();
-	const [isLoading, setIsLoading] = useState(false);
-	const [submitError, setSubmitError] = useState<string | null>(null);
-
-	const clearSubmitError = useCallback((): void => {
-		setSubmitError(null);
-	}, []);
-
-	const { mutateAsync: createAccount } = useCreateAccount();
-	const { mutateAsync: checkIn } = useAgentCheckIn();
-	const handleError = useAxiosError();
-
-	const { data: connectionParams, isLoading: isConnectionParamsLoading } =
-		useGetConnectionCredentials<GetConnectionCredentialsQueryResult>(
-			{
-				cloudProvider: INTEGRATION_TYPES.GCP,
-			},
-			{
-				query: {
-					onError: handleError,
-				},
-			},
-		);
-
-	const handleClose = useCallback((): void => {
-		onClose();
-	}, [onClose]);
-
-	const handleConnectionSuccess = useCallback(
-		(payload: {
-			cloudIntegrationId: string;
-			providerAccountId: string;
-		}): void => {
-			void logEvent('GCP Integration: Account connected', {
-				cloudIntegrationId: payload.cloudIntegrationId,
-				providerAccountId: payload.providerAccountId,
-			});
-			toast.success('GCP account connected successfully', {
-				position: 'bottom-right',
-			});
-			void invalidateListAccounts(queryClient, {
-				cloudProvider: INTEGRATION_TYPES.GCP,
-			});
-			handleClose();
-		},
-		[handleClose, queryClient],
-	);
-
-	const connectAccount = useCallback(
-		async (values: GcpSetupFormValues): Promise<void> => {
-			try {
-				setIsLoading(true);
-				setSubmitError(null);
-
-				const payload: CloudintegrationtypesPostableAccountDTO = {
-					config: {
-						gcp: {
-							deploymentRegion: values.deploymentRegion,
-							deploymentProjectId: values.deploymentProjectId,
-							projectIds: values.projectIds || [],
-						},
-					},
-					credentials: {
-						// Cloud users can't edit these — the backend-provided credentials are
-						// authoritative. Enterprise users have no backend defaults and enter
-						// their own (validated non-empty), so their form values are used.
-						ingestionUrl: connectionParams?.data?.ingestionUrl || values.ingestionUrl,
-						ingestionKey: connectionParams?.data?.ingestionKey || values.ingestionKey,
-						sigNozApiUrl: connectionParams?.data?.sigNozApiUrl || values.sigNozApiUrl,
-						sigNozApiKey: connectionParams?.data?.sigNozApiKey || values.sigNozApiKey,
-					},
-				};
-
-				// Step 1: create the integration account.
-				const createResponse: CreateAccountMutationResult = await createAccount({
-					pathParams: { cloudProvider: INTEGRATION_TYPES.GCP },
-					data: payload,
-				});
-
-				const cloudIntegrationId = createResponse.data.id;
-				const providerAccountId = values.accountName;
-
-				void logEvent('GCP Integration: Account created', {
-					id: cloudIntegrationId,
-				});
-
-				// Step 2: mimic the agent by checking in from the frontend (manual flow).
-				await checkIn({
-					pathParams: { cloudProvider: INTEGRATION_TYPES.GCP },
-					data: {
-						providerAccountId,
-						cloudIntegrationId,
-						data: {},
-					},
-				});
-
-				handleConnectionSuccess({ cloudIntegrationId, providerAccountId });
-			} catch (error) {
-				// Surface the backend's message inline in the drawer instead of a
-				// generic failure string.
-				const message = toAPIError(
-					error as ErrorType<RenderErrorResponseDTO>,
-					'Failed to connect GCP account',
-				).getErrorMessage();
-				setSubmitError(message);
-			} finally {
-				setIsLoading(false);
-			}
-		},
-		[connectionParams, createAccount, checkIn, handleConnectionSuccess],
-	);
-
-	return {
-		isLoading,
-		connectAccount,
-		handleClose,
-		connectionParams: connectionParams?.data as
-			| CloudintegrationtypesCredentialsDTO
-			| undefined,
-		isConnectionParamsLoading,
-		submitError,
-		clearSubmitError,
-	};
-}

frontend/src/periscope/components/CopyButton/CopyButton.tsx

@@ -16,8 +16,6 @@ export interface CopyButtonProps {
 	/** Extra class merged onto the button. */
 	className?: string;
 	testId?: string;
-	/** Called after the copy is triggered (e.g. to show a toast). */
-	onCopy?: () => void;
 }
 
 /**
@@ -31,7 +29,6 @@ function CopyButton({
 	ariaLabel = 'Copy',
 	className,
 	testId,
-	onCopy,
 }: CopyButtonProps): JSX.Element {
 	const { copyToClipboard, isCopied } = useCopyButton();
 
@@ -39,9 +36,8 @@ function CopyButton({
 		(e: MouseEvent<HTMLButtonElement>): void => {
 			e.stopPropagation();
 			copyToClipboard(value);
-			onCopy?.();
 		},
-		[copyToClipboard, value, onCopy],
+		[copyToClipboard, value],
 	);
 
 	const stackStyle: CSSProperties = { width: size, height: size };
@@ -69,7 +65,6 @@ CopyButton.defaultProps = {
 	ariaLabel: 'Copy',
 	className: undefined,
 	testId: undefined,
-	onCopy: undefined,
 };
 
 export default CopyButton;

frontend/src/utils/permission/index.ts

@@ -151,7 +151,6 @@ export const routePermission: Record<keyof typeof ROUTES, ROLES[]> = {
 	AI_OBSERVABILITY_ATTRIBUTE_MAPPING: ['ADMIN', 'EDITOR', 'VIEWER'],
 	AI_OBSERVABILITY_BASE: ['ADMIN', 'EDITOR', 'VIEWER'],
 	AI_OBSERVABILITY_OVERVIEW: ['ADMIN', 'EDITOR', 'VIEWER'],
-	AI_OBSERVABILITY_EXPLORER: ['ADMIN', 'EDITOR', 'VIEWER'],
 	AI_OBSERVABILITY_CONFIGURATION: ['ADMIN', 'EDITOR', 'VIEWER'],
 };
 

pkg/apiserver/signozapiserver/user.go

@@ -122,7 +122,7 @@ func (provider *provider) addUserRoutes(router *mux.Router) error {
 		Response:            nil,
 		ResponseContentType: "",
 		SuccessStatusCode:   http.StatusNoContent,
-		ErrorStatusCodes:    []int{},
+		ErrorStatusCodes:    []int{http.StatusBadRequest},
 		Deprecated:          false,
 		SecuritySchemes:     []handler.OpenAPISecurityScheme{{Name: authtypes.IdentNProviderTokenizer.StringValue()}},
 	})).Methods(http.MethodPut).GetError(); err != nil {
@@ -173,7 +173,7 @@ func (provider *provider) addUserRoutes(router *mux.Router) error {
 		Response:            nil,
 		ResponseContentType: "",
 		SuccessStatusCode:   http.StatusNoContent,
-		ErrorStatusCodes:    []int{http.StatusNotFound},
+		ErrorStatusCodes:    []int{http.StatusBadRequest, http.StatusNotFound},
 		Deprecated:          false,
 		SecuritySchemes:     newSecuritySchemes(types.RoleAdmin),
 	})).Methods(http.MethodDelete).GetError(); err != nil {
@@ -343,7 +343,7 @@ func (provider *provider) addUserRoutes(router *mux.Router) error {
 		Response:            nil,
 		ResponseContentType: "",
 		SuccessStatusCode:   http.StatusOK,
-		ErrorStatusCodes:    []int{http.StatusNotFound},
+		ErrorStatusCodes:    []int{http.StatusBadRequest, http.StatusNotFound},
 		Deprecated:          true,
 		SecuritySchemes:     newSecuritySchemes(types.RoleAdmin),
 	})).Methods(http.MethodPost).GetError(); err != nil {
@@ -360,7 +360,7 @@ func (provider *provider) addUserRoutes(router *mux.Router) error {
 		Response:            nil,
 		ResponseContentType: "",
 		SuccessStatusCode:   http.StatusNoContent,
-		ErrorStatusCodes:    []int{http.StatusNotFound},
+		ErrorStatusCodes:    []int{http.StatusBadRequest, http.StatusNotFound},
 		Deprecated:          true,
 		SecuritySchemes:     newSecuritySchemes(types.RoleAdmin),
 	})).Methods(http.MethodDelete).GetError(); err != nil {

pkg/types/user.go

@@ -170,7 +170,7 @@ func (u *User) UpdateEmail(email valuer.Email) {
 // enrich the error with the specific operation using errors.WithAdditionalf.
 func (u *User) ErrIfRoot() error {
 	if u.IsRoot {
-		return errors.New(errors.TypeUnsupported, ErrCodeRootUserOperationUnsupported, "this operation is not supported for the root user")
+		return errors.New(errors.TypeInvalidInput, ErrCodeRootUserOperationUnsupported, "this operation is not supported for the root user")
 	}
 	return nil
 }
@@ -179,7 +179,7 @@ func (u *User) ErrIfRoot() error {
 // This error can be enriched with specific operation by the called using errors.WithAdditionalf.
 func (u *User) ErrIfDeleted() error {
 	if u.Status == UserStatusDeleted {
-		return errors.New(errors.TypeUnsupported, ErrCodeUserStatusDeleted, "unsupported operation for deleted user")
+		return errors.New(errors.TypeInvalidInput, ErrCodeUserStatusDeleted, "unsupported operation for deleted user")
 	}
 	return nil
 }
@@ -188,7 +188,7 @@ func (u *User) ErrIfDeleted() error {
 // This error can be enriched with specific operation by the called using errors.WithAdditionalf.
 func (u *User) ErrIfPending() error {
 	if u.Status == UserStatusPendingInvite {
-		return errors.New(errors.TypeUnsupported, ErrCodeUserStatusPendingInvite, "unsupported operation for pending user")
+		return errors.New(errors.TypeInvalidInput, ErrCodeUserStatusPendingInvite, "unsupported operation for pending user")
 	}
 	return nil
 }

tests/fixtures/cloudintegrations.py

@@ -26,14 +26,14 @@ class ProviderAccountSpec:
     provider: str
     # params for the account created by default.
     initial_params: dict
+    # params for the config an update (PUT) test sends.
+    updated_params: dict
     # params -> the provider-keyed `config` block for a POST/PUT body.
     build_config: Callable[[dict], dict]
     # params -> the full config block the API is expected to return under
     # config[provider] on GET/list. This may differ from what build_config sends:
     # e.g. AWS accepts deploymentRegion on POST but the API does not echo it back.
     expected_config: Callable[[dict], dict]
-    # only the suites that exercise updates need to supply it.
-    updated_params: dict = field(default_factory=dict)
     # id shown in parametrized test names; defaults to the provider slug.
     id: str = field(default="")
 
@@ -42,29 +42,6 @@ class ProviderAccountSpec:
             object.__setattr__(self, "id", self.provider)
 
 
-# Per-provider service shape.
-@dataclass(frozen=True)
-class ProviderServiceSpec:
-    provider: str
-    service_id: str
-    # GCP ships every service with supportedSignals.logs false, so a logs block
-    # is neither required on write nor persisted.
-    supports_logs: bool
-    account_config: dict
-    # id shown in parametrized test names; defaults to the provider slug.
-    id: str = field(default="")
-
-    def __post_init__(self) -> None:
-        if not self.id:
-            object.__setattr__(self, "id", self.provider)
-
-    def build_service_config(self, metrics_enabled: bool, logs_enabled: bool | None = None) -> dict:
-        config: dict = {"metrics": {"enabled": metrics_enabled}}
-        if self.supports_logs:
-            config["logs"] = {"enabled": metrics_enabled if logs_enabled is None else logs_enabled}
-        return {self.provider: config}
-
-
 @pytest.fixture(scope="function")
 def deprecated_create_cloud_integration_account(
     request: pytest.FixtureRequest,

tests/integration/tests/cloudintegrations/02_create_account.py

@@ -1,52 +1,14 @@
 from collections.abc import Callable
 from http import HTTPStatus
 
-import pytest
 import requests
 
 from fixtures import types
 from fixtures.auth import USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD, add_license
-from fixtures.cloudintegrations import ProviderAccountSpec
 from fixtures.logger import setup_logger
 
 logger = setup_logger(__name__)
 
-AWS_ACCOUNT_SPEC = ProviderAccountSpec(
-    provider="aws",
-    initial_params={"deployment_region": "us-east-1", "regions": ["us-east-1", "us-west-2"]},
-    build_config=lambda p: {"aws": {"deploymentRegion": p["deployment_region"], "regions": p["regions"]}},
-    expected_config=lambda p: {"regions": p["regions"]},
-)
-
-GCP_ACCOUNT_SPEC = ProviderAccountSpec(
-    provider="gcp",
-    initial_params={
-        "deployment_project_id": "signoz-test-project",
-        "deployment_region": "us-central1",
-        "project_ids": ["signoz-test-project"],
-    },
-    build_config=lambda p: {
-        "gcp": {
-            "deploymentProjectId": p["deployment_project_id"],
-            "deploymentRegion": p["deployment_region"],
-            "projectIds": p["project_ids"],
-        }
-    },
-    expected_config=lambda p: {
-        "deploymentProjectId": p["deployment_project_id"],
-        "deploymentRegion": p["deployment_region"],
-        "projectIds": p["project_ids"],
-    },
-)
-
-PROVIDER_ACCOUNT_SPECS = [AWS_ACCOUNT_SPEC, GCP_ACCOUNT_SPEC]
-
-provider_spec = pytest.mark.parametrize(
-    "spec",
-    PROVIDER_ACCOUNT_SPECS,
-    ids=[s.id for s in PROVIDER_ACCOUNT_SPECS],
-)
-
 
 def test_apply_license(
     signoz: types.SigNoz,
@@ -58,19 +20,19 @@ def test_apply_license(
     add_license(signoz, make_http_mocks, get_token)
 
 
-@provider_spec
 def test_create_account(
     create_user_admin: types.Operation,  # pylint: disable=unused-argument
     get_token: Callable[[str, str], str],
     create_cloud_integration_account: Callable,
-    spec: ProviderAccountSpec,
 ) -> None:
     admin_token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
+    cloud_provider = "aws"
 
     data = create_cloud_integration_account(
         admin_token,
-        spec.provider,
-        config=spec.build_config(spec.initial_params),
+        cloud_provider,
+        deployment_region="us-east-1",
+        regions=["us-east-1", "us-west-2"],
     )
 
     assert "id" in data, "Response data should contain 'id' field"
@@ -78,17 +40,12 @@ def test_create_account(
 
     assert "connectionArtifact" in data, "Response data should contain 'connectionArtifact' field"
     artifact = data["connectionArtifact"]
+    assert "aws" in artifact, "connectionArtifact should contain 'aws' field"
+    assert "connectionUrl" in artifact["aws"], "connectionArtifact.aws should contain 'connectionUrl'"
 
-    if spec.provider == "aws":
-        assert "aws" in artifact, "connectionArtifact should contain 'aws' field"
-        assert "connectionUrl" in artifact["aws"], "connectionArtifact.aws should contain 'connectionUrl'"
-
-        connection_url = artifact["aws"]["connectionUrl"]
-        assert "console.aws.amazon.com/cloudformation" in connection_url, "connectionUrl should be an AWS CloudFormation URL"
-        assert f"region={spec.initial_params['deployment_region']}" in connection_url, "connectionUrl should contain the deployment region"
-    else:
-        # GCP is a manual flow: no one-click install artifact.
-        assert artifact.get("gcp") is None, f"GCP should not return a connection artifact, got: {artifact}"
+    connection_url = artifact["aws"]["connectionUrl"]
+    assert "console.aws.amazon.com/cloudformation" in connection_url, "connectionUrl should be an AWS CloudFormation URL"
+    assert "region=us-east-1" in connection_url, "connectionUrl should contain the deployment region"
 
 
 def test_create_account_unsupported_provider(
@@ -119,36 +76,3 @@ def test_create_account_unsupported_provider(
 
     response_data = response.json()
     assert "error" in response_data, "Response should contain 'error' field"
-
-
-def test_create_gcp_account_without_project_ids(
-    signoz: types.SigNoz,
-    create_user_admin: types.Operation,  # pylint: disable=unused-argument
-    get_token: Callable[[str, str], str],
-) -> None:
-    """GCP account config requires at least one project ID to monitor."""
-    admin_token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
-
-    response = requests.post(
-        signoz.self.host_configs["8080"].get("/api/v1/cloud_integrations/gcp/accounts"),
-        headers={"Authorization": f"Bearer {admin_token}"},
-        json={
-            "config": {
-                "gcp": {
-                    "deploymentProjectId": "signoz-test-project",
-                    "deploymentRegion": "us-central1",
-                    "projectIds": [],
-                }
-            },
-            "credentials": {
-                "sigNozApiURL": "https://test.signoz.cloud",
-                "sigNozApiKey": "test-key",
-                "ingestionUrl": "https://ingest.test.signoz.cloud",
-                "ingestionKey": "test-ingestion-key",
-            },
-        },
-        timeout=10,
-    )
-
-    assert response.status_code == HTTPStatus.BAD_REQUEST, f"Expected 400 for empty projectIds, got {response.status_code}: {response.text}"
-    assert "error" in response.json(), "Response should contain 'error' field"

tests/integration/tests/cloudintegrations/03_agent_check_in.py

@@ -2,53 +2,14 @@ import uuid
 from collections.abc import Callable
 from http import HTTPStatus
 
-import pytest
-
 from fixtures import types
 from fixtures.auth import USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD, add_license
-from fixtures.cloudintegrations import (
-    ProviderAccountSpec,
-    simulate_agent_checkin,
-)
+from fixtures.cloudintegrations import simulate_agent_checkin
 from fixtures.logger import setup_logger
 
 logger = setup_logger(__name__)
 
-AWS_ACCOUNT_SPEC = ProviderAccountSpec(
-    provider="aws",
-    initial_params={"deployment_region": "us-east-1", "regions": ["us-east-1"]},
-    build_config=lambda p: {"aws": {"deploymentRegion": p["deployment_region"], "regions": p["regions"]}},
-    expected_config=lambda p: {"regions": p["regions"]},
-)
-
-GCP_ACCOUNT_SPEC = ProviderAccountSpec(
-    provider="gcp",
-    initial_params={
-        "deployment_project_id": "signoz-test-project",
-        "deployment_region": "us-central1",
-        "project_ids": ["signoz-test-project"],
-    },
-    build_config=lambda p: {
-        "gcp": {
-            "deploymentProjectId": p["deployment_project_id"],
-            "deploymentRegion": p["deployment_region"],
-            "projectIds": p["project_ids"],
-        }
-    },
-    expected_config=lambda p: {
-        "deploymentProjectId": p["deployment_project_id"],
-        "deploymentRegion": p["deployment_region"],
-        "projectIds": p["project_ids"],
-    },
-)
-
-PROVIDER_ACCOUNT_SPECS = [AWS_ACCOUNT_SPEC, GCP_ACCOUNT_SPEC]
-
-provider_spec = pytest.mark.parametrize(
-    "spec",
-    PROVIDER_ACCOUNT_SPECS,
-    ids=[s.id for s in PROVIDER_ACCOUNT_SPECS],
-)
+CLOUD_PROVIDER = "aws"
 
 
 def test_apply_license(
@@ -61,28 +22,22 @@ def test_apply_license(
     add_license(signoz, make_http_mocks, get_token)
 
 
-@provider_spec
 def test_agent_check_in(
     signoz: types.SigNoz,
     create_user_admin: types.Operation,  # pylint: disable=unused-argument
     get_token: Callable[[str, str], str],
     create_cloud_integration_account: Callable,
-    spec: ProviderAccountSpec,
 ) -> None:
     admin_token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
 
-    account = create_cloud_integration_account(
-        admin_token,
-        spec.provider,
-        config=spec.build_config(spec.initial_params),
-    )
+    account = create_cloud_integration_account(admin_token, CLOUD_PROVIDER, regions=["us-east-1"])
     account_id = account["id"]
     provider_account_id = str(uuid.uuid4())
 
     response = simulate_agent_checkin(
         signoz,
         admin_token,
-        spec.provider,
+        CLOUD_PROVIDER,
         account_id,
         provider_account_id,
         data={"version": "v0.0.8"},
@@ -92,63 +47,57 @@ def test_agent_check_in(
 
     data = response.json()["data"]
 
+    # New camelCase fields
     assert data["cloudIntegrationId"] == account_id, "cloudIntegrationId should match"
     assert data["providerAccountId"] == provider_account_id, "providerAccountId should match"
     assert "integrationConfig" in data, "Response should contain 'integrationConfig'"
     assert data["removedAt"] is None, "removedAt should be null for a live account"
 
-    if spec.provider == "aws":
-        # Backward compat for agents deployed before the camelCase response; AWS only.
-        assert data["account_id"] == account_id, "account_id (compat) should match"
-        assert data["cloud_account_id"] == provider_account_id, "cloud_account_id (compat) should match"
-        assert "integration_config" in data, "Response should contain 'integration_config' (compat)"
-        assert "removed_at" in data, "Response should contain 'removed_at' (compat)"
+    # Backward-compat snake_case fields
+    assert data["account_id"] == account_id, "account_id (compat) should match"
+    assert data["cloud_account_id"] == provider_account_id, "cloud_account_id (compat) should match"
+    assert "integration_config" in data, "Response should contain 'integration_config' (compat)"
+    assert "removed_at" in data, "Response should contain 'removed_at' (compat)"
 
-        integration_config = data["integrationConfig"]
-        assert "aws" in integration_config, "integrationConfig should contain 'aws' block"
-        assert integration_config["aws"]["enabledRegions"] == spec.initial_params["regions"], "enabledRegions should match account config"
-    else:
-        # GCP is a manual flow: the agent carries its own configuration.
-        assert data["integrationConfig"].get("gcp") is None, f"GCP should not return an integration config, got: {data['integrationConfig']}"
+    # integrationConfig should reflect the configured regions
+    integration_config = data["integrationConfig"]
+    assert "aws" in integration_config, "integrationConfig should contain 'aws' block"
+    assert integration_config["aws"]["enabledRegions"] == ["us-east-1"], "enabledRegions should match account config"
 
 
-@provider_spec
 def test_agent_check_in_account_not_found(
     signoz: types.SigNoz,
     create_user_admin: types.Operation,  # pylint: disable=unused-argument
     get_token: Callable[[str, str], str],
-    spec: ProviderAccountSpec,
 ) -> None:
     admin_token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
     fake_id = str(uuid.uuid4())
 
-    response = simulate_agent_checkin(signoz, admin_token, spec.provider, fake_id, str(uuid.uuid4()))
+    response = simulate_agent_checkin(signoz, admin_token, CLOUD_PROVIDER, fake_id, str(uuid.uuid4()))
 
     assert response.status_code == HTTPStatus.NOT_FOUND, f"Expected 404, got {response.status_code}: {response.text}"
 
 
-@provider_spec
 def test_duplicate_cloud_account_checkins(
     signoz: types.SigNoz,
     create_user_admin: types.Operation,  # pylint: disable=unused-argument
     get_token: Callable[[str, str], str],
     create_cloud_integration_account: Callable,
-    spec: ProviderAccountSpec,
 ) -> None:
     """Test that two different accounts cannot check in with the same providerAccountId."""
     admin_token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
 
-    account1 = create_cloud_integration_account(admin_token, spec.provider, config=spec.build_config(spec.initial_params))
-    account2 = create_cloud_integration_account(admin_token, spec.provider, config=spec.build_config(spec.initial_params))
+    account1 = create_cloud_integration_account(admin_token, CLOUD_PROVIDER)
+    account2 = create_cloud_integration_account(admin_token, CLOUD_PROVIDER)
 
     assert account1["id"] != account2["id"], "Two accounts should have different IDs"
 
     same_provider_account_id = str(uuid.uuid4())
 
     # First check-in: account1 claims the provider account ID
-    response = simulate_agent_checkin(signoz, admin_token, spec.provider, account1["id"], same_provider_account_id)
+    response = simulate_agent_checkin(signoz, admin_token, CLOUD_PROVIDER, account1["id"], same_provider_account_id)
     assert response.status_code == HTTPStatus.OK, f"Expected 200 for first check-in, got {response.status_code}: {response.text}"
 
     # Second check-in: account2 tries to claim the same provider account ID → 409
-    response = simulate_agent_checkin(signoz, admin_token, spec.provider, account2["id"], same_provider_account_id)
+    response = simulate_agent_checkin(signoz, admin_token, CLOUD_PROVIDER, account2["id"], same_provider_account_id)
     assert response.status_code == HTTPStatus.CONFLICT, f"Expected 409 for duplicate providerAccountId, got {response.status_code}: {response.text}"

tests/integration/tests/cloudintegrations/05_services.py

@@ -2,47 +2,18 @@ import uuid
 from collections.abc import Callable
 from http import HTTPStatus
 
-import pytest
 import requests
 from sqlalchemy import bindparam, sql
 
 from fixtures import types
 from fixtures.auth import USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD, add_license
-from fixtures.cloudintegrations import (
-    ProviderServiceSpec,
-    simulate_agent_checkin,
-)
+from fixtures.cloudintegrations import simulate_agent_checkin
 from fixtures.logger import setup_logger
 
 logger = setup_logger(__name__)
 
-AWS_SERVICE_SPEC = ProviderServiceSpec(
-    provider="aws",
-    service_id="rds",
-    supports_logs=True,
-    account_config={"aws": {"deploymentRegion": "us-east-1", "regions": ["us-east-1"]}},
-)
-
-GCP_SERVICE_SPEC = ProviderServiceSpec(
-    provider="gcp",
-    service_id="cloudsql_postgres",
-    supports_logs=False,
-    account_config={
-        "gcp": {
-            "deploymentProjectId": "signoz-test-project",
-            "deploymentRegion": "us-central1",
-            "projectIds": ["signoz-test-project"],
-        }
-    },
-)
-
-PROVIDER_SERVICE_SPECS = [AWS_SERVICE_SPEC, GCP_SERVICE_SPEC]
-
-provider_spec = pytest.mark.parametrize(
-    "spec",
-    PROVIDER_SERVICE_SPECS,
-    ids=[s.id for s in PROVIDER_SERVICE_SPECS],
-)
+CLOUD_PROVIDER = "aws"
+SERVICE_ID = "rds"
 
 
 def test_apply_license(
@@ -55,18 +26,16 @@ def test_apply_license(
     add_license(signoz, make_http_mocks, get_token)
 
 
-@provider_spec
 def test_list_services_without_account(
     signoz: types.SigNoz,
     create_user_admin: types.Operation,  # pylint: disable=unused-argument
     get_token: Callable[[str, str], str],
-    spec: ProviderServiceSpec,
 ) -> None:
     """List the cloud provider's supported services"""
     admin_token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
 
     response = requests.get(
-        signoz.self.host_configs["8080"].get(f"/api/v1/cloud_integrations/{spec.provider}/services"),
+        signoz.self.host_configs["8080"].get(f"/api/v1/cloud_integrations/{CLOUD_PROVIDER}/services"),
         headers={"Authorization": f"Bearer {admin_token}"},
         timeout=10,
     )
@@ -84,37 +53,35 @@ def test_list_services_without_account(
     assert "icon" in service, "Service should have 'icon' field"
     assert "enabled" in service, "Service should have 'enabled' field"
 
-    listed_ids = {s["id"] for s in data["services"]}
-    assert spec.service_id in listed_ids, f"'{spec.service_id}' should be listed for {spec.provider}"
+
+EC2_SERVICE_ID = "ec2"
 
 
-@provider_spec
 def test_list_account_services(
     signoz: types.SigNoz,
     create_user_admin: types.Operation,  # pylint: disable=unused-argument
     get_token: Callable[[str, str], str],
     create_cloud_integration_account: Callable,
-    spec: ProviderServiceSpec,
 ) -> None:
-    """ListAccountServicesMetadata reflects enabled state per service."""
+    """ListAccountServicesMetadata reflects enabled state after enabling a service."""
     admin_token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
 
-    account = create_cloud_integration_account(admin_token, spec.provider, config=spec.account_config)
+    account = create_cloud_integration_account(admin_token, CLOUD_PROVIDER)
     account_id = account["id"]
 
-    checkin = simulate_agent_checkin(signoz, admin_token, spec.provider, account_id, str(uuid.uuid4()))
+    checkin = simulate_agent_checkin(signoz, admin_token, CLOUD_PROVIDER, account_id, str(uuid.uuid4()))
     assert checkin.status_code == HTTPStatus.OK, f"Check-in failed: {checkin.text}"
 
     put_response = requests.put(
-        signoz.self.host_configs["8080"].get(f"/api/v1/cloud_integrations/{spec.provider}/accounts/{account_id}/services/{spec.service_id}"),
+        signoz.self.host_configs["8080"].get(f"/api/v1/cloud_integrations/{CLOUD_PROVIDER}/accounts/{account_id}/services/{EC2_SERVICE_ID}"),
         headers={"Authorization": f"Bearer {admin_token}"},
-        json={"config": spec.build_service_config(True)},
+        json={"config": {"aws": {"metrics": {"enabled": True}, "logs": {"enabled": True}}}},
         timeout=10,
     )
-    assert put_response.status_code == HTTPStatus.NO_CONTENT, f"Enable {spec.service_id} failed: {put_response.status_code}: {put_response.text}"
+    assert put_response.status_code == HTTPStatus.NO_CONTENT, f"Enable ec2 failed: {put_response.status_code}: {put_response.text}"
 
     list_response = requests.get(
-        signoz.self.host_configs["8080"].get(f"/api/v1/cloud_integrations/{spec.provider}/accounts/{account_id}/services"),
+        signoz.self.host_configs["8080"].get(f"/api/v1/cloud_integrations/{CLOUD_PROVIDER}/accounts/{account_id}/services"),
         headers={"Authorization": f"Bearer {admin_token}"},
         timeout=10,
     )
@@ -125,28 +92,21 @@ def test_list_account_services(
     assert isinstance(data["services"], list), "services should be a list"
     assert len(data["services"]) > 0, "services list should be non-empty"
 
-    enabled_service = next((s for s in data["services"] if s["id"] == spec.service_id), None)
-    assert enabled_service is not None, f"Service '{spec.service_id}' not found in services list"
-    assert enabled_service["enabled"] is True, f"Service should be enabled, got: {enabled_service['enabled']}"
-
-    # The listing must report state per service, not blanket-enable or echo the write.
-    untouched_service = next((s for s in data["services"] if s["id"] != spec.service_id), None)
-    assert untouched_service is not None, "Expected more than one service in the listing"
-    assert untouched_service["enabled"] is False, f"Service '{untouched_service['id']}' was never enabled, got: {untouched_service['enabled']}"
+    ec2_service = next((s for s in data["services"] if s["id"] == EC2_SERVICE_ID), None)
+    assert ec2_service is not None, f"EC2 service '{EC2_SERVICE_ID}' not found in services list"
+    assert ec2_service["enabled"] is True, f"EC2 service should be enabled, got: {ec2_service['enabled']}"
 
 
-@provider_spec
 def test_get_service_details_without_account(
     signoz: types.SigNoz,
     create_user_admin: types.Operation,  # pylint: disable=unused-argument
     get_token: Callable[[str, str], str],
-    spec: ProviderServiceSpec,
 ) -> None:
     """Get full service definition without specifying an account."""
     admin_token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
 
     response = requests.get(
-        signoz.self.host_configs["8080"].get(f"/api/v1/cloud_integrations/{spec.provider}/services/{spec.service_id}"),
+        signoz.self.host_configs["8080"].get(f"/api/v1/cloud_integrations/{CLOUD_PROVIDER}/services/{SERVICE_ID}"),
         headers={"Authorization": f"Bearer {admin_token}"},
         timeout=10,
     )
@@ -154,36 +114,31 @@ def test_get_service_details_without_account(
     assert response.status_code == HTTPStatus.OK, f"Expected 200, got {response.status_code}"
 
     data = response.json()["data"]
-    assert data["id"] == spec.service_id, f"id should be '{spec.service_id}'"
+    assert data["id"] == SERVICE_ID, f"id should be '{SERVICE_ID}'"
     assert "title" in data, "Service should have 'title'"
     assert "overview" in data, "Service should have 'overview' (markdown)"
     assert "assets" in data, "Service should have 'assets'"
     assert isinstance(data["assets"]["dashboards"], list), "assets.dashboards should be a list"
     assert data["cloudIntegrationService"] is None, "cloudIntegrationService should be null without account context"
 
-    assert data["supportedSignals"]["metrics"] is True, "metrics should be a supported signal"
-    assert data["supportedSignals"]["logs"] is spec.supports_logs, f"logs support should be {spec.supports_logs} for {spec.provider}"
 
-
-@provider_spec
 def test_get_account_service(
     signoz: types.SigNoz,
     create_user_admin: types.Operation,  # pylint: disable=unused-argument
     get_token: Callable[[str, str], str],
     create_cloud_integration_account: Callable,
-    spec: ProviderServiceSpec,
 ) -> None:
     """Get service for a specific account — all disabled by default."""
     admin_token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
 
-    account = create_cloud_integration_account(admin_token, spec.provider, config=spec.account_config)
+    account = create_cloud_integration_account(admin_token, CLOUD_PROVIDER)
     account_id = account["id"]
 
-    checkin = simulate_agent_checkin(signoz, admin_token, spec.provider, account_id, str(uuid.uuid4()))
+    checkin = simulate_agent_checkin(signoz, admin_token, CLOUD_PROVIDER, account_id, str(uuid.uuid4()))
     assert checkin.status_code == HTTPStatus.OK, f"Check-in failed: {checkin.text}"
 
     response = requests.get(
-        signoz.self.host_configs["8080"].get(f"/api/v1/cloud_integrations/{spec.provider}/accounts/{account_id}/services/{spec.service_id}"),
+        signoz.self.host_configs["8080"].get(f"/api/v1/cloud_integrations/{CLOUD_PROVIDER}/accounts/{account_id}/services/{SERVICE_ID}"),
         headers={"Authorization": f"Bearer {admin_token}"},
         timeout=10,
     )
@@ -191,22 +146,20 @@ def test_get_account_service(
     assert response.status_code == HTTPStatus.OK, f"Expected 200, got {response.status_code}"
 
     data = response.json()["data"]
-    assert data["id"] == spec.service_id, f"id should be '{spec.service_id}'"
+    assert data["id"] == SERVICE_ID, f"id should be '{SERVICE_ID}'"
     assert data["cloudIntegrationService"] is None, "cloudIntegrationService should be null before any config is set"
 
 
-@provider_spec
 def test_get_service_not_found(
     signoz: types.SigNoz,
     create_user_admin: types.Operation,  # pylint: disable=unused-argument
     get_token: Callable[[str, str], str],
-    spec: ProviderServiceSpec,
 ) -> None:
     """Get a non-existent service ID returns 400 (invalid service ID is a bad request)."""
     admin_token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
 
     response = requests.get(
-        signoz.self.host_configs["8080"].get(f"/api/v1/cloud_integrations/{spec.provider}/services/non-existent-service"),
+        signoz.self.host_configs["8080"].get(f"/api/v1/cloud_integrations/{CLOUD_PROVIDER}/services/non-existent-service"),
         headers={"Authorization": f"Bearer {admin_token}"},
         timeout=10,
     )
@@ -214,34 +167,32 @@ def test_get_service_not_found(
     assert response.status_code == HTTPStatus.BAD_REQUEST, f"Expected 400, got {response.status_code}"
 
 
-@provider_spec
 def test_update_service_config(
     signoz: types.SigNoz,
     create_user_admin: types.Operation,  # pylint: disable=unused-argument
     get_token: Callable[[str, str], str],
     create_cloud_integration_account: Callable,
-    spec: ProviderServiceSpec,
 ) -> None:
     """Enable a service and verify the config is persisted via GET."""
     admin_token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
 
-    account = create_cloud_integration_account(admin_token, spec.provider, config=spec.account_config)
+    account = create_cloud_integration_account(admin_token, CLOUD_PROVIDER)
     account_id = account["id"]
 
-    checkin = simulate_agent_checkin(signoz, admin_token, spec.provider, account_id, str(uuid.uuid4()))
+    checkin = simulate_agent_checkin(signoz, admin_token, CLOUD_PROVIDER, account_id, str(uuid.uuid4()))
     assert checkin.status_code == HTTPStatus.OK, f"Check-in failed: {checkin.text}"
 
     put_response = requests.put(
-        signoz.self.host_configs["8080"].get(f"/api/v1/cloud_integrations/{spec.provider}/accounts/{account_id}/services/{spec.service_id}"),
+        signoz.self.host_configs["8080"].get(f"/api/v1/cloud_integrations/{CLOUD_PROVIDER}/accounts/{account_id}/services/{SERVICE_ID}"),
         headers={"Authorization": f"Bearer {admin_token}"},
-        json={"config": spec.build_service_config(True)},
+        json={"config": {"aws": {"metrics": {"enabled": True}, "logs": {"enabled": True}}}},
         timeout=10,
     )
 
     assert put_response.status_code == HTTPStatus.NO_CONTENT, f"Expected 204, got {put_response.status_code}: {put_response.text}"
 
     get_response = requests.get(
-        signoz.self.host_configs["8080"].get(f"/api/v1/cloud_integrations/{spec.provider}/accounts/{account_id}/services/{spec.service_id}"),
+        signoz.self.host_configs["8080"].get(f"/api/v1/cloud_integrations/{CLOUD_PROVIDER}/accounts/{account_id}/services/{SERVICE_ID}"),
         headers={"Authorization": f"Bearer {admin_token}"},
         timeout=10,
     )
@@ -250,39 +201,33 @@ def test_update_service_config(
     data = get_response.json()["data"]
     svc = data["cloudIntegrationService"]
     assert svc is not None, "cloudIntegrationService should be non-null after UpdateService"
-    assert svc["config"][spec.provider]["metrics"]["enabled"] is True, "metrics should be enabled"
+    assert svc["config"]["aws"]["metrics"]["enabled"] is True, "metrics should be enabled"
+    assert svc["config"]["aws"]["logs"]["enabled"] is True, "logs should be enabled"
     assert svc["cloudIntegrationId"] == account_id, "cloudIntegrationId should match the account"
 
-    if spec.supports_logs:
-        assert svc["config"][spec.provider]["logs"]["enabled"] is True, "logs should be enabled"
-    else:
-        assert svc["config"][spec.provider].get("logs") is None, f"logs should not be stored for {spec.provider}, got: {svc['config'][spec.provider]}"
 
-
-@provider_spec
 def test_update_service_config_disable(
     signoz: types.SigNoz,
     create_user_admin: types.Operation,  # pylint: disable=unused-argument
     get_token: Callable[[str, str], str],
     create_cloud_integration_account: Callable,
-    spec: ProviderServiceSpec,
 ) -> None:
     """Enable then disable a service — config change is persisted."""
     admin_token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
 
-    account = create_cloud_integration_account(admin_token, spec.provider, config=spec.account_config)
+    account = create_cloud_integration_account(admin_token, CLOUD_PROVIDER)
     account_id = account["id"]
 
-    checkin = simulate_agent_checkin(signoz, admin_token, spec.provider, account_id, str(uuid.uuid4()))
+    checkin = simulate_agent_checkin(signoz, admin_token, CLOUD_PROVIDER, account_id, str(uuid.uuid4()))
     assert checkin.status_code == HTTPStatus.OK, f"Check-in failed: {checkin.text}"
 
-    endpoint = signoz.self.host_configs["8080"].get(f"/api/v1/cloud_integrations/{spec.provider}/accounts/{account_id}/services/{spec.service_id}")
+    endpoint = signoz.self.host_configs["8080"].get(f"/api/v1/cloud_integrations/{CLOUD_PROVIDER}/accounts/{account_id}/services/{SERVICE_ID}")
 
     # Enable
     r = requests.put(
         endpoint,
         headers={"Authorization": f"Bearer {admin_token}"},
-        json={"config": spec.build_service_config(True)},
+        json={"config": {"aws": {"metrics": {"enabled": True}, "logs": {"enabled": True}}}},
         timeout=10,
     )
     assert r.status_code == HTTPStatus.NO_CONTENT, f"Enable failed: {r.status_code}: {r.text}"
@@ -291,13 +236,13 @@ def test_update_service_config_disable(
     r = requests.put(
         endpoint,
         headers={"Authorization": f"Bearer {admin_token}"},
-        json={"config": spec.build_service_config(False)},
+        json={"config": {"aws": {"metrics": {"enabled": False}, "logs": {"enabled": False}}}},
         timeout=10,
     )
     assert r.status_code == HTTPStatus.NO_CONTENT, f"Disable failed: {r.status_code}: {r.text}"
 
     get_response = requests.get(
-        signoz.self.host_configs["8080"].get(f"/api/v1/cloud_integrations/{spec.provider}/accounts/{account_id}/services/{spec.service_id}"),
+        signoz.self.host_configs["8080"].get(f"/api/v1/cloud_integrations/{CLOUD_PROVIDER}/accounts/{account_id}/services/{SERVICE_ID}"),
         headers={"Authorization": f"Bearer {admin_token}"},
         timeout=10,
     )
@@ -305,57 +250,28 @@ def test_update_service_config_disable(
     assert get_response.status_code == HTTPStatus.OK
     svc = get_response.json()["data"]["cloudIntegrationService"]
     assert svc is not None, "cloudIntegrationService should still be present after disable"
-    assert svc["config"][spec.provider]["metrics"]["enabled"] is False, "metrics should be disabled"
-
-    if spec.supports_logs:
-        assert svc["config"][spec.provider]["logs"]["enabled"] is False, "logs should be disabled"
+    assert svc["config"]["aws"]["metrics"]["enabled"] is False, "metrics should be disabled"
+    assert svc["config"]["aws"]["logs"]["enabled"] is False, "logs should be disabled"
 
 
-@provider_spec
 def test_update_service_account_not_found(
     signoz: types.SigNoz,
     create_user_admin: types.Operation,  # pylint: disable=unused-argument
     get_token: Callable[[str, str], str],
-    spec: ProviderServiceSpec,
 ) -> None:
     """PUT with a non-existent account UUID returns 404."""
     admin_token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
 
     response = requests.put(
-        signoz.self.host_configs["8080"].get(f"/api/v1/cloud_integrations/{spec.provider}/accounts/{uuid.uuid4()}/services/{spec.service_id}"),
+        signoz.self.host_configs["8080"].get(f"/api/v1/cloud_integrations/{CLOUD_PROVIDER}/accounts/{uuid.uuid4()}/services/{SERVICE_ID}"),
         headers={"Authorization": f"Bearer {admin_token}"},
-        json={"config": spec.build_service_config(True)},
+        json={"config": {"aws": {"metrics": {"enabled": True}}}},
         timeout=10,
     )
 
     assert response.status_code == HTTPStatus.NOT_FOUND, f"Expected 404, got {response.status_code}"
 
 
-def test_update_gcp_service_without_metrics_config(
-    signoz: types.SigNoz,
-    create_user_admin: types.Operation,  # pylint: disable=unused-argument
-    get_token: Callable[[str, str], str],
-    create_cloud_integration_account: Callable,
-) -> None:
-    """GCP services support metrics only, so a config omitting metrics is rejected."""
-    admin_token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
-
-    account = create_cloud_integration_account(admin_token, "gcp", config=GCP_SERVICE_SPEC.account_config)
-    account_id = account["id"]
-
-    checkin = simulate_agent_checkin(signoz, admin_token, "gcp", account_id, str(uuid.uuid4()))
-    assert checkin.status_code == HTTPStatus.OK, f"Check-in failed: {checkin.text}"
-
-    response = requests.put(
-        signoz.self.host_configs["8080"].get(f"/api/v1/cloud_integrations/gcp/accounts/{account_id}/services/{GCP_SERVICE_SPEC.service_id}"),
-        headers={"Authorization": f"Bearer {admin_token}"},
-        json={"config": {"gcp": {"logs": {"enabled": True}}}},
-        timeout=10,
-    )
-
-    assert response.status_code == HTTPStatus.BAD_REQUEST, f"Expected 400 when metrics config is missing, got {response.status_code}: {response.text}"
-
-
 def test_list_services_unsupported_provider(
     signoz: types.SigNoz,
     create_user_admin: types.Operation,  # pylint: disable=unused-argument
@@ -373,32 +289,30 @@ def test_list_services_unsupported_provider(
     assert response.status_code == HTTPStatus.BAD_REQUEST, f"Expected 400, got {response.status_code}"
 
 
-@provider_spec
 def test_list_services_account_removed(
     signoz: types.SigNoz,
     create_user_admin: types.Operation,  # pylint: disable=unused-argument
     get_token: Callable[[str, str], str],
     create_cloud_integration_account: Callable,
-    spec: ProviderServiceSpec,
 ) -> None:
     """List services for a deleted account returns 404."""
     admin_token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
 
-    account = create_cloud_integration_account(admin_token, spec.provider, config=spec.account_config)
+    account = create_cloud_integration_account(admin_token, CLOUD_PROVIDER)
     account_id = account["id"]
 
-    checkin = simulate_agent_checkin(signoz, admin_token, spec.provider, account_id, str(uuid.uuid4()))
+    checkin = simulate_agent_checkin(signoz, admin_token, CLOUD_PROVIDER, account_id, str(uuid.uuid4()))
     assert checkin.status_code == HTTPStatus.OK, f"Check-in failed: {checkin.text}"
 
     delete_response = requests.delete(
-        signoz.self.host_configs["8080"].get(f"/api/v1/cloud_integrations/{spec.provider}/accounts/{account_id}"),
+        signoz.self.host_configs["8080"].get(f"/api/v1/cloud_integrations/{CLOUD_PROVIDER}/accounts/{account_id}"),
         headers={"Authorization": f"Bearer {admin_token}"},
         timeout=10,
     )
     assert delete_response.status_code == HTTPStatus.NO_CONTENT, f"Expected 204 on delete, got {delete_response.status_code}"
 
     response = requests.get(
-        signoz.self.host_configs["8080"].get(f"/api/v1/cloud_integrations/{spec.provider}/accounts/{account_id}/services"),
+        signoz.self.host_configs["8080"].get(f"/api/v1/cloud_integrations/{CLOUD_PROVIDER}/accounts/{account_id}/services"),
         headers={"Authorization": f"Bearer {admin_token}"},
         timeout=10,
     )
@@ -406,32 +320,30 @@ def test_list_services_account_removed(
     assert response.status_code == HTTPStatus.NOT_FOUND, f"Expected 404, got {response.status_code}"
 
 
-@provider_spec
 def test_get_service_details_account_removed(
     signoz: types.SigNoz,
     create_user_admin: types.Operation,  # pylint: disable=unused-argument
     get_token: Callable[[str, str], str],
     create_cloud_integration_account: Callable,
-    spec: ProviderServiceSpec,
 ) -> None:
     """Get service details for a deleted account returns 404."""
     admin_token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
 
-    account = create_cloud_integration_account(admin_token, spec.provider, config=spec.account_config)
+    account = create_cloud_integration_account(admin_token, CLOUD_PROVIDER)
     account_id = account["id"]
 
-    checkin = simulate_agent_checkin(signoz, admin_token, spec.provider, account_id, str(uuid.uuid4()))
+    checkin = simulate_agent_checkin(signoz, admin_token, CLOUD_PROVIDER, account_id, str(uuid.uuid4()))
     assert checkin.status_code == HTTPStatus.OK, f"Check-in failed: {checkin.text}"
 
     delete_response = requests.delete(
-        signoz.self.host_configs["8080"].get(f"/api/v1/cloud_integrations/{spec.provider}/accounts/{account_id}"),
+        signoz.self.host_configs["8080"].get(f"/api/v1/cloud_integrations/{CLOUD_PROVIDER}/accounts/{account_id}"),
         headers={"Authorization": f"Bearer {admin_token}"},
         timeout=10,
     )
     assert delete_response.status_code == HTTPStatus.NO_CONTENT, f"Expected 204 on delete, got {delete_response.status_code}"
 
     response = requests.get(
-        signoz.self.host_configs["8080"].get(f"/api/v1/cloud_integrations/{spec.provider}/accounts/{account_id}/services/{spec.service_id}"),
+        signoz.self.host_configs["8080"].get(f"/api/v1/cloud_integrations/{CLOUD_PROVIDER}/accounts/{account_id}/services/{SERVICE_ID}"),
         headers={"Authorization": f"Bearer {admin_token}"},
         timeout=10,
     )
@@ -439,68 +351,64 @@ def test_get_service_details_account_removed(
     assert response.status_code == HTTPStatus.NOT_FOUND, f"Expected 404, got {response.status_code}"
 
 
-@provider_spec
 def test_update_service_account_removed(
     signoz: types.SigNoz,
     create_user_admin: types.Operation,  # pylint: disable=unused-argument
     get_token: Callable[[str, str], str],
     create_cloud_integration_account: Callable,
-    spec: ProviderServiceSpec,
 ) -> None:
     """PUT service config for a deleted account returns 404."""
     admin_token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
 
-    account = create_cloud_integration_account(admin_token, spec.provider, config=spec.account_config)
+    account = create_cloud_integration_account(admin_token, CLOUD_PROVIDER)
     account_id = account["id"]
 
-    checkin = simulate_agent_checkin(signoz, admin_token, spec.provider, account_id, str(uuid.uuid4()))
+    checkin = simulate_agent_checkin(signoz, admin_token, CLOUD_PROVIDER, account_id, str(uuid.uuid4()))
     assert checkin.status_code == HTTPStatus.OK, f"Check-in failed: {checkin.text}"
 
     delete_response = requests.delete(
-        signoz.self.host_configs["8080"].get(f"/api/v1/cloud_integrations/{spec.provider}/accounts/{account_id}"),
+        signoz.self.host_configs["8080"].get(f"/api/v1/cloud_integrations/{CLOUD_PROVIDER}/accounts/{account_id}"),
         headers={"Authorization": f"Bearer {admin_token}"},
         timeout=10,
     )
     assert delete_response.status_code == HTTPStatus.NO_CONTENT, f"Expected 204 on delete, got {delete_response.status_code}"
 
     response = requests.put(
-        signoz.self.host_configs["8080"].get(f"/api/v1/cloud_integrations/{spec.provider}/accounts/{account_id}/services/{spec.service_id}"),
+        signoz.self.host_configs["8080"].get(f"/api/v1/cloud_integrations/{CLOUD_PROVIDER}/accounts/{account_id}/services/{SERVICE_ID}"),
         headers={"Authorization": f"Bearer {admin_token}"},
-        json={"config": spec.build_service_config(True)},
+        json={"config": {"aws": {"metrics": {"enabled": True}}}},
         timeout=10,
     )
 
     assert response.status_code == HTTPStatus.NOT_FOUND, f"Expected 404, got {response.status_code}"
 
 
-@provider_spec
 def test_enable_metrics_provisions_dashboards(
     signoz: types.SigNoz,
     create_user_admin: types.Operation,  # pylint: disable=unused-argument
     get_token: Callable[[str, str], str],
     create_cloud_integration_account: Callable,
-    spec: ProviderServiceSpec,
 ) -> None:
     """Enabling metrics provisions dashboards visible in GetService and present in the DB."""
     admin_token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
 
-    account = create_cloud_integration_account(admin_token, spec.provider, config=spec.account_config)
+    account = create_cloud_integration_account(admin_token, CLOUD_PROVIDER)
     account_id = account["id"]
 
-    checkin = simulate_agent_checkin(signoz, admin_token, spec.provider, account_id, str(uuid.uuid4()))
+    checkin = simulate_agent_checkin(signoz, admin_token, CLOUD_PROVIDER, account_id, str(uuid.uuid4()))
     assert checkin.status_code == HTTPStatus.OK, f"Check-in failed: {checkin.text}"
 
     put_response = requests.put(
-        signoz.self.host_configs["8080"].get(f"/api/v1/cloud_integrations/{spec.provider}/accounts/{account_id}/services/{spec.service_id}"),
+        signoz.self.host_configs["8080"].get(f"/api/v1/cloud_integrations/{CLOUD_PROVIDER}/accounts/{account_id}/services/{SERVICE_ID}"),
         headers={"Authorization": f"Bearer {admin_token}"},
-        json={"config": spec.build_service_config(True, logs_enabled=False)},
+        json={"config": {"aws": {"metrics": {"enabled": True}, "logs": {"enabled": False}}}},
         timeout=10,
     )
     assert put_response.status_code == HTTPStatus.NO_CONTENT, f"Expected 204, got {put_response.status_code}: {put_response.text}"
 
     # Assertion 1: GetService returns provisioned dashboard UUIDs
     get_svc_response = requests.get(
-        signoz.self.host_configs["8080"].get(f"/api/v1/cloud_integrations/{spec.provider}/accounts/{account_id}/services/{spec.service_id}"),
+        signoz.self.host_configs["8080"].get(f"/api/v1/cloud_integrations/{CLOUD_PROVIDER}/accounts/{account_id}/services/{SERVICE_ID}"),
         headers={"Authorization": f"Bearer {admin_token}"},
         timeout=10,
     )
@@ -509,7 +417,7 @@ def test_enable_metrics_provisions_dashboards(
     data = get_svc_response.json()["data"]
     svc = data["cloudIntegrationService"]
     assert svc is not None, "cloudIntegrationService should be non-null after enabling metrics"
-    assert svc["config"][spec.provider]["metrics"]["enabled"] is True
+    assert svc["config"]["aws"]["metrics"]["enabled"] is True
 
     dashboards_in_service = data["assets"]["dashboards"]
     assert isinstance(dashboards_in_service, list) and len(dashboards_in_service) > 0, "assets.dashboards should be non-empty after enabling metrics"
@@ -537,37 +445,35 @@ def test_enable_metrics_provisions_dashboards(
     assert provisioned_ids == db_ids, f"Dashboards {provisioned_ids - db_ids} are missing from the DB"
 
 
-@provider_spec
 def test_disable_metrics_deprovisions_dashboards(
     signoz: types.SigNoz,
     create_user_admin: types.Operation,  # pylint: disable=unused-argument
     get_token: Callable[[str, str], str],
     create_cloud_integration_account: Callable,
-    spec: ProviderServiceSpec,
 ) -> None:
     """Disabling metrics removes provisioned dashboards from both GetService and the dashboards list."""
     admin_token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
 
-    account = create_cloud_integration_account(admin_token, spec.provider, config=spec.account_config)
+    account = create_cloud_integration_account(admin_token, CLOUD_PROVIDER)
     account_id = account["id"]
 
-    checkin = simulate_agent_checkin(signoz, admin_token, spec.provider, account_id, str(uuid.uuid4()))
+    checkin = simulate_agent_checkin(signoz, admin_token, CLOUD_PROVIDER, account_id, str(uuid.uuid4()))
     assert checkin.status_code == HTTPStatus.OK, f"Check-in failed: {checkin.text}"
 
-    endpoint = signoz.self.host_configs["8080"].get(f"/api/v1/cloud_integrations/{spec.provider}/accounts/{account_id}/services/{spec.service_id}")
+    endpoint = signoz.self.host_configs["8080"].get(f"/api/v1/cloud_integrations/{CLOUD_PROVIDER}/accounts/{account_id}/services/{SERVICE_ID}")
 
     # Enable metrics to provision dashboards first
     enable_response = requests.put(
         endpoint,
         headers={"Authorization": f"Bearer {admin_token}"},
-        json={"config": spec.build_service_config(True, logs_enabled=False)},
+        json={"config": {"aws": {"metrics": {"enabled": True}, "logs": {"enabled": False}}}},
         timeout=10,
     )
     assert enable_response.status_code == HTTPStatus.NO_CONTENT, f"Enable failed: {enable_response.status_code}: {enable_response.text}"
 
     # Capture the provisioned dashboard IDs before disabling
     get_svc_response = requests.get(
-        signoz.self.host_configs["8080"].get(f"/api/v1/cloud_integrations/{spec.provider}/accounts/{account_id}/services/{spec.service_id}"),
+        signoz.self.host_configs["8080"].get(f"/api/v1/cloud_integrations/{CLOUD_PROVIDER}/accounts/{account_id}/services/{SERVICE_ID}"),
         headers={"Authorization": f"Bearer {admin_token}"},
         timeout=10,
     )
@@ -579,14 +485,14 @@ def test_disable_metrics_deprovisions_dashboards(
     disable_response = requests.put(
         endpoint,
         headers={"Authorization": f"Bearer {admin_token}"},
-        json={"config": spec.build_service_config(False)},
+        json={"config": {"aws": {"metrics": {"enabled": False}, "logs": {"enabled": False}}}},
         timeout=10,
     )
     assert disable_response.status_code == HTTPStatus.NO_CONTENT, f"Disable failed: {disable_response.status_code}: {disable_response.text}"
 
     # Assertion 1: GetService no longer returns UUID dashboard IDs
     get_svc_after = requests.get(
-        signoz.self.host_configs["8080"].get(f"/api/v1/cloud_integrations/{spec.provider}/accounts/{account_id}/services/{spec.service_id}"),
+        signoz.self.host_configs["8080"].get(f"/api/v1/cloud_integrations/{CLOUD_PROVIDER}/accounts/{account_id}/services/{SERVICE_ID}"),
         headers={"Authorization": f"Bearer {admin_token}"},
         timeout=10,
     )

tests/integration/tests/rootuser/02_impersonation.py

@@ -55,3 +55,33 @@ def test_impersonated_user_is_admin(signoz: types.SigNoz) -> None:
     )
     assert root_detail.status_code == HTTPStatus.OK
     assert_user_has_role(root_detail.json()["data"], "signoz-admin")
+
+
+def test_mutating_root_user_is_rejected(signoz: types.SigNoz) -> None:
+    """
+    The root user is permanently protected, so mutating it is rejected with
+    400 and a machine readable code. ErrIfRoot runs before the self-delete
+    guard, so this holds even when the caller is the impersonated root
+    identity itself.
+    """
+    response = requests.get(
+        signoz.self.host_configs["8080"].get("/api/v2/users"),
+        timeout=2,
+    )
+    assert response.status_code == HTTPStatus.OK
+
+    root_user = next(
+        (u for u in response.json()["data"] if u.get("isRoot") is True),
+        None,
+    )
+    assert root_user is not None
+
+    response = requests.delete(
+        signoz.self.host_configs["8080"].get(f"/api/v2/users/{root_user['id']}"),
+        timeout=2,
+    )
+
+    assert response.status_code == HTTPStatus.BAD_REQUEST, response.text
+    error = response.json()["error"]
+    assert error["type"] == "invalid-input"
+    assert error["code"] == "root_user_operation_unsupported"