test

ministryofjustice · Jan 17, 2025 · d4b00ff · d4b00ff
1 parent c6db683
commit d4b00ff
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 12 deletions.
diff --git a/....gov.uk/hmpps-templates-dev/resources/modules/hmpps-template-application/client-secret.tf b/....gov.uk/hmpps-templates-dev/resources/modules/hmpps-template-application/client-secret.tf
@@ -1,6 +1,6 @@
 # Generate a secure random session secret
 resource "kubernetes_secret" "client_secret" {
-  count = var.client_secret ? 1 : 0
+  count = var.source_template_repo == "hmpps-template-kotlin" ? 1 : 0
   metadata {
     name      = "${var.application}-client-secret"
     namespace = var.namespace

diff --git a/...gov.uk/hmpps-templates-dev/resources/modules/hmpps-template-application/session-secret.tf b/...gov.uk/hmpps-templates-dev/resources/modules/hmpps-template-application/session-secret.tf
@@ -7,7 +7,7 @@ resource "random_password" "session_secret" {
   numeric = true
 }
 resource "kubernetes_secret" "session_secret" {
-  count = var.session_secret ? 1 : 0
+  count = var.source_template_repo == "hmpps-template-typescript" ? 1 : 0
   metadata {
     name      = "${var.application}-session-secret"
     namespace = var.namespace

diff --git a/...tice.gov.uk/hmpps-templates-dev/resources/modules/hmpps-template-application/variables.tf b/...tice.gov.uk/hmpps-templates-dev/resources/modules/hmpps-template-application/variables.tf
@@ -67,12 +67,6 @@ variable "serviceaccount_name" {
   default     = "github-actions-sa"
 }
 
-variable "client_secret" {
-  description = "Set to 'true' to create the initial client secret required for kotlin template apps"
-  default = false
-}
-
-variable "session_secret" {
-  description = "Set to 'true' to create the initial session secret required for typescript template apps"
-  default = false
+variable "source_template_repo" {
+  description = "The source template repository used for this app, e.g. 'hmpps-template-kotlin' or 'hmpps-template-typescript'"
 }
diff --git a/...ve.cloud-platform.service.justice.gov.uk/hmpps-templates-dev/resources/template-kotlin.tf b/...ve.cloud-platform.service.justice.gov.uk/hmpps-templates-dev/resources/template-kotlin.tf
@@ -6,7 +6,7 @@ module "hmpps_template_kotlin" {
   environment                   = var.environment # Should match environment name used in helm values file e.g. values-dev.yaml
   is_production                 = var.is_production
   application_insights_instance = "dev" # Either "dev", "preprod" or "prod"
-  client_secret = true
+  source_template_repo          = "hmpps-template-kotlin"
 
   team_name              = var.team_name
   infrastructure_support = var.infrastructure_support

diff --git a/...loud-platform.service.justice.gov.uk/hmpps-templates-dev/resources/template-typescript.tf b/...loud-platform.service.justice.gov.uk/hmpps-templates-dev/resources/template-typescript.tf
@@ -6,7 +6,7 @@ module "hmpps_template_typescript" {
   environment                   = var.environment # Should match environment name used in helm values file e.g. values-dev.yaml
   is_production                 = var.is_production
   application_insights_instance = "dev" # Either "dev", "preprod" or "prod"
-  session_secret = true
+  source_template_repo          = "hmpps-template-typescript"
 
   team_name              = var.team_name
   infrastructure_support = var.infrastructure_support