Skip to content

Commit dea893b

Browse files
committed
better subdomain collision message
1 parent bb36180 commit dea893b

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/main/java/com/redhat/labs/lodestar/hosting/service/HostingService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ public String updateHosting(String engagementUuid, List<HostingEnvironment> host
189189
}
190190

191191
if(hostingEnv.getOcpSubDomain() != null && !isValidSubdomain(engagementUuid, hostingEnv.getOcpSubDomain())) {
192-
String message = String.format("Subdomain name %s is invalid", hostingEnv.getOcpSubDomain());
192+
String message = String.format("Subdomain %s has been taken by another engagement", hostingEnv.getOcpSubDomain());
193193
throw new WebApplicationException(Response.status(409).entity(Map.of("lodestarMessage", message)).build());
194194
}
195195
fillOutHostingEnvironment(hostingEnv, engagement.getUuid(), engagement.getRegion(), engagement.getProjectId());

src/test/java/com/redhat/labs/lodestar/hosting/resource/HostingResourceTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ void testUsedSubdomainUpdateByUuid() {
6161
he.get(0).setOcpSubDomain("red-1");
6262

6363
given().contentType(ContentType.JSON).pathParam("engagementUuid", "second").body(he).put("/engagements/{engagementUuid}").then()
64-
.statusCode(409).body("lodestarMessage", equalTo("Subdomain name red-1 is invalid"));
64+
.statusCode(409).body("lodestarMessage", equalTo("Subdomain red-1 has been taken by another engagement"));
6565
}
6666

6767
@Test

0 commit comments

Comments
 (0)