Merge branch '3.8.0-fix' into for_iaas_3.8.0

# Conflicts:
#	volcstack-java-sdk-autoscaling/pom.xml
#	volcstack-java-sdk-cen/pom.xml
#	volcstack-java-sdk-clb/pom.xml
#	volcstack-java-sdk-core/pom.xml
#	volcstack-java-sdk-core/src/main/java/com/volcengine/volcstack/version/Version.java
#	volcstack-java-sdk-directconnect/pom.xml
#	volcstack-java-sdk-ecs/pom.xml
#	volcstack-java-sdk-natgateway/pom.xml
#	volcstack-java-sdk-storageebs/pom.xml
#	volcstack-java-sdk-vpc/pom.xml
#	volcstack-java-sdk-vpn/pom.xml

Author: xuyaming0800

README.md

@@ -51,7 +51,7 @@
     <dependency>
       <groupId>com.volcengine</groupId>
 	  <artifactId>volcstack-java-sdk-bom</artifactId>
-        <version>0.1.0</version>
+        <version>0.1.1</version>
 	  <type>pom</type>
       <scope>import</scope>
     </dependency>
@@ -67,12 +67,12 @@
   <dependency>
     <groupId>com.volcengine</groupId>
     <artifactId>volcstack-java-sdk-vpc</artifactId>
-    <version>0.1.0</version>
+    <version>0.1.1</version>
   </dependency>
   <dependency>
     <groupId>com.volcengine</groupId>
     <artifactId>volcstack-java-sdk-ecs</artifactId>
-    <version>0.1.0</version>
+    <version>0.1.1</version>
   </dependency>
 </dependencies>
 ```

pom.xml

@@ -4,7 +4,7 @@
     <groupId>com.volcengine</groupId>
     <artifactId>volcstack-java-sdk</artifactId>
     <packaging>pom</packaging>
-    <version>0.1.0</version>
+    <version>0.1.1</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <java.source.version>1.7</java.source.version>

volcstack-java-sdk-autoscaling/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>volcstack-java-sdk</artifactId>
         <groupId>com.volcengine</groupId>
-        <version>0.1.0</version>
+        <version>0.1.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

volcstack-java-sdk-autoscaling/src/main/java/com/volcengine/volcstack/autoscaling/AutoScalingApi.java

@@ -27,7 +27,7 @@
  * AlarmPolicyConditionForCreateScalingPolicyInput
  */
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-05-13T17:16:15.237208+08:00[Asia/Shanghai]")
+@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-05-24T15:52:12.731669+08:00[Asia/Shanghai]")
 public class AlarmPolicyConditionForCreateScalingPolicyInput {
   @SerializedName("ComparisonOperator")
   private String comparisonOperator = null;

volcstack-java-sdk-autoscaling/src/main/java/com/volcengine/volcstack/autoscaling/model/AlarmPolicyConditionForCreateScalingPolicyInput.java

@@ -27,7 +27,7 @@
  * AlarmPolicyConditionForModifyScalingPolicyInput
  */
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-05-13T17:16:15.237208+08:00[Asia/Shanghai]")
+@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-05-24T15:52:12.731669+08:00[Asia/Shanghai]")
 public class AlarmPolicyConditionForModifyScalingPolicyInput {
   @SerializedName("ComparisonOperator")
   private String comparisonOperator = null;

volcstack-java-sdk-autoscaling/src/main/java/com/volcengine/volcstack/autoscaling/model/AlarmPolicyConditionForModifyScalingPolicyInput.java

@@ -28,14 +28,17 @@
  * AlarmPolicyForCreateScalingPolicyInput
  */
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-05-13T17:16:15.237208+08:00[Asia/Shanghai]")
+@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-05-24T15:52:12.731669+08:00[Asia/Shanghai]")
 public class AlarmPolicyForCreateScalingPolicyInput {
   @SerializedName("Condition")
   private AlarmPolicyConditionForCreateScalingPolicyInput condition = null;
 
   @SerializedName("EvaluationCount")
   private Integer evaluationCount = null;
 
+  @SerializedName("RuleId")
+  private String ruleId = null;
+
   @SerializedName("RuleType")
   private String ruleType = null;
 
@@ -76,6 +79,24 @@ public void setEvaluationCount(Integer evaluationCount) {
     this.evaluationCount = evaluationCount;
   }
 
+  public AlarmPolicyForCreateScalingPolicyInput ruleId(String ruleId) {
+    this.ruleId = ruleId;
+    return this;
+  }
+
+   /**
+   * Get ruleId
+   * @return ruleId
+  **/
+  @Schema(description = "")
+  public String getRuleId() {
+    return ruleId;
+  }
+
+  public void setRuleId(String ruleId) {
+    this.ruleId = ruleId;
+  }
+
   public AlarmPolicyForCreateScalingPolicyInput ruleType(String ruleType) {
     this.ruleType = ruleType;
     return this;
@@ -106,12 +127,13 @@ public boolean equals(java.lang.Object o) {
     AlarmPolicyForCreateScalingPolicyInput alarmPolicyForCreateScalingPolicyInput = (AlarmPolicyForCreateScalingPolicyInput) o;
     return Objects.equals(this.condition, alarmPolicyForCreateScalingPolicyInput.condition) &&
         Objects.equals(this.evaluationCount, alarmPolicyForCreateScalingPolicyInput.evaluationCount) &&
+        Objects.equals(this.ruleId, alarmPolicyForCreateScalingPolicyInput.ruleId) &&
         Objects.equals(this.ruleType, alarmPolicyForCreateScalingPolicyInput.ruleType);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(condition, evaluationCount, ruleType);
+    return Objects.hash(condition, evaluationCount, ruleId, ruleType);
   }
 
 
@@ -122,6 +144,7 @@ public String toString() {
 
     sb.append("    condition: ").append(toIndentedString(condition)).append("\n");
     sb.append("    evaluationCount: ").append(toIndentedString(evaluationCount)).append("\n");
+    sb.append("    ruleId: ").append(toIndentedString(ruleId)).append("\n");
     sb.append("    ruleType: ").append(toIndentedString(ruleType)).append("\n");
     sb.append("}");
     return sb.toString();

volcstack-java-sdk-autoscaling/src/main/java/com/volcengine/volcstack/autoscaling/model/AlarmPolicyForCreateScalingPolicyInput.java

@@ -28,14 +28,17 @@
  * AlarmPolicyForDescribeScalingPoliciesOutput
  */
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-05-13T17:16:15.237208+08:00[Asia/Shanghai]")
+@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-05-24T15:52:12.731669+08:00[Asia/Shanghai]")
 public class AlarmPolicyForDescribeScalingPoliciesOutput {
   @SerializedName("Condition")
   private ConditionForDescribeScalingPoliciesOutput condition = null;
 
   @SerializedName("EvaluationCount")
   private Integer evaluationCount = null;
 
+  @SerializedName("RuleId")
+  private String ruleId = null;
+
   @SerializedName("RuleType")
   private String ruleType = null;
 
@@ -76,6 +79,24 @@ public void setEvaluationCount(Integer evaluationCount) {
     this.evaluationCount = evaluationCount;
   }
 
+  public AlarmPolicyForDescribeScalingPoliciesOutput ruleId(String ruleId) {
+    this.ruleId = ruleId;
+    return this;
+  }
+
+   /**
+   * Get ruleId
+   * @return ruleId
+  **/
+  @Schema(description = "")
+  public String getRuleId() {
+    return ruleId;
+  }
+
+  public void setRuleId(String ruleId) {
+    this.ruleId = ruleId;
+  }
+
   public AlarmPolicyForDescribeScalingPoliciesOutput ruleType(String ruleType) {
     this.ruleType = ruleType;
     return this;
@@ -106,12 +127,13 @@ public boolean equals(java.lang.Object o) {
     AlarmPolicyForDescribeScalingPoliciesOutput alarmPolicyForDescribeScalingPoliciesOutput = (AlarmPolicyForDescribeScalingPoliciesOutput) o;
     return Objects.equals(this.condition, alarmPolicyForDescribeScalingPoliciesOutput.condition) &&
         Objects.equals(this.evaluationCount, alarmPolicyForDescribeScalingPoliciesOutput.evaluationCount) &&
+        Objects.equals(this.ruleId, alarmPolicyForDescribeScalingPoliciesOutput.ruleId) &&
         Objects.equals(this.ruleType, alarmPolicyForDescribeScalingPoliciesOutput.ruleType);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(condition, evaluationCount, ruleType);
+    return Objects.hash(condition, evaluationCount, ruleId, ruleType);
   }
 
 
@@ -122,6 +144,7 @@ public String toString() {
 
     sb.append("    condition: ").append(toIndentedString(condition)).append("\n");
     sb.append("    evaluationCount: ").append(toIndentedString(evaluationCount)).append("\n");
+    sb.append("    ruleId: ").append(toIndentedString(ruleId)).append("\n");
     sb.append("    ruleType: ").append(toIndentedString(ruleType)).append("\n");
     sb.append("}");
     return sb.toString();

volcstack-java-sdk-autoscaling/src/main/java/com/volcengine/volcstack/autoscaling/model/AlarmPolicyForDescribeScalingPoliciesOutput.java

@@ -28,14 +28,17 @@
  * AlarmPolicyForModifyScalingPolicyInput
  */
 
-@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-05-13T17:16:15.237208+08:00[Asia/Shanghai]")
+@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.JavaClientCodegen", date = "2022-05-24T15:52:12.731669+08:00[Asia/Shanghai]")
 public class AlarmPolicyForModifyScalingPolicyInput {
   @SerializedName("Condition")
   private AlarmPolicyConditionForModifyScalingPolicyInput condition = null;
 
   @SerializedName("EvaluationCount")
   private Integer evaluationCount = null;
 
+  @SerializedName("RuleId")
+  private String ruleId = null;
+
   @SerializedName("RuleType")
   private String ruleType = null;
 
@@ -76,6 +79,24 @@ public void setEvaluationCount(Integer evaluationCount) {
     this.evaluationCount = evaluationCount;
   }
 
+  public AlarmPolicyForModifyScalingPolicyInput ruleId(String ruleId) {
+    this.ruleId = ruleId;
+    return this;
+  }
+
+   /**
+   * Get ruleId
+   * @return ruleId
+  **/
+  @Schema(description = "")
+  public String getRuleId() {
+    return ruleId;
+  }
+
+  public void setRuleId(String ruleId) {
+    this.ruleId = ruleId;
+  }
+
   public AlarmPolicyForModifyScalingPolicyInput ruleType(String ruleType) {
     this.ruleType = ruleType;
     return this;
@@ -106,12 +127,13 @@ public boolean equals(java.lang.Object o) {
     AlarmPolicyForModifyScalingPolicyInput alarmPolicyForModifyScalingPolicyInput = (AlarmPolicyForModifyScalingPolicyInput) o;
     return Objects.equals(this.condition, alarmPolicyForModifyScalingPolicyInput.condition) &&
         Objects.equals(this.evaluationCount, alarmPolicyForModifyScalingPolicyInput.evaluationCount) &&
+        Objects.equals(this.ruleId, alarmPolicyForModifyScalingPolicyInput.ruleId) &&
         Objects.equals(this.ruleType, alarmPolicyForModifyScalingPolicyInput.ruleType);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(condition, evaluationCount, ruleType);
+    return Objects.hash(condition, evaluationCount, ruleId, ruleType);
   }
 
 
@@ -122,6 +144,7 @@ public String toString() {
 
     sb.append("    condition: ").append(toIndentedString(condition)).append("\n");
     sb.append("    evaluationCount: ").append(toIndentedString(evaluationCount)).append("\n");
+    sb.append("    ruleId: ").append(toIndentedString(ruleId)).append("\n");
     sb.append("    ruleType: ").append(toIndentedString(ruleType)).append("\n");
     sb.append("}");
     return sb.toString();