Merge branch 'main' into feature-ui-logs

Author: shwstppr

api/src/main/java/org/apache/cloudstack/api/ApiConstants.java

@@ -381,6 +381,7 @@ public class ApiConstants {
     public static final String MAC_ADDRESS = "macaddress";
     public static final String MAC_ADDRESSES = "macaddresses";
     public static final String MANUAL_UPGRADE = "manualupgrade";
+    public static final String MATCH_TYPE = "matchtype";
     public static final String MAX = "max";
     public static final String MAX_SNAPS = "maxsnaps";
     public static final String MAX_BACKUPS = "maxbackups";

api/src/main/java/org/apache/cloudstack/api/command/user/backup/CreateBackupCmd.java

@@ -19,6 +19,7 @@
 
 import javax.inject.Inject;
 
+import com.cloud.vm.VirtualMachine;
 import org.apache.cloudstack.acl.RoleType;
 import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.ApiCommandResourceType;
@@ -138,7 +139,8 @@ public String getEventType() {
 
     @Override
     public String getEventDescription() {
-        return "Creating backup for Instance " + vmId;
+        String vmUuid = _uuidMgr.getUuid(VirtualMachine.class, getVmId());
+        return "Creating backup for Instance " + vmUuid;
     }
 
     @Override

api/src/main/java/org/apache/cloudstack/api/command/user/backup/DeleteBackupCmd.java

@@ -28,6 +28,7 @@
 import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.api.response.BackupResponse;
 import org.apache.cloudstack.api.response.SuccessResponse;
+import org.apache.cloudstack.backup.Backup;
 import org.apache.cloudstack.backup.BackupManager;
 import org.apache.cloudstack.context.CallContext;
 import org.apache.commons.lang3.BooleanUtils;
@@ -111,6 +112,7 @@ public String getEventType() {
 
     @Override
     public String getEventDescription() {
-        return "Deleting backup ID " + backupId;
+        String backupUuid = _uuidMgr.getUuid(Backup.class, getId());
+        return "Deleting backup ID " + backupUuid;
     }
 }

api/src/main/java/org/apache/cloudstack/api/command/user/backup/RestoreBackupCmd.java

@@ -28,6 +28,7 @@
 import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.api.response.SuccessResponse;
 import org.apache.cloudstack.api.response.BackupResponse;
+import org.apache.cloudstack.backup.Backup;
 import org.apache.cloudstack.backup.BackupManager;
 import org.apache.cloudstack.context.CallContext;
 
@@ -99,6 +100,7 @@ public String getEventType() {
 
     @Override
     public String getEventDescription() {
-        return "Restoring Instance from backup: " + backupId;
+        String backupUuid = _uuidMgr.getUuid(Backup.class, getBackupId());
+        return "Restoring Instance from backup: " + backupUuid;
     }
 }

engine/schema/src/main/resources/META-INF/db/schema-42210to42300.sql

@@ -25,6 +25,22 @@
 UPDATE `cloud`.`configuration` SET value='random' WHERE name IN ('vm.allocation.algorithm', 'volume.allocation.algorithm') AND value='userconcentratedpod_random';
 UPDATE `cloud`.`configuration` SET value='firstfit' WHERE name IN ('vm.allocation.algorithm', 'volume.allocation.algorithm') AND value='userconcentratedpod_firstfit';
 
+-- Create webhook_filter table
+DROP TABLE IF EXISTS `cloud`.`webhook_filter`;
+CREATE TABLE IF NOT EXISTS `cloud`.`webhook_filter` (
+    `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'id of the webhook filter',
+    `uuid` varchar(255) COMMENT 'uuid of the webhook filter',
+    `webhook_id` bigint unsigned  NOT NULL COMMENT 'id of the webhook',
+    `type` varchar(20) COMMENT 'type of the filter',
+    `mode` varchar(20) COMMENT 'mode of the filter',
+    `match_type` varchar(20) COMMENT 'match type of the filter',
+    `value` varchar(256) NOT NULL COMMENT 'value of the filter used for matching',
+    `created` datetime NOT NULL COMMENT 'date created',
+    PRIMARY KEY (`id`),
+    INDEX `i_webhook_filter__webhook_id`(`webhook_id`),
+    CONSTRAINT `fk_webhook_filter__webhook_id` FOREIGN KEY(`webhook_id`) REFERENCES `webhook`(`id`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
 -- Add management_server_details table to allow ManagementServer scope configs
 CREATE TABLE IF NOT EXISTS `cloud`.`management_server_details` (
     `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'id',

plugins/event-bus/webhook/src/main/java/org/apache/cloudstack/mom/webhook/Webhook.java

@@ -24,8 +24,8 @@
 import org.apache.cloudstack.api.InternalIdentity;
 
 public interface Webhook extends ControlledEntity, Identity, InternalIdentity {
-    public static final long ID_DUMMY = 0L;
-    public static final String NAME_DUMMY = "Test";
+    long ID_DUMMY = 0L;
+    String NAME_DUMMY = "Test";
     enum State {
         Enabled, Disabled;
     };

plugins/event-bus/webhook/src/main/java/org/apache/cloudstack/mom/webhook/WebhookApiService.java

@@ -18,14 +18,18 @@
 package org.apache.cloudstack.mom.webhook;
 
 import org.apache.cloudstack.api.response.ListResponse;
+import org.apache.cloudstack.mom.webhook.api.command.user.AddWebhookFilterCmd;
 import org.apache.cloudstack.mom.webhook.api.command.user.CreateWebhookCmd;
 import org.apache.cloudstack.mom.webhook.api.command.user.DeleteWebhookCmd;
 import org.apache.cloudstack.mom.webhook.api.command.user.DeleteWebhookDeliveryCmd;
+import org.apache.cloudstack.mom.webhook.api.command.user.DeleteWebhookFilterCmd;
 import org.apache.cloudstack.mom.webhook.api.command.user.ExecuteWebhookDeliveryCmd;
 import org.apache.cloudstack.mom.webhook.api.command.user.ListWebhookDeliveriesCmd;
+import org.apache.cloudstack.mom.webhook.api.command.user.ListWebhookFiltersCmd;
 import org.apache.cloudstack.mom.webhook.api.command.user.ListWebhooksCmd;
 import org.apache.cloudstack.mom.webhook.api.command.user.UpdateWebhookCmd;
 import org.apache.cloudstack.mom.webhook.api.response.WebhookDeliveryResponse;
+import org.apache.cloudstack.mom.webhook.api.response.WebhookFilterResponse;
 import org.apache.cloudstack.mom.webhook.api.response.WebhookResponse;
 
 import com.cloud.utils.component.PluggableService;
@@ -41,4 +45,7 @@ public interface WebhookApiService extends PluggableService {
     ListResponse<WebhookDeliveryResponse> listWebhookDeliveries(ListWebhookDeliveriesCmd cmd);
     int deleteWebhookDelivery(DeleteWebhookDeliveryCmd cmd) throws CloudRuntimeException;
     WebhookDeliveryResponse executeWebhookDelivery(ExecuteWebhookDeliveryCmd cmd) throws CloudRuntimeException;
+    ListResponse<WebhookFilterResponse> listWebhookFilters(ListWebhookFiltersCmd cmd) throws CloudRuntimeException;
+    WebhookFilterResponse addWebhookFilter(AddWebhookFilterCmd cmd) throws CloudRuntimeException;
+    int deleteWebhookFilter(DeleteWebhookFilterCmd cmd) throws CloudRuntimeException;
 }