Skip to content

Commit 82d6f89

Browse files
Revert "Add trigger for periodic topology snapshots" (#3286)
* Revert "Add trigger for periodic topology snapshots (#3188)" This reverts commit f289b6e. Signed-off-by: Oriol Muñoz <oriol.munoz@digitalasset.com> * [ci] run Signed-off-by: Oriol Muñoz <oriol.munoz@digitalasset.com> --------- Signed-off-by: Oriol Muñoz <oriol.munoz@digitalasset.com>
1 parent 1d7c997 commit 82d6f89

File tree

30 files changed

+50
-648
lines changed

30 files changed

+50
-648
lines changed
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
# This is deliberately lower than ConsoleCommandTimeout.defaultRequestTimeout
22
pekko.http.server.request-timeout = 38 seconds
33
pekko.http.server.parsing.error-handler="org.lfdecentralizedtrust.splice.http.PekkoHttpParsingErrorHandler$"
4-
pekko.http.server.parsing.ignore-illegal-header-for = ["user-agent", "etag"]
5-
pekko.http.client.parsing.ignore-illegal-header-for = ["etag"]
4+
pekko.http.server.parsing.ignore-illegal-header-for = ["user-agent"]

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import org.lfdecentralizedtrust.splice.config.{
44
BackupDumpConfig,
55
ConfigTransforms,
66
GcpBucketConfig,
7-
IdentityDumpTest,
87
PeriodicBackupDumpConfig,
98
}
109
import org.lfdecentralizedtrust.splice.identities.NodeIdentitiesDump
@@ -99,7 +98,7 @@ final class DirectoryPeriodicBackupIntegrationTest
9998
final class GcpBucketPeriodicBackupIntegrationTest
10099
extends PeriodicBackupIntegrationTestBase[BackupDumpConfig.Gcp] {
101100
override def backupDumpLocation =
102-
BackupDumpConfig.Gcp(GcpBucketConfig.inferForTesting(IdentityDumpTest), None)
101+
BackupDumpConfig.Gcp(GcpBucketConfig.inferForTesting, None)
103102
val bucket = new GcpBucket(backupDumpLocation.bucket, loggerFactory)
104103
override def readDump(filename: String) = {
105104
bucket.readStringFromBucket(Paths.get(filename))

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

Lines changed: 0 additions & 78 deletions
This file was deleted.

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
package org.lfdecentralizedtrust.splice.integration.tests.runbook
22

3-
import org.lfdecentralizedtrust.splice.config.IdentityDump
43
import org.lfdecentralizedtrust.splice.integration.EnvironmentDefinition
54
import org.lfdecentralizedtrust.splice.integration.tests.SpliceTests.{
6-
IntegrationTestWithSharedEnvironment,
75
SpliceTestConsoleEnvironment,
6+
IntegrationTestWithSharedEnvironment,
87
}
98
import org.lfdecentralizedtrust.splice.util.DataExportTestUtil
109

@@ -42,11 +41,11 @@ final class NonDsoNonDevNetPreflightIntegrationTest
4241
}
4342

4443
"Check that there is a recent participant identities backup on GCP for validator1" in { _ =>
45-
testRecentParticipantIdentitiesDump("validator1", IdentityDump)
44+
testRecentParticipantIdentitiesDump("validator1")
4645
}
4746

4847
"Check that there is a recent participant identities backup on GCP for splitwell validator" in {
4948
_ =>
50-
testRecentParticipantIdentitiesDump("splitwell", IdentityDump)
49+
testRecentParticipantIdentitiesDump("splitwell")
5150
}
5251
}

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
package org.lfdecentralizedtrust.splice.integration.tests.runbook
22

3-
import org.lfdecentralizedtrust.splice.config.IdentityDump
43
import org.lfdecentralizedtrust.splice.integration.EnvironmentDefinition
54
import org.lfdecentralizedtrust.splice.integration.tests.SpliceTests.SpliceTestConsoleEnvironment
65
import org.lfdecentralizedtrust.splice.integration.tests.FrontendIntegrationTestWithSharedEnvironment
76
import org.lfdecentralizedtrust.splice.util.DataExportTestUtil
8-
import org.lfdecentralizedtrust.splice.util.FrontendLoginUtil
97

8+
import org.lfdecentralizedtrust.splice.util.FrontendLoginUtil
109
import scala.util.Try
1110

1211
abstract class SvNonDevNetPreflightIntegrationTestBase
@@ -114,7 +113,7 @@ abstract class SvNonDevNetPreflightIntegrationTestBase
114113
}
115114

116115
"Check that there is a recent participant identities backup on GCP" in { _ =>
117-
testRecentParticipantIdentitiesDump(svNamespace, IdentityDump)
116+
testRecentParticipantIdentitiesDump(svNamespace)
118117
}
119118
}
120119

apps/app/src/test/scala/org/lfdecentralizedtrust/splice/util/DataExportTestUtil.scala

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.lfdecentralizedtrust.splice.util
22

3-
import org.lfdecentralizedtrust.splice.config.{BucketName, GcpBucketConfig}
3+
import org.lfdecentralizedtrust.splice.config.GcpBucketConfig
44
import org.lfdecentralizedtrust.splice.identities.{NodeIdentitiesDump, NodeIdentitiesStore}
55
import org.lfdecentralizedtrust.splice.integration.tests.SpliceTests.TestCommon
66
import com.digitalasset.canton.topology.ParticipantId
@@ -15,9 +15,8 @@ trait DataExportTestUtil extends TestCommon {
1515
namespace: String,
1616
getFileName: Instant => Path,
1717
decode: String => Either[String, A],
18-
bucketName: BucketName,
1918
) = {
20-
val bucket = new GcpBucket(GcpBucketConfig.inferForCluster(bucketName), loggerFactory)
19+
val bucket = new GcpBucket(GcpBucketConfig.inferForCluster, loggerFactory)
2120
import java.time.Instant
2221
import java.time.temporal.ChronoUnit
2322
val cluster = sys.env("GCP_CLUSTER_BASENAME")
@@ -34,11 +33,10 @@ trait DataExportTestUtil extends TestCommon {
3433
}
3534
}
3635

37-
def testRecentParticipantIdentitiesDump(namespace: String, bucketName: BucketName) =
36+
def testRecentParticipantIdentitiesDump(namespace: String) =
3837
testRecentDump(
3938
namespace,
4039
NodeIdentitiesStore.dumpFilename(_),
4140
NodeIdentitiesDump.fromJsonString(ParticipantId.tryFromProtoPrimitive, _),
42-
bucketName,
4341
)
4442
}

apps/common/src/main/scala/org/lfdecentralizedtrust/splice/config/GcpConfig.scala

Lines changed: 4 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -48,36 +48,16 @@ final case class GcpBucketConfig(
4848
def description: String = s"GCP bucket $bucketName in project $projectId"
4949
}
5050

51-
sealed trait BucketName {
52-
def value: String
53-
}
54-
55-
case object IdentityDumpTest extends BucketName {
56-
val value: String = "da-splice-identity-dumps"
57-
}
58-
59-
case object TopologySnapshotTest extends BucketName {
60-
val value: String = "da-splice-topology-snapshots"
61-
}
62-
63-
case object IdentityDump extends BucketName {
64-
val value: String = "da-cn-data-dumps"
65-
}
66-
67-
case object TopologySnapshot extends BucketName {
68-
val value: String = "da-cn-topology-snapshots"
69-
}
70-
7151
object GcpBucketConfig {
72-
def inferForTesting(testBucketName: BucketName): GcpBucketConfig =
52+
def inferForTesting: GcpBucketConfig =
7353
infer(
7454
"GCP_DATA_EXPORT_INTEGRATION_TEST_SERVICE_ACCOUNT_CREDENTIALS",
7555
"da-cn-splice",
76-
testBucketName.value,
56+
"da-splice-identity-dumps",
7757
)
7858

79-
def inferForCluster(bucketName: BucketName): GcpBucketConfig =
80-
infer("GCP_DATA_DUMP_BUCKET_SERVICE_ACCOUNT_CREDENTIALS", "da-cn-devnet", bucketName.value)
59+
def inferForCluster: GcpBucketConfig =
60+
infer("GCP_DATA_DUMP_BUCKET_SERVICE_ACCOUNT_CREDENTIALS", "da-cn-devnet", "da-cn-data-dumps")
8161

8262
def inferForBundles: GcpBucketConfig =
8363
infer(

0 commit comments

Comments
 (0)