This is an automated email from the ASF dual-hosted git repository.
pearl11594 pushed a change to branch ghi11438-errorprone-fixes
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
from f4baae44171 address possible npe
add 6bed3d4e641 Update storage usage / size in backup usage response
(#12539)
add ce42ce54c2d Fix template details deletion while updating template from
UI (#12559)
add 9ae696d1c82 Preserve VM settings on Instance Snapshot revert for
Custom Service Offering (#12555)
add 349eea501ab Mvn updates (#12575)
add 3d7d412d5be UI: Add comprehensive domain deletion confirmation dialog
(Feature Request #11497) (#12380)
add a0f35a186d8 Fixes issue with loading Capacity dashboard when mulitple
backup providers configured (#12550)
add b45726f7b12 ssvm: delete temp directory while deleting entity download
url (#12562)
add 4de8c2b6f68 Add a Prometheus metric to track host certificate expiry
(#12613)
add b7c970f45f1 Fix issue with multiple KVM Host entries in host table
(#12589)
add 34f6f413a1f Fix injection of preset variables into the JS interpreter
(#12515)
add 18d66595b39 engine/schema: fix cluster/zone settings with encrypted
values (#12626)
add e22f842ed8d Allow limit queries without random ordering (#12598)
add d8230c9598f Usage: Heartbeat should not schedule usage job when a job
is already running (#12616)
add ae5308bdd20 Fix issue when restoring backup after migration of volume
(#12549)
add 8c12a13216e Fix NPE during reset password (#12585)
add 9dd93cef760 Support for custom SSH port for KVM hosts from the host
url on add host and the configuration (#12571)
add 8b38cea33cd Fix NPE while stopping the RabbitMQEventBus bean when
there is no connection established with RabbitMQ Event Bus (#12635)
add 32c0cdbed98 Add volumes in 'Expunging' state to storage cleanup thread
and during delete storage pool (#12602)
add 87c8e746423 Fix github action workflow (#12675)
add da7ac80dc41 prevent user.uuid from being regenerated on each operation
by reading it from the DB (#12632)
add d0543449a66 Changes to the error message displayed during the removal
of public templates that are used (#12373)
add cf71938473b [UI] Allow change password for native users only. (#12584)
add c748b69e70c Fix NPE during public IP listing when a removed network or
VPC ID is informed for associatenetworkid parameter (#12372)
add 744c8afcf15 fix primary storage maintenance on xcpng (#12694)
add 56dc11980f6 test_accounts.py failure fix - keep the camelCase
parameter "domainId" (#12689)
add 45c3819fb21 Merge branch '4.20' of
https://github.com/apache/cloudstack into ghi11438-errorprone-fixes
No new revisions were added by this update.
Summary of changes:
.github/workflows/merge-conflict-checker.yml | 4 +-
api/src/main/java/com/cloud/host/Host.java | 3 +
.../apache/cloudstack/api/ApiServerService.java | 2 +
.../cloudstack/api/BaseUpdateTemplateOrIsoCmd.java | 4 +-
.../api/command/admin/host/AddHostCmd.java | 3 +-
.../apache/cloudstack/backup/BackupManager.java | 16 +-
.../cloud/agent/api/ModifyStoragePoolAnswer.java | 4 +
.../cloudstack/backup/RestoreBackupCommand.java | 18 +--
.../main/java/com/cloud/agent/AgentManager.java | 6 +
.../java/com/cloud/resource/ResourceManager.java | 2 +
.../com/cloud/agent/manager/AgentManagerImpl.java | 23 ++-
.../cloud/agent/manager/AgentManagerImplTest.java | 34 ++++
.../java/com/cloud/dc/ClusterDetailsDaoImpl.java | 2 +-
.../com/cloud/dc/dao/DataCenterDetailsDaoImpl.java | 2 +-
.../main/java/com/cloud/host/dao/HostDaoImpl.java | 2 +-
.../com/cloud/storage/dao/VMTemplateDaoImpl.java | 4 +-
.../java/com/cloud/storage/dao/VolumeDaoImpl.java | 13 +-
.../src/main/java/com/cloud/user/UserVO.java | 2 +-
.../main/java/com/cloud/user/dao/AccountDao.java | 2 -
.../java/com/cloud/user/dao/AccountDaoImpl.java | 60 +------
.../storage/datastore/db/ImageStoreDaoImpl.java | 2 +-
.../storage/volume/VolumeServiceImpl.java | 3 +
.../framework/config/ValidatedConfigKey.java | 28 ++--
.../src/main/java/com/cloud/utils/db/Filter.java | 13 +-
.../java/com/cloud/utils/db/GenericDaoBase.java | 6 +-
.../test/java/com/cloud/utils/db/FilterTest.java | 58 +++++++
.../com/cloud/utils/db/GenericDaoBaseTest.java | 68 ++++++++
.../apache/cloudstack/quota/QuotaManagerImpl.java | 12 +-
.../activationrule/presetvariables/Account.java | 1 -
.../presetvariables/BackupOffering.java | 1 -
.../presetvariables/ComputeOffering.java | 1 -
.../activationrule/presetvariables/Domain.java | 1 -
.../presetvariables/GenericPresetVariable.java | 18 +--
.../quota/activationrule/presetvariables/Host.java | 2 -
.../presetvariables/PresetVariableHelper.java | 10 +-
.../quota/activationrule/presetvariables/Role.java | 9 +-
.../activationrule/presetvariables/Storage.java | 11 +-
.../activationrule/presetvariables/Tariff.java | 1 -
.../activationrule/presetvariables/Value.java | 40 ++---
.../cloudstack/quota/QuotaManagerImplTest.java | 24 +--
.../presetvariables/AccountTest.java | 34 ----
.../presetvariables/BackupOfferingTest.java | 36 -----
.../presetvariables/ComputeOfferingTest.java | 35 -----
.../presetvariables/ComputingResourcesTest.java | 40 -----
.../activationrule/presetvariables/DomainTest.java | 35 -----
.../presetvariables/GenericPresetVariableTest.java | 73 ---------
.../activationrule/presetvariables/HostTest.java | 34 ----
.../presetvariables/PresetVariableHelperTest.java | 68 ++------
.../presetvariables/ResourceTest.java | 40 -----
.../activationrule/presetvariables/RoleTest.java | 34 ----
.../presetvariables/StorageTest.java | 41 -----
.../activationrule/presetvariables/ValueTest.java | 175 ---------------------
.../cloudstack/backup/NASBackupProvider.java | 24 ++-
.../cloudstack/backup/NetworkerBackupProvider.java | 17 +-
.../cloudstack/mom/rabbitmq/RabbitMQEventBus.java | 2 +-
.../LibvirtRestoreBackupCommandWrapper.java | 50 +++---
.../CitrixModifyStoragePoolCommandWrapper.java | 12 +-
.../cloudstack/metrics/PrometheusExporterImpl.java | 43 +++++
.../metrics/PrometheusExporterImplTest.java | 108 +++++++++++++
.../api/command/OauthLoginAPIAuthenticatorCmd.java | 12 +-
.../command/OauthLoginAPIAuthenticatorCmdTest.java | 19 +++
.../api/command/SAML2LoginAPIAuthenticatorCmd.java | 10 +-
pom.xml | 8 +-
.../main/java/com/cloud/api/ApiResponseHelper.java | 7 +-
server/src/main/java/com/cloud/api/ApiServer.java | 20 +++
server/src/main/java/com/cloud/api/ApiServlet.java | 13 +-
.../DefaultForgotPasswordAPIAuthenticatorCmd.java | 6 +-
.../api/auth/DefaultLoginAPIAuthenticatorCmd.java | 17 +-
.../DefaultResetPasswordAPIAuthenticatorCmd.java | 1 -
.../configuration/ConfigurationManagerImpl.java | 7 +
.../kvm/discoverer/LibvirtServerDiscoverer.java | 10 +-
.../com/cloud/resource/ResourceManagerImpl.java | 31 +++-
.../com/cloud/server/ManagementServerImpl.java | 33 ++--
.../com/cloud/template/TemplateManagerImpl.java | 19 ++-
.../java/com/cloud/user/AccountManagerImpl.java | 134 ++++++++--------
.../cloud/vm/snapshot/VMSnapshotManagerImpl.java | 23 ++-
.../cloudstack/backup/BackupManagerImpl.java | 10 +-
.../storage/heuristics/HeuristicRuleHelper.java | 20 +--
.../heuristics/presetvariables/Account.java | 2 -
.../storage/heuristics/presetvariables/Domain.java | 1 -
.../GenericHeuristicPresetVariable.java | 17 +-
.../presetvariables/SecondaryStorage.java | 4 -
.../heuristics/presetvariables/Snapshot.java | 10 +-
.../heuristics/presetvariables/Template.java | 24 ++-
.../storage/heuristics/presetvariables/Volume.java | 10 +-
.../cloud/resource/MockResourceManagerImpl.java | 5 +
.../cloud/resource/ResourceManagerImplTest.java | 2 +
...tBase.java => AccountManagentImplTestBase.java} | 8 +-
.../com/cloud/user/AccountManagerImplTest.java | 112 ++++++-------
.../AccountManagerImplVolumeDeleteEventTest.java | 2 +-
.../cloud/vm/snapshot/VMSnapshotManagerTest.java | 42 +++--
.../heuristics/HeuristicRuleHelperTest.java | 16 ++
.../heuristics/presetvariables/AccountTest.java | 46 ------
.../heuristics/presetvariables/DomainTest.java | 41 -----
.../GenericHeuristicPresetVariableTest.java | 40 -----
.../presetvariables/SecondaryStorageTest.java | 45 ------
.../heuristics/presetvariables/SnapshotTest.java | 44 ------
.../heuristics/presetvariables/TemplateTest.java | 46 ------
.../heuristics/presetvariables/VolumeTest.java | 44 ------
.../storage/template/UploadManagerImpl.java | 50 +++++-
.../storage/template/UploadManagerImplTest.java | 85 ++++++++++
tools/checkstyle/src/main/resources/cloud-pmd.xml | 53 +++----
ui/public/locales/en.json | 4 +
ui/src/components/view/DomainDeleteConfirm.vue | 155 ++++++++++++++++++
ui/src/config/section/user.js | 4 +
ui/src/views/iam/DomainView.vue | 56 ++++++-
ui/src/views/image/UpdateTemplate.vue | 47 ++++--
.../java/com/cloud/usage/UsageManagerImpl.java | 20 ++-
.../com/cloud/usage/parser/BackupUsageParser.java | 3 +-
.../usage/parser/VMSnapshotOnPrimaryParser.java | 2 +-
utils/src/main/java/com/cloud/utils/FileUtil.java | 15 ++
.../java/com/cloud/utils/ssh/SSHCmdHelper.java | 2 +-
.../utils/jsinterpreter/JsInterpreter.java | 33 ++--
.../utils/jsinterpreter/TagAsRuleHelper.java | 21 ++-
.../utils/jsinterpreter/JsInterpreterTest.java | 18 ---
115 files changed, 1383 insertions(+), 1562 deletions(-)
copy
api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/ListVPCsCmdByAdmin.java
=>
framework/config/src/main/java/org/apache/cloudstack/framework/config/ValidatedConfigKey.java
(57%)
delete mode 100644
framework/quota/src/test/java/org/apache/cloudstack/quota/activationrule/presetvariables/AccountTest.java
delete mode 100644
framework/quota/src/test/java/org/apache/cloudstack/quota/activationrule/presetvariables/BackupOfferingTest.java
delete mode 100644
framework/quota/src/test/java/org/apache/cloudstack/quota/activationrule/presetvariables/ComputeOfferingTest.java
delete mode 100644
framework/quota/src/test/java/org/apache/cloudstack/quota/activationrule/presetvariables/ComputingResourcesTest.java
delete mode 100644
framework/quota/src/test/java/org/apache/cloudstack/quota/activationrule/presetvariables/DomainTest.java
delete mode 100644
framework/quota/src/test/java/org/apache/cloudstack/quota/activationrule/presetvariables/GenericPresetVariableTest.java
delete mode 100644
framework/quota/src/test/java/org/apache/cloudstack/quota/activationrule/presetvariables/HostTest.java
delete mode 100644
framework/quota/src/test/java/org/apache/cloudstack/quota/activationrule/presetvariables/ResourceTest.java
delete mode 100644
framework/quota/src/test/java/org/apache/cloudstack/quota/activationrule/presetvariables/RoleTest.java
delete mode 100644
framework/quota/src/test/java/org/apache/cloudstack/quota/activationrule/presetvariables/StorageTest.java
delete mode 100644
framework/quota/src/test/java/org/apache/cloudstack/quota/activationrule/presetvariables/ValueTest.java
create mode 100644
plugins/integrations/prometheus/src/test/java/org/apache/cloudstack/metrics/PrometheusExporterImplTest.java
rename server/src/test/java/com/cloud/user/{AccountManagetImplTestBase.java =>
AccountManagentImplTestBase.java} (98%)
delete mode 100644
server/src/test/java/org/apache/cloudstack/storage/heuristics/presetvariables/AccountTest.java
delete mode 100644
server/src/test/java/org/apache/cloudstack/storage/heuristics/presetvariables/DomainTest.java
delete mode 100644
server/src/test/java/org/apache/cloudstack/storage/heuristics/presetvariables/GenericHeuristicPresetVariableTest.java
delete mode 100644
server/src/test/java/org/apache/cloudstack/storage/heuristics/presetvariables/SecondaryStorageTest.java
delete mode 100644
server/src/test/java/org/apache/cloudstack/storage/heuristics/presetvariables/SnapshotTest.java
delete mode 100644
server/src/test/java/org/apache/cloudstack/storage/heuristics/presetvariables/TemplateTest.java
delete mode 100644
server/src/test/java/org/apache/cloudstack/storage/heuristics/presetvariables/VolumeTest.java
create mode 100644
services/secondary-storage/server/src/test/java/org/apache/cloudstack/storage/template/UploadManagerImplTest.java
create mode 100644 ui/src/components/view/DomainDeleteConfirm.vue
