FACT-1613 support public keys both suppliers #2182

joshblackmoor · 2024-02-19T13:22:00Z

JIRA link (if applicable)

https://tools.hmcts.net/jira/browse/FACT-1613

Change description

Added support of public keys from both suppliers.

Does this PR introduce a breaking change? (check one with "x")

[ ] Yes
[x] No

…er things that can be thrown

…liers

…1698-renovate-updates # Conflicts: # infrastructure/state.tf

…-blob-12.x' into FACT-1698-renovate-updates

…e-10.x' into FACT-1698-renovate-updates

…x' into FACT-1698-renovate-updates

…698-renovate-updates

…o FACT-1698-renovate-updates" This reverts commit 1d3970e, reversing changes made to b4a3a4e.

…ql-42.x' into FACT-1698-renovate-updates # Conflicts: # build.gradle

…n-databind

…ic-keys-both-suppliers

hmcts-jenkins-a-to-c · 2024-05-02T10:28:38Z

Plan Result (aat)

Plan: 0 to add, 10 to change, 0 to destroy.

Update
- azurerm_key_vault_secret.flexible_secret_staging["host"]
- azurerm_key_vault_secret.flexible_secret_staging["name"]
- azurerm_key_vault_secret.flexible_secret_staging["password"]
- azurerm_key_vault_secret.flexible_secret_staging["port"]
- azurerm_key_vault_secret.flexible_secret_staging["user"]
- azurerm_key_vault_secret.flexible_secret_standard_format["DATABASE"]
- azurerm_key_vault_secret.flexible_secret_standard_format["HOST"]
- azurerm_key_vault_secret.flexible_secret_standard_format["PASS"]
- azurerm_key_vault_secret.flexible_secret_standard_format["PORT"]
- azurerm_key_vault_secret.flexible_secret_standard_format["USER"]

