ldap trust map cleanup on domain delete by DaanHoogland · Pull Request #7915 · apache/cloudstack

DaanHoogland · 2023-08-28T11:28:22Z

Description

This PR...

Fixes: #6752

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)

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

Major
Minor

Bug Severity

Screenshots (if appropriate):

How Has This Been Tested?

weizhouapache · 2023-08-28T13:48:59Z

@blueorangutan package

blueorangutan · 2023-08-28T13:50:03Z

@weizhouapache a [SF] 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.

codecov · 2023-08-28T14:00:56Z

Codecov Report

Merging #7915 (28f64da) into 4.18 (439d70f) will increase coverage by 0.00%.
Report is 10 commits behind head on 4.18.
The diff coverage is 30.76%.

@@            Coverage Diff            @@
##               4.18    #7915   +/-   ##
=========================================
  Coverage     13.06%   13.06%           
- Complexity     9093     9101    +8     
=========================================
  Files          2720     2720           
  Lines        257431   257490   +59     
  Branches      40141    40147    +6     
=========================================
+ Hits          33622    33637   +15     
- Misses       219582   219623   +41     
- Partials       4227     4230    +3

Files Changed	Coverage Δ
...va/org/apache/cloudstack/ldap/LdapManagerImpl.java	`4.05% <0.00%> (-0.32%)`	⬇️
...c/main/java/com/cloud/user/AccountManagerImpl.java	`20.47% <14.28%> (-0.01%)`	⬇️
...rc/main/java/com/cloud/user/DomainManagerImpl.java	`32.92% <58.06%> (+0.41%)`	⬆️

... and 12 files with indirect coverage changes

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

weizhouapache · 2023-08-28T14:03:48Z

@blueorangutan package

blueorangutan · 2023-08-28T14:04:03Z

@weizhouapache a [SF] 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.

…dstack/ldap/LdapManagerImpl.java

weizhouapache · 2023-08-28T14:21:19Z

@blueorangutan package

blueorangutan · 2023-08-28T14:22:03Z

@weizhouapache a [SF] 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.

weizhouapache · 2023-08-28T14:28:43Z

verified OK

before domain removal (some mock data)

MariaDB [cloud]> select * from ldap_trust_map;
+----+-----------+------+----------------------+--------------+------------+
| id | domain_id | type | name                 | account_type | account_id |
+----+-----------+------+----------------------+--------------+------------+
|  1 |         3 | OU   | DC=CloudStack,DC=com |            2 |          0 |
|  2 |         4 | OU   | DC=CloudStack,DC=com |            2 |          0 |
|  3 |         5 | OU   | DC=CloudStack,DC=com |            2 |          0 |
+----+-----------+------+----------------------+--------------+------------+
3 rows in set (0.00 sec)

after domain removal

MariaDB [cloud]> select * from ldap_trust_map;
+----+-----------+------+----------------------+--------------+------------+
| id | domain_id | type | name                 | account_type | account_id |
+----+-----------+------+----------------------+--------------+------------+
|  1 |         3 | OU   | DC=CloudStack,DC=com |            2 |          0 |
|  2 |         4 | OU   | DC=CloudStack,DC=com |            2 |          0 |
+----+-----------+------+----------------------+--------------+------------+
2 rows in set (0.01 sec)

blueorangutan · 2023-08-28T14:51:02Z

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

blueorangutan · 2023-08-28T15:06:28Z

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

weizhouapache · 2023-08-28T15:17:50Z

@blueorangutan test

blueorangutan · 2023-08-28T15:18:03Z

@weizhouapache a [SF] Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests

blueorangutan · 2023-08-28T15:19:44Z

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

blueorangutan · 2023-08-29T03:39:10Z

[SF] Trillian test result (tid-7593)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 42969 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr7915-t7593-kvm-centos7.zip
Smoke tests completed. 105 look OK, 3 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test	Result	Time (s)	Test File
ContextSuite context=TestNetworkACL>:teardown	`Error`	89.77	test_network_acl.py
test_02_upgrade_kubernetes_cluster	`Failure`	532.23	test_kubernetes_clusters.py
ContextSuite context=TestNestedVirtualization>:teardown	`Error`	2.14	test_nested_virtualization.py

