浏览代码

ESS SDK Auto Released By wujin.lhr,Version:1.21.1

Signed-off-by: haowei.yao <haowei.yao@alibaba-inc.com>
haowei.yao 7 年之前
父节点
当前提交
61403c78b5

+ 4 - 0
ChangeLog.txt

@@ -1,3 +1,7 @@
+2018-06-28 Version: 1.21.1
+1, ScalingConfiguration support hostName and passwordInherit
+2, ScalingConfiguration support modify
+
 2018-06-27 Version: 1.21.0
 1, Modify QueryDomainRealNameVerificationInfo Api, add a return value IdentityCredentialUrl, which is domain real name verification image, you can download it via a HTTP get request,It has validity for 30 seconds.
 2, Modify QueryRegistrantProfileRealNameVerificationInfo Api, add a return value IdentityCredentialUrl, which is domain real name verification image, you can download it via a HTTP get request,It has validity for 30 seconds

+ 48 - 46
services/ess/create_scaling_configuration.go

@@ -76,54 +76,56 @@ func (client *Client) CreateScalingConfigurationWithCallback(request *CreateScal
 // CreateScalingConfigurationRequest is the request struct for api CreateScalingConfiguration
 type CreateScalingConfigurationRequest struct {
 	*requests.RpcRequest
-	DataDisk3Size               requests.Integer                    `position:"Query" name:"DataDisk.3.Size"`
-	ImageId                     string                              `position:"Query" name:"ImageId"`
-	DataDisk1SnapshotId         string                              `position:"Query" name:"DataDisk.1.SnapshotId"`
-	DataDisk3Category           string                              `position:"Query" name:"DataDisk.3.Category"`
-	DataDisk1Device             string                              `position:"Query" name:"DataDisk.1.Device"`
-	ScalingGroupId              string                              `position:"Query" name:"ScalingGroupId"`
-	DataDisk2Device             string                              `position:"Query" name:"DataDisk.2.Device"`
-	InstanceTypes               *[]string                           `position:"Query" name:"InstanceTypes"  type:"Repeated"`
-	IoOptimized                 string                              `position:"Query" name:"IoOptimized"`
-	SecurityGroupId             string                              `position:"Query" name:"SecurityGroupId"`
-	InternetMaxBandwidthOut     requests.Integer                    `position:"Query" name:"InternetMaxBandwidthOut"`
-	SecurityEnhancementStrategy string                              `position:"Query" name:"SecurityEnhancementStrategy"`
-	KeyPairName                 string                              `position:"Query" name:"KeyPairName"`
-	SpotPriceLimit              *[]CreateScalingConfigurationString `position:"Query" name:"SpotPriceLimit"  type:"Repeated"`
-	SystemDiskCategory          string                              `position:"Query" name:"SystemDisk.Category"`
-	UserData                    string                              `position:"Query" name:"UserData"`
-	DataDisk4Category           string                              `position:"Query" name:"DataDisk.4.Category"`
-	DataDisk2SnapshotId         string                              `position:"Query" name:"DataDisk.2.SnapshotId"`
-	DataDisk4Size               requests.Integer                    `position:"Query" name:"DataDisk.4.Size"`
-	InstanceType                string                              `position:"Query" name:"InstanceType"`
-	DataDisk2Category           string                              `position:"Query" name:"DataDisk.2.Category"`
-	DataDisk1Size               requests.Integer                    `position:"Query" name:"DataDisk.1.Size"`
-	DataDisk3SnapshotId         string                              `position:"Query" name:"DataDisk.3.SnapshotId"`
-	ResourceOwnerAccount        string                              `position:"Query" name:"ResourceOwnerAccount"`
-	OwnerAccount                string                              `position:"Query" name:"OwnerAccount"`
-	DataDisk2Size               requests.Integer                    `position:"Query" name:"DataDisk.2.Size"`
-	RamRoleName                 string                              `position:"Query" name:"RamRoleName"`
-	OwnerId                     requests.Integer                    `position:"Query" name:"OwnerId"`
-	ScalingConfigurationName    string                              `position:"Query" name:"ScalingConfigurationName"`
-	Tags                        string                              `position:"Query" name:"Tags"`
-	DataDisk2DeleteWithInstance string                              `position:"Query" name:"DataDisk.2.DeleteWithInstance"`
-	SpotStrategy                string                              `position:"Query" name:"SpotStrategy"`
-	DataDisk1Category           string                              `position:"Query" name:"DataDisk.1.Category"`
-	DataDisk3DeleteWithInstance string                              `position:"Query" name:"DataDisk.3.DeleteWithInstance"`
-	LoadBalancerWeight          requests.Integer                    `position:"Query" name:"LoadBalancerWeight"`
-	InstanceName                string                              `position:"Query" name:"InstanceName"`
-	SystemDiskSize              requests.Integer                    `position:"Query" name:"SystemDisk.Size"`
-	DataDisk4SnapshotId         string                              `position:"Query" name:"DataDisk.4.SnapshotId"`
-	DataDisk4Device             string                              `position:"Query" name:"DataDisk.4.Device"`
-	InternetChargeType          string                              `position:"Query" name:"InternetChargeType"`
-	DataDisk3Device             string                              `position:"Query" name:"DataDisk.3.Device"`
-	DataDisk4DeleteWithInstance string                              `position:"Query" name:"DataDisk.4.DeleteWithInstance"`
-	InternetMaxBandwidthIn      requests.Integer                    `position:"Query" name:"InternetMaxBandwidthIn"`
-	DataDisk1DeleteWithInstance string                              `position:"Query" name:"DataDisk.1.DeleteWithInstance"`
+	DataDisk3Size               requests.Integer                            `position:"Query" name:"DataDisk.3.Size"`
+	ImageId                     string                                      `position:"Query" name:"ImageId"`
+	DataDisk1SnapshotId         string                                      `position:"Query" name:"DataDisk.1.SnapshotId"`
+	DataDisk3Category           string                                      `position:"Query" name:"DataDisk.3.Category"`
+	DataDisk1Device             string                                      `position:"Query" name:"DataDisk.1.Device"`
+	ScalingGroupId              string                                      `position:"Query" name:"ScalingGroupId"`
+	DataDisk2Device             string                                      `position:"Query" name:"DataDisk.2.Device"`
+	InstanceTypes               *[]string                                   `position:"Query" name:"InstanceTypes"  type:"Repeated"`
+	IoOptimized                 string                                      `position:"Query" name:"IoOptimized"`
+	SecurityGroupId             string                                      `position:"Query" name:"SecurityGroupId"`
+	InternetMaxBandwidthOut     requests.Integer                            `position:"Query" name:"InternetMaxBandwidthOut"`
+	SecurityEnhancementStrategy string                                      `position:"Query" name:"SecurityEnhancementStrategy"`
+	KeyPairName                 string                                      `position:"Query" name:"KeyPairName"`
+	SpotPriceLimit              *[]CreateScalingConfigurationSpotPriceLimit `position:"Query" name:"SpotPriceLimit"  type:"Repeated"`
+	SystemDiskCategory          string                                      `position:"Query" name:"SystemDisk.Category"`
+	UserData                    string                                      `position:"Query" name:"UserData"`
+	DataDisk4Category           string                                      `position:"Query" name:"DataDisk.4.Category"`
+	HostName                    string                                      `position:"Query" name:"HostName"`
+	DataDisk2SnapshotId         string                                      `position:"Query" name:"DataDisk.2.SnapshotId"`
+	PasswordInherit             requests.Boolean                            `position:"Query" name:"PasswordInherit"`
+	DataDisk4Size               requests.Integer                            `position:"Query" name:"DataDisk.4.Size"`
+	InstanceType                string                                      `position:"Query" name:"InstanceType"`
+	DataDisk2Category           string                                      `position:"Query" name:"DataDisk.2.Category"`
+	DataDisk1Size               requests.Integer                            `position:"Query" name:"DataDisk.1.Size"`
+	DataDisk3SnapshotId         string                                      `position:"Query" name:"DataDisk.3.SnapshotId"`
+	ResourceOwnerAccount        string                                      `position:"Query" name:"ResourceOwnerAccount"`
+	OwnerAccount                string                                      `position:"Query" name:"OwnerAccount"`
+	DataDisk2Size               requests.Integer                            `position:"Query" name:"DataDisk.2.Size"`
+	RamRoleName                 string                                      `position:"Query" name:"RamRoleName"`
+	OwnerId                     requests.Integer                            `position:"Query" name:"OwnerId"`
+	ScalingConfigurationName    string                                      `position:"Query" name:"ScalingConfigurationName"`
+	Tags                        string                                      `position:"Query" name:"Tags"`
+	DataDisk2DeleteWithInstance string                                      `position:"Query" name:"DataDisk.2.DeleteWithInstance"`
+	SpotStrategy                string                                      `position:"Query" name:"SpotStrategy"`
+	DataDisk1Category           string                                      `position:"Query" name:"DataDisk.1.Category"`
+	DataDisk3DeleteWithInstance string                                      `position:"Query" name:"DataDisk.3.DeleteWithInstance"`
+	LoadBalancerWeight          requests.Integer                            `position:"Query" name:"LoadBalancerWeight"`
+	InstanceName                string                                      `position:"Query" name:"InstanceName"`
+	SystemDiskSize              requests.Integer                            `position:"Query" name:"SystemDisk.Size"`
+	DataDisk4SnapshotId         string                                      `position:"Query" name:"DataDisk.4.SnapshotId"`
+	DataDisk4Device             string                                      `position:"Query" name:"DataDisk.4.Device"`
+	InternetChargeType          string                                      `position:"Query" name:"InternetChargeType"`
+	DataDisk3Device             string                                      `position:"Query" name:"DataDisk.3.Device"`
+	DataDisk4DeleteWithInstance string                                      `position:"Query" name:"DataDisk.4.DeleteWithInstance"`
+	InternetMaxBandwidthIn      requests.Integer                            `position:"Query" name:"InternetMaxBandwidthIn"`
+	DataDisk1DeleteWithInstance string                                      `position:"Query" name:"DataDisk.1.DeleteWithInstance"`
 }
 
-// CreateScalingConfigurationString is a repeated param struct in CreateScalingConfigurationRequest
-type CreateScalingConfigurationString struct {
+// CreateScalingConfigurationSpotPriceLimit is a repeated param struct in CreateScalingConfigurationRequest
+type CreateScalingConfigurationSpotPriceLimit struct {
 	InstanceType string `name:"InstanceType"`
 	PriceLimit   string `name:"PriceLimit"`
 }

+ 1 - 0
services/ess/describe_capacity_history.go

@@ -88,6 +88,7 @@ type DescribeCapacityHistoryRequest struct {
 // DescribeCapacityHistoryResponse is the response struct for api DescribeCapacityHistory
 type DescribeCapacityHistoryResponse struct {
 	*responses.BaseResponse
+	RequestId            string               `json:"RequestId" xml:"RequestId"`
 	TotalCount           int                  `json:"TotalCount" xml:"TotalCount"`
 	PageNumber           int                  `json:"PageNumber" xml:"PageNumber"`
 	PageSize             int                  `json:"PageSize" xml:"PageSize"`

+ 121 - 0
services/ess/modify_scaling_configuration.go

@@ -0,0 +1,121 @@
+package ess
+
+//Licensed under the Apache License, Version 2.0 (the "License");
+//you may not use this file except in compliance with the License.
+//You may obtain a copy of the License at
+//
+//http://www.apache.org/licenses/LICENSE-2.0
+//
+//Unless required by applicable law or agreed to in writing, software
+//distributed under the License is distributed on an "AS IS" BASIS,
+//WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//See the License for the specific language governing permissions and
+//limitations under the License.
+//
+// Code generated by Alibaba Cloud SDK Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is regenerated.
+
+import (
+	"github.com/aliyun/alibaba-cloud-sdk-go/sdk/requests"
+	"github.com/aliyun/alibaba-cloud-sdk-go/sdk/responses"
+)
+
+// ModifyScalingConfiguration invokes the ess.ModifyScalingConfiguration API synchronously
+// api document: https://help.aliyun.com/api/ess/modifyscalingconfiguration.html
+func (client *Client) ModifyScalingConfiguration(request *ModifyScalingConfigurationRequest) (response *ModifyScalingConfigurationResponse, err error) {
+	response = CreateModifyScalingConfigurationResponse()
+	err = client.DoAction(request, response)
+	return
+}
+
+// ModifyScalingConfigurationWithChan invokes the ess.ModifyScalingConfiguration API asynchronously
+// api document: https://help.aliyun.com/api/ess/modifyscalingconfiguration.html
+// asynchronous document: https://help.aliyun.com/document_detail/66220.html
+func (client *Client) ModifyScalingConfigurationWithChan(request *ModifyScalingConfigurationRequest) (<-chan *ModifyScalingConfigurationResponse, <-chan error) {
+	responseChan := make(chan *ModifyScalingConfigurationResponse, 1)
+	errChan := make(chan error, 1)
+	err := client.AddAsyncTask(func() {
+		defer close(responseChan)
+		defer close(errChan)
+		response, err := client.ModifyScalingConfiguration(request)
+		if err != nil {
+			errChan <- err
+		} else {
+			responseChan <- response
+		}
+	})
+	if err != nil {
+		errChan <- err
+		close(responseChan)
+		close(errChan)
+	}
+	return responseChan, errChan
+}
+
+// ModifyScalingConfigurationWithCallback invokes the ess.ModifyScalingConfiguration API asynchronously
+// api document: https://help.aliyun.com/api/ess/modifyscalingconfiguration.html
+// asynchronous document: https://help.aliyun.com/document_detail/66220.html
+func (client *Client) ModifyScalingConfigurationWithCallback(request *ModifyScalingConfigurationRequest, callback func(response *ModifyScalingConfigurationResponse, err error)) <-chan int {
+	result := make(chan int, 1)
+	err := client.AddAsyncTask(func() {
+		var response *ModifyScalingConfigurationResponse
+		var err error
+		defer close(result)
+		response, err = client.ModifyScalingConfiguration(request)
+		callback(response, err)
+		result <- 1
+	})
+	if err != nil {
+		defer close(result)
+		callback(nil, err)
+		result <- 0
+	}
+	return result
+}
+
+// ModifyScalingConfigurationRequest is the request struct for api ModifyScalingConfiguration
+type ModifyScalingConfigurationRequest struct {
+	*requests.RpcRequest
+	ImageId                  string           `position:"Query" name:"ImageId"`
+	ResourceOwnerAccount     string           `position:"Query" name:"ResourceOwnerAccount"`
+	OwnerAccount             string           `position:"Query" name:"OwnerAccount"`
+	InstanceTypes            *[]string        `position:"Query" name:"InstanceTypes"  type:"Repeated"`
+	InternetMaxBandwidthOut  requests.Integer `position:"Query" name:"InternetMaxBandwidthOut"`
+	RamRoleName              string           `position:"Query" name:"RamRoleName"`
+	KeyPairName              string           `position:"Query" name:"KeyPairName"`
+	OwnerId                  requests.Integer `position:"Query" name:"OwnerId"`
+	SystemDiskCategory       string           `position:"Query" name:"SystemDisk.Category"`
+	ScalingConfigurationName string           `position:"Query" name:"ScalingConfigurationName"`
+	Tags                     string           `position:"Query" name:"Tags"`
+	ScalingConfigurationId   string           `position:"Query" name:"ScalingConfigurationId"`
+	UserData                 string           `position:"Query" name:"UserData"`
+	HostName                 string           `position:"Query" name:"HostName"`
+	InstanceName             string           `position:"Query" name:"InstanceName"`
+	LoadBalancerWeight       requests.Integer `position:"Query" name:"LoadBalancerWeight"`
+	PasswordInherit          requests.Boolean `position:"Query" name:"PasswordInherit"`
+	SystemDiskSize           requests.Integer `position:"Query" name:"SystemDisk.Size"`
+	InternetChargeType       string           `position:"Query" name:"InternetChargeType"`
+}
+
+// ModifyScalingConfigurationResponse is the response struct for api ModifyScalingConfiguration
+type ModifyScalingConfigurationResponse struct {
+	*responses.BaseResponse
+	RequestId string `json:"RequestId" xml:"RequestId"`
+}
+
+// CreateModifyScalingConfigurationRequest creates a request to invoke ModifyScalingConfiguration API
+func CreateModifyScalingConfigurationRequest() (request *ModifyScalingConfigurationRequest) {
+	request = &ModifyScalingConfigurationRequest{
+		RpcRequest: &requests.RpcRequest{},
+	}
+	request.InitWithApiInfo("Ess", "2014-08-28", "ModifyScalingConfiguration", "ess", "openAPI")
+	return
+}
+
+// CreateModifyScalingConfigurationResponse creates a response to parse from ModifyScalingConfiguration response
+func CreateModifyScalingConfigurationResponse() (response *ModifyScalingConfigurationResponse) {
+	response = &ModifyScalingConfigurationResponse{
+		BaseResponse: &responses.BaseResponse{},
+	}
+	return
+}

+ 2 - 0
services/ess/struct_scaling_configuration.go

@@ -22,6 +22,7 @@ type ScalingConfiguration struct {
 	ScalingGroupId              string         `json:"ScalingGroupId" xml:"ScalingGroupId"`
 	InstanceName                string         `json:"InstanceName" xml:"InstanceName"`
 	ImageId                     string         `json:"ImageId" xml:"ImageId"`
+	HostName                    string         `json:"HostName" xml:"HostName"`
 	InstanceType                string         `json:"InstanceType" xml:"InstanceType"`
 	InstanceGeneration          string         `json:"InstanceGeneration" xml:"InstanceGeneration"`
 	SecurityGroupId             string         `json:"SecurityGroupId" xml:"SecurityGroupId"`
@@ -40,6 +41,7 @@ type ScalingConfiguration struct {
 	DeploymentSetId             string         `json:"DeploymentSetId" xml:"DeploymentSetId"`
 	SecurityEnhancementStrategy string         `json:"SecurityEnhancementStrategy" xml:"SecurityEnhancementStrategy"`
 	SpotStrategy                string         `json:"SpotStrategy" xml:"SpotStrategy"`
+	PasswordInherit             bool           `json:"PasswordInherit" xml:"PasswordInherit"`
 	InstanceTypes               InstanceTypes  `json:"InstanceTypes" xml:"InstanceTypes"`
 	DataDisks                   DataDisks      `json:"DataDisks" xml:"DataDisks"`
 	Tags                        Tags           `json:"Tags" xml:"Tags"`

+ 2 - 0
services/ess/struct_scaling_group.go

@@ -19,6 +19,8 @@ package ess
 type ScalingGroup struct {
 	DefaultCooldown              int             `json:"DefaultCooldown" xml:"DefaultCooldown"`
 	MaxSize                      int             `json:"MaxSize" xml:"MaxSize"`
+	PendingWaitCapacity          int             `json:"PendingWaitCapacity" xml:"PendingWaitCapacity"`
+	RemovingWaitCapacity         int             `json:"RemovingWaitCapacity" xml:"RemovingWaitCapacity"`
 	PendingCapacity              int             `json:"PendingCapacity" xml:"PendingCapacity"`
 	RemovingCapacity             int             `json:"RemovingCapacity" xml:"RemovingCapacity"`
 	ScalingGroupName             string          `json:"ScalingGroupName" xml:"ScalingGroupName"`