Add UUID field for LDAP configuration #11462

Pearl1594 · 2025-08-18T13:32:46Z

Description

This PR adds UUID for the ldap config, which will help resolve #11440

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

Screenshots (if appropriate):

How Has This Been Tested?

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

DaanHoogland

clgtm, but let’s do this in 4.20.2 or 4.22 ? including some of the other ldap improvements?

codecov · 2025-08-18T13:39:45Z

Codecov Report

❌ Patch coverage is 6.97674% with 40 lines in your changes missing coverage. Please review.
✅ Project coverage is 17.57%. Comparing base (ec533cd) to head (9ab2d6e).
⚠️ Report is 13 commits behind head on main.

Files with missing lines	Patch %	Lines
...va/org/apache/cloudstack/ldap/LdapManagerImpl.java	0.00%	13 Missing ⚠️
.../cloudstack/ldap/dao/LdapConfigurationDaoImpl.java	9.09%	10 Missing ⚠️
...dstack/api/response/LdapConfigurationResponse.java	0.00%	7 Missing ⚠️
...rg/apache/cloudstack/ldap/LdapConfigurationVO.java	33.33%	3 Missing and 1 partial ⚠️
...dstack/api/command/LdapDeleteConfigurationCmd.java	0.00%	3 Missing ⚠️
...oudstack/api/command/LdapListConfigurationCmd.java	0.00%	3 Missing ⚠️

Additional details and impacted files

@@             Coverage Diff              @@
##               main   #11462      +/-   ##
============================================
+ Coverage     17.42%   17.57%   +0.14%     
- Complexity    15336    15493     +157     
============================================
  Files          5892     5894       +2     
  Lines        526521   528978    +2457     
  Branches      64293    65276     +983     
============================================
+ Hits          91767    92964    +1197     
- Misses       424401   425640    +1239     
- Partials      10353    10374      +21

Flag	Coverage Δ
uitests	`3.61% <ø> (-0.01%)`	⬇️
unittests	`18.63% <6.97%> (+0.15%)`	⬆️

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

☔ View full report in Codecov by Sentry.
📢 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.

sureshanaparti

clgtm

...s/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/LdapConfigurationVO.java

Pearl1594 · 2025-09-03T19:44:55Z

@blueorgangutan package

DaanHoogland · 2025-09-08T11:29:42Z

@blueorgangutan package

shwstppr · 2025-09-11T12:12:21Z

@blueorangutan package

blueorangutan · 2025-09-11T12:14:04Z

@shwstppr a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

blueorangutan · 2025-09-11T15:33:55Z

Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ el10 ✖️ debian ✔️ suse15. SL-JID 14961

DaanHoogland · 2025-09-15T09:50:37Z

@Pearl1594 , should this be a draft still?

Pearl1594 · 2025-09-15T12:05:11Z

any particular reason this needs to be a draft @DaanHoogland . I believe it's ready for review and test.

weizhouapache

code lgtm

…uuid-ldap-conf

DaanHoogland · 2025-09-15T12:07:44Z

any particular reason this needs to be a draft @DaanHoogland . I believe it's ready for review and test.

I was asking because of the upgrade path

weizhouapache · 2025-09-15T12:09:50Z

any particular reason this needs to be a draft @DaanHoogland . I believe it's ready for review and test.

I was asking because of the upgrade path

right, I did not notice it at all 🤦

Pearl1594 · 2025-09-15T12:10:26Z

Updated the upgrade path :). Thanks @DaanHoogland

DaanHoogland

clgtm

github-actions · 2025-09-25T08:24:15Z

This pull request has merge conflicts. Dear author, please fix the conflicts and sync your branch with the base branch.

DaanHoogland · 2025-09-25T12:03:42Z

@blueorangutan package

blueorangutan · 2025-09-25T12:06:04Z

@DaanHoogland a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

blueorangutan · 2025-09-25T14:11:43Z

Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ el10 ✔️ debian ✔️ suse15. SL-JID 15168

DaanHoogland · 2025-09-26T11:54:18Z

@blueorangutan test keepEnv

blueorangutan · 2025-09-26T11:56:03Z

@DaanHoogland a [SL] Trillian-Jenkins test job (ol8 mgmt + kvm-ol8) has been kicked to run smoke tests

blueorangutan · 2025-09-27T03:35:54Z

[SF] Trillian test result (tid-14449)
Environment: kvm-ol8 (x2), zone: Advanced Networking with Mgmt server ol8
Total time taken: 52733 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr11462-t14449-kvm-ol8.zip
Smoke tests completed. 147 look OK, 0 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test	Result	Time (s)	Test File

vishesh92 · 2025-09-30T07:59:44Z

@blueorangutan package

blueorangutan · 2025-09-30T08:02:04Z

@vishesh92 a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/LdapManagerImpl.java

...icators/ldap/src/main/java/org/apache/cloudstack/api/command/LdapDeleteConfigurationCmd.java

blueorangutan · 2025-09-30T09:29:49Z

Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ el10 ✔️ debian ✔️ suse15. SL-JID 15233

vishesh92 · 2025-09-30T10:44:05Z

@blueorangutan test keepEnv

blueorangutan · 2025-09-30T10:46:05Z

@vishesh92 a [SL] Trillian-Jenkins test job (ol8 mgmt + kvm-ol8) has been kicked to run smoke tests

vishesh92

I did a cursory review of code and it looks good to me.

I created 2 LDAP configs in UI with same host & port but different domains.
After the fix, I am able to open the LDAP config I want and see the correct details.

blueorangutan · 2025-10-01T02:37:01Z

[SF] Trillian test result (tid-14479)
Environment: kvm-ol8 (x2), zone: Advanced Networking with Mgmt server ol8
Total time taken: 53881 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr11462-t14479-kvm-ol8.zip
Smoke tests completed. 147 look OK, 0 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test	Result	Time (s)	Test File

...icators/ldap/src/main/java/org/apache/cloudstack/api/command/LdapDeleteConfigurationCmd.java

weizhouapache

code lgtm

weizhouapache · 2025-10-01T12:43:44Z

merging based on approvals and manual test.
thanks @Pearl1594 @vishesh92

sonarqubecloud · 2025-10-01T12:48:25Z

Quality Gate failed

Failed conditions
5.1% Coverage on New Code (required ≥ 40%)

See analysis details on SonarQube Cloud

* Add UUID field for LDAP configuration * move db changes to the lastest schema file * Add ID param to list ldapConf API & delete ldapConf API * fix ui test * fix 1 ui test * fix test * fix api description --------- Co-authored-by: dahn <[email protected]>

Add UUID field for LDAP configuration

10a386f

boring-cyborg bot added the component:LDAP label Aug 18, 2025

DaanHoogland approved these changes Aug 18, 2025

View reviewed changes

sureshanaparti approved these changes Aug 18, 2025

View reviewed changes

sureshanaparti added this to the 4.22.0 milestone Aug 18, 2025

sureshanaparti added the status:needs-testing label Aug 18, 2025

harikrishna-patnala added this to Apache CloudStack 4.22.0 Aug 19, 2025

DaanHoogland reviewed Aug 19, 2025

View reviewed changes

...s/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/LdapConfigurationVO.java Show resolved Hide resolved

sureshanaparti moved this to In Progress in Apache CloudStack 4.22.0 Aug 22, 2025

Pearl1594 marked this pull request as ready for review September 3, 2025 19:44

Pearl1594 requested a review from harikrishna-patnala September 3, 2025 19:45

DaanHoogland self-requested a review September 15, 2025 09:49

weizhouapache approved these changes Sep 15, 2025

View reviewed changes

Merge branch 'main' of https://github.com/apache/cloudstack into add-…

3d8cb12

…uuid-ldap-conf

move db changes to the lastest schema file

5d043c3

DaanHoogland approved these changes Sep 15, 2025

View reviewed changes

github-actions bot added the status:has-conflicts label Sep 25, 2025

Merge branch 'main' into add-uuid-ldap-conf

5f59a02

Add ID param to list ldapConf API & delete ldapConf API

5558fe0

boring-cyborg bot added the component:UI label Sep 30, 2025

Pearl1594 added 3 commits September 29, 2025 22:12

fix ui test

8204b2c

fix 1 ui test

0762b08

fix test

89efeb1

weizhouapache reviewed Sep 30, 2025

View reviewed changes

plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/LdapManagerImpl.java Show resolved Hide resolved

...icators/ldap/src/main/java/org/apache/cloudstack/api/command/LdapDeleteConfigurationCmd.java Show resolved Hide resolved

vishesh92 approved these changes Sep 30, 2025

View reviewed changes

vishesh92 added status:ready-for-merge and removed status:needs-testing labels Oct 1, 2025

vishesh92 reviewed Oct 1, 2025

View reviewed changes

...icators/ldap/src/main/java/org/apache/cloudstack/api/command/LdapDeleteConfigurationCmd.java Show resolved Hide resolved

fix api description

9ab2d6e

weizhouapache approved these changes Oct 1, 2025

View reviewed changes

weizhouapache merged commit cd12fa5 into main Oct 1, 2025
48 of 50 checks passed

github-project-automation bot moved this from In Progress to Done in Apache CloudStack 4.22.0 Oct 1, 2025

weizhouapache deleted the add-uuid-ldap-conf branch October 1, 2025 12:43

Add UUID field for LDAP configuration #11462

Add UUID field for LDAP configuration #11462

Uh oh!

Conversation

Pearl1594 commented Aug 18, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Types of changes

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

Screenshots (if appropriate):

How Has This Been Tested?

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

Uh oh!

DaanHoogland left a comment

Choose a reason for hiding this comment

Uh oh!

codecov bot commented Aug 18, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

sureshanaparti left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Pearl1594 commented Sep 3, 2025

Uh oh!

DaanHoogland commented Sep 8, 2025

Uh oh!

shwstppr commented Sep 11, 2025

Uh oh!

blueorangutan commented Sep 11, 2025

Uh oh!

blueorangutan commented Sep 11, 2025

Uh oh!

DaanHoogland commented Sep 15, 2025

Uh oh!

Pearl1594 commented Sep 15, 2025

Uh oh!

weizhouapache left a comment

Choose a reason for hiding this comment

Uh oh!

DaanHoogland commented Sep 15, 2025

Uh oh!

weizhouapache commented Sep 15, 2025

Uh oh!

Pearl1594 commented Sep 15, 2025

Uh oh!

DaanHoogland left a comment

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Sep 25, 2025

Uh oh!

DaanHoogland commented Sep 25, 2025

Uh oh!

blueorangutan commented Sep 25, 2025

Uh oh!

blueorangutan commented Sep 25, 2025

Uh oh!

DaanHoogland commented Sep 26, 2025

Uh oh!

blueorangutan commented Sep 26, 2025

Uh oh!

blueorangutan commented Sep 27, 2025

Uh oh!

vishesh92 commented Sep 30, 2025

Uh oh!

blueorangutan commented Sep 30, 2025

Uh oh!

Uh oh!

Uh oh!

blueorangutan commented Sep 30, 2025

Uh oh!

vishesh92 commented Sep 30, 2025

Uh oh!

blueorangutan commented Sep 30, 2025

Uh oh!

vishesh92 left a comment

Choose a reason for hiding this comment

Uh oh!

Pearl1594 commented Aug 18, 2025 •

edited

Loading

codecov bot commented Aug 18, 2025 •

edited

Loading