Merge branch 'fix-82022@@2' into '5.5.12'

<fix>[accesskey]: support AccessKey type distinction

See merge request zstackio/zstack!9270

Author: gitlab

conf/db/upgrade/V5.5.12__schema.sql

@@ -1,3 +1,5 @@
+CALL ADD_COLUMN('AccessKeyVO', 'type', 'varchar(32)', 0, 'User');
+
 -- ZSTAC-75319: Add normalizedModelName column for GPU spec dedup
 CALL ADD_COLUMN('GpuDeviceSpecVO', 'normalizedModelName', 'VARCHAR(255)', 1, NULL);
 CALL CREATE_INDEX('GpuDeviceSpecVO', 'idx_gpu_spec_normalized_model', 'normalizedModelName');

sdk/src/main/java/SourceClassMap.java

@@ -9,6 +9,7 @@ public class SourceClassMap {
 			put("org.zstack.abstraction.OptionType$InputType", "org.zstack.sdk.InputType");
 			put("org.zstack.accessKey.AccessKeyInventory", "org.zstack.sdk.AccessKeyInventory");
 			put("org.zstack.accessKey.AccessKeyState", "org.zstack.sdk.AccessKeyState");
+			put("org.zstack.accessKey.AccessKeyType", "org.zstack.sdk.AccessKeyType");
 			put("org.zstack.ai.NginxRedirectRule", "org.zstack.sdk.NginxRedirectRule");
 			put("org.zstack.ai.entity.ApplicationDevelopmentServiceInventory", "org.zstack.sdk.ApplicationDevelopmentServiceInventory");
 			put("org.zstack.ai.entity.DatasetInventory", "org.zstack.sdk.DatasetInventory");
@@ -884,6 +885,7 @@ public class SourceClassMap {
 			put("org.zstack.sdk.AccessControlRuleInventory", "org.zstack.loginControl.entity.AccessControlRuleInventory");
 			put("org.zstack.sdk.AccessKeyInventory", "org.zstack.accessKey.AccessKeyInventory");
 			put("org.zstack.sdk.AccessKeyState", "org.zstack.accessKey.AccessKeyState");
+			put("org.zstack.sdk.AccessKeyType", "org.zstack.accessKey.AccessKeyType");
 			put("org.zstack.sdk.AccessPathInfo", "org.zstack.header.volume.block.AccessPathInfo");
 			put("org.zstack.sdk.AccountInventory", "org.zstack.header.identity.AccountInventory");
 			put("org.zstack.sdk.AccountPriceTableRefInventory", "org.zstack.billing.table.AccountPriceTableRefInventory");

sdk/src/main/java/org/zstack/sdk/AccessKeyInventory.java

@@ -1,6 +1,7 @@
 package org.zstack.sdk;
 
 import org.zstack.sdk.AccessKeyState;
+import org.zstack.sdk.AccessKeyType;
 
 public class AccessKeyInventory  {
 
@@ -60,6 +61,14 @@ public AccessKeyState getState() {
         return this.state;
     }
 
+    public AccessKeyType type;
+    public void setType(AccessKeyType type) {
+        this.type = type;
+    }
+    public AccessKeyType getType() {
+        return this.type;
+    }
+
     public java.sql.Timestamp createDate;
     public void setCreateDate(java.sql.Timestamp createDate) {
         this.createDate = createDate;

sdk/src/main/java/org/zstack/sdk/AccessKeyType.java

@@ -0,0 +1,6 @@
+package org.zstack.sdk;
+
+public enum AccessKeyType {
+	User,
+	System,
+}

sdk/src/main/java/org/zstack/sdk/CreateAccessKeyAction.java

@@ -40,6 +40,9 @@ public Result throwExceptionIfError() {
     @Param(required = false, maxLength = 40, minLength = 10, nonempty = false, nullElements = false, emptyString = true, noTrim = false)
     public java.lang.String AccessKeySecret;
 
+    @Param(required = false, validValues = {"User","System"}, nonempty = false, nullElements = false, emptyString = true, noTrim = false)
+    public java.lang.String accessKeyType = "User";
+
     @Param(required = false)
     public java.lang.String resourceUuid;