Skip to content

Set isrecursive to false when listall=true by default for users #6111

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
davidjumani wants to merge 3 commits into from
Closed

Set isrecursive to false when listall=true by default for users #6111

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
38366c8
Fix recursive lookup for offerings for users
davidjumani Mar 14, 2022
35ca308
Revert "Fix recursive lookup for offerings for users"
davidjumani Mar 15, 2022
16f653d
Set isrecursive as false by default of users
davidjumani Mar 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion api/src/main/java/org/apache/cloudstack/api/BaseListDomainResourcesCmd.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,10 @@
// under the License.
package org.apache.cloudstack.api;

import com.cloud.user.Account;

import org.apache.cloudstack.api.response.DomainResponse;
import org.apache.cloudstack.context.CallContext;

public abstract class BaseListDomainResourcesCmd extends BaseListCmd implements IBaseListDomainResourcesCmd {

Expand All @@ -42,7 +45,10 @@ public boolean listAll() {
@Override
public boolean isRecursive() {
if (listAll()) {
return recursive == null ? true : recursive;
Account caller = CallContext.current().getCallingAccount();
if (caller.getType() != Account.Type.NORMAL) {
return recursive == null ? true : recursive;

@Pearl1594 Pearl1594 Mar 15, 2022

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Could be simplified to

Suggested change
return recursive == null ? true : recursive;
return recursive == null || recursive;

@DaanHoogland DaanHoogland Mar 15, 2022

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

more concise, less readable /m no me gusta

}
}
return recursive == null ? false : recursive;

@Pearl1594 Pearl1594 Mar 15, 2022

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Could probably be simplified to:

Suggested change
return recursive == null ? false : recursive;
return recursive != null && recursive;

@DaanHoogland DaanHoogland Mar 15, 2022

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

hm, that is not more expressive, i'd say.

}
Expand Down