small refactors on account manager by DaanHoogland · Pull Request #11784 · apache/cloudstack

DaanHoogland · 2025-10-03T10:34:09Z

Description

This PR does some small refactors encountered during trouble shooting. ...

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

Screenshots (if appropriate):

How Has This Been Tested?

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

codecov · 2025-10-03T10:42:46Z

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 3.41%. Comparing base (1cd2491) to head (40b5897).

❗ There is a different number of reports uploaded between BASE (1cd2491) and HEAD (40b5897). Click for more details.

HEAD has 1 upload less than BASE

Flag BASE (1cd2491) HEAD (40b5897)

unittests 1 0

Additional details and impacted files

@@              Coverage Diff              @@
##               main   #11784       +/-   ##
=============================================
- Coverage     19.65%    3.41%   -16.25%     
=============================================
  Files          6368      487     -5881     
  Lines        574889    41867   -533022     
  Branches      70353     7912    -62441     
=============================================
- Hits         112985     1429   -111556     
+ Misses       449634    40238   -409396     
+ Partials      12270      200    -12070

Flag	Coverage Δ
uitests	`3.41% <ø> (ø)`
unittests	`?`

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.

Copilot

Pull Request Overview

This PR performs small refactoring improvements to the AccountManagerImpl class to enhance code readability and maintainability. The changes include simplifying conditional logic, extracting reusable methods, and updating logging patterns.

Simplified multiple conditional statements to use direct return expressions
Extracted domain ID calculation logic into a reusable private method
Updated logging to use parameterized format and modern charset handling

_{Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.}

hsato03 · 2025-12-09T18:48:53Z


    }

+    private static long getDomainIdFor(ControlledEntity entity) {


Suggested change

private static long getDomainIdFor(ControlledEntity entity) {

private long getDomainIdFor(ControlledEntity entity) {

Can static be removed?

sure, I think it can. Any pressing reason? It is a bit of a utility method and has no bearing on the manager internals.

I don't think the keyword is useful here, but it's just a nitpicking. ;)

hsato03

clgtm

Copilot

Pull request overview

Copilot reviewed 1 out of 1 changed files in this pull request and generated 1 comment.

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

Copilot · 2025-12-12T07:35:29Z

                // Block when is not in the list of allowed IPs
                if (!NetUtils.isIpInCidrList(loginIpAddress, accessAllowedCidrs.split(","))) {
-                    logger.warn("Request by account '" + account.toString() + "' was denied since " + loginIpAddress.toString().replace("/", "") + " does not match " + accessAllowedCidrs);
+                    logger.warn("Request by account '{}' was denied since {} does not match {}", account , loginIpAddress.toString().replace("/", ""), accessAllowedCidrs);


There's an extra space before the comma after the first placeholder. The code has "account ," but it should be "account," for consistent formatting.

Suggested change

logger.warn("Request by account '{}' was denied since {} does not match {}", account , loginIpAddress.toString().replace("/", ""), accessAllowedCidrs);

logger.warn("Request by account '{}' was denied since {} does not match {}", account, loginIpAddress.toString().replace("/", ""), accessAllowedCidrs);

github-actions · 2026-02-26T05:44:53Z

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

nvazquez · 2026-08-12T16:29:52Z

Hi @DaanHoogland is this PR still in progress?

Copilot

Copilot was unable to review this pull request because the user who requested the review has reached their quota limit.

Copilot

Copilot was unable to review this pull request because the user who requested the review has reached their quota limit.

DaanHoogland · 2026-08-16T17:00:03Z

@blueorangutan package

blueorangutan · 2026-08-16T17:02:03Z

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

blueorangutan · 2026-08-16T17:11:45Z

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

DaanHoogland modified the milestones: 4.23, 4.20.3 Oct 3, 2025

DaanHoogland requested a lite review from Copilot October 6, 2025 06:07

Copilot AI reviewed Oct 6, 2025

View reviewed changes

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

DaanHoogland marked this pull request as ready for review October 7, 2025 07:09

DaanHoogland added the status:needs-testing label Oct 20, 2025

DaanHoogland force-pushed the accountManagerRefactors branch from 9dc2f0d to bee7667 Compare December 8, 2025 15:34

apache deleted a comment from blueorangutan Dec 8, 2025

DaanHoogland force-pushed the accountManagerRefactors branch from bee7667 to 9c9bb32 Compare December 8, 2025 15:50

apache deleted a comment from blueorangutan Dec 9, 2025

hsato03 reviewed Dec 9, 2025

View reviewed changes

hsato03 approved these changes Dec 9, 2025

View reviewed changes

DaanHoogland marked this pull request as draft December 11, 2025 07:22

DaanHoogland force-pushed the accountManagerRefactors branch from 9c9bb32 to 10fa999 Compare December 12, 2025 07:25

DaanHoogland requested review from Copilot and sureshanaparti December 12, 2025 07:25

Copilot started reviewing on behalf of DaanHoogland December 12, 2025 07:26 View session

Copilot AI reviewed Dec 12, 2025

View reviewed changes

DaanHoogland force-pushed the accountManagerRefactors branch from 10fa999 to a9df597 Compare December 23, 2025 19:41

small refactors on account manager

7718dd8

DaanHoogland force-pushed the accountManagerRefactors branch from a9df597 to 7718dd8 Compare January 30, 2026 09:30

github-actions Bot added the status:has-conflicts label Feb 26, 2026

Merge branch 'main' into accountManagerRefactors

2a2bf45

github-actions Bot removed the status:has-conflicts label Feb 26, 2026

weizhouapache modified the milestones: 4.23.0, 4.23.1, 4.24.0 Jun 29, 2026

DaanHoogland assigned vishesh92 Aug 10, 2026

fix duplicate import + tests

85a4e30

Copilot AI review requested due to automatic review settings August 16, 2026 16:55

Copilot AI reviewed Aug 16, 2026

Merge branch 'main' into accountManagerRefactors

40b5897

Copilot AI review requested due to automatic review settings August 16, 2026 16:57


		}

		private static long getDomainIdFor(ControlledEntity entity) {

	private static long getDomainIdFor(ControlledEntity entity) {
	private long getDomainIdFor(ControlledEntity entity) {

	logger.warn("Request by account '{}' was denied since {} does not match {}", account , loginIpAddress.toString().replace("/", ""), accessAllowedCidrs);
	logger.warn("Request by account '{}' was denied since {} does not match {}", account, loginIpAddress.toString().replace("/", ""), accessAllowedCidrs);

Uh oh!

Conversation

DaanHoogland commented Oct 3, 2025

Description

Types of changes

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

Bug Severity

Screenshots (if appropriate):

How Has This Been Tested?

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

Uh oh!

codecov Bot commented Oct 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Uh oh!

Uh oh!

hsato03 Dec 9, 2025

Choose a reason for hiding this comment

Uh oh!

DaanHoogland Dec 10, 2025

Choose a reason for hiding this comment

Uh oh!

hsato03 Dec 10, 2025

Choose a reason for hiding this comment

Uh oh!

hsato03 left a comment

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Copilot AI Dec 12, 2025

Choose a reason for hiding this comment

Uh oh!

github-actions Bot commented Feb 26, 2026

Uh oh!

nvazquez commented Aug 12, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Uh oh!

DaanHoogland commented Aug 16, 2026

Uh oh!

blueorangutan commented Aug 16, 2026

Uh oh!

blueorangutan commented Aug 16, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

codecov Bot commented Oct 3, 2025 •

edited

Loading