Skip to content

Commit

Permalink
Renovate Combined Pull Request (#1974)
Browse files Browse the repository at this point in the history 
* Update spring core to v5.3.37

* Update dependency io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations to v1.33.4

* Update dependency com.azure:azure-core to v1.49.1

* Update Terraform azuread to v2.53.0

* Updating Terraform Formatting

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: 58046 <62422075+hmcts-jenkins-a-to-c[bot]@users.noreply.github.com>
Co-authored-by: github-actions <github-actions@github.com>
Co-authored-by: mikebrownccd <104495891+mikebrownccd@users.noreply.github.com>
  • Loading branch information
@github-actions @renovate
@hmcts-jenkins-a-to-c @mikebrownccd
5 people authored Jul 4, 2024
1 parent 3879737 commit 4de12db
Show file tree
Hide file tree
Showing 6 changed files with 52 additions and 52 deletions.
6 changes: 3 additions & 3 deletions build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ def versions = [
reformS2sClient: '4.0.2',
serenity : '2.2.12',
springBoot : '2.7.18',
spring : '5.3.36',
spring : '5.3.37',
springSecurity : '5.7.11',
springHystrix : '2.1.1.RELEASE',
swagger2Version: '2.10.5',
Expand Down Expand Up @@ -378,7 +378,7 @@ dependencies {
implementation group: 'javax.inject', name: 'javax.inject', version: '1'

implementation group: 'com.microsoft.azure', name: 'applicationinsights-spring-boot-starter', version: '2.6.4'
implementation group: 'io.opentelemetry.instrumentation', name: 'opentelemetry-instrumentation-annotations', version: '1.33.3'
implementation group: 'io.opentelemetry.instrumentation', name: 'opentelemetry-instrumentation-annotations', version: '1.33.4'

implementation group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.14'

Expand Down Expand Up @@ -407,7 +407,7 @@ dependencies {
exclude group: 'com.microsoft.azure', module: 'adal4j'
exclude group: 'org.asynchttpclient', module: 'async-http-client-netty-utils'
}
implementation group: 'com.azure', name: 'azure-core', version: '1.48.0'
implementation group: 'com.azure', name: 'azure-core', version: '1.49.1'
implementation group: 'com.azure', name: 'azure-messaging-servicebus', version: '7.16.0'
implementation group: 'io.projectreactor', name: 'reactor-core', version: '3.6.7'
implementation group: 'commons-cli', name: 'commons-cli', version: '1.7.0'
Expand Down
2 changes: 1 addition & 1 deletion infrastructure/aat.tfvars
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
enable_schema_ownership = true
kv_subscription = "DCD-CNP-DEV"
kv_subscription = "DCD-CNP-DEV"
88 changes: 44 additions & 44 deletions infrastructure/main.tf
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
locals {
app_full_name = join("-", [var.product, var.component])

local_env = (var.env == "preview" || var.env == "spreview") ? (var.env == "preview" ) ? "aat" : "saat" : var.env
local_env = (var.env == "preview" || var.env == "spreview") ? (var.env == "preview") ? "aat" : "saat" : var.env

// Vault name
previewVaultName = join("-", [var.raw_product, "aat"])
previewVaultName = join("-", [var.raw_product, "aat"])
nonPreviewVaultName = join("-", [var.raw_product, var.env])
vaultName = (var.env == "preview" || var.env == "spreview") ? local.previewVaultName : local.nonPreviewVaultName
vaultName = (var.env == "preview" || var.env == "spreview") ? local.previewVaultName : local.nonPreviewVaultName

// Shared Resource Group
previewResourceGroup = join("-", [var.raw_product, "shared-infrastructure-aat"])
previewResourceGroup = join("-", [var.raw_product, "shared-infrastructure-aat"])
nonPreviewResourceGroup = join("-", [var.raw_product, "shared-infrastructure", var.env])
sharedResourceGroup = (var.env == "preview" || var.env == "spreview") ? local.previewResourceGroup : local.nonPreviewResourceGroup
sharedResourceGroup = (var.env == "preview" || var.env == "spreview") ? local.previewResourceGroup : local.nonPreviewResourceGroup
}

data "azurerm_key_vault" "am_key_vault" {
Expand All @@ -25,86 +25,86 @@ data "azurerm_key_vault" "s2s_vault" {
}

data "azurerm_key_vault_secret" "s2s_secret" {
name = "microservicekey-am-org-role-mapping-service"
key_vault_id = data.azurerm_key_vault.s2s_vault.id
name = "microservicekey-am-org-role-mapping-service"
key_vault_id = data.azurerm_key_vault.s2s_vault.id
}

resource "azurerm_key_vault_secret" "am_org-role-mapping_service_s2s_secret" {
name = "am-org-role-mapping-service-s2s-secret"
value = data.azurerm_key_vault_secret.s2s_secret.value
key_vault_id = data.azurerm_key_vault.am_key_vault.id
name = "am-org-role-mapping-service-s2s-secret"
value = data.azurerm_key_vault_secret.s2s_secret.value
key_vault_id = data.azurerm_key_vault.am_key_vault.id
}

////////////////////////////////
// Populate Vault with DB info
////////////////////////////////

resource "azurerm_key_vault_secret" "POSTGRES-PASS" {
name = join("-", [var.component, "POSTGRES-PASS"])
value = module.org-role-mapping-database-v15.password
key_vault_id = data.azurerm_key_vault.am_key_vault.id
name = join("-", [var.component, "POSTGRES-PASS"])
value = module.org-role-mapping-database-v15.password
key_vault_id = data.azurerm_key_vault.am_key_vault.id
}

resource "azurerm_key_vault_secret" "POSTGRES-USER" {
name = join("-", [var.component, "POSTGRES-USER"])
value = module.org-role-mapping-database-v15.username
key_vault_id = data.azurerm_key_vault.am_key_vault.id
name = join("-", [var.component, "POSTGRES-USER"])
value = module.org-role-mapping-database-v15.username
key_vault_id = data.azurerm_key_vault.am_key_vault.id
}

resource "azurerm_key_vault_secret" "POSTGRES_HOST" {
name = join("-", [var.component, "POSTGRES-HOST"])
value = module.org-role-mapping-database-v15.fqdn
key_vault_id = data.azurerm_key_vault.am_key_vault.id
name = join("-", [var.component, "POSTGRES-HOST"])
value = module.org-role-mapping-database-v15.fqdn
key_vault_id = data.azurerm_key_vault.am_key_vault.id
}

resource "azurerm_key_vault_secret" "POSTGRES_PORT" {
name = join("-", [var.component, "POSTGRES-PORT"])
value = "5432"
key_vault_id = data.azurerm_key_vault.am_key_vault.id
name = join("-", [var.component, "POSTGRES-PORT"])
value = "5432"
key_vault_id = data.azurerm_key_vault.am_key_vault.id
}

resource "azurerm_key_vault_secret" "POSTGRES_DATABASE" {
name = join("-", [var.component, "POSTGRES-DATABASE"])
value = var.database_name
key_vault_id = data.azurerm_key_vault.am_key_vault.id
name = join("-", [var.component, "POSTGRES-DATABASE"])
value = var.database_name
key_vault_id = data.azurerm_key_vault.am_key_vault.id
}

module "org-role-mapping-database-v15" {
source = "git@github.com:hmcts/terraform-module-postgresql-flexible?ref=master"
source = "git@github.com:hmcts/terraform-module-postgresql-flexible?ref=master"

providers = {
azurerm.postgres_network = azurerm.postgres_network
}
azurerm.postgres_network = azurerm.postgres_network
}

admin_user_object_id = var.jenkins_AAD_objectId
business_area = "cft"
name = join("-", [local.app_full_name, "postgres-db", "v15"])
product = var.product
env = var.env
component = var.component
common_tags = var.common_tags
pgsql_version = "15"
pgsql_sku = var.pgsql_sku
name = join("-", [local.app_full_name, "postgres-db", "v15"])
product = var.product
env = var.env
component = var.component
common_tags = var.common_tags
pgsql_version = "15"
pgsql_sku = var.pgsql_sku

# Setup Access Reader db user
force_user_permissions_trigger = "5"

# Sets correct DB owner after migration to fix permissions
enable_schema_ownership = var.enable_schema_ownership
enable_schema_ownership = var.enable_schema_ownership
force_schema_ownership_trigger = "5"
kv_subscription = var.kv_subscription
kv_name = data.azurerm_key_vault.am_key_vault.name
user_secret_name = azurerm_key_vault_secret.POSTGRES-USER.name
pass_secret_name = azurerm_key_vault_secret.POSTGRES-PASS.name
kv_subscription = var.kv_subscription
kv_name = data.azurerm_key_vault.am_key_vault.name
user_secret_name = azurerm_key_vault_secret.POSTGRES-USER.name
pass_secret_name = azurerm_key_vault_secret.POSTGRES-PASS.name

# The original subnet is full, this is required to use the new subnet for new databases
subnet_suffix = "expanded"

pgsql_databases = [
{
name = var.database_name
}
]
{
name = var.database_name
}
]

pgsql_server_configuration = [
{
Expand Down
2 changes: 1 addition & 1 deletion infrastructure/output.tf
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
output "env" {
value = "${var.env}"
value = var.env
}
4 changes: 2 additions & 2 deletions infrastructure/terraform.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ terraform {

required_providers {
azurerm = {
source = "hashicorp/azurerm"
source = "hashicorp/azurerm"
version = "~> 3.105.0"
}
azuread = {
source = "hashicorp/azuread"
version = "2.48.0"
version = "2.53.0"
}
}
}
2 changes: 1 addition & 1 deletion infrastructure/variables.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ variable "subscription" {
}

variable "common_tags" {
type = map(string)
type = map(string)
}

////////////////////////////////
Expand Down

0 comments on commit 4de12db

Please sign in to comment.