refactoring

supabase-community · Dec 5, 2022 · 15dcdf3 · 15dcdf3
1 parent 3d782fe
commit 15dcdf3
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 30 deletions.
diff --git a/src/ecs-force-deploy-job.ts b/src/ecs-force-deploy-job.ts
@@ -68,15 +68,19 @@ export class ForceDeployJob extends Construct {
 
   addTrigger(props: TriggerProps) {
     const rule = props.rule;
-    const services = props.services?.map(x => x.service.serviceArn);
+    const input = props.input || {};
     const target = new targets.SfnStateMachine(this.stateMachine, {
-      input: events.RuleTargetInput.fromObject({ services }),
+      input: events.RuleTargetInput.fromObject(input),
     });
     rule.addTarget(target);
   }
 }
 
 interface TriggerProps {
   rule: events.Rule;
-  services?: BaseFargateService[];
+  input?: ForceDeployJobInput;
+}
+
+interface ForceDeployJobInput {
+  services?: string[];
 }
diff --git a/src/supabase-stack.ts b/src/supabase-stack.ts
@@ -396,40 +396,45 @@ export class SupabaseStack extends FargateStack {
     meta.connectDatabase(db);
 
     const forceDeployJob = new ForceDeployJob(this, 'ForceDeployJob', { cluster });
-
-    const newServiceCreated = new events.Rule(this, 'NewServiceCreated', {
-      description: 'Supabase - New service created (for Service Connect)',
-      eventPattern: {
-        source: ['aws.servicediscovery'],
-        detailType: ['AWS API Call via CloudTrail'],
-        detail: {
-          eventName: ['CreateService'],
-          responseElements: {
-            service: {
-              namespaceId: [namespace.namespaceId],
-              type: ['HTTP'],
+    // for ECS Service Connect
+    forceDeployJob.addTrigger({
+      rule: new events.Rule(this, 'NewServiceCreated', {
+        description: 'Supabase - New service created (for Service Connect)',
+        eventPattern: {
+          source: ['aws.servicediscovery'],
+          detailType: ['AWS API Call via CloudTrail'],
+          detail: {
+            eventName: ['CreateService'],
+            responseElements: {
+              service: {
+                namespaceId: [namespace.namespaceId],
+                type: ['HTTP'],
+              },
             },
           },
         },
-      },
+      }),
     });
-
-    const authParameterChangedRule = new events.Rule(this, 'AuthParameterChanged', {
-      description: 'Supabase - Auth parameter changed',
-      eventPattern: {
-        source: ['aws.ssm'],
-        detailType: ['Parameter Store Change'],
-        detail: {
-          name: [{ prefix: `/${cdk.Aws.STACK_NAME}/${auth.node.id}/` }],
-          operation: ['Update'],
+    // for DB secret rotation
+    forceDeployJob.addTrigger({
+      rule: db.secretRotationSucceeded,
+    });
+    // for Auth provider settings changed
+    forceDeployJob.addTrigger({
+      input: { services: [auth.service.serviceArn] },
+      rule: new events.Rule(this, 'AuthParameterChanged', {
+        description: 'Supabase - Auth parameter changed',
+        eventPattern: {
+          source: ['aws.ssm'],
+          detailType: ['Parameter Store Change'],
+          detail: {
+            name: [{ prefix: `/${cdk.Aws.STACK_NAME}/${auth.node.id}/` }],
+            operation: ['Update'],
+          },
         },
-      },
+      }),
     });
 
-    forceDeployJob.addTrigger({ rule: newServiceCreated }); // for Service Connect
-    forceDeployJob.addTrigger({ rule: db.secretRotationSucceeded });
-    forceDeployJob.addTrigger({ rule: authParameterChangedRule, services: [auth] });
-
     // Supabase Studio
     const studioBranch = new cdk.CfnParameter(this, 'StudioBranch', {
       type: 'String',