Change Result (Click me)

  # azurerm_key_vault_secret.flexible_secret_staging["host"] will be updated in-place
  ~ resource "azurerm_key_vault_secret" "flexible_secret_staging" {
      ~ expiration_date         = "2026-05-17T08:46:40Z" -> (known after apply)
        id                      = "https://reform-scan-aat.vault.azure.net/secrets/blob-router-staging-flexible-db-host/51af603b98ee42aca7cf2631adc3bbe0"
        name                    = "blob-router-staging-flexible-db-host"
        tags                    = {
            "application"         = "bulk-scan-print"
            "autoShutdown"        = "true"
            "builtFrom"           = "https://github.com/HMCTS/blob-router-service.git"
            "businessArea"        = "CFT"
            "contactSlackChannel" = "#rbs"
            "environment"         = "staging"
            "managedBy"           = "Bulk Scanning and Printing"
            "source"              = "blob-router PostgreSQL"
        }
        # (6 unchanged attributes hidden)
    }

  # azurerm_key_vault_secret.flexible_secret_staging["name"] will be updated in-place
  ~ resource "azurerm_key_vault_secret" "flexible_secret_staging" {
      ~ expiration_date         = "2026-05-17T08:46:40Z" -> (known after apply)
        id                      = "https://reform-scan-aat.vault.azure.net/secrets/blob-router-staging-flexible-db-name/1b3b5c5e0c554eb89a60aef83a27c8cb"
        name                    = "blob-router-staging-flexible-db-name"
        tags                    = {
            "application"         = "bulk-scan-print"
            "autoShutdown"        = "true"
            "builtFrom"           = "https://github.com/HMCTS/blob-router-service.git"
            "businessArea"        = "CFT"
            "contactSlackChannel" = "#rbs"
            "environment"         = "staging"
            "managedBy"           = "Bulk Scanning and Printing"
            "source"              = "blob-router PostgreSQL"
        }
        # (6 unchanged attributes hidden)
    }

  # azurerm_key_vault_secret.flexible_secret_staging["password"] will be updated in-place
  ~ resource "azurerm_key_vault_secret" "flexible_secret_staging" {
      ~ expiration_date         = "2026-05-17T08:46:40Z" -> (known after apply)
        id                      = "https://reform-scan-aat.vault.azure.net/secrets/blob-router-staging-flexible-db-password/f4dab7117dd94d0c917122dc8264f07f"
        name                    = "blob-router-staging-flexible-db-password"
        tags                    = {
            "application"         = "bulk-scan-print"
            "autoShutdown"        = "true"
            "builtFrom"           = "https://github.com/HMCTS/blob-router-service.git"
            "businessArea"        = "CFT"
            "contactSlackChannel" = "#rbs"
            "environment"         = "staging"
            "managedBy"           = "Bulk Scanning and Printing"
            "source"              = "blob-router PostgreSQL"
        }
        # (6 unchanged attributes hidden)
    }

  # azurerm_key_vault_secret.flexible_secret_staging["port"] will be updated in-place
  ~ resource "azurerm_key_vault_secret" "flexible_secret_staging" {
      ~ expiration_date         = "2026-05-17T08:46:40Z" -> (known after apply)
        id                      = "https://reform-scan-aat.vault.azure.net/secrets/blob-router-staging-flexible-db-port/3f6911f2652641e28c00c0f7617e8352"
        name                    = "blob-router-staging-flexible-db-port"
        tags                    = {
            "application"         = "bulk-scan-print"
            "autoShutdown"        = "true"
            "builtFrom"           = "https://github.com/HMCTS/blob-router-service.git"
            "businessArea"        = "CFT"
            "contactSlackChannel" = "#rbs"
            "environment"         = "staging"
            "managedBy"           = "Bulk Scanning and Printing"
            "source"              = "blob-router PostgreSQL"
        }
        # (6 unchanged attributes hidden)
    }

  # azurerm_key_vault_secret.flexible_secret_staging["user"] will be updated in-place
  ~ resource "azurerm_key_vault_secret" "flexible_secret_staging" {
      ~ expiration_date         = "2026-05-17T08:46:40Z" -> (known after apply)
        id                      = "https://reform-scan-aat.vault.azure.net/secrets/blob-router-staging-flexible-db-user/dceb88eefa2e4175b5479e9433a0a42c"
        name                    = "blob-router-staging-flexible-db-user"
        tags                    = {
            "application"         = "bulk-scan-print"
            "autoShutdown"        = "true"
            "builtFrom"           = "https://github.com/HMCTS/blob-router-service.git"
            "businessArea"        = "CFT"
            "contactSlackChannel" = "#rbs"
            "environment"         = "staging"
            "managedBy"           = "Bulk Scanning and Printing"
            "source"              = "blob-router PostgreSQL"
        }
        # (6 unchanged attributes hidden)
    }

  # azurerm_key_vault_secret.flexible_secret_standard_format["DATABASE"] will be updated in-place
  ~ resource "azurerm_key_vault_secret" "flexible_secret_standard_format" {
      ~ expiration_date         = "2026-05-17T08:46:40Z" -> (known after apply)
        id                      = "https://reform-scan-aat.vault.azure.net/secrets/blob-router-POSTGRES-DATABASE/7a0447b3f9f6468e8254dd6cd6a251fe"
        name                    = "blob-router-POSTGRES-DATABASE"
        tags                    = {
            "application"         = "bulk-scan-print"
            "autoShutdown"        = "true"
            "builtFrom"           = "https://github.com/HMCTS/blob-router-service.git"
            "businessArea"        = "CFT"
            "contactSlackChannel" = "#rbs"
            "environment"         = "staging"
            "managedBy"           = "Bulk Scanning and Printing"
            "source"              = "blob-router PostgreSQL"
        }
        # (6 unchanged attributes hidden)
    }

  # azurerm_key_vault_secret.flexible_secret_standard_format["HOST"] will be updated in-place
  ~ resource "azurerm_key_vault_secret" "flexible_secret_standard_format" {
      ~ expiration_date         = "2026-05-17T08:46:40Z" -> (known after apply)
        id                      = "https://reform-scan-aat.vault.azure.net/secrets/blob-router-POSTGRES-HOST/e6389c15635b4b6fb3a25730d66faa8d"
        name                    = "blob-router-POSTGRES-HOST"
        tags                    = {
            "application"         = "bulk-scan-print"
            "autoShutdown"        = "true"
            "builtFrom"           = "https://github.com/HMCTS/blob-router-service.git"
            "businessArea"        = "CFT"
            "contactSlackChannel" = "#rbs"
            "environment"         = "staging"
            "managedBy"           = "Bulk Scanning and Printing"
            "source"              = "blob-router PostgreSQL"
        }
        # (6 unchanged attributes hidden)
    }

  # azurerm_key_vault_secret.flexible_secret_standard_format["PASS"] will be updated in-place
  ~ resource "azurerm_key_vault_secret" "flexible_secret_standard_format" {
      ~ expiration_date         = "2026-05-17T08:46:40Z" -> (known after apply)
        id                      = "https://reform-scan-aat.vault.azure.net/secrets/blob-router-POSTGRES-PASS/7dfccbdee4744013b65f47dcb5e16581"
        name                    = "blob-router-POSTGRES-PASS"
        tags                    = {
            "application"         = "bulk-scan-print"
            "autoShutdown"        = "true"
            "builtFrom"           = "https://github.com/HMCTS/blob-router-service.git"
            "businessArea"        = "CFT"
            "contactSlackChannel" = "#rbs"
            "environment"         = "staging"
            "managedBy"           = "Bulk Scanning and Printing"
            "source"              = "blob-router PostgreSQL"
        }
        # (6 unchanged attributes hidden)
    }

  # azurerm_key_vault_secret.flexible_secret_standard_format["PORT"] will be updated in-place
  ~ resource "azurerm_key_vault_secret" "flexible_secret_standard_format" {
      ~ expiration_date         = "2026-05-17T08:46:40Z" -> (known after apply)
        id                      = "https://reform-scan-aat.vault.azure.net/secrets/blob-router-POSTGRES-PORT/4130bc7a2b324a03b6f605cecd9558da"
        name                    = "blob-router-POSTGRES-PORT"
        tags                    = {
            "application"         = "bulk-scan-print"
            "autoShutdown"        = "true"
            "builtFrom"           = "https://github.com/HMCTS/blob-router-service.git"
            "businessArea"        = "CFT"
            "contactSlackChannel" = "#rbs"
            "environment"         = "staging"
            "managedBy"           = "Bulk Scanning and Printing"
            "source"              = "blob-router PostgreSQL"
        }
        # (6 unchanged attributes hidden)
    }

  # azurerm_key_vault_secret.flexible_secret_standard_format["USER"] will be updated in-place
  ~ resource "azurerm_key_vault_secret" "flexible_secret_standard_format" {
      ~ expiration_date         = "2026-05-17T08:46:40Z" -> (known after apply)
        id                      = "https://reform-scan-aat.vault.azure.net/secrets/blob-router-POSTGRES-USER/030d6661b5ff4e76ba34d7f3918a3609"
        name                    = "blob-router-POSTGRES-USER"
        tags                    = {
            "application"         = "bulk-scan-print"
            "autoShutdown"        = "true"
            "builtFrom"           = "https://github.com/HMCTS/blob-router-service.git"
            "businessArea"        = "CFT"
            "contactSlackChannel" = "#rbs"
            "environment"         = "staging"
            "managedBy"           = "Bulk Scanning and Printing"
            "source"              = "blob-router PostgreSQL"
        }
        # (6 unchanged attributes hidden)
    }

