Skip to content

Commit 80500d6

Browse files
authored
domain-dependency-list - return 404 for unknown domains (#3186)
Signed-off-by: Henry Avetisyan <hga@yahooinc.com>
1 parent 9caa032 commit 80500d6

File tree

2 files changed

+13
-2
lines changed

2 files changed

+13
-2
lines changed

servers/zms/src/main/java/com/yahoo/athenz/zms/ZMSImpl.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12801,6 +12801,10 @@ public ServiceIdentityList getDependentServiceList(ResourceContext ctx, String d
1280112801
String serviceDomainName = domainName.toLowerCase();
1280212802
setRequestDomain(ctx, serviceDomainName);
1280312803

12804+
if (dbService.getDomain(serviceDomainName, false) == null) {
12805+
throw ZMSUtils.notFoundError("No such domain: " + serviceDomainName, caller);
12806+
}
12807+
1280412808
// first let's get the service dependencies from our own database
1280512809

1280612810
ServiceIdentityList services = dbService.listServiceDependencies(serviceDomainName);

servers/zms/src/test/java/com/yahoo/athenz/zms/DomainDependencyTest.java

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -463,8 +463,15 @@ public void testDomainNotFound() {
463463
ZMSImpl zmsImpl = zmsTestInitializer.zmsInit();
464464
RsrcCtxWrapper ctx = zmsTestInitializer.getMockDomRsrcCtx();
465465

466-
ServiceIdentityList dependentServiceList = zmsImpl.getDependentServiceList(ctx, "some.unknown.domain");
467-
assertTrue(dependentServiceList.getNames().isEmpty());
466+
// asking for domain dependency on a non-existent domain should return 404 not found exception
467+
468+
try {
469+
zmsImpl.getDependentServiceList(ctx, "some.unknown.domain");
470+
fail();
471+
} catch (ResourceException ex) {
472+
assertEquals(ex.getCode(), 404);
473+
assertTrue(ex.getMessage().contains("No such domain: some.unknown.domain"));
474+
}
468475
}
469476

470477
@Test

0 commit comments

Comments
 (0)