Fixed getting the service name for SST services

CHANGELOG.md

@@ -6,7 +6,8 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## [Unreleased]
-
+### Fixed
+- Fix getting the service name for SST services
 
 ## [0.0.41] 2023-08-12
 ### Fixed

src/resources/alert.ts

@@ -2,13 +2,11 @@ import { CfnResource, Stack } from "aws-cdk-lib";
 import { Baselime as Config } from "../config";
 import { Query } from "./query";
 import { AlertProps, DeploymentAlertParameters } from "../types/alert";
-import { QueryProps } from "../types/query";
 import { getServiceName } from "../utils/service-name";
 
 export class Alert<TKey extends string> extends CfnResource {
 
 	constructor(id: string, props: AlertProps<TKey>) {
-		const stack = Stack.of(Config.getConstruct());
 		const defaultFrequency = "1hour";
 		const defaultWindow = "1hour";
 
@@ -55,7 +53,7 @@ export class Alert<TKey extends string> extends CfnResource {
 				BaselimeApiKey: Config.getApiKey(),
 				enabled: props.enabled,
 				Description: props.description,
-				Service: getServiceName(stack),
+				Service: getServiceName(),
 				Parameters,
 				Channels: props.channels || Config.getDefaultChannel() && [Config.getDefaultChannel()],
 				Origin: "cdk",

src/resources/dashboard.ts

@@ -6,7 +6,6 @@ import { getServiceName } from "../utils/service-name";
 
 export class Dashboard extends CfnResource {
 	constructor(id: string, props: DashboardProps) {
-		const stack = Stack.of(Config.getConstruct());
 
 		const parameters = {
 			...props.parameters,
@@ -20,7 +19,7 @@ export class Dashboard extends CfnResource {
 				ServiceToken: Config.getServiceToken(),
 				BaselimeApiKey: Config.getApiKey(),
 				Description: props.description,
-				Service: getServiceName(stack),
+				Service: getServiceName(),
 				Parameters: parameters,
 				Origin: "cdk"
 			},

src/resources/query.ts

@@ -87,7 +87,7 @@ export class Query<TKey extends string> extends CfnResource {
 				ServiceToken: Config.getServiceToken(),
 				BaselimeApiKey: Config.getApiKey(),
 				Description: props.description,
-				Service: getServiceName(stack),
+				Service: getServiceName(),
 				Parameters,
 				Origin: "cdk"
 			},

src/utils/service-name.ts

@@ -1,18 +1,21 @@
 import { Stack } from "aws-cdk-lib";
 import { Baselime as Config } from "../config";
 
-export function getServiceName(stack: Stack): string {
+export function getServiceName(): string {
   const s = Config.getServiceName();
   if (s) {
     return s;
   }
-  const tags = stack.tags.tagValues();
 
-  const isSST = Object.keys(tags).some((el) => el.includes("sst"));
+  const construct = Config.getConstruct();
+  const root = construct.node.root as any;
 
-  if (isSST) {
-    return `${tags['sst:stage']}-${tags['sst:app']}`;
-  }
+  const stage = root.stage;
+  const name = root.name;
 
+  if (stage && name) {
+    return `${stage}-${name}`;
+  }
+  const stack = Stack.of(construct);
   return stack.stackName;
 }