Cleanup

README.md

@@ -26,7 +26,7 @@ docker run -d \
   -e DATABASE_URL=postgresql://user:pass@host:5432/forge \
   -e REDIS_URL=redis://host:6379/0 \
   -e ENCRYPTION_KEY=your-32-char-encryption-key \
-  -e DEFAULT_PROVIDER=aws-codebuild \
+  -e DEFAULT_PROVIDER=aws.code-build \
   -e OBJECT_STORAGE_URL=http://object-storage:52010 \
   -e LOG_BUCKET_NAME=logs \
   -e ARTIFACT_BUCKET_NAME=artifacts \
@@ -80,7 +80,7 @@ services:
       REDIS_URL: redis://redis:6379/0
 
       ENCRYPTION_KEY: ${ENCRYPTION_KEY}
-      DEFAULT_PROVIDER: aws-codebuild
+      DEFAULT_PROVIDER: aws.code-build
 
       OBJECT_STORAGE_URL: http://object-storage:52010
       LOG_BUCKET_NAME: logs

service/.env.example

@@ -3,7 +3,7 @@ DATABASE_URL=postgresql://forge:forge@postgres:5432/forge
 REDIS_URL=redis://redis:6379
 
 # Provider Configuration
-DEFAULT_PROVIDER=aws-codebuild
+DEFAULT_PROVIDER=aws.code-build
 
 # AWS CodeBuild Configuration (optional)
 CODE_BUILD_AWS_REGION=

service/src/env.ts

@@ -18,7 +18,7 @@ export let env = createValidatedEnv({
   },
 
   provider: {
-    DEFAULT_PROVIDER: v.enumOf(['aws-code-build'])
+    DEFAULT_PROVIDER: v.enumOf(['aws.code-build'])
   },
 
   codeBuild: {

service/src/presenters/workflowVersion.ts

@@ -6,32 +6,32 @@ import type {
 } from '../../prisma/generated/client';
 
 export let workflowVersionPresenter = (
-  artifact: WorkflowVersion & {
+  version: WorkflowVersion & {
     steps: (WorkflowVersionStep & {
       artifactToDownload: WorkflowArtifact | null;
     })[];
     workflow: Workflow;
   }
 ) => ({
-  object: 'workflow.run',
+  object: 'workflow.version',
 
-  id: artifact.id,
-  identifier: artifact.identifier,
-  name: artifact.name,
+  id: version.id,
+  identifier: version.identifier,
+  name: version.name,
 
-  workflowId: artifact.workflow.id,
+  workflowId: version.workflow.id,
 
-  steps: artifact.steps.sort((a, b) => a.index - b.index).map(workflowVersionStepPresenter),
+  steps: version.steps.sort((a, b) => a.index - b.index).map(workflowVersionStepPresenter),
 
-  createdAt: artifact.createdAt
+  createdAt: version.createdAt
 });
 
 export let workflowVersionStepPresenter = (
   step: WorkflowVersionStep & {
     artifactToDownload: WorkflowArtifact | null;
   }
 ) => ({
-  object: 'workflow.run.step',
+  object: 'workflow.version.step',
 
   id: step.id,
   type: step.type,

service/src/providers/aws-codebuild/codeBuild.ts

@@ -3,7 +3,7 @@ import { CodeBuildClient } from '@aws-sdk/client-codebuild';
 import { env } from '../../env';
 
 export let codebuild =
-  env.provider.DEFAULT_PROVIDER == 'aws-code-build'
+  env.provider.DEFAULT_PROVIDER == 'aws.code-build'
     ? new CodeBuildClient({
         region: env.codeBuild.CODE_BUILD_AWS_REGION,
         credentials:
@@ -18,7 +18,7 @@ export let codebuild =
     : undefined;
 
 export let logsClient =
-  env.provider.DEFAULT_PROVIDER == 'aws-code-build'
+  env.provider.DEFAULT_PROVIDER == 'aws.code-build'
     ? new CloudWatchLogsClient({
         region: env.codeBuild.CODE_BUILD_AWS_REGION,
         credentials:

service/src/providers/aws-codebuild/index.ts

@@ -543,6 +543,11 @@ let storeOutputCleanupQueueProcessor = storeOutputCleanupQueue.process(async dat
   await db.workflowRunOutputTemp.deleteMany({
     where: { runOid: data.runOid }
   });
+
+  await db.workflowRun.updateMany({
+    where: { oid: data.runOid },
+    data: { encryptedEnvironmentVariables: '' }
+  });
 });
 
 export let awsCodeBuildProcessors = combineQueueProcessors([

service/src/providers/aws-codebuild/role.ts

@@ -9,7 +9,7 @@ import { once } from '@lowerdeck/once';
 import { env } from '../../env';
 
 let iam =
-  env.provider.DEFAULT_PROVIDER == 'aws-code-build'
+  env.provider.DEFAULT_PROVIDER == 'aws.code-build'
     ? new IAMClient({
         region: env.codeBuild.CODE_BUILD_AWS_REGION,
         credentials: