Merge branch 'vke_2.10' into 'master'

xuyaming0800 · xuyaming0800 · commit e6677c8b232f · 2023-03-14T03:29:17.000Z
feat: Vke 2.10 [skipped]

See merge request iaasng/volcengine-java-sdk!47
diff --git a/README.md b/README.md
@@ -54,7 +54,7 @@
     <dependency>
       <groupId>com.volcengine</groupId>
 	  <artifactId>volcengine-java-sdk-bom</artifactId>
-       <version>0.1.37</version>
+       <version>0.1.38</version>
 	  <type>pom</type>
       <scope>import</scope>
     </dependency>
@@ -70,12 +70,12 @@
   <dependency>
     <groupId>com.volcengine</groupId>
     <artifactId>volcengine-java-sdk-vpc</artifactId>
-   <version>0.1.37</version>
+   <version>0.1.38</version>
   </dependency>
   <dependency>
     <groupId>com.volcengine</groupId>
     <artifactId>volcengine-java-sdk-ecs</artifactId>
-   <version>0.1.37</version>
+   <version>0.1.38</version>
   </dependency>
 </dependencies>
 ```
diff --git a/meta.json b/meta.json
@@ -1,4 +1,4 @@
 {
-	"lasted": "0.1.37",
-	"meta_commit": "95eec105decc8a783ba0a06ec5028b1850fa7f4b"
+	"lasted": "0.1.38",
+	"meta_commit": "d886ed91af2c429606e9232b9f6a8a62fe68892f"
 }
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     <groupId>com.volcengine</groupId>
     <artifactId>volcengine-java-sdk</artifactId>
     <packaging>pom</packaging>
-    <version>0.1.37</version>
+    <version>0.1.38</version>
     <name>volcengine-java-sdk</name>
     <url>https://open.volcengineapi.com</url>
     <description>The Java SDK For Volcengine</description>
diff --git a/volcengine-java-sdk-alb/pom.xml b/volcengine-java-sdk-alb/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>volcengine-java-sdk</artifactId>
         <groupId>com.volcengine</groupId>
-        <version>0.1.37</version>
+        <version>0.1.38</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/volcengine-java-sdk-autoscaling/pom.xml b/volcengine-java-sdk-autoscaling/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>volcengine-java-sdk</artifactId>
         <groupId>com.volcengine</groupId>
-        <version>0.1.37</version>
+        <version>0.1.38</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/volcengine-java-sdk-bom/pom.xml b/volcengine-java-sdk-bom/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>volcengine-java-sdk</artifactId>
         <groupId>com.volcengine</groupId>
-        <version>0.1.37</version>
+        <version>0.1.38</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/volcengine-java-sdk-cen/pom.xml b/volcengine-java-sdk-cen/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>volcengine-java-sdk</artifactId>
         <groupId>com.volcengine</groupId>
-        <version>0.1.37</version>
+        <version>0.1.38</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/volcengine-java-sdk-clb/pom.xml b/volcengine-java-sdk-clb/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>volcengine-java-sdk</artifactId>
         <groupId>com.volcengine</groupId>
-        <version>0.1.37</version>
+        <version>0.1.38</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/volcengine-java-sdk-core/pom.xml b/volcengine-java-sdk-core/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>com.volcengine</groupId>
         <artifactId>volcengine-java-sdk</artifactId>
-        <version>0.1.37</version>
+        <version>0.1.38</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/volcengine-java-sdk-core/src/main/java/com/volcengine/version/Version.java b/volcengine-java-sdk-core/src/main/java/com/volcengine/version/Version.java
@@ -1,6 +1,6 @@
 package com.volcengine.version;
 
 public class Version {
-    public final static String SDK_VERSION = "0.1.37";
+    public final static String SDK_VERSION = "0.1.38";
     public final static String SDK_NAME = "volcengine-java-sdk";
 }
diff --git a/volcengine-java-sdk-cr/pom.xml b/volcengine-java-sdk-cr/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>volcengine-java-sdk</artifactId>
         <groupId>com.volcengine</groupId>
-        <version>0.1.37</version>
+        <version>0.1.38</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/volcengine-java-sdk-directconnect/pom.xml b/volcengine-java-sdk-directconnect/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>volcengine-java-sdk</artifactId>
         <groupId>com.volcengine</groupId>
-        <version>0.1.37</version>
+        <version>0.1.38</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/volcengine-java-sdk-ecs/pom.xml b/volcengine-java-sdk-ecs/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>volcengine-java-sdk</artifactId>
         <groupId>com.volcengine</groupId>
-        <version>0.1.37</version>
+        <version>0.1.38</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/volcengine-java-sdk-mongodb/pom.xml b/volcengine-java-sdk-mongodb/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>volcengine-java-sdk</artifactId>
         <groupId>com.volcengine</groupId>
-        <version>0.1.37</version>
+        <version>0.1.38</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/volcengine-java-sdk-natgateway/pom.xml b/volcengine-java-sdk-natgateway/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>volcengine-java-sdk</artifactId>
         <groupId>com.volcengine</groupId>
-        <version>0.1.37</version>
+        <version>0.1.38</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/volcengine-java-sdk-rdsmysql/pom.xml b/volcengine-java-sdk-rdsmysql/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>volcengine-java-sdk</artifactId>
         <groupId>com.volcengine</groupId>
-        <version>0.1.37</version>
+        <version>0.1.38</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/volcengine-java-sdk-rdsmysqlv2/pom.xml b/volcengine-java-sdk-rdsmysqlv2/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>volcengine-java-sdk</artifactId>
         <groupId>com.volcengine</groupId>
-        <version>0.1.37</version>
+        <version>0.1.38</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/volcengine-java-sdk-storageebs/pom.xml b/volcengine-java-sdk-storageebs/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>volcengine-java-sdk</artifactId>
         <groupId>com.volcengine</groupId>
-        <version>0.1.37</version>
+        <version>0.1.38</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/volcengine-java-sdk-vke/pom.xml b/volcengine-java-sdk-vke/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>volcengine-java-sdk</artifactId>
         <groupId>com.volcengine</groupId>
-        <version>0.1.37</version>
+        <version>0.1.38</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/volcengine-java-sdk-vke/src/main/java/com/volcengine/vke/VkeApi.java b/volcengine-java-sdk-vke/src/main/java/com/volcengine/vke/VkeApi.java
@@ -65,8 +65,8 @@
 import com.volcengine.vke.model.ListSupportedAddonsResponse;
 import com.volcengine.vke.model.ListSupportedResourceTypesRequest;
 import com.volcengine.vke.model.ListSupportedResourceTypesResponse;
-import com.volcengine.vke.model.ListTagsForResourceRequest;
-import com.volcengine.vke.model.ListTagsForResourceResponse;
+import com.volcengine.vke.model.ListTagsForResourcesRequest;
+import com.volcengine.vke.model.ListTagsForResourcesResponse;
 import com.volcengine.vke.model.TagResourcesRequest;
 import com.volcengine.vke.model.TagResourcesResponse;
 import com.volcengine.vke.model.UntagResourcesRequest;
@@ -2462,18 +2462,18 @@ public void onRequestProgress(long bytesWritten, long contentLength, boolean don
         return call;
     }
     /**
-     * Build call for listTagsForResource
+     * Build call for listTagsForResources
      * @param body  (required)
      * @param progressListener Progress listener
      * @param progressRequestListener Progress request listener
      * @return Call to execute
      * @throws ApiException If fail to serialize the request body object
      */
-    public com.squareup.okhttp.Call listTagsForResourceCall(ListTagsForResourceRequest body, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
+    public com.squareup.okhttp.Call listTagsForResourcesCall(ListTagsForResourcesRequest body, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
         Object localVarPostBody = body;
         
         // create path and map variables
-        String localVarPath = "/ListTagsForResource/2022-05-12/vke/post/";
+        String localVarPath = "/ListTagsForResources/2022-05-12/vke/post/";
 
         List<Pair> localVarQueryParams = new ArrayList<Pair>();
         List<Pair> localVarCollectionQueryParams = new ArrayList<Pair>();
@@ -2511,13 +2511,13 @@ public com.squareup.okhttp.Response intercept(com.squareup.okhttp.Interceptor.Ch
     }
     
     @SuppressWarnings("rawtypes")
-    private com.squareup.okhttp.Call listTagsForResourceValidateBeforeCall(ListTagsForResourceRequest body, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
+    private com.squareup.okhttp.Call listTagsForResourcesValidateBeforeCall(ListTagsForResourcesRequest body, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
         // verify the required parameter 'body' is set
         if (body == null) {
-            throw new ApiException("Missing the required parameter 'body' when calling listTagsForResource(Async)");
+            throw new ApiException("Missing the required parameter 'body' when calling listTagsForResources(Async)");
         }
         
-        com.squareup.okhttp.Call call = listTagsForResourceCall(body, progressListener, progressRequestListener);
+        com.squareup.okhttp.Call call = listTagsForResourcesCall(body, progressListener, progressRequestListener);
         return call;
 
         
@@ -2530,24 +2530,24 @@ private com.squareup.okhttp.Call listTagsForResourceValidateBeforeCall(ListTagsF
      * 
      * 
      * @param body  (required)
-     * @return ListTagsForResourceResponse
+     * @return ListTagsForResourcesResponse
      * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
      */
-    public ListTagsForResourceResponse listTagsForResource(ListTagsForResourceRequest body) throws ApiException {
-        ApiResponse<ListTagsForResourceResponse> resp = listTagsForResourceWithHttpInfo(body);
+    public ListTagsForResourcesResponse listTagsForResources(ListTagsForResourcesRequest body) throws ApiException {
+        ApiResponse<ListTagsForResourcesResponse> resp = listTagsForResourcesWithHttpInfo(body);
         return resp.getData();
     }
 
     /**
      * 
      * 
      * @param body  (required)
-     * @return ApiResponse&lt;ListTagsForResourceResponse&gt;
+     * @return ApiResponse&lt;ListTagsForResourcesResponse&gt;
      * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
      */
-    public ApiResponse<ListTagsForResourceResponse> listTagsForResourceWithHttpInfo( @NotNull ListTagsForResourceRequest body) throws ApiException {
-        com.squareup.okhttp.Call call = listTagsForResourceValidateBeforeCall(body, null, null);
-        Type localVarReturnType = new TypeToken<ListTagsForResourceResponse>(){}.getType();
+    public ApiResponse<ListTagsForResourcesResponse> listTagsForResourcesWithHttpInfo( @NotNull ListTagsForResourcesRequest body) throws ApiException {
+        com.squareup.okhttp.Call call = listTagsForResourcesValidateBeforeCall(body, null, null);
+        Type localVarReturnType = new TypeToken<ListTagsForResourcesResponse>(){}.getType();
         return apiClient.execute(call, localVarReturnType);
     }
 
@@ -2559,7 +2559,7 @@ public ApiResponse<ListTagsForResourceResponse> listTagsForResourceWithHttpInfo(
      * @return The request call
      * @throws ApiException If fail to process the API call, e.g. serializing the request body object
      */
-    public com.squareup.okhttp.Call listTagsForResourceAsync(ListTagsForResourceRequest body, final ApiCallback<ListTagsForResourceResponse> callback) throws ApiException {
+    public com.squareup.okhttp.Call listTagsForResourcesAsync(ListTagsForResourcesRequest body, final ApiCallback<ListTagsForResourcesResponse> callback) throws ApiException {
 
         ProgressResponseBody.ProgressListener progressListener = null;
         ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
@@ -2580,8 +2580,8 @@ public void onRequestProgress(long bytesWritten, long contentLength, boolean don
             };
         }
 
-        com.squareup.okhttp.Call call = listTagsForResourceValidateBeforeCall(body, progressListener, progressRequestListener);
-        Type localVarReturnType = new TypeToken<ListTagsForResourceResponse>(){}.getType();
+        com.squareup.okhttp.Call call = listTagsForResourcesValidateBeforeCall(body, progressListener, progressRequestListener);
+        Type localVarReturnType = new TypeToken<ListTagsForResourcesResponse>(){}.getType();
         apiClient.executeAsync(call, localVarReturnType, callback);
         return call;
     }
diff --git a/volcengine-java-sdk-vke/src/main/java/com/volcengine/vke/model/CreateAddonRequest.java b/volcengine-java-sdk-vke/src/main/java/com/volcengine/vke/model/CreateAddonRequest.java
@@ -82,6 +82,51 @@ public DeployModeEnum read(final JsonReader jsonReader) throws IOException {
   }  @SerializedName("DeployMode")
   private DeployModeEnum deployMode = null;
 
+  /**
+   * Gets or Sets deployNodeType
+   */
+  @JsonAdapter(DeployNodeTypeEnum.Adapter.class)
+  public enum DeployNodeTypeEnum {
+    EDGENODE("EdgeNode"),
+    NODE("Node"),
+    VIRTUALNODE("VirtualNode");
+
+    private String value;
+
+    DeployNodeTypeEnum(String value) {
+      this.value = value;
+    }
+    public String getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+    public static DeployNodeTypeEnum fromValue(String input) {
+      for (DeployNodeTypeEnum b : DeployNodeTypeEnum.values()) {
+        if (b.value.equals(input)) {
+          return b;
+        }
+      }
+      return null;
+    }
+    public static class Adapter extends TypeAdapter<DeployNodeTypeEnum> {
+      @Override
+      public void write(final JsonWriter jsonWriter, final DeployNodeTypeEnum enumeration) throws IOException {
+        jsonWriter.value(String.valueOf(enumeration.getValue()));
+      }
+
+      @Override
+      public DeployNodeTypeEnum read(final JsonReader jsonReader) throws IOException {
+        Object value = jsonReader.nextString();
+        return DeployNodeTypeEnum.fromValue((String)(value));
+      }
+    }
+  }  @SerializedName("DeployNodeType")
+  private DeployNodeTypeEnum deployNodeType = null;
+
   @SerializedName("Name")
   private String name = null;
 
@@ -160,6 +205,24 @@ public void setDeployMode(DeployModeEnum deployMode) {
     this.deployMode = deployMode;
   }
 
+  public CreateAddonRequest deployNodeType(DeployNodeTypeEnum deployNodeType) {
+    this.deployNodeType = deployNodeType;
+    return this;
+  }
+
+   /**
+   * Get deployNodeType
+   * @return deployNodeType
+  **/
+  @Schema(description = "")
+  public DeployNodeTypeEnum getDeployNodeType() {
+    return deployNodeType;
+  }
+
+  public void setDeployNodeType(DeployNodeTypeEnum deployNodeType) {
+    this.deployNodeType = deployNodeType;
+  }
+
   public CreateAddonRequest name(String name) {
     this.name = name;
     return this;
@@ -210,13 +273,14 @@ public boolean equals(java.lang.Object o) {
         Objects.equals(this.clusterId, createAddonRequest.clusterId) &&
         Objects.equals(this.config, createAddonRequest.config) &&
         Objects.equals(this.deployMode, createAddonRequest.deployMode) &&
+        Objects.equals(this.deployNodeType, createAddonRequest.deployNodeType) &&
         Objects.equals(this.name, createAddonRequest.name) &&
         Objects.equals(this.version, createAddonRequest.version);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(clientToken, clusterId, config, deployMode, name, version);
+    return Objects.hash(clientToken, clusterId, config, deployMode, deployNodeType, name, version);
   }
 
 
@@ -229,6 +293,7 @@ public String toString() {
     sb.append("    clusterId: ").append(toIndentedString(clusterId)).append("\n");
     sb.append("    config: ").append(toIndentedString(config)).append("\n");
     sb.append("    deployMode: ").append(toIndentedString(deployMode)).append("\n");
+    sb.append("    deployNodeType: ").append(toIndentedString(deployNodeType)).append("\n");
     sb.append("    name: ").append(toIndentedString(name)).append("\n");
     sb.append("    version: ").append(toIndentedString(version)).append("\n");
     sb.append("}");
diff --git a/volcengine-java-sdk-vke/src/main/java/com/volcengine/vke/model/FilterForListAddonsInput.java b/volcengine-java-sdk-vke/src/main/java/com/volcengine/vke/model/FilterForListAddonsInput.java
@@ -87,6 +87,7 @@ public DeployModesEnum read(final JsonReader jsonReader) throws IOException {
    */
   @JsonAdapter(DeployNodeTypesEnum.Adapter.class)
   public enum DeployNodeTypesEnum {
+    EDGENODE("EdgeNode"),
     NODE("Node"),
     VIRTUALNODE("VirtualNode");
 
diff --git a/volcengine-java-sdk-vke/src/main/java/com/volcengine/vke/model/FilterForListSupportedAddonsInput.java b/volcengine-java-sdk-vke/src/main/java/com/volcengine/vke/model/FilterForListSupportedAddonsInput.java
diff --git a/volcengine-java-sdk-vke/src/main/java/com/volcengine/vke/model/ItemForListSupportedAddonsOutput.java b/volcengine-java-sdk-vke/src/main/java/com/volcengine/vke/model/ItemForListSupportedAddonsOutput.java
diff --git a/volcengine-java-sdk-vke/src/main/java/com/volcengine/vke/model/ListTagsForResourcesRequest.java b/volcengine-java-sdk-vke/src/main/java/com/volcengine/vke/model/ListTagsForResourcesRequest.java
diff --git a/volcengine-java-sdk-vke/src/main/java/com/volcengine/vke/model/ListTagsForResourcesResponse.java b/volcengine-java-sdk-vke/src/main/java/com/volcengine/vke/model/ListTagsForResourcesResponse.java
diff --git a/volcengine-java-sdk-vke/src/main/java/com/volcengine/vke/model/PublicAccessNetworkConfigForCreateClusterInput.java b/volcengine-java-sdk-vke/src/main/java/com/volcengine/vke/model/PublicAccessNetworkConfigForCreateClusterInput.java
diff --git a/volcengine-java-sdk-vke/src/main/java/com/volcengine/vke/model/ResourceTagForListTagsForResourcesOutput.java b/volcengine-java-sdk-vke/src/main/java/com/volcengine/vke/model/ResourceTagForListTagsForResourcesOutput.java
diff --git a/volcengine-java-sdk-vke/src/main/java/com/volcengine/vke/model/TagFilterForListTagsForResourcesInput.java b/volcengine-java-sdk-vke/src/main/java/com/volcengine/vke/model/TagFilterForListTagsForResourcesInput.java
diff --git a/volcengine-java-sdk-volcobserve/pom.xml b/volcengine-java-sdk-volcobserve/pom.xml
diff --git a/volcengine-java-sdk-vpc/pom.xml b/volcengine-java-sdk-vpc/pom.xml
diff --git a/volcengine-java-sdk-vpn/pom.xml b/volcengine-java-sdk-vpn/pom.xml

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`	`1`	`{`
`2`		`- "lasted": "0.1.37",`
`3`		`- "meta_commit": "95eec105decc8a783ba0a06ec5028b1850fa7f4b"`
	`2`	`+ "lasted": "0.1.38",`
	`3`	`+ "meta_commit": "d886ed91af2c429606e9232b9f6a8a62fe68892f"`
`4`	`4`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`package com.volcengine.version;`
`2`	`2`
`3`	`3`	`public class Version {`
`4`		`- public final static String SDK_VERSION = "0.1.37";`
	`4`	`+ public final static String SDK_VERSION = "0.1.38";`
`5`	`5`	`public final static String SDK_NAME = "volcengine-java-sdk";`
`6`	`6`	`}`