Skip to content

Conversation

@weizhouapache
Copy link
Member

Description

This PR fixes the issue that zone/cluster encrypted settings are not decrypted when use valueIn(resourceId)

The issue should have been fixed in 4.19 by #10237 which has changes with

engine/schema/src/main/java/com/cloud/dc/ClusterDetailsDaoImpl.java
engine/schema/src/main/java/com/cloud/dc/dao/DataCenterDetailsDaoImpl.java
engine/schema/src/main/java/com/cloud/domain/dao/DomainDetailsDaoImpl.java
engine/schema/src/main/java/com/cloud/storage/dao/StoragePoolDetailsDaoImpl.java
engine/schema/src/main/java/com/cloud/user/AccountDetailsDaoImpl.java
engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/ImageStoreDetailsDaoImpl.java

However, the changes are missing in 4.20 in two files

engine/schema/src/main/java/com/cloud/dc/ClusterDetailsDaoImpl.java
engine/schema/src/main/java/com/cloud/dc/dao/DataCenterDetailsDaoImpl.java

other files are good.

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?

@weizhouapache weizhouapache added this to the 4.20.3 milestone Feb 11, 2026
@weizhouapache
Copy link
Member Author

@blueorangutan package

@codecov
Copy link

codecov bot commented Feb 11, 2026

Codecov Report

❌ Patch coverage is 0% with 2 lines in your changes missing coverage. Please review.
✅ Project coverage is 16.26%. Comparing base (a0f35a1) to head (1ab212b).
⚠️ Report is 1 commits behind head on 4.20.

Files with missing lines Patch % Lines
.../main/java/com/cloud/dc/ClusterDetailsDaoImpl.java 0.00% 1 Missing ⚠️
...ava/com/cloud/dc/dao/DataCenterDetailsDaoImpl.java 0.00% 1 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff              @@
##               4.20   #12626      +/-   ##
============================================
- Coverage     16.27%   16.26%   -0.01%     
+ Complexity    13433    13431       -2     
============================================
  Files          5662     5662              
  Lines        500033   500033              
  Branches      60717    60717              
============================================
- Hits          81368    81355      -13     
- Misses       409591   409604      +13     
  Partials       9074     9074              
Flag Coverage Δ
uitests 4.15% <ø> (ø)
unittests 17.12% <0.00%> (-0.01%) ⬇️

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.

Copy link
Contributor

@DaanHoogland DaanHoogland left a comment

Choose a reason for hiding this comment

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

clgtm

Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

Copilot encountered an error and was unable to review this pull request. You can try again by re-requesting a review.

@DaanHoogland DaanHoogland marked this pull request as ready for review February 11, 2026 08:39
Copy link
Collaborator

@RosiKyu RosiKyu left a comment

Choose a reason for hiding this comment

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

testing still in progress

Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull request overview

Copilot reviewed 2 out of 2 changed files in this pull request and generated no new comments.


💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copy link
Contributor

@sureshanaparti sureshanaparti left a comment

Choose a reason for hiding this comment

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

clgtm

@sureshanaparti
Copy link
Contributor

@blueorangutan package

@blueorangutan
Copy link

@sureshanaparti 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
Copy link

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

@weizhouapache
Copy link
Member Author

@blueorangutan test

@blueorangutan
Copy link

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

@DaanHoogland DaanHoogland requested a review from RosiKyu February 11, 2026 11:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants