Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DTSPO-15971 - Point towards DTSPO-15971 Jenkins branch for testing purposes (Demo) #429

Draft
wants to merge 6 commits into
base: demo
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Jenkinsfile_CNP
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!groovy

@Library("Infrastructure") _
@Library("Infrastructure@DTSPO-17280/fix-base-name") _

def type = "java"
def product = "toffee"
Expand Down
12 changes: 9 additions & 3 deletions infrastructure/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ provider "azurerm" {
}

locals {
app = "recipe-backend"
app = "recipe-backend"

create_api = var.env != "preview" && var.env != "spreview"

Expand Down Expand Up @@ -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
}

Expand All @@ -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 = [
{
Expand Down
2 changes: 1 addition & 1 deletion infrastructure/prod.tfvars
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
capacity = "2"
capacity = "2"
api_gateway_test_certificate_thumbprint = "8A13CF9CC991EDE7A2A227E4153A54F6E3157774"
4 changes: 2 additions & 2 deletions infrastructure/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ variable "location" {
variable "env" {
}

variable aks_subscription_id {
variable "aks_subscription_id" {
}

variable "subscription" {
Expand All @@ -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 = ""
}
Expand Down