@appliance.sh/infra 1.18.0 → 1.19.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appliance.sh/infra",
-  "version": "1.18.0",
+  "version": "1.19.0",
   "description": "Deploy the Appliance Infrastructure",
   "repository": "https://github.com/appliance-sh/appliance.sh",
   "license": "MIT",
@@ -23,7 +23,7 @@
     "dev:setup": "npm link"
   },
   "dependencies": {
-    "@appliance.sh/sdk": "1.18.0",
+    "@appliance.sh/sdk": "1.19.0",
     "@pulumi/aws": "^7.16.0",
     "@pulumi/aws-native": "^1.48.0",
     "@pulumi/awsx": "^3.1.0",

package/src/lib/ApplianceDeploymentService.ts

@@ -1,7 +1,7 @@
 import * as auto from '@pulumi/pulumi/automation';
 import * as aws from '@pulumi/aws';
 import * as awsNative from '@pulumi/aws-native';
-import { ApplianceStack, toResourceId } from './aws/ApplianceStack';
+import { ApplianceStack, ApplianceStackMetadata, toResourceId } from './aws/ApplianceStack';
 import { applianceBaseConfig, ApplianceBaseConfig } from '@appliance.sh/sdk';
 
 export type PulumiAction = 'deploy' | 'destroy';
@@ -32,7 +32,7 @@ export class ApplianceDeploymentService {
     this.region = this.baseConfig?.aws.region || 'us-east-1';
   }
 
-  private inlineProgram(stackName: string) {
+  private inlineProgram(stackName: string, metadata?: ApplianceStackMetadata) {
     return async () => {
       if (!this.baseConfig) {
         throw new Error('Missing base config');
@@ -56,7 +56,7 @@ export class ApplianceDeploymentService {
       const applianceStack = new ApplianceStack(
         stackName,
         {
-          tags: { project: stackName },
+          metadata,
           config: this.baseConfig,
         },
         {
@@ -73,8 +73,8 @@ export class ApplianceDeploymentService {
     };
   }
 
-  private async getOrCreateStack(stackName: string): Promise<auto.Stack> {
-    const program = this.inlineProgram(stackName);
+  private async getOrCreateStack(stackName: string, metadata?: ApplianceStackMetadata): Promise<auto.Stack> {
+    const program = this.inlineProgram(stackName, metadata);
     const envVars: Record<string, string> = {
       AWS_REGION: this.region,
     };
@@ -112,8 +112,8 @@ export class ApplianceDeploymentService {
     return auto.Stack.createOrSelect(stackName, ws);
   }
 
-  async deploy(stackName = 'appliance-api-managed'): Promise<PulumiResult> {
-    const stack = await this.getOrCreateStack(stackName);
+  async deploy(stackName: string, metadata?: ApplianceStackMetadata): Promise<PulumiResult> {
+    const stack = await this.getOrCreateStack(stackName, metadata);
     const result = await stack.up({ onOutput: (m) => console.log(m) });
     const changes = result.summary.resourceChanges || {};
     const totalChanges = Object.entries(changes)
@@ -129,7 +129,7 @@ export class ApplianceDeploymentService {
     };
   }
 
-  async destroy(stackName = 'appliance-api-managed'): Promise<PulumiResult> {
+  async destroy(stackName: string): Promise<PulumiResult> {
     try {
       const stack = await this.selectExistingStack(stackName);
       await stack.destroy({ onOutput: (m) => console.log(m) });

package/src/lib/aws/ApplianceStack.ts

@@ -35,8 +35,17 @@ export function toDnsLabel(name: string): string {
   return truncateWithHash(name, MAX_DNS_LABEL_LENGTH);
 }
 
+export interface ApplianceStackMetadata {
+  projectId: string;
+  projectName: string;
+  environmentId: string;
+  environmentName: string;
+  deploymentId: string;
+  stackName: string;
+}
+
 export interface ApplianceStackArgs {
-  tags?: Record<string, string>;
+  metadata?: ApplianceStackMetadata;
   config: ApplianceBaseConfig;
 }
 
@@ -64,7 +73,17 @@ export class ApplianceStack extends pulumi.ComponentResource {
 
     const defaultOpts = { parent: this, provider: opts.provider };
     const defaultNativeOpts = { parent: this, provider: opts.nativeProvider };
-    const defaultTags = { stack: name, managed: 'appliance', ...args.tags };
+    const defaultTags: Record<string, string> = {
+      'appliance:managed': 'true',
+      'appliance:stack-name': name,
+    };
+    if (args.metadata) {
+      defaultTags['appliance:project-id'] = args.metadata.projectId;
+      defaultTags['appliance:project-name'] = args.metadata.projectName;
+      defaultTags['appliance:environment-id'] = args.metadata.environmentId;
+      defaultTags['appliance:environment-name'] = args.metadata.environmentName;
+      defaultTags['appliance:deployment-id'] = args.metadata.deploymentId;
+    }
 
     this.lambdaRole = new aws.iam.Role(`${rid}-role`, {
       path: `/appliance/${name}/`,