Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

during delete tenancy check the primary db instance #2743

Merged
merged 1 commit into from
Sep 28, 2024
Merged

during delete tenancy check the primary db instance #2743

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions servers/zms/src/main/java/com/yahoo/athenz/zms/DBService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3457,8 +3457,11 @@ DomainList lookupDomainByRole(String roleMember, String roleName) {
}

List<String> listRoles(String domainName) {
return listRoles(domainName, false);
}

try (ObjectStoreConnection con = store.getConnection(true, false)) {
List<String> listRoles(String domainName, boolean readWrite) {
try (ObjectStoreConnection con = store.getConnection(true, readWrite)) {
return con.listRoles(domainName);
}
}
Expand Down Expand Up @@ -9145,7 +9148,11 @@ private boolean processDeleteDomainDependency(ObjectStoreConnection con, String
}

public ServiceIdentityList listServiceDependencies(String domainName) {
try (ObjectStoreConnection con = store.getConnection(true, false)) {
return listServiceDependencies(domainName, false);
}

public ServiceIdentityList listServiceDependencies(String domainName, boolean readWrite) {
try (ObjectStoreConnection con = store.getConnection(true, readWrite)) {
ServiceIdentityList serviceIdentityList = new ServiceIdentityList();
serviceIdentityList.setNames(con.listServiceDependencies(domainName));
return serviceIdentityList;
Expand Down
30 changes: 16 additions & 14 deletions servers/zms/src/main/java/com/yahoo/athenz/zms/ZMSImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7820,13 +7820,15 @@ private void tenancyRegisterDomainDependency(ResourceContext ctx, String tenantD
}

private void tenancyDeregisterDomainDependency(ResourceContext ctx, String tenantDomain, String provSvcDomain,
String provSvcName, String auditRef, String caller) {
String provSvcName, String auditRef, String caller) {
final String serviceToDeregister = provSvcDomain + "." + provSvcName;
if (serviceProviderManager.isServiceProvider(serviceToDeregister)) {
boolean tenantDomainRolesExist = isTenantDomainRolesExist(tenantDomain, provSvcDomain, provSvcName);
DomainList domainList = dbService.listDomainDependencies(serviceToDeregister);
if (!tenantDomainRolesExist && domainList.getNames().contains(tenantDomain)) {
dbService.deleteDomainDependency(ctx, tenantDomain, serviceToDeregister, auditRef, caller);
ServiceIdentityList serviceIdentityList = dbService.listServiceDependencies(tenantDomain, true);
if (serviceIdentityList.getNames().contains(serviceToDeregister)) {
boolean tenantDomainRolesExist = isTenantDomainRolesExist(tenantDomain, provSvcDomain, provSvcName);
if (!tenantDomainRolesExist) {
dbService.deleteDomainDependency(ctx, tenantDomain, serviceToDeregister, auditRef, caller);
}
}
}
}
Expand Down Expand Up @@ -8432,15 +8434,15 @@ public void deleteProviderResourceGroupRoles(ResourceContext ctx, String tenantD
}
}

private boolean isTenantDomainRolesExist(String tenantDomain, String provSvcDomain, String provSvcName) {
final String provider = provSvcDomain + "." + provSvcName;
List<String> dependentResourceGroups = getDependentServiceResourceGroupList(tenantDomain).getServiceAndResourceGroups().stream()
.filter(dependency -> dependency.getDomain().equals(tenantDomain) && dependency.getService().equals(provider))
.findAny()
.map(DependentServiceResourceGroup::getResourceGroups)
.orElse(new ArrayList<>());

return !dependentResourceGroups.isEmpty();
private boolean isTenantDomainRolesExist(final String tenantDomain, final String provSvcDomain, final String provSvcName) {
final String rolePrefix = ZMSUtils.getTenantResourceGroupRolePrefix(provSvcName, tenantDomain, "");
final List<String> tenantDomainRoles = dbService.listRoles(provSvcDomain, true);
for (String tenantDomainRole : tenantDomainRoles) {
if (tenantDomainRole.startsWith(rolePrefix)) {
return true;
}
}
return false;
}

public ProviderResourceGroupRoles getProviderResourceGroupRoles(ResourceContext ctx, String tenantDomain,
Expand Down