chore(dsl): Enforce types

apps/web/infra/web.ts

@@ -1,3 +1,4 @@
+import { Ingress } from 'infra/src/dsl/types/input-types'
 import { ref, service, ServiceBuilder } from '../../../infra/src/dsl/dsl'
 
 export const serviceSetup = (services: {
@@ -49,7 +50,7 @@ export const serviceSetup = (services: {
           },
         },
         paths: ['/'],
-      },
+      } as Ingress,
     })
     .liveness('/liveness')
     .readiness({ path: '/readiness', initialDelaySeconds: 20 })

infra/src/dsl/dsl.ts

@@ -17,6 +17,7 @@ import {
   ServiceDefinition,
   XroadConfig,
   PodDisruptionBudget,
+  IngressMapping,
 } from './types/input-types'
 import { logger } from '../logging'
 import { COMMON_SECRETS } from './consts'
@@ -65,7 +66,7 @@ export class ServiceBuilder<ServiceType extends string> {
       grantNamespaces: [],
       grantNamespacesEnabled: false,
       secrets: COMMON_SECRETS,
-      ingress: {},
+      ingress: {} as IngressMapping, // Force type conformance for initialization
       namespace: 'islandis',
       serviceAccountEnabled: false,
       securityContext: {
@@ -461,7 +462,7 @@ export class ServiceBuilder<ServiceType extends string> {
    * You can allow ingress traffic (traffic from the internet) to your service by creating an ingress controller. Mapped to an [Ingress](https://kubernetes.io/docs/concepts/services-networking/ingress/#what-is-ingress).
    * @param ingress - Ingress parameters
    */
-  ingress(ingress: { [name: string]: Ingress }) {
+  ingress(ingress: IngressMapping) {
     this.serviceDef.ingress = ingress
     return this
   }

infra/src/dsl/types/charts.ts

@@ -36,6 +36,6 @@ export type OpsEnvName =
   | 'prod'
   | 'prod-ids'
 
-export type EnvironmentServices = { [name in OpsEnv]: ServiceBuilder<any>[] }
+export type EnvironmentServices = { [env in OpsEnv]: ServiceBuilder<any>[] }
 
 export type EnvironmentConfigs = { [name in OpsEnvName]: EnvironmentConfig }

infra/src/dsl/types/input-types.ts

@@ -18,7 +18,7 @@ export type ValueType = MissingSettingType | ValueSource
 export type AccessModes = 'ReadWrite' | 'ReadOnly'
 export type PostgresInfo = {
   host?: {
-    [idx in OpsEnv]: string
+    [env in OpsEnv]: string
   }
   name?: string
   username?: string
@@ -35,7 +35,7 @@ export type PostgresInfoForEnv = {
 }
 
 export type RedisInfo = {
-  host?: { [idx in OpsEnv]: string }
+  host?: { [env in OpsEnv]: string }
 }
 
 export type RedisInfoForEnv = {
@@ -106,13 +106,15 @@ export type ServiceDefinitionCore = {
   volumes: PersistentVolumeClaim[]
   podDisruptionBudget?: PodDisruptionBudget
 }
+export type IngressType = 'primary' | 'internal'
+export type IngressMapping = Partial<{ [name in IngressType]: Ingress }>
 /**
  * This is the definition of a service as generated by ServiceBuilder.
  */
 export type ServiceDefinition = ServiceDefinitionCore & {
   initContainers?: InitContainers
   env: EnvironmentVariables
-  ingress: { [name: string]: Ingress }
+  ingress: IngressMapping
   postgres?: PostgresInfo
   redis?: RedisInfo
   extraAttributes?: ExtraValues
@@ -133,11 +135,13 @@ export type ServiceDefinitionForEnv = ServiceDefinitionCore & {
 
 export interface Ingress {
   host: {
-    [name in OpsEnv]: string | string[]
+    [env in OpsEnv]: string | string[]
   }
   paths: string[]
   public?: boolean
-  extraAnnotations?: { [name in OpsEnv]: { [idx: string]: string | null } }
+  extraAnnotations?: {
+    [env in OpsEnv]: { [annotation: string]: string | null }
+  }
 }
 
 export interface IngressForEnv {
@@ -227,4 +231,4 @@ export interface Context {
 }
 
 export type ExtraValuesForEnv = Hash
-export type ExtraValues = { [idx in OpsEnv]: Hash | MissingSettingType }
+export type ExtraValues = { [env in OpsEnv]: Hash | MissingSettingType }