Address comments

Author: vishesh92

api/src/main/java/com/cloud/event/EventTypes.java

@@ -1038,6 +1038,7 @@ public class EventTypes {
         entityEventDetails.put(EVENT_KMS_KEY_WRAP, KMSKey.class);
         entityEventDetails.put(EVENT_KMS_KEY_DELETE, KMSKey.class);
         entityEventDetails.put(EVENT_KMS_KEY_ROTATE, KMSKey.class);
+        entityEventDetails.put(EVENT_VOLUME_MIGRATE_TO_KMS, KMSKey.class);
 
         // HSM Profile Events
         entityEventDetails.put(EVENT_HSM_PROFILE_CREATE, HSMProfile.class);

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

@@ -23,7 +23,6 @@
 import java.util.Set;
 
 import org.apache.cloudstack.api.response.ConsoleSessionResponse;
-import org.apache.cloudstack.api.response.KMSKeyResponse;
 import org.apache.cloudstack.consoleproxy.ConsoleSession;
 import org.apache.cloudstack.acl.apikeypair.ApiKeyPair;
 import org.apache.cloudstack.acl.apikeypair.ApiKeyPairPermission;
@@ -157,7 +156,6 @@
 import org.apache.cloudstack.direct.download.DirectDownloadCertificateHostMap;
 import org.apache.cloudstack.direct.download.DirectDownloadManager;
 import org.apache.cloudstack.gui.theme.GuiThemeJoin;
-import org.apache.cloudstack.kms.KMSKey;
 import org.apache.cloudstack.management.ManagementServerHost;
 import org.apache.cloudstack.network.lb.ApplicationLoadBalancerRule;
 import org.apache.cloudstack.region.PortableIp;

api/src/main/java/org/apache/cloudstack/api/command/admin/kms/MigrateVolumesToKMSCmd.java

@@ -39,14 +39,13 @@
 import java.util.List;
 
 @APICommand(name = "migrateVolumesToKMS",
-            description = "Migrates passphrase-based volumes to KMS (admin only)",
+            description = "Migrates encrypted volumes to KMS",
             responseObject = AsyncJobResponse.class,
             since = "4.23.0",
             authorized = {RoleType.Admin},
             requestHasSensitiveInfo = false,
             responseHasSensitiveInfo = false)
 public class MigrateVolumesToKMSCmd extends BaseAsyncCmd {
-    private static final String s_name = "migratevolumestokmsresponse";
 
     @Inject
     private KMSManager kmsManager;
@@ -112,11 +111,6 @@ public void execute() {
         }
     }
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         KMSKey key = _entityMgr.findById(KMSKey.class, kmsKeyId);
@@ -138,11 +132,11 @@ public String getEventDescription() {
 
     @Override
     public ApiCommandResourceType getApiResourceType() {
-        return ApiCommandResourceType.Zone;
+        return ApiCommandResourceType.KmsKey;
     }
 
     @Override
     public Long getApiResourceId() {
-        return zoneId;
+        return kmsKeyId;
     }
 }

api/src/main/java/org/apache/cloudstack/api/command/user/kms/DeleteKMSKeyCmd.java

@@ -83,6 +83,11 @@ public ApiCommandResourceType getApiResourceType() {
         return ApiCommandResourceType.KmsKey;
     }
 
+    @Override
+    public Long getApiResourceId() {
+        return getId();
+    }
+
     @Override
     public String getEventType() {
         return EventTypes.EVENT_KMS_KEY_DELETE;

api/src/main/java/org/apache/cloudstack/api/command/user/kms/RotateKMSKeyCmd.java

@@ -36,7 +36,7 @@
 import javax.inject.Inject;
 
 @APICommand(name = "rotateKMSKey",
-            description = "Rotates KEK by creating new version and scheduling gradual re-encryption",
+            description = "Rotates KMS key (KEK) by creating new version and scheduling gradual re-encryption",
             responseObject = AsyncJobResponse.class,
             since = "4.23.0",
             authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User},
@@ -123,6 +123,6 @@ public ApiCommandResourceType getApiResourceType() {
 
     @Override
     public Long getApiResourceId() {
-        return id;
+        return getId();
     }
 }

api/src/main/java/org/apache/cloudstack/api/command/user/kms/UpdateKMSKeyCmd.java

@@ -104,6 +104,11 @@ public ApiCommandResourceType getApiResourceType() {
         return ApiCommandResourceType.KmsKey;
     }
 
+    @Override
+    public Long getApiResourceId() {
+        return getId();
+    }
+
     @Override
     public String getEventType() {
         return EventTypes.EVENT_KMS_KEY_UPDATE;

…mmand/user/kms/hsm/AddHSMProfileCmd.java …nd/user/kms/hsm/CreateHSMProfileCmd.javaapi/src/main/java/org/apache/cloudstack/api/command/user/kms/hsm/AddHSMProfileCmd.java renamed to api/src/main/java/org/apache/cloudstack/api/command/user/kms/hsm/CreateHSMProfileCmd.java api/src/main/java/org/apache/cloudstack/api/command/user/kms/hsm/AddHSMProfileCmd.java renamed to api/src/main/java/org/apache/cloudstack/api/command/user/kms/hsm/CreateHSMProfileCmd.java

@@ -25,6 +25,7 @@
 import com.cloud.utils.StringUtils;
 import org.apache.cloudstack.acl.RoleType;
 import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiCommandResourceType;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.ApiErrorCode;
 import org.apache.cloudstack.api.BaseCmd;
@@ -45,10 +46,10 @@
 import java.util.HashMap;
 import java.util.Map;
 
-@APICommand(name = "addHSMProfile", description = "Adds a new HSM profile", responseObject = HSMProfileResponse.class,
+@APICommand(name = "createHSMProfile", description = "Creates a new HSM profile", responseObject = HSMProfileResponse.class,
             requestHasSensitiveInfo = true, responseHasSensitiveInfo = true, since = "4.23.0",
         authorized = { RoleType.Admin })
-public class AddHSMProfileCmd extends BaseCmd {
+public class CreateHSMProfileCmd extends BaseCmd {
 
     @Inject
     private KMSManager kmsManager;
@@ -77,10 +78,10 @@ public class AddHSMProfileCmd extends BaseCmd {
                description = "the ID of the project to add the HSM profile for")
     private Long projectId;
 
-    @Parameter(name = "system", type = CommandType.BOOLEAN,
-               description = "whether this is a system HSM profile available to all users globally (root admin only). "
+    @Parameter(name = ApiConstants.IS_PUBLIC, type = CommandType.BOOLEAN,
+               description = "whether this is a public HSM profile available to all users globally (root admin only). "
                              + "Default is false")
-    private Boolean system;
+    private Boolean isPublic;
 
     @Parameter(name = ApiConstants.VENDOR_NAME, type = CommandType.STRING, description = "the vendor name of the HSM")
     private String vendorName;
@@ -116,8 +117,8 @@ public Long getProjectId() {
         return projectId;
     }
 
-    public Boolean isSystem() {
-        return system != null && system;
+    public Boolean getIsPublic() {
+        return isPublic != null && isPublic;
     }
 
     public String getVendorName() {
@@ -159,4 +160,9 @@ public long getEntityOwnerId() {
         }
         return CallContext.current().getCallingAccount().getId();
     }
+
+    @Override
+    public ApiCommandResourceType getApiResourceType() {
+        return ApiCommandResourceType.HsmProfile;
+    }
 }

api/src/main/java/org/apache/cloudstack/api/command/user/kms/hsm/DeleteHSMProfileCmd.java

@@ -24,6 +24,7 @@
 import com.cloud.exception.ResourceUnavailableException;
 import org.apache.cloudstack.acl.RoleType;
 import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiCommandResourceType;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.ApiErrorCode;
 import org.apache.cloudstack.api.BaseCmd;
@@ -78,4 +79,15 @@ public long getEntityOwnerId() {
         }
         return CallContext.current().getCallingAccount().getId();
     }
+
+
+    @Override
+    public ApiCommandResourceType getApiResourceType() {
+        return ApiCommandResourceType.HsmProfile;
+    }
+
+    @Override
+    public Long getApiResourceId() {
+        return getId();
+    }
 }

api/src/main/java/org/apache/cloudstack/api/command/user/kms/hsm/UpdateHSMProfileCmd.java

@@ -24,6 +24,7 @@
 import com.cloud.exception.ResourceUnavailableException;
 import org.apache.cloudstack.acl.RoleType;
 import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiCommandResourceType;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.ApiErrorCode;
 import org.apache.cloudstack.api.BaseCmd;
@@ -90,4 +91,14 @@ public long getEntityOwnerId() {
         }
         return CallContext.current().getCallingAccount().getId();
     }
+
+    @Override
+    public ApiCommandResourceType getApiResourceType() {
+        return ApiCommandResourceType.HsmProfile;
+    }
+
+    @Override
+    public Long getApiResourceId() {
+        return getId();
+    }
 }

api/src/main/java/org/apache/cloudstack/api/response/HSMProfileResponse.java

@@ -90,9 +90,9 @@ public class HSMProfileResponse extends BaseResponse implements ControlledViewEn
     @Param(description = "whether the HSM profile is enabled")
     private Boolean enabled;
 
-    @SerializedName("system")
+    @SerializedName(ApiConstants.IS_PUBLIC)
     @Param(description = "whether this is a system HSM profile available to all users globally")
-    private Boolean system;
+    private Boolean isPublic;
 
     @SerializedName(ApiConstants.CREATED)
     @Param(description = "the date the HSM profile was created")
@@ -168,8 +168,8 @@ public void setEnabled(Boolean enabled) {
         this.enabled = enabled;
     }
 
-    public void setSystem(Boolean system) {
-        this.system = system;
+    public void setIsPublic(Boolean isPublic) {
+        this.isPublic = isPublic;
     }
 
     public void setCreated(Date created) {