Abstract away configmap interface

pennlabs · Oct 22, 2023 · dcc058e · dcc058e
1 parent 2d202d3
commit dcc058e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 13 deletions.
diff --git a/cdk/kittyhawk/src/application/redis.ts b/cdk/kittyhawk/src/application/redis.ts
@@ -35,11 +35,9 @@ export interface RedisApplicationProps {
   /**
    * Override the default redis ConfigMap configuration and creates a custom ConfigMap object.
    */
-  readonly configMap?: {
+  readonly redisConfigMap?: {
     readonly name: string;
-    readonly data: {
-      readonly "redis-config": string;
-    };
+    readonly config: string;
   };
 }
 
@@ -51,12 +49,14 @@ export class RedisApplication extends Application {
   ) {
     const CONFIG_MAP_NAME = "redis-config";
 
-    if (redisProps.configMap) {
-      new KubeConfigMap(scope, redisProps.configMap.name, {
+    if (redisProps.redisConfigMap) {
+      new KubeConfigMap(scope, redisProps.redisConfigMap.name, {
         metadata: {
-          name: redisProps.configMap.name,
+          name: redisProps.redisConfigMap.name,
+        },
+        data: {
+          "redis-config": redisProps.redisConfigMap.config,
         },
-        data: redisProps.configMap.data,
       });
     }
 
@@ -123,7 +123,7 @@ export class RedisApplication extends Application {
                 {
                   name: "config",
                   configMap: {
-                    name: redisProps.configMap?.name ?? CONFIG_MAP_NAME,
+                    name: redisProps.redisConfigMap?.name ?? CONFIG_MAP_NAME,
                     items: [
                       {
                         key: "redis-config",

diff --git a/cdk/kittyhawk/test/application/redis.test.ts b/cdk/kittyhawk/test/application/redis.test.ts
@@ -39,11 +39,9 @@ const redisTestConfig = {
     },
   },
   customConfigMap: {
-    configMap: {
+    redisConfigMap: {
       name: "custom-config-map",
-      data: {
-        "redis-config": "custom-config",
-      },
+      config: "custom-config",
     },
   },
 };