Conditionally set admin env vars based on keycloak version

NASA-IMPACT · Oct 31, 2024 · fbfbcb2 · fbfbcb2
1 parent 9760b09
commit fbfbcb2
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/deploy/lib/KeycloakService.ts b/deploy/lib/KeycloakService.ts
@@ -13,6 +13,7 @@ interface KeycloakServiceProps extends StackInputProps {
   vpc: ec2.IVpc;
   databaseName: string;
   databaseInstance: rds.DatabaseInstance;
+  version: string;
 }
 
 export class KeycloakService extends Construct {
@@ -91,8 +92,15 @@ export class KeycloakService extends Construct {
             KC_DB_URL_PORT: ecsDbSecret("port"),
 
             // Admin
-            KEYCLOAK_ADMIN: ecsAdminSecret("username"),
-            KEYCLOAK_ADMIN_PASSWORD: ecsAdminSecret("password"),
+            ...(parseInt(props.version.split(".")[0]) >= 26
+              ? {
+                  KEYCLOAK_ADMIN: ecsAdminSecret("username"),
+                  KEYCLOAK_ADMIN_PASSWORD: ecsAdminSecret("password"),
+                }
+              : {
+                  KC_BOOTSTRAP_ADMIN_USERNAME: ecsAdminSecret("username"),
+                  KC_BOOTSTRAP_ADMIN_PASSWORD: ecsAdminSecret("password"),
+                }),
           },
         },
       }

diff --git a/deploy/lib/KeycloakStack.ts b/deploy/lib/KeycloakStack.ts
@@ -36,6 +36,7 @@ export class KeycloakStack extends cdk.Stack {
       vpc,
       databaseName,
       databaseInstance: database,
+      version: props.keycloakVersion,
       ...props,
     });