summaryrefslogtreecommitdiffstats
path: root/controller-server
diff options
context:
space:
mode:
authorValerij Fredriksen <freva@users.noreply.github.com>2023-08-07 15:12:17 +0200
committerGitHub <noreply@github.com>2023-08-07 15:12:17 +0200
commit0c7f184f640ff6e8bb5ae92a990f44c83854fab9 (patch)
tree0532700303e7b5e811ca5d6618a9d958470cb3bf /controller-server
parent241e9b5509d89f4442d50ae3ae3fe0baf8b879a0 (diff)
Revert "Require GCP cloud account explicitly prefixed with cloud name"
Diffstat (limited to 'controller-server')
-rw-r--r--controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/ArchiveBucketsSerializerTest.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/ArchiveBucketsSerializerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/ArchiveBucketsSerializerTest.java
index 2e308e926b0..1d1b1124d22 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/ArchiveBucketsSerializerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/ArchiveBucketsSerializerTest.java
@@ -20,8 +20,8 @@ public class ArchiveBucketsSerializerTest {
ArchiveBuckets archiveBuckets = new ArchiveBuckets(
Set.of(new VespaManagedArchiveBucket("bucket1Name", "key1Arn").withTenants(Set.of(TenantName.from("t1"), TenantName.from("t2"))),
new VespaManagedArchiveBucket("bucket2Name", "key2Arn").withTenant(TenantName.from("t3"))),
- Set.of(new TenantManagedArchiveBucket("bucket3Name", CloudAccount.from("gcp:acct-1"), Instant.ofEpochMilli(1234)),
- new TenantManagedArchiveBucket("bucket4Name", CloudAccount.from("gcp:acct-2"), Instant.ofEpochMilli(5678))));
+ Set.of(new TenantManagedArchiveBucket("bucket3Name", CloudAccount.from("acct-1"), Instant.ofEpochMilli(1234)),
+ new TenantManagedArchiveBucket("bucket4Name", CloudAccount.from("acct-2"), Instant.ofEpochMilli(5678))));
assertEquals(archiveBuckets, ArchiveBucketsSerializer.fromSlime(ArchiveBucketsSerializer.toSlime(archiveBuckets)));
}