Skip to content

zms storage layer does not return multiple matches for the product id listing #3145

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

Merged
psasidhar merged 2 commits into from
Dec 11, 2025
Merged

zms storage layer does not return multiple matches for the product id listing #3145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f6c389
zms storage layer does not return multiple matches for the product id…
havetisyan Dec 8, 2025
b74ea87
address review comments
havetisyan Dec 8, 2025
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
8 changes: 4 additions & 4 deletions ...rver_common/src/main/java/com/yahoo/athenz/common/server/store/ObjectStoreConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public interface ObjectStoreConnection extends Closeable {
void commitChanges() throws ServerResourceException;
void rollbackChanges() throws ServerResourceException;
void close();
void setOperationTimeout(int opTimout);
void setOperationTimeout(int opTimeout);
void setTagLimit(int domainLimit, int roleLimit, int groupLimit, int policyLimit, int serviceLimit);

// Domain commands
Expand All @@ -47,9 +47,9 @@ public interface ObjectStoreConnection extends Closeable {
long getDomainModTimestamp(String domainName) throws ServerResourceException;
boolean updateDomainModTimestamp(String domainName) throws ServerResourceException;
List<String> listDomains(String prefix, long modifiedSince) throws ServerResourceException;
String lookupDomainByProductId(int productId) throws ServerResourceException;
String lookupDomainByProductId(String productId) throws ServerResourceException;
String lookupDomainByCloudProvider(String provider, String value) throws ServerResourceException;
List<String> lookupDomainByProductId(int productId) throws ServerResourceException;
List<String> lookupDomainByProductId(String productId) throws ServerResourceException;
List<String> lookupDomainByCloudProvider(String provider, String value) throws ServerResourceException;
Map<String, String> listDomainsByCloudProvider(String provider) throws ServerResourceException;
List<String> lookupDomainByRole(String roleMember, String roleName) throws ServerResourceException;
List<String> lookupDomainByBusinessService(String businessService) throws ServerResourceException;
Expand Down
101 changes: 56 additions & 45 deletions ...server_common/src/main/java/com/yahoo/athenz/common/server/store/impl/JDBCConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1068,74 +1068,85 @@ void verifyDomainNameDashUniqueness(final String name, String caller) throws Ser
}
}

void verifyDomainProductIdUniqueness(final String name, Integer productNumber, final String caller) throws ServerResourceException {
void uniquenessCheck(final List<String> domains, final String domainName, final String label,
final String caller) throws ServerResourceException {

// if the domains list is null or empty then we're good

if (domains == null || domains.isEmpty()) {
return;
}

// if we have more than one domain or the single
// domain is different from our current domain
// then our value is not unique

if (domains.size() > 1 || !domains.get(0).equals(domainName)) {
throw requestError(caller, label + " is already assigned to domain: " + domains.get(0));
}
}

void verifyDomainProductIdUniqueness(final String domainName, Integer productNumber, final String caller)
throws ServerResourceException {

if (productNumber == null || productNumber == 0) {
return;
}
if (domainOptions != null && !domainOptions.getEnforceUniqueProductIds()) {
return;
}
final String domainName = lookupDomainByProductId(productNumber);
if (domainName != null && !domainName.equals(name)) {
throw requestError(caller, "Product Id: " + productNumber + " is already assigned to domain: " + domainName);
}
uniquenessCheck(lookupDomainByProductId(productNumber), domainName, "Product Id: " + productNumber, caller);
}

void verifyDomainProductIdUniqueness(final String name, String productId, final String caller) throws ServerResourceException {
void verifyDomainProductIdUniqueness(final String domainName, String productId, final String caller)
throws ServerResourceException {

if (StringUtil.isEmpty(productId)) {
return;
}
if (domainOptions != null && !domainOptions.getEnforceUniqueProductIds()) {
return;
}
final String domainName = lookupDomainByProductId(productId);
if (domainName != null && !domainName.equals(name)) {
throw requestError(caller, "Product Id: " + productId + " is already assigned to domain: " + domainName);
}
uniquenessCheck(lookupDomainByProductId(productId), domainName, "Product Id: " + productId, caller);
}

void verifyDomainAwsAccountUniqueness(final String name, final String account, final String caller) throws ServerResourceException {
void verifyDomainAwsAccountUniqueness(final String domainName, final String account, final String caller)
throws ServerResourceException {

if (StringUtil.isEmpty(account)) {
return;
}
if (domainOptions != null && !domainOptions.getEnforceUniqueAWSAccounts()) {
return;
}
final String domainName = lookupDomainByCloudProvider(ObjectStoreConnection.PROVIDER_AWS, account);
if (domainName != null && !domainName.equals(name)) {
throw requestError(caller, "Account Id: " + account + " is already assigned to domain: " + domainName);
}
uniquenessCheck(lookupDomainByCloudProvider(ObjectStoreConnection.PROVIDER_AWS, account), domainName,
"Account Id: " + account, caller);
}

void verifyDomainAzureSubscriptionUniqueness(final String name, final String subscription, final String caller) throws ServerResourceException {
void verifyDomainAzureSubscriptionUniqueness(final String domainName, final String subscription,
final String caller) throws ServerResourceException {

if (StringUtil.isEmpty(subscription)) {
return;
}
if (domainOptions != null && !domainOptions.getEnforceUniqueAzureSubscriptions()) {
return;
}
final String domainName = lookupDomainByCloudProvider(ObjectStoreConnection.PROVIDER_AZURE, subscription);
if (domainName != null && !domainName.equals(name)) {
throw requestError(caller, "Subscription Id: " + subscription + " is already assigned to domain: " + domainName);
}
uniquenessCheck(lookupDomainByCloudProvider(ObjectStoreConnection.PROVIDER_AZURE, subscription), domainName,
"Subscription Id: " + subscription, caller);
}

void verifyDomainGcpProjectUniqueness(final String name, final String project, final String caller) throws ServerResourceException {
void verifyDomainGcpProjectUniqueness(final String domainName, final String project, final String caller)
throws ServerResourceException {

if (StringUtil.isEmpty(project)) {
return;
}
if (domainOptions != null && !domainOptions.getEnforceUniqueGCPProjects()) {
return;
}
final String domainName = lookupDomainByCloudProvider(ObjectStoreConnection.PROVIDER_GCP, project);
if (domainName != null && !domainName.equals(name)) {
throw requestError(caller, "Project: " + project + " is already assigned to domain: " + domainName);
}
uniquenessCheck(lookupDomainByCloudProvider(ObjectStoreConnection.PROVIDER_GCP, project), domainName,
"Project: " + project, caller);
}

@Override
Expand Down Expand Up @@ -1343,41 +1354,41 @@ public List<String> lookupDomainByBusinessService(String businessService) throws
}

@Override
public String lookupDomainByProductId(int productId) throws ServerResourceException {
public List<String> lookupDomainByProductId(int productId) throws ServerResourceException {

final String caller = "lookupDomainByProductId";
String domainName = null;
List<String> domains = new ArrayList<>();
try (PreparedStatement ps = con.prepareStatement(SQL_GET_DOMAIN_WITH_YPM_ID)) {
ps.setInt(1, productId);
try (ResultSet rs = executeQuery(ps, caller)) {
if (rs.next()) {
domainName = rs.getString(1);
while (rs.next()) {
domains.add(rs.getString(JDBCConsts.DB_COLUMN_NAME));
}
}
} catch (SQLException ex) {
throw sqlError(ex, caller);
}

return domainName;
Collections.sort(domains);
return domains;
}

@Override
public String lookupDomainByProductId(String productId) throws ServerResourceException {
public List<String> lookupDomainByProductId(String productId) throws ServerResourceException {

final String caller = "lookupDomainByProductId";
String domainName = null;
List<String> domains = new ArrayList<>();
try (PreparedStatement ps = con.prepareStatement(SQL_GET_DOMAIN_WITH_PRODUCT_ID)) {
ps.setString(1, productId);
try (ResultSet rs = executeQuery(ps, caller)) {
if (rs.next()) {
domainName = rs.getString(1);
while (rs.next()) {
domains.add(rs.getString(JDBCConsts.DB_COLUMN_NAME));
}
}
} catch (SQLException ex) {
throw sqlError(ex, caller);
}

return domainName;
Collections.sort(domains);
return domains;
}

String getCloudProviderLookupDomainSQLCommand(final String provider) {
Expand Down Expand Up @@ -1426,26 +1437,26 @@ String getCloudProviderColumnName(final String provider) {
}

@Override
public String lookupDomainByCloudProvider(String provider, String value) throws ServerResourceException {
public List<String> lookupDomainByCloudProvider(String provider, String value) throws ServerResourceException {

final String caller = "lookupDomainByCloudProvider";
final String sqlCmd = getCloudProviderLookupDomainSQLCommand(provider);
if (sqlCmd == null || value == null) {
return null;
return Collections.emptyList();
}
String domainName = null;
List<String> domains = new ArrayList<>();
try (PreparedStatement ps = con.prepareStatement(sqlCmd)) {
ps.setString(1, value.trim());
try (ResultSet rs = executeQuery(ps, caller)) {
if (rs.next()) {
domainName = rs.getString(1);
while (rs.next()) {
domains.add(rs.getString(JDBCConsts.DB_COLUMN_NAME));
}
}
} catch (SQLException ex) {
throw sqlError(ex, caller);
}

return domainName;
Collections.sort(domains);
return domains;
}

@Override
Expand All @@ -1454,7 +1465,7 @@ public Map<String, String> listDomainsByCloudProvider(String provider) throws Se
final String caller = "listDomainByCloudProvider";
final String sqlCmd = getCloudProviderListDomainsSQLCommand(provider);
if (sqlCmd == null) {
return null;
return Collections.emptyMap();
}
final String columnName = getCloudProviderColumnName(provider);
Map<String, String> domains = new HashMap<>();
Expand Down
Loading