This is an automated email from the ASF dual-hosted git repository.
DaanHoogland pushed a change to branch ghi13586-prometheusDrainage-20
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
discard 1951bdb3c21 sonarcube
discard 80d6dfed1c5 prometheus: fix scrape duration growing unbounded (#13667)
(#13696)
omit 98f057025b5 more tests
omit 0d49b1df463 renaming to newer convention
omit d765e5d8b85 move comment to javadoc
omit 46ee46e4968 optimise prometheus scraping workflow
add f8a3762f076 do not send jetty version on failure to start (#13744)
add 69fc541737e server: ignore projectid=-1 for finding owner (#12695)
add 1e5d534c3ca guard against stopping stats background threads (#13659)
add 2bc8d299733 Don't allow adding of existing host to another zone, pod
or cluster (#13182)
add 5432a04ae6e Ensure VM IP is removed from VR DHCP records in
dnsmasq.leases after expunge VM (#13194)
add 18c1a30028d Allow only authorized users to add and list entity's
annotations
add 30e6abb63fb Restrict domain admin access to project roles within their
own domain and add tests to cover perm check for proj role permissions
add 4ae69bc7fd3 Restrict listHostTags to hosts dedicated to the caller's
domain (including sub-domains and accounts in a domain)
add e6640803ed9 webhook: improve deliveries access
add bbd37271c62 Validate URL before obtaining remote size
add 19d31cf6faf ldap: improve config access
add 57a2b4d5051 server: fix access for disable user 2fa
add 113ccb28e3b Upgrade axios to 0.31.1 which has the config merge fix
add 3eb928bc72d Escape HTML in username, VM display name and diagnostics
output
add 07e09db0af5 Fix issue in direct download and NFS templates
add 7c872a988ac api,server: improve async job storage
add 5b325dd49e4 Prevent command injections in get/run diagnostics API
add f320f552c33 oauth2: improve list providers api for access
add b17edb538e0 oauth2: improve google provider flow
add 9781fb906a7 api,server,kvm: improve backup repository mount handling
add ea75dc3c437 Fix database connection leak
add 2c7f13b709f webhook: additional check for payload url
add 04598336311 saml: reject signed SAMLResponse when IdP has no signing
certificate registered
add 8985a1fc7c2 add access validation for the deleteUserData,
linkUserDataToTemplate and resetUserDataForVirtualMachine APIs
add 6136ac93854 api: add ACL on ApiConstants.USER_DATA_ID
add 9623b17ca69 optimise prometheus scraping workflow
add 91b541a2e37 move comment to javadoc
add 828857a23a3 renaming to newer convention
add 8b1daf02fc1 more tests
add 7dfa353cc8e prometheus: fix scrape duration growing unbounded (#13667)
(#13696)
add 2d2c40bebce sonarcube
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (1951bdb3c21)
\
N -- N -- N refs/heads/ghi13586-prometheusDrainage-20
(2d2c40bebce)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
.../org/apache/cloudstack/api/ApiArgValidator.java | 73 +++++-
.../admin/vm/ResetVMPasswordCmdByAdmin.java | 2 +-
.../autoscale/CreateAutoScaleVmProfileCmd.java | 2 +
.../autoscale/UpdateAutoScaleVmProfileCmd.java | 1 +
.../backup/repository/AddBackupRepositoryCmd.java | 4 +-
.../command/user/userdata/DeleteUserDataCmd.java | 17 +-
.../user/userdata/LinkUserDataToTemplateCmd.java | 3 +
.../api/command/user/vm/DeployVMCmd.java | 1 +
.../api/command/user/vm/ResetVMPasswordCmd.java | 2 +-
.../api/command/user/vm/ResetVMUserDataCmd.java | 1 +
.../api/command/user/vm/UpdateVMCmd.java | 1 +
.../cloudstack/api/response/HostTagResponse.java | 6 +-
.../direct/download/DirectDownloadManager.java | 10 +
.../user/userdata/DeleteUserDataCmdTest.java | 31 ++-
.../template/MetalinkTemplateDownloader.java | 7 +
.../directdownload/DirectDownloadCommand.java | 11 +-
.../direct/download/DirectDownloadHelper.java | 5 +-
.../download/MetalinkDirectTemplateDownloader.java | 55 ++++-
.../download/NfsDirectTemplateDownloader.java | 79 ++++++-
.../download/NfsDirectTemplateDownloaderTest.java | 73 ++++++
.../com/cloud/vm/VirtualMachineManagerImpl.java | 6 +-
.../java/com/cloud/host/dao/HostTagsDaoImpl.java | 1 -
.../framework/config/impl/ConfigDepotImpl.java | 11 +-
.../framework/jobs/AsyncJobDataHelper.java | 150 +++++++++++++
.../framework/jobs/impl/AsyncJobManagerImpl.java | 48 ++--
.../cloudstack/framework/jobs/impl/AsyncJobVO.java | 22 +-
.../framework/jobs/AsyncJobDataHelperTest.java | 249 +++++++++++++++++++++
.../framework/jobs/AsyncJobManagerTest.java | 2 -
.../mom/webhook/WebhookApiServiceImpl.java | 79 ++++---
.../mom/webhook/WebhookDeliveryThread.java | 117 ++++++++--
.../cloudstack/mom/webhook/WebhookService.java | 38 +++-
.../cloudstack/mom/webhook/WebhookServiceImpl.java | 61 ++++-
.../mom/webhook/WebhookUrlValidator.java | 123 ++++++++++
.../mom/webhook/dao/WebhookDeliveryDao.java | 3 +-
.../mom/webhook/dao/WebhookDeliveryDaoImpl.java | 14 +-
.../mom/webhook/dao/WebhookDeliveryJoinDao.java | 6 +-
.../webhook/dao/WebhookDeliveryJoinDaoImpl.java | 9 +-
.../mom/webhook/WebhookApiServiceImplTest.java | 198 +++++++++++++++-
.../mom/webhook/WebhookDeliveryThreadTest.java | 7 +
.../mom/webhook/WebhookUrlValidatorTest.java | 100 +++++++++
.../LibvirtRestoreBackupCommandWrapper.java | 66 +++---
.../api/response/LdapConfigurationResponse.java | 16 +-
.../apache/cloudstack/ldap/LdapManagerImpl.java | 24 +-
.../oauth2/api/command/ListOAuthProvidersCmd.java | 52 ++++-
.../oauth2/google/GoogleOAuth2Provider.java | 121 ++++++----
.../oauth2/google/GoogleOAuth2ProviderTest.java | 177 ++++++++-------
.../api/command/SAML2LoginAPIAuthenticatorCmd.java | 78 ++++---
server/src/main/java/com/cloud/api/ApiServer.java | 4 +-
.../com/cloud/api/dispatch/ParamProcessWorker.java | 6 +
.../java/com/cloud/api/query/QueryManagerImpl.java | 63 +++++-
.../com/cloud/api/query/vo/AsyncJobJoinVO.java | 3 +-
.../com/cloud/dc/dao/DedicatedResourceDao.java | 6 +
.../com/cloud/dc/dao/DedicatedResourceDaoImpl.java | 12 +
.../com/cloud/resource/ResourceManagerImpl.java | 55 +++++
.../main/java/com/cloud/server/StatsCollector.java | 14 +-
.../com/cloud/storage/VolumeApiServiceImpl.java | 16 +-
.../com/cloud/template/TemplateManagerImpl.java | 26 ++-
.../java/com/cloud/user/AccountManagerImpl.java | 8 +-
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 10 +-
.../cloud/vm/snapshot/VMSnapshotManagerImpl.java | 10 +-
.../cloudstack/acl/ProjectRoleManagerImpl.java | 17 +-
.../annotation/AnnotationManagerImpl.java | 9 +-
.../diagnostics/DiagnosticsServiceImpl.java | 37 ++-
.../direct/download/DirectDownloadManagerImpl.java | 27 ++-
.../cloud/api/dispatch/ParamProcessWorkerTest.java | 20 ++
.../com/cloud/api/query/QueryManagerImplTest.java | 232 +++++++++++++++++++
.../cloud/resource/ResourceManagerImplTest.java | 90 ++++++++
.../java/com/cloud/server/StatsCollectorTest.java | 43 ++++
.../cloud/template/TemplateManagerImplTest.java | 65 ++++++
.../com/cloud/user/AccountManagerImplTest.java | 33 ++-
.../java/com/cloud/vm/UserVmManagerImplTest.java | 1 -
.../cloudstack/acl/ProjectRoleManagerImplTest.java | 245 ++++++++++++++++++++
.../diagnostics/DiagnosticsServiceImplTest.java | 133 +++++++++++
.../consoleproxy/ConsoleProxyNoVNCServer.java | 10 +-
systemvm/debian/opt/cloud/bin/cs/CsDhcp.py | 67 +++++-
test/integration/smoke/test_webhook_delivery.py | 67 +++++-
test/integration/smoke/test_webhook_lifecycle.py | 83 ++++++-
ui/package.json | 2 +-
ui/src/config/section/compute.js | 3 +-
ui/src/config/section/infra/routers.js | 3 +-
ui/src/config/section/infra/systemVms.js | 3 +-
ui/src/config/section/network.js | 3 +-
ui/src/config/section/user.js | 3 +-
ui/src/utils/util.js | 9 +
.../src/main/java/com/cloud/utils/StringUtils.java | 23 ++
utils/src/main/java/com/cloud/utils/UriUtils.java | 145 +++++++++++-
86 files changed, 3326 insertions(+), 442 deletions(-)
create mode 100644
core/src/test/java/org/apache/cloudstack/direct/download/NfsDirectTemplateDownloaderTest.java
create mode 100644
framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/AsyncJobDataHelper.java
create mode 100644
framework/jobs/src/test/java/org/apache/cloudstack/framework/jobs/AsyncJobDataHelperTest.java
create mode 100644
plugins/event-bus/webhook/src/main/java/org/apache/cloudstack/mom/webhook/WebhookUrlValidator.java
create mode 100644
plugins/event-bus/webhook/src/test/java/org/apache/cloudstack/mom/webhook/WebhookUrlValidatorTest.java
create mode 100644
server/src/test/java/org/apache/cloudstack/acl/ProjectRoleManagerImplTest.java