Plan: 0 to add, 10 to change, 0 to destroy.

hmcts-jenkins-a-to-c · 2024-05-02T10:29:11Z

Plan Result (prod)

Plan: 0 to add, 5 to change, 0 to destroy.

Update
- azurerm_key_vault_secret.flexible_secret_standard_format["DATABASE"]
- azurerm_key_vault_secret.flexible_secret_standard_format["HOST"]
- azurerm_key_vault_secret.flexible_secret_standard_format["PASS"]
- azurerm_key_vault_secret.flexible_secret_standard_format["PORT"]
- azurerm_key_vault_secret.flexible_secret_standard_format["USER"]

Change Result (Click me)

  # azurerm_key_vault_secret.flexible_secret_standard_format["DATABASE"] will be updated in-place
  ~ resource "azurerm_key_vault_secret" "flexible_secret_standard_format" {
      ~ expiration_date         = "2026-05-17T08:51:59Z" -> (known after apply)
        id                      = "https://reform-scan-prod.vault.azure.net/secrets/blob-router-POSTGRES-DATABASE/8fcfcc7568314980a0d149fde7581330"
        name                    = "blob-router-POSTGRES-DATABASE"
        tags                    = {
            "application"         = "bulk-scan-print"
            "builtFrom"           = "https://github.com/HMCTS/blob-router-service.git"
            "businessArea"        = "CFT"
            "contactSlackChannel" = "#rbs"
            "environment"         = "production"
            "managedBy"           = "Bulk Scanning and Printing"
            "source"              = "blob-router PostgreSQL"
        }
        # (6 unchanged attributes hidden)
    }

  # azurerm_key_vault_secret.flexible_secret_standard_format["HOST"] will be updated in-place
  ~ resource "azurerm_key_vault_secret" "flexible_secret_standard_format" {
      ~ expiration_date         = "2026-05-17T08:51:59Z" -> (known after apply)
        id                      = "https://reform-scan-prod.vault.azure.net/secrets/blob-router-POSTGRES-HOST/ed980219a91e4a53a32550c8b91bdffb"
        name                    = "blob-router-POSTGRES-HOST"
        tags                    = {
            "application"         = "bulk-scan-print"
            "builtFrom"           = "https://github.com/HMCTS/blob-router-service.git"
            "businessArea"        = "CFT"
            "contactSlackChannel" = "#rbs"
            "environment"         = "production"
            "managedBy"           = "Bulk Scanning and Printing"
            "source"              = "blob-router PostgreSQL"
        }
        # (6 unchanged attributes hidden)
    }

  # azurerm_key_vault_secret.flexible_secret_standard_format["PASS"] will be updated in-place
  ~ resource "azurerm_key_vault_secret" "flexible_secret_standard_format" {
      ~ expiration_date         = "2026-05-17T08:51:59Z" -> (known after apply)
        id                      = "https://reform-scan-prod.vault.azure.net/secrets/blob-router-POSTGRES-PASS/8eb8d92035ca4a98b659a9592856d9a7"
        name                    = "blob-router-POSTGRES-PASS"
        tags                    = {
            "application"         = "bulk-scan-print"
            "builtFrom"           = "https://github.com/HMCTS/blob-router-service.git"
            "businessArea"        = "CFT"
            "contactSlackChannel" = "#rbs"
            "environment"         = "production"
            "managedBy"           = "Bulk Scanning and Printing"
            "source"              = "blob-router PostgreSQL"
        }
        # (6 unchanged attributes hidden)
    }

  # azurerm_key_vault_secret.flexible_secret_standard_format["PORT"] will be updated in-place
  ~ resource "azurerm_key_vault_secret" "flexible_secret_standard_format" {
      ~ expiration_date         = "2026-05-17T08:51:59Z" -> (known after apply)
        id                      = "https://reform-scan-prod.vault.azure.net/secrets/blob-router-POSTGRES-PORT/625ba64f902c483f8454541197005db0"
        name                    = "blob-router-POSTGRES-PORT"
        tags                    = {
            "application"         = "bulk-scan-print"
            "builtFrom"           = "https://github.com/HMCTS/blob-router-service.git"
            "businessArea"        = "CFT"
            "contactSlackChannel" = "#rbs"
            "environment"         = "production"
            "managedBy"           = "Bulk Scanning and Printing"
            "source"              = "blob-router PostgreSQL"
        }
        # (6 unchanged attributes hidden)
    }

  # azurerm_key_vault_secret.flexible_secret_standard_format["USER"] will be updated in-place
  ~ resource "azurerm_key_vault_secret" "flexible_secret_standard_format" {
      ~ expiration_date         = "2026-05-17T08:51:59Z" -> (known after apply)
        id                      = "https://reform-scan-prod.vault.azure.net/secrets/blob-router-POSTGRES-USER/3ee7881662a042839db61e23d65df6bb"
        name                    = "blob-router-POSTGRES-USER"
        tags                    = {
            "application"         = "bulk-scan-print"
            "builtFrom"           = "https://github.com/HMCTS/blob-router-service.git"
            "businessArea"        = "CFT"
            "contactSlackChannel" = "#rbs"
            "environment"         = "production"
            "managedBy"           = "Bulk Scanning and Printing"
            "source"              = "blob-router PostgreSQL"
        }
        # (6 unchanged attributes hidden)
    }

Plan: 0 to add, 5 to change, 0 to destroy.

# Conflicts: # build.gradle # config/owasp/suppressions.xml

renovate bot and others added 14 commits December 13, 2023 13:20

Update Helm release java to v5.0.2

eae0ba1

Bumping chart version/ fixing aliases

791566f

First test code

37272f4

Updated with further code, two public keys working - need to sort oth…

6bf764a

…er things that can be thrown

Working as expected. Tests todo

3c75efa

Update Terraform azuread to v2.47.0

e04d38d

Update dependency hashicorp/terraform to v1.7.3

0563ea2

Merge branch 'master' into FACT-1613-support-public-keys-both-suppliers

039a6b9

Update Terraform azurerm to v3.92.0

2465100

Public keys added, tests fixed

23fec4d

Updated values.yaml for public key

404b367

Bumping chart version/ fixing aliases

3cfe666

Updated props for int tests

966b028

Added another unit test

616b466

hmcts-jenkins-a-to-c bot deployed to preview February 19, 2024 15:10 View deployment

hmcts-jenkins-a-to-c bot added ns:reform-scan prd:reform-scan rel:reform-scan-blob-router-pr-2182 labels Feb 19, 2024

hmcts-jenkins-a-to-c bot deployed to preview February 19, 2024 15:21 View deployment

amstevenson and others added 5 commits March 1, 2024 18:00

code changes for sb3 so far

22f1fb3

updates to build gradle and statement checker class

055fdda

changes, hopefully int tests pass

0763326

Merge branch 'master' into FACT-1613-support-public-keys-both-suppliers

0bd7546

Bumping chart version/ fixing aliases

e9edb16

hmcts-jenkins-a-to-c bot deployed to preview March 12, 2024 14:02 View deployment

Merge branch 'master' into FACT-1613-support-public-keys-both-suppliers

21e220c

hmcts-jenkins-a-to-c bot deployed to preview March 18, 2024 10:05 View deployment

Updated logs for better info

3ccbc57

hmcts-jenkins-a-to-c bot deployed to preview March 18, 2024 11:19 View deployment

Merge branch 'FACT-1580' into FACT-1613-support-public-keys-both-supp…

dd9d011

…liers

RuthKirby and others added 20 commits April 15, 2024 18:25

Merge remote-tracking branch 'origin/renovate/azuread-2.x' into FACT-…

b98ecea

…1698-renovate-updates # Conflicts: # infrastructure/state.tf

Merge remote-tracking branch 'origin/renovate/azurerm-3.x' into FACT-…

effe54c

…1698-renovate-updates # Conflicts: # infrastructure/state.tf

Merge remote-tracking branch 'origin/renovate/com.azure-azure-storage…

d74d8b6

…-blob-12.x' into FACT-1698-renovate-updates

- rollback azure-storage-blob due to breaking changes

b3dd088

Merge remote-tracking branch 'origin/renovate/org.flywaydb-flyway-cor…

d65a4d1

…e-10.x' into FACT-1698-renovate-updates

- attempt fix for upgrading to flyway-core 10.x

3ca143c

Merge remote-tracking branch 'origin/renovate/org.flywaydb.flyway-10.…

b4a3a4e

…x' into FACT-1698-renovate-updates

Merge remote-tracking branch 'origin/renovate/gradle-7.x' into FACT-1…

1d3970e

…698-renovate-updates

revert "Merge remote-tracking branch 'origin/renovate/gradle-7.x' int…

8ea4a3a

…o FACT-1698-renovate-updates" This reverts commit 1d3970e, reversing changes made to b4a3a4e.

Merge remote-tracking branch 'origin/renovate/org.postgresql-postgres…

e9e2973

…ql-42.x' into FACT-1698-renovate-updates # Conflicts: # build.gradle

- manual gradle version upgrade

903a42c

- removes not needed suppressions

c77fd02

- puts back azure suppression

456de77

Merge branch 'master' into FACT-1613-support-public-keys-both-suppliers

2d69b02

Merge branch 'master' into FACT-1698-renovate-updates

2df6507

Merge branch 'master' into FACT-1698-renovate-updates

913f645

- manually updates spring boot and springdoc to bring in newer jackso…

d35241e

…n-databind

- suppress jackson-databind cve

e339b37

Merge branch 'FACT-1698-renovate-updates' into FACT-1613-support-publ…

5309305

…ic-keys-both-suppliers

Bumping chart version/ fixing aliases

d9aa961

hmcts-jenkins-a-to-c bot added the aat/add-or-update label May 2, 2024

hmcts-jenkins-a-to-c bot added the prod/add-or-update label May 2, 2024

hmcts-jenkins-a-to-c bot deployed to preview May 2, 2024 10:29 View deployment

hmcts-jenkins-a-to-c bot deployed to preview May 20, 2024 11:41 View deployment

Merge branch 'master' into FACT-1613-support-public-keys-both-suppliers

0968a1c

hmcts-jenkins-a-to-c bot deployed to preview May 20, 2024 11:57 View deployment

Merge branch 'master' into FACT-1613-support-public-keys-both-suppliers

7c91014

# Conflicts: # build.gradle # config/owasp/suppressions.xml

hmcts-jenkins-a-to-c bot deployed to preview May 30, 2024 10:16 View deployment

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

FACT-1613 support public keys both suppliers #2182

FACT-1613 support public keys both suppliers #2182

joshblackmoor commented Feb 19, 2024

hmcts-jenkins-a-to-c bot commented May 2, 2024 •

edited

hmcts-jenkins-a-to-c bot commented May 2, 2024 •

edited

FACT-1613 support public keys both suppliers #2182

Are you sure you want to change the base?

FACT-1613 support public keys both suppliers #2182

Conversation

joshblackmoor commented Feb 19, 2024

JIRA link (if applicable)

Change description

hmcts-jenkins-a-to-c bot commented May 2, 2024 • edited

Plan Result (aat)

hmcts-jenkins-a-to-c bot commented May 2, 2024 • edited

Plan Result (prod)

hmcts-jenkins-a-to-c bot commented May 2, 2024 •

edited

hmcts-jenkins-a-to-c bot commented May 2, 2024 •

edited