Use different IDs for HYBRID test storage profiles.

chenkins · chenkins · commit 4d16c6533648 · 2025-10-27T17:28:47.000+01:00
diff --git a/hub/src/test/java/cloud/katta/core/AbstractHubSynchronizeTest.java b/hub/src/test/java/cloud/katta/core/AbstractHubSynchronizeTest.java
@@ -190,16 +190,16 @@ public void test01Bootstrapping(final HubTestConfig hubTestConfig) throws Except
                     .apiStorageprofileGet(false);
             // aws static
             assertTrue(storageProfileDtos.stream().anyMatch(storageProfileDto -> StorageProfileDtoWrapper.coerce(storageProfileDto).getId().toString()
-                    .equals("72736c19-283c-49d3-80a5-ab74b5202543")));
+                    .startsWith("72736c19-283c-49d3-80a5-ab74b520254")));
             // aws sts
             assertTrue(storageProfileDtos.stream().anyMatch(storageProfileDto -> StorageProfileDtoWrapper.coerce(storageProfileDto).getId().toString()
-                    .equals("844bd517-96d4-4787-bcfa-238e103149f6")));
+                    .startsWith("844bd517-96d4-4787-bcfa-238e103149f")));
             // minio static
             assertTrue(storageProfileDtos.stream().anyMatch(storageProfileDto -> StorageProfileDtoWrapper.coerce(storageProfileDto).getId().toString()
-                    .equals("71b910e0-2ecc-46de-a871-8db28549677e")));
+                    .startsWith("71b910e0-2ecc-46de-a871-8db28549677")));
             // minio sts
             assertTrue(storageProfileDtos.stream().anyMatch(storageProfileDto -> StorageProfileDtoWrapper.coerce(storageProfileDto).getId().toString()
-                    .equals("732d43fa-3716-46c4-b931-66ea5405ef1c")));
+                    .startsWith("732d43fa-3716-46c4-b931-66ea5405ef1")));
         }
         catch(ApiException e) {
             log.error("{} {}", e.getCode(), e.getMessage(), e);
diff --git a/hub/src/test/java/cloud/katta/testsetup/AbstractHubTest.java b/hub/src/test/java/cloud/katta/testsetup/AbstractHubTest.java
@@ -108,20 +108,20 @@ public abstract class AbstractHubTest extends VaultTest {
 
 
     public static final Arguments HYBRID_MINIO_STATIC = prepareArgumentsHybrid.apply(new HubTestConfig.VaultSpec(
-            "MinIO static", "71B910E0-2ECC-46DE-A871-8DB28549677E", PROPERTIES.get("minio.testing.katta.cloud.handmade_access_user.name"), PROPERTIES.get("minio.testing.katta.cloud.handmade_access_user.password"), "us-east-1"
+            "MinIO static", "71B910E0-2ECC-46DE-A871-8DB285496779", PROPERTIES.get("minio.testing.katta.cloud.handmade_access_user.name"), PROPERTIES.get("minio.testing.katta.cloud.handmade_access_user.password"), "us-east-1"
     ));
     public static final Arguments HYBRID_MINIO_STS = prepareArgumentsHybrid.apply(new HubTestConfig.VaultSpec(
-            "MinIO STS", "732D43FA-3716-46C4-B931-66EA5405EF1C", null, null, "eu-central-1"
+            "MinIO STS", "732D43FA-3716-46C4-B931-66EA5405EF19", null, null, "eu-central-1"
     ));
 
     public static final Arguments HYBRID_AWS_STATIC = prepareArgumentsHybrid.apply(new HubTestConfig.VaultSpec(
-            "AWS static", "72736C19-283C-49D3-80A5-AB74B5202543", PROPERTIES.get("handmade2.s3.amazonaws.com.username"), PROPERTIES.get("handmade2.s3.amazonaws.com.password"),
+            "AWS static", "72736C19-283C-49D3-80A5-AB74B5202549", PROPERTIES.get("handmade2.s3.amazonaws.com.username"), PROPERTIES.get("handmade2.s3.amazonaws.com.password"),
             // TODO https://github.com/shift7-ch/katta-server/issues/87
             // "eu-north-1"
             "us-east-1"
     ));
     public static final Arguments HYBRID_AWS_STS = prepareArgumentsHybrid.apply(new HubTestConfig.VaultSpec(
-            "AWS STS", "844BD517-96D4-4787-BCFA-238E103149F6", null, null, "eu-west-1"
+            "AWS STS", "844BD517-96D4-4787-BCFA-238E103149F9", null, null, "eu-west-1"
     ));
 
     @BeforeEach
diff --git a/hub/src/test/resources/setup/hybrid/aws_static/aws_static_profile.json b/hub/src/test/resources/setup/hybrid/aws_static/aws_static_profile.json
@@ -1,5 +1,5 @@
 {
-    "id": "72736C19-283C-49D3-80A5-AB74B5202543",
+    "id": "72736C19-283C-49D3-80A5-AB74B5202549",
     "name": "AWS S3 static",
     "region": "eu-north-1",
     "protocol": "S3",
diff --git a/hub/src/test/resources/setup/hybrid/aws_sts/aws_sts_profile.json b/hub/src/test/resources/setup/hybrid/aws_sts/aws_sts_profile.json
@@ -1,5 +1,5 @@
 {
-    "id": "844BD517-96D4-4787-BCFA-238E103149F6",
+    "id": "844BD517-96D4-4787-BCFA-238E103149F9",
     "name": "AWS S3 STS",
     "bucketPrefix": "katta-test-",
     "stsRoleArnHub": "arn:aws:iam::430118840017:role/testing.katta.cloud-kc-realms-chipotle-createbucket",
diff --git a/hub/src/test/resources/setup/hybrid/minio_static/minio_static_profile.json b/hub/src/test/resources/setup/hybrid/minio_static/minio_static_profile.json
@@ -1,5 +1,5 @@
 {
-    "id": "71B910E0-2ECC-46DE-A871-8DB28549677E",
+    "id": "71B910E0-2ECC-46DE-A871-8DB285496779",
     "name": "MinIO S3 static",
     "protocol": "S3",
     "withPathStyleAccessEnabled": "true",
diff --git a/hub/src/test/resources/setup/hybrid/minio_sts/minio_sts_profile.json b/hub/src/test/resources/setup/hybrid/minio_sts/minio_sts_profile.json
@@ -1,5 +1,5 @@
 {
-    "id": "732D43FA-3716-46C4-B931-66EA5405EF1C",
+    "id": "732D43FA-3716-46C4-B931-66EA5405EF19",
     "name": "MinIO S3 STS",
     "bucketPrefix": "katta-test-",
     "region": "eu-central-1",

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "id": "72736C19-283C-49D3-80A5-AB74B5202543",`
	`2`	`+ "id": "72736C19-283C-49D3-80A5-AB74B5202549",`
`3`	`3`	`"name": "AWS S3 static",`
`4`	`4`	`"region": "eu-north-1",`
`5`	`5`	`"protocol": "S3",`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "id": "844BD517-96D4-4787-BCFA-238E103149F6",`
	`2`	`+ "id": "844BD517-96D4-4787-BCFA-238E103149F9",`
`3`	`3`	`"name": "AWS S3 STS",`
`4`	`4`	`"bucketPrefix": "katta-test-",`
`5`	`5`	`"stsRoleArnHub": "arn:aws:iam::430118840017:role/testing.katta.cloud-kc-realms-chipotle-createbucket",`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "id": "71B910E0-2ECC-46DE-A871-8DB28549677E",`
	`2`	`+ "id": "71B910E0-2ECC-46DE-A871-8DB285496779",`
`3`	`3`	`"name": "MinIO S3 static",`
`4`	`4`	`"protocol": "S3",`
`5`	`5`	`"withPathStyleAccessEnabled": "true",`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "id": "732D43FA-3716-46C4-B931-66EA5405EF1C",`
	`2`	`+ "id": "732D43FA-3716-46C4-B931-66EA5405EF19",`
`3`	`3`	`"name": "MinIO S3 STS",`
`4`	`4`	`"bucketPrefix": "katta-test-",`
`5`	`5`	`"region": "eu-central-1",`