Skip to content

Commit e4bf2b4

Browse files
Move KMS integration tests to use keyring in da-cn-splice (#1123) (#1261)
Backports #1123 as part of DACH-NY/canton-network-internal#347 (comment) Signed-off-by: Martin Florian <martin.florian@digitalasset.com>
1 parent a524ecf commit e4bf2b4

File tree

4 files changed

+19
-18
lines changed

4 files changed

+19
-18
lines changed

apps/app/src/test/resources/dumps/alice-kms-id-identity-dump.json

Lines changed: 7 additions & 7 deletions
Large diffs are not rendered by default.

apps/app/src/test/resources/dumps/sv2-kms-id-identity-dump.json

Lines changed: 6 additions & 6 deletions
Large diffs are not rendered by default.

apps/app/src/test/scala/org/lfdecentralizedtrust/splice/integration/tests/ParticipantKmsIdentitiesIntegrationTest.scala

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ class ParticipantKmsIdentitiesIntegrationTest extends IntegrationTest with Stand
3131
.addConfigTransforms(
3232
(_, conf) => ConfigTransforms.bumpCantonPortsBy(22_000)(conf),
3333
(_, conf) => ConfigTransforms.bumpCantonDomainPortsBy(22_000)(conf),
34-
// comment this to generate a fresh dump with fresh keys
3534
(_, conf) =>
3635
updateAllValidatorConfigs { case (name, c) =>
3736
if (name == "aliceValidator") {
3837
c.copy(
3938
domains = c.domains.copy(extra = Seq.empty),
39+
// comment this to generate a fresh dump with fresh keys
4040
participantBootstrappingDump = Some(
4141
ParticipantBootstrapDumpConfig
4242
.File(
@@ -98,8 +98,8 @@ class ParticipantKmsIdentitiesIntegrationTest extends IntegrationTest with Stand
9898
"EXTRA_PARTICIPANT_DB" -> ("participant_extra_" + dbsSuffix),
9999
"KMS_TYPE" -> "gcp",
100100
"KMS_LOCATION_ID" -> "us-central1",
101-
"KMS_PROJECT_ID" -> "da-cn-shared",
102-
"KMS_KEY_RING_ID" -> "kms-ci",
101+
"KMS_PROJECT_ID" -> "da-cn-splice",
102+
"KMS_KEY_RING_ID" -> "integration-tests",
103103
),
104104
)() {
105105
startAllSync(sv1Backend, sv1ScanBackend, sv1ValidatorBackend)
@@ -169,8 +169,8 @@ class ParticipantKmsIdentitiesIntegrationTest extends IntegrationTest with Stand
169169
)(
170170
"KMS_TYPE" -> "gcp",
171171
"KMS_LOCATION_ID" -> "us-central1",
172-
"KMS_PROJECT_ID" -> "da-cn-shared",
173-
"KMS_KEY_RING_ID" -> "kms-ci",
172+
"KMS_PROJECT_ID" -> "da-cn-splice",
173+
"KMS_KEY_RING_ID" -> "integration-tests",
174174
) {
175175
startAllSync(sv1Backend, sv1ScanBackend, sv1ValidatorBackend)
176176

scripts/check-repo-names.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ function check_patterns_locally() {
4747
'SpliceTests\.scala.*getMeterProvider\.get."cn_tests"' # test metrics
4848
'^[^:]+package-lock\.json:.*"integrity"' # appears in hashes
4949
'Preflight.*Test.*\.scala:.*s"https://cns' # hostnames in preflights
50+
'Test.*\.scala:.*da-cn-splice' # GCP project we use for KMS keys used in integration tests
5051
'cluster/images/splice-test-temp-runner-hook/index.js' # gha-runner-hook copied over
5152
'apps/app/src/test/resources/dumps/.*-identity-dump.json' # encoded snapshots can randomly contain 'cn'
5253
'token-standard/CHANGELOG.md'

0 commit comments

Comments
 (0)