fix(api): 🐛 merge construct props and function props correctly

- the root function props were overriding the route-specific ones
icssc · Dec 21, 2023 · 09657ee · 09657ee
1 parent ffe387c
commit 09657ee
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/apps/api/src/routes/v1/rest/websoc/+config.ts b/apps/api/src/routes/v1/rest/websoc/+config.ts
@@ -12,7 +12,9 @@ import { constructs, esbuildOptions } from "../../../../../bronya.config";
 
 export const overrides: ApiPropsOverride = {
   constructs: {
+    ...constructs,
     functionProps: (scope, id) => ({
+      ...constructs.functionProps(scope, id),
       role: new Role(scope, `${id}-v1-rest-websoc-role`, {
         assumedBy: new ServicePrincipal("lambda.amazonaws.com"),
         managedPolicies: [
@@ -33,7 +35,6 @@ export const overrides: ApiPropsOverride = {
         },
       }),
     }),
-    ...constructs,
   },
   esbuild: {
     ...esbuildOptions,

diff --git a/apps/api/src/routes/v1/rest/websoc/{id}/+config.ts b/apps/api/src/routes/v1/rest/websoc/{id}/+config.ts
@@ -12,7 +12,9 @@ import { constructs, esbuildOptions } from "../../../../../../bronya.config";
 
 export const overrides: ApiPropsOverride = {
   constructs: {
+    ...constructs,
     functionProps: (scope, id) => ({
+      ...constructs.functionProps(scope, id),
       role: new Role(scope, `${id}-v1-rest-websoc-id-role`, {
         assumedBy: new ServicePrincipal("lambda.amazonaws.com"),
         managedPolicies: [
@@ -33,7 +35,6 @@ export const overrides: ApiPropsOverride = {
         },
       }),
     }),
-    ...constructs,
   },
   esbuild: {
     ...esbuildOptions,