diff --git a/Jenkinsfile_CNP b/Jenkinsfile_CNP index 4b4817db..eeeaf451 100644 --- a/Jenkinsfile_CNP +++ b/Jenkinsfile_CNP @@ -1,6 +1,6 @@ #!groovy -@Library("Infrastructure") _ +@Library("Infrastructure@DTSPO-17280/fix-base-name") _ def type = "java" def product = "toffee" diff --git a/infrastructure/main.tf b/infrastructure/main.tf index 45928736..25374443 100644 --- a/infrastructure/main.tf +++ b/infrastructure/main.tf @@ -10,7 +10,7 @@ provider "azurerm" { } locals { - app = "recipe-backend" + app = "recipe-backend" create_api = var.env != "preview" && var.env != "spreview" @@ -76,8 +76,14 @@ resource "azurerm_key_vault_secret" "POSTGRES_DATABASE-DESTINATION" { key_vault_id = data.azurerm_key_vault.key_vault.id } +resource "azurerm_key_vault_secret" "test-secret" { + name = "test-secret" + value = "test-secret" + key_vault_id = data.azurerm_key_vault.key_vault.id +} + module "postgresql_flexible" { - providers = { + providers = { azurerm.postgres_network = azurerm.postgres_network } @@ -90,7 +96,7 @@ module "postgresql_flexible" { location = var.location create_mode = "Update" - common_tags = var.common_tags + common_tags = var.common_tags admin_user_object_id = var.jenkins_AAD_objectId pgsql_databases = [ { diff --git a/infrastructure/prod.tfvars b/infrastructure/prod.tfvars index fcfceb3d..6696ec71 100644 --- a/infrastructure/prod.tfvars +++ b/infrastructure/prod.tfvars @@ -1,2 +1,2 @@ -capacity = "2" +capacity = "2" api_gateway_test_certificate_thumbprint = "8A13CF9CC991EDE7A2A227E4153A54F6E3157774" diff --git a/infrastructure/variables.tf b/infrastructure/variables.tf index cf31b1dc..9ffa57dc 100644 --- a/infrastructure/variables.tf +++ b/infrastructure/variables.tf @@ -10,7 +10,7 @@ variable "location" { variable "env" { } -variable aks_subscription_id { +variable "aks_subscription_id" { } variable "subscription" { @@ -27,7 +27,7 @@ variable "capacity" { } # thumbprint of the SSL certificate for API gateway tests -variable api_gateway_test_certificate_thumbprint { +variable "api_gateway_test_certificate_thumbprint" { # keeping this empty by default, so that no thumbprint will match default = "" }