blueorangutan · 2023-08-29T04:07:52Z

[SF] Trillian test result (tid-7594)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 39231 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr7915-t7594-kvm-centos7.zip
Smoke tests completed. 106 look OK, 2 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test	Result	Time (s)	Test File
ContextSuite context=TestNetworkACL>:teardown	`Error`	86.85	test_network_acl.py
ContextSuite context=TestNestedVirtualization>:teardown	`Error`	2.15	test_nested_virtualization.py

DaanHoogland · 2023-08-31T13:49:02Z

@blueorangutan package

blueorangutan · 2023-08-31T13:50:03Z

@DaanHoogland a [SF] 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 · 2023-08-31T14:44:14Z

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

DaanHoogland · 2023-08-31T14:57:17Z

@blueorangutan test

blueorangutan · 2023-08-31T14:58:04Z

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

blueorangutan · 2023-09-01T02:23:28Z

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

Test	Result	Time (s)	Test File

yadvr

LGTM didnt' test it though

DaanHoogland · 2023-09-18T12:43:57Z

@blueorangutan package

blueorangutan · 2023-09-18T12:46:03Z

@DaanHoogland a [SF] 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 · 2023-09-18T13:41:29Z

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

DaanHoogland · 2023-09-18T13:48:15Z

@blueorangutan test matrix

DaanHoogland · 2023-09-18T14:00:37Z

@blueorangutan test matrix

blueorangutan · 2023-09-18T14:02:04Z

@DaanHoogland a [SF] Trillian-Jenkins matrix job (centos7 mgmt + xenserver71, rocky8 mgmt + vmware67u3, centos7 mgmt + kvmcentos7) has been kicked to run smoke tests

blueorangutan · 2023-09-19T02:05:15Z

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

Test	Result	Time (s)	Test File

blueorangutan · 2023-09-19T03:09:02Z

[SF] Trillian test result (tid-7680)
Environment: xenserver-71 (x2), Advanced Networking with Mgmt server 7
Total time taken: 45661 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr7915-t7680-xenserver-71.zip
Smoke tests completed. 108 look OK, 0 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test	Result	Time (s)	Test File

blueorangutan · 2023-09-19T04:41:03Z

[SF] Trillian test result (tid-7681)
Environment: vmware-67u3 (x2), Advanced Networking with Mgmt server r8
Total time taken: 51122 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr7915-t7681-vmware-67u3.zip
Smoke tests completed. 108 look OK, 0 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test	Result	Time (s)	Test File

* 4.18: ldap trust map cleanup on domain delete (#7915) upgrade: fix upgrade from 4.18.1.0 to 4.18.2.0-SNAPSHOT (#7959)

Co-authored-by: Wei Zhou <weizhou@apache.org> (cherry picked from commit 09ae049) Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

boring-cyborg Bot added the component:LDAP label Aug 28, 2023

DaanHoogland added this to the 4.18.1.0 milestone Aug 28, 2023

weizhouapache reviewed Aug 28, 2023

View reviewed changes

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

Comment thread server/src/main/java/com/cloud/user/AccountManagerImpl.java Outdated

DaanHoogland force-pushed the 6752-ldap-mapping-leftover-when-subdomain-is-deleted branch from 6ccbf7a to 4396526 Compare August 28, 2023 12:11

DaanHoogland marked this pull request as ready for review August 28, 2023 12:51

DaanHoogland added 3 commits August 28, 2023 16:01

ldap trust map cleanup on domain delete

0986d8e

delete need check reversed

7c6d09f

iterate through all candidates to remove

81e67cb

DaanHoogland force-pushed the 6752-ldap-mapping-leftover-when-subdomain-is-deleted branch from 102549e to 81e67cb Compare August 28, 2023 14:01

DaanHoogland changed the base branch from main to 4.18 August 28, 2023 14:02

weizhouapache reviewed Aug 28, 2023

View reviewed changes

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

id allready passed

12d5780

weizhouapache reviewed Aug 28, 2023

View reviewed changes

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

Update plugins/user-authenticators/ldap/src/main/java/org/apache/clou…

d7fb26b

…dstack/ldap/LdapManagerImpl.java

apache deleted a comment from blueorangutan Aug 28, 2023

weizhouapache approved these changes Aug 28, 2023

View reviewed changes

nvazquez reviewed Aug 28, 2023

View reviewed changes

weizhouapache reviewed Aug 28, 2023

View reviewed changes

Comment thread server/src/main/java/com/cloud/user/AccountManagerImpl.java Outdated

weizhouapache modified the milestones: 4.18.1.0, 4.18.2.0 Aug 28, 2023

npe

06ea620

yadvr approved these changes Sep 6, 2023

View reviewed changes

weizhouapache reviewed Sep 18, 2023

View reviewed changes

Comment thread server/src/main/java/com/cloud/user/DomainManagerImpl.java Outdated

DaanHoogland commented Sep 18, 2023

View reviewed changes

Comment thread server/src/main/java/com/cloud/user/DomainManagerImpl.java Outdated

Apply suggestions from code review

28f64da

DaanHoogland merged commit 09ae049 into apache:4.18 Sep 19, 2023

DaanHoogland deleted the 6752-ldap-mapping-leftover-when-subdomain-is-deleted branch September 19, 2023 06:01

DaanHoogland added a commit that referenced this pull request Sep 19, 2023

Merge release branch 4.18 to main

0375714

* 4.18: ldap trust map cleanup on domain delete (#7915) upgrade: fix upgrade from 4.18.1.0 to 4.18.2.0-SNAPSHOT (#7959)

DaanHoogland mentioned this pull request Sep 19, 2023

LDAP mapping leftover when subdomain is deleted #6752

Closed

Uh oh!

Conversation

DaanHoogland commented Aug 28, 2023

Description

Types of changes

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

Bug Severity

Screenshots (if appropriate):

How Has This Been Tested?

Uh oh!

Uh oh!

Uh oh!

weizhouapache commented Aug 28, 2023

Uh oh!

blueorangutan commented Aug 28, 2023

Uh oh!

codecov Bot commented Aug 28, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

weizhouapache commented Aug 28, 2023

Uh oh!

blueorangutan commented Aug 28, 2023

Uh oh!

Uh oh!

Uh oh!

weizhouapache commented Aug 28, 2023

Uh oh!

blueorangutan commented Aug 28, 2023

Uh oh!

weizhouapache commented Aug 28, 2023

Uh oh!

blueorangutan commented Aug 28, 2023

Uh oh!

Uh oh!

Uh oh!

Uh oh!

blueorangutan commented Aug 28, 2023

Uh oh!

weizhouapache commented Aug 28, 2023

Uh oh!

blueorangutan commented Aug 28, 2023

Uh oh!

blueorangutan commented Aug 28, 2023

Uh oh!

Uh oh!

blueorangutan commented Aug 29, 2023

Uh oh!

blueorangutan commented Aug 29, 2023

Uh oh!

DaanHoogland commented Aug 31, 2023

Uh oh!

blueorangutan commented Aug 31, 2023

Uh oh!

blueorangutan commented Aug 31, 2023

Uh oh!

DaanHoogland commented Aug 31, 2023

Uh oh!

blueorangutan commented Aug 31, 2023

Uh oh!

blueorangutan commented Sep 1, 2023

Uh oh!

yadvr left a comment

Choose a reason for hiding this comment

Uh oh!

DaanHoogland commented Sep 18, 2023

Uh oh!

blueorangutan commented Sep 18, 2023

Uh oh!

Uh oh!

blueorangutan commented Sep 18, 2023

Uh oh!

DaanHoogland commented Sep 18, 2023

Uh oh!

Uh oh!

DaanHoogland commented Sep 18, 2023

Uh oh!

blueorangutan commented Sep 18, 2023

Uh oh!

codecov Bot commented Aug 28, 2023 •

edited

Loading