Skip to content

allow linking a domain to a LDAP when it was already used before - #13948

Open
DaanHoogland wants to merge 2 commits into
4.20from
ghi11471-relinkLdapDomain
Open

allow linking a domain to a LDAP when it was already used before#13948
DaanHoogland wants to merge 2 commits into
4.20from
ghi11471-relinkLdapDomain

Conversation

@DaanHoogland

Copy link
Copy Markdown
Contributor

Description

This PR...

Fixes: #11471

Types of changes

  • Breaking change (fix or feature that would cause existing functionality to change)
  • New feature (non-breaking change which adds functionality)
  • Bug fix (non-breaking change which fixes an issue)
  • Enhancement (improves an existing feature and functionality)
  • Cleanup (Code refactoring and cleanup, that may add test cases)
  • Build/CI
  • Test (unit or integration test code)

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

  • Major
  • Minor

Bug Severity

  • BLOCKER
  • Critical
  • Major
  • Minor
  • Trivial

Screenshots (if appropriate):

How Has This Been Tested?

How did you try to break this feature and the system with this change?

@codecov

codecov Bot commented Aug 22, 2026

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 97.36842% with 1 line in your changes missing coverage. Please review.
✅ Project coverage is 16.34%. Comparing base (6136ac9) to head (291f662).

Files with missing lines Patch % Lines
...va/org/apache/cloudstack/ldap/LdapManagerImpl.java 97.36% 0 Missing and 1 partial ⚠️
Additional details and impacted files
@@             Coverage Diff              @@
##               4.20   #13948      +/-   ##
============================================
+ Coverage     16.32%   16.34%   +0.02%     
- Complexity    13556    13582      +26     
============================================
  Files          5669     5669              
  Lines        501399   501436      +37     
  Branches      60902    60909       +7     
============================================
+ Hits          81847    81980     +133     
+ Misses       410390   410285     -105     
- Partials       9162     9171       +9     
Flag Coverage Δ
uitests 4.14% <ø> (ø)
unittests 17.20% <97.36%> (+0.02%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Harness.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@sonarqubecloud

Copy link
Copy Markdown

LdapTrustMapVO oldVo = _ldapTrustMapDao.findByDomainId(domainId);
if (oldVo != null) {
ensureOldDomainMappingNotInUse(domainId, oldVo);
logger.warn(String.format("domain %d is already linked to ldap %s '%s'; replacing with the new mapping", domainId, oldVo.getType(), oldVo.getName()));

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
logger.warn(String.format("domain %d is already linked to ldap %s '%s'; replacing with the new mapping", domainId, oldVo.getType(), oldVo.getName()));
logger.warn("domain {} is already linked to ldap {} ‘{}'; replacing with the new mapping", domainId, oldVo.getType(), oldVo.getName());

@DaanHoogland DaanHoogland moved this from Backlog to conflict/waiting in CloudStack Testing Sep 1, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

Status: conflict/waiting

Development

Successfully merging this pull request may close these issues.

1 participant