@appliance.sh/api-server 1.18.0 → 1.19.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appliance.sh/api-server",
-  "version": "1.18.0",
+  "version": "1.19.0",
   "description": "",
   "author": "Eliot Lim",
   "repository": "https://github.com/appliance-sh/appliance.sh",
@@ -19,8 +19,8 @@
     "test:e2e": "vitest run --config vitest.e2e.config.ts"
   },
   "dependencies": {
-    "@appliance.sh/infra": "1.18.0",
-    "@appliance.sh/sdk": "1.18.0",
+    "@appliance.sh/infra": "1.19.0",
+    "@appliance.sh/sdk": "1.19.0",
     "@aws-sdk/client-s3": "^3.750.0",
     "express": "^5.2.1"
   },

package/src/main.ts

@@ -1,6 +1,6 @@
 import express from 'express';
 import { indexRoutes } from './routes';
-import { infraRoutes } from './routes/infra';
+
 import { projectRoutes } from './routes/projects';
 import { environmentRoutes } from './routes/environments';
 import { deploymentRoutes } from './routes/deployments';
@@ -26,7 +26,6 @@ export function createApp() {
   app.use('/api/v1/projects', signatureAuth, projectRoutes);
   app.use('/api/v1/projects/:projectId/environments', signatureAuth, environmentRoutes);
   app.use('/api/v1/deployments', signatureAuth, deploymentRoutes);
-  app.use('/api/v1/infra', signatureAuth, infraRoutes);
 
   return app;
 }

package/src/services/api-key.service.ts

@@ -1,6 +1,6 @@
-import { randomUUID, randomBytes } from 'crypto';
+import { randomBytes } from 'crypto';
 import { getStorageService } from './storage.service';
-import { ApiKeyCreateResponse } from '@appliance.sh/sdk';
+import { ApiKeyCreateResponse, generateId } from '@appliance.sh/sdk';
 
 const COLLECTION = 'api-keys';
 
@@ -17,7 +17,7 @@ interface StoredApiKey {
 export class ApiKeyService {
   async create(name: string): Promise<ApiKeyCreateResponse> {
     const storage = getStorageService();
-    const id = `ak_${randomUUID()}`;
+    const id = generateId('ak');
     const secret = `sk_${randomBytes(32).toString('hex')}`;
     const now = new Date().toISOString();
 

package/src/services/deployment.service.ts

@@ -1,8 +1,15 @@
-import { Deployment, DeploymentInput, DeploymentStatus, DeploymentAction, EnvironmentStatus } from '@appliance.sh/sdk';
+import {
+  Deployment,
+  DeploymentInput,
+  DeploymentStatus,
+  DeploymentAction,
+  EnvironmentStatus,
+  generateId,
+} from '@appliance.sh/sdk';
 import { createApplianceDeploymentService } from '@appliance.sh/infra';
 import { getStorageService } from './storage.service';
 import { environmentService } from './environment.service';
-import { randomUUID } from 'crypto';
+import { projectService } from './project.service';
 
 const COLLECTION = 'deployments';
 
@@ -18,7 +25,7 @@ export class DeploymentService {
     const now = new Date().toISOString();
     const deployment: Deployment = {
       ...input,
-      id: randomUUID(),
+      id: generateId('dep'),
       projectId: environment.projectId,
       status: DeploymentStatus.Pending,
       startedAt: now,
@@ -35,6 +42,21 @@ export class DeploymentService {
       input.action === DeploymentAction.Deploy ? EnvironmentStatus.Deploying : EnvironmentStatus.Destroying;
     await environmentService.updateStatus(environment.id, envStatus);
 
+    // Look up the project for tagging
+    const project = await projectService.get(environment.projectId);
+    if (!project) {
+      throw new Error(`Project not found: ${environment.projectId}`);
+    }
+
+    const metadata = {
+      projectId: project.id,
+      projectName: project.name,
+      environmentId: environment.id,
+      environmentName: environment.name,
+      deploymentId: deployment.id,
+      stackName: environment.stackName,
+    };
+
     // Execute the deployment
     try {
       const deploymentService = createApplianceDeploymentService({
@@ -43,7 +65,7 @@ export class DeploymentService {
 
       let result;
       if (input.action === DeploymentAction.Deploy) {
-        result = await deploymentService.deploy(environment.stackName);
+        result = await deploymentService.deploy(environment.stackName, metadata);
       } else {
         result = await deploymentService.destroy(environment.stackName);
       }

package/src/services/environment.service.ts

@@ -1,7 +1,6 @@
-import { Environment, EnvironmentInput, EnvironmentStatus } from '@appliance.sh/sdk';
+import { Environment, EnvironmentInput, EnvironmentStatus, generateId } from '@appliance.sh/sdk';
 import type { ApplianceBaseConfig } from '@appliance.sh/sdk';
 import { getStorageService } from './storage.service';
-import { randomUUID } from 'crypto';
 
 const COLLECTION = 'environments';
 
@@ -9,7 +8,7 @@ export class EnvironmentService {
   async create(input: EnvironmentInput, projectName: string, baseConfig: ApplianceBaseConfig): Promise<Environment> {
     const storage = getStorageService();
     const now = new Date().toISOString();
-    const id = randomUUID();
+    const id = generateId('env');
     const environment: Environment = {
       ...input,
       id,

package/src/services/project.service.ts

@@ -1,6 +1,5 @@
-import { Project, ProjectInput, ProjectStatus } from '@appliance.sh/sdk';
+import { Project, ProjectInput, ProjectStatus, generateId } from '@appliance.sh/sdk';
 import { getStorageService } from './storage.service';
-import { randomUUID } from 'crypto';
 
 const COLLECTION = 'projects';
 
@@ -10,7 +9,7 @@ export class ProjectService {
     const now = new Date().toISOString();
     const project: Project = {
       ...input,
-      id: randomUUID(),
+      id: generateId('proj'),
       status: ProjectStatus.Active,
       createdAt: now,
       updatedAt: now,

package/src/routes/infra/index.ts

@@ -1,24 +0,0 @@
-import { Router } from 'express';
-import { pulumiService } from '../../services/pulumi.service';
-
-export const infraRoutes = Router();
-
-infraRoutes.post('/deploy', async (_req, res) => {
-  try {
-    const result = await pulumiService.deploy();
-    res.json(result);
-  } catch (error) {
-    console.error('Deploy error:', error);
-    res.status(500).json({ error: 'Deploy failed', message: String(error) });
-  }
-});
-
-infraRoutes.post('/destroy', async (_req, res) => {
-  try {
-    const result = await pulumiService.destroy();
-    res.json(result);
-  } catch (error) {
-    console.error('Destroy error:', error);
-    res.status(500).json({ error: 'Destroy failed', message: String(error) });
-  }
-});

package/src/services/pulumi.service.ts

@@ -1,12 +0,0 @@
-import {
-  ApplianceDeploymentService,
-  createApplianceDeploymentService,
-  type PulumiAction,
-  type PulumiResult,
-} from '@appliance.sh/infra';
-
-// Re-export types for consumers
-export type { PulumiAction, PulumiResult };
-
-// Export a singleton instance
-export const pulumiService: ApplianceDeploymentService = createApplianceDeploymentService();