chore: cleanup dupes

island-is · Oct 22, 2024 · 67f75e3 · 67f75e3
1 parent f06506a
commit 67f75e3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/infra/src/dsl/dsl.ts b/infra/src/dsl/dsl.ts
@@ -186,10 +186,10 @@ export class ServiceBuilder<ServiceType extends string> {
   }
 
   bff(config: BffInfo) {
-    this.serviceDef.env = { ...this.serviceDef.env, ...bffConfig(config).env }
+    this.serviceDef.env = { ...bffConfig(config).env, ...this.serviceDef.env }
     this.serviceDef.secrets = {
-      ...this.serviceDef.secrets,
       ...bffConfig(config).secrets,
+      ...this.serviceDef.secrets,
     }
     return this
   }

diff --git a/infra/src/uber-charts/islandis.ts b/infra/src/uber-charts/islandis.ts
@@ -117,7 +117,6 @@ const api = apiSetup({
   userNotificationService,
 })
 
-const bffAdminPortalService = bffAdminPortalServiceSetup({ api: api })
 const servicePortal = servicePortalSetup({ graphql: api })
 const bffAdminPortalService = bffAdminPortalServiceSetup({ api })
 const appSystemForm = appSystemFormSetup({ api })