浏览代码

RunInstances support AutoSnapshotPolicyId.

sdk-team 6 年之前
父节点
当前提交
43da442b86
共有 30 个文件被更改,包括 119 次插入1054 次删除
  1. 3 0
      ChangeLog.txt
  2. 0 137
      services/ecs/create_fleet.go
  3. 0 108
      services/ecs/delete_fleet.go
  4. 0 111
      services/ecs/describe_fleet_history.go
  5. 0 113
      services/ecs/describe_fleet_instances.go
  6. 0 115
      services/ecs/describe_fleets.go
  7. 1 0
      services/ecs/describe_invocations.go
  8. 1 0
      services/ecs/describe_price.go
  9. 1 0
      services/ecs/modify_disk_attribute.go
  10. 0 114
      services/ecs/modify_fleet.go
  11. 1 0
      services/ecs/purchase_reserved_instances_offering.go
  12. 77 75
      services/ecs/run_instances.go
  13. 0 22
      services/ecs/struct_activity_detail_in_describe_fleet_history.go
  14. 2 2
      services/ecs/struct_activity_details.go
  15. 0 21
      services/ecs/struct_activity_details_in_describe_fleet_history.go
  16. 19 19
      services/ecs/struct_auto_provisioning_group.go
  17. 5 5
      services/ecs/struct_auto_provisioning_group_history.go
  18. 0 39
      services/ecs/struct_fleet.go
  19. 0 25
      services/ecs/struct_fleet_history.go
  20. 0 21
      services/ecs/struct_fleet_historys.go
  21. 0 21
      services/ecs/struct_fleets.go
  22. 0 33
      services/ecs/struct_instance_in_describe_fleet_instances.go
  23. 0 21
      services/ecs/struct_instances_in_describe_fleet_instances.go
  24. 2 0
      services/ecs/struct_invoke_instance.go
  25. 2 3
      services/ecs/struct_launch_template_config.go
  26. 2 2
      services/ecs/struct_launch_template_configs.go
  27. 0 21
      services/ecs/struct_launch_template_configs_in_describe_auto_provisioning_groups.go
  28. 0 21
      services/ecs/struct_on_demand_options.go
  29. 1 1
      services/ecs/struct_spot_options.go
  30. 2 4
      services/ecs/struct_target_capacity_specification.go

+ 3 - 0
ChangeLog.txt

@@ -1,3 +1,6 @@
+2019-10-22 Version: 1.60.207
+- RunInstances support AutoSnapshotPolicyId.
+
 2019-10-22 Version: 1.60.206
 - Fix ListDatabases CatalogName dataType integer to string.
 - Remove GetLogicDatabase invalid output param named TotalCount.

+ 0 - 137
services/ecs/create_fleet.go

@@ -1,137 +0,0 @@
-package ecs
-
-//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"
-)
-
-// CreateFleet invokes the ecs.CreateFleet API synchronously
-// api document: https://help.aliyun.com/api/ecs/createfleet.html
-func (client *Client) CreateFleet(request *CreateFleetRequest) (response *CreateFleetResponse, err error) {
-	response = CreateCreateFleetResponse()
-	err = client.DoAction(request, response)
-	return
-}
-
-// CreateFleetWithChan invokes the ecs.CreateFleet API asynchronously
-// api document: https://help.aliyun.com/api/ecs/createfleet.html
-// asynchronous document: https://help.aliyun.com/document_detail/66220.html
-func (client *Client) CreateFleetWithChan(request *CreateFleetRequest) (<-chan *CreateFleetResponse, <-chan error) {
-	responseChan := make(chan *CreateFleetResponse, 1)
-	errChan := make(chan error, 1)
-	err := client.AddAsyncTask(func() {
-		defer close(responseChan)
-		defer close(errChan)
-		response, err := client.CreateFleet(request)
-		if err != nil {
-			errChan <- err
-		} else {
-			responseChan <- response
-		}
-	})
-	if err != nil {
-		errChan <- err
-		close(responseChan)
-		close(errChan)
-	}
-	return responseChan, errChan
-}
-
-// CreateFleetWithCallback invokes the ecs.CreateFleet API asynchronously
-// api document: https://help.aliyun.com/api/ecs/createfleet.html
-// asynchronous document: https://help.aliyun.com/document_detail/66220.html
-func (client *Client) CreateFleetWithCallback(request *CreateFleetRequest, callback func(response *CreateFleetResponse, err error)) <-chan int {
-	result := make(chan int, 1)
-	err := client.AddAsyncTask(func() {
-		var response *CreateFleetResponse
-		var err error
-		defer close(result)
-		response, err = client.CreateFleet(request)
-		callback(response, err)
-		result <- 1
-	})
-	if err != nil {
-		defer close(result)
-		callback(nil, err)
-		result <- 0
-	}
-	return result
-}
-
-// CreateFleetRequest is the request struct for api CreateFleet
-type CreateFleetRequest struct {
-	*requests.RpcRequest
-	ResourceOwnerId                  requests.Integer                   `position:"Query" name:"ResourceOwnerId"`
-	FleetType                        string                             `position:"Query" name:"FleetType"`
-	Description                      string                             `position:"Query" name:"Description"`
-	TerminateInstancesWithExpiration requests.Boolean                   `position:"Query" name:"TerminateInstancesWithExpiration"`
-	OnDemandTargetCapacity           string                             `position:"Query" name:"OnDemandTargetCapacity"`
-	FleetName                        string                             `position:"Query" name:"FleetName"`
-	SpotAllocationStrategy           string                             `position:"Query" name:"SpotAllocationStrategy"`
-	TerminateInstances               requests.Boolean                   `position:"Query" name:"TerminateInstances"`
-	DefaultTargetCapacityType        string                             `position:"Query" name:"DefaultTargetCapacityType"`
-	ExcessCapacityTerminationPolicy  string                             `position:"Query" name:"ExcessCapacityTerminationPolicy"`
-	LaunchTemplateConfig             *[]CreateFleetLaunchTemplateConfig `position:"Query" name:"LaunchTemplateConfig"  type:"Repeated"`
-	ValidUntil                       string                             `position:"Query" name:"ValidUntil"`
-	FillGapWithOnDemand              string                             `position:"Query" name:"FillGapWithOnDemand"`
-	SpotInstanceInterruptionBehavior string                             `position:"Query" name:"SpotInstanceInterruptionBehavior"`
-	LaunchTemplateId                 string                             `position:"Query" name:"LaunchTemplateId"`
-	ResourceOwnerAccount             string                             `position:"Query" name:"ResourceOwnerAccount"`
-	OwnerAccount                     string                             `position:"Query" name:"OwnerAccount"`
-	SpotInstancePoolsToUseCount      requests.Integer                   `position:"Query" name:"SpotInstancePoolsToUseCount"`
-	OwnerId                          requests.Integer                   `position:"Query" name:"OwnerId"`
-	LaunchTemplateVersion            string                             `position:"Query" name:"LaunchTemplateVersion"`
-	TotalTargetCapacity              string                             `position:"Query" name:"TotalTargetCapacity"`
-	OnDemandAllocationStrategy       string                             `position:"Query" name:"OnDemandAllocationStrategy"`
-	SpotTargetCapacity               string                             `position:"Query" name:"SpotTargetCapacity"`
-	ValidFrom                        string                             `position:"Query" name:"ValidFrom"`
-	MaxSpotPrice                     requests.Float                     `position:"Query" name:"MaxSpotPrice"`
-}
-
-// CreateFleetLaunchTemplateConfig is a repeated param struct in CreateFleetRequest
-type CreateFleetLaunchTemplateConfig struct {
-	InstanceType     string `name:"InstanceType"`
-	MaxPrice         string `name:"MaxPrice"`
-	VSwitchId        string `name:"VSwitchId"`
-	WeightedCapacity string `name:"WeightedCapacity"`
-	Priority         string `name:"Priority"`
-}
-
-// CreateFleetResponse is the response struct for api CreateFleet
-type CreateFleetResponse struct {
-	*responses.BaseResponse
-	RequestId string `json:"RequestId" xml:"RequestId"`
-	FleetId   string `json:"FleetId" xml:"FleetId"`
-}
-
-// CreateCreateFleetRequest creates a request to invoke CreateFleet API
-func CreateCreateFleetRequest() (request *CreateFleetRequest) {
-	request = &CreateFleetRequest{
-		RpcRequest: &requests.RpcRequest{},
-	}
-	request.InitWithApiInfo("Ecs", "2014-05-26", "CreateFleet", "ecs", "openAPI")
-	return
-}
-
-// CreateCreateFleetResponse creates a response to parse from CreateFleet response
-func CreateCreateFleetResponse() (response *CreateFleetResponse) {
-	response = &CreateFleetResponse{
-		BaseResponse: &responses.BaseResponse{},
-	}
-	return
-}

+ 0 - 108
services/ecs/delete_fleet.go

@@ -1,108 +0,0 @@
-package ecs
-
-//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"
-)
-
-// DeleteFleet invokes the ecs.DeleteFleet API synchronously
-// api document: https://help.aliyun.com/api/ecs/deletefleet.html
-func (client *Client) DeleteFleet(request *DeleteFleetRequest) (response *DeleteFleetResponse, err error) {
-	response = CreateDeleteFleetResponse()
-	err = client.DoAction(request, response)
-	return
-}
-
-// DeleteFleetWithChan invokes the ecs.DeleteFleet API asynchronously
-// api document: https://help.aliyun.com/api/ecs/deletefleet.html
-// asynchronous document: https://help.aliyun.com/document_detail/66220.html
-func (client *Client) DeleteFleetWithChan(request *DeleteFleetRequest) (<-chan *DeleteFleetResponse, <-chan error) {
-	responseChan := make(chan *DeleteFleetResponse, 1)
-	errChan := make(chan error, 1)
-	err := client.AddAsyncTask(func() {
-		defer close(responseChan)
-		defer close(errChan)
-		response, err := client.DeleteFleet(request)
-		if err != nil {
-			errChan <- err
-		} else {
-			responseChan <- response
-		}
-	})
-	if err != nil {
-		errChan <- err
-		close(responseChan)
-		close(errChan)
-	}
-	return responseChan, errChan
-}
-
-// DeleteFleetWithCallback invokes the ecs.DeleteFleet API asynchronously
-// api document: https://help.aliyun.com/api/ecs/deletefleet.html
-// asynchronous document: https://help.aliyun.com/document_detail/66220.html
-func (client *Client) DeleteFleetWithCallback(request *DeleteFleetRequest, callback func(response *DeleteFleetResponse, err error)) <-chan int {
-	result := make(chan int, 1)
-	err := client.AddAsyncTask(func() {
-		var response *DeleteFleetResponse
-		var err error
-		defer close(result)
-		response, err = client.DeleteFleet(request)
-		callback(response, err)
-		result <- 1
-	})
-	if err != nil {
-		defer close(result)
-		callback(nil, err)
-		result <- 0
-	}
-	return result
-}
-
-// DeleteFleetRequest is the request struct for api DeleteFleet
-type DeleteFleetRequest struct {
-	*requests.RpcRequest
-	ResourceOwnerId      requests.Integer `position:"Query" name:"ResourceOwnerId"`
-	TerminateInstances   requests.Boolean `position:"Query" name:"TerminateInstances"`
-	ResourceOwnerAccount string           `position:"Query" name:"ResourceOwnerAccount"`
-	OwnerAccount         string           `position:"Query" name:"OwnerAccount"`
-	OwnerId              requests.Integer `position:"Query" name:"OwnerId"`
-	FleetId              string           `position:"Query" name:"FleetId"`
-}
-
-// DeleteFleetResponse is the response struct for api DeleteFleet
-type DeleteFleetResponse struct {
-	*responses.BaseResponse
-	RequestId string `json:"RequestId" xml:"RequestId"`
-}
-
-// CreateDeleteFleetRequest creates a request to invoke DeleteFleet API
-func CreateDeleteFleetRequest() (request *DeleteFleetRequest) {
-	request = &DeleteFleetRequest{
-		RpcRequest: &requests.RpcRequest{},
-	}
-	request.InitWithApiInfo("Ecs", "2014-05-26", "DeleteFleet", "ecs", "openAPI")
-	return
-}
-
-// CreateDeleteFleetResponse creates a response to parse from DeleteFleet response
-func CreateDeleteFleetResponse() (response *DeleteFleetResponse) {
-	response = &DeleteFleetResponse{
-		BaseResponse: &responses.BaseResponse{},
-	}
-	return
-}

+ 0 - 111
services/ecs/describe_fleet_history.go

@@ -1,111 +0,0 @@
-package ecs
-
-//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"
-)
-
-// DescribeFleetHistory invokes the ecs.DescribeFleetHistory API synchronously
-// api document: https://help.aliyun.com/api/ecs/describefleethistory.html
-func (client *Client) DescribeFleetHistory(request *DescribeFleetHistoryRequest) (response *DescribeFleetHistoryResponse, err error) {
-	response = CreateDescribeFleetHistoryResponse()
-	err = client.DoAction(request, response)
-	return
-}
-
-// DescribeFleetHistoryWithChan invokes the ecs.DescribeFleetHistory API asynchronously
-// api document: https://help.aliyun.com/api/ecs/describefleethistory.html
-// asynchronous document: https://help.aliyun.com/document_detail/66220.html
-func (client *Client) DescribeFleetHistoryWithChan(request *DescribeFleetHistoryRequest) (<-chan *DescribeFleetHistoryResponse, <-chan error) {
-	responseChan := make(chan *DescribeFleetHistoryResponse, 1)
-	errChan := make(chan error, 1)
-	err := client.AddAsyncTask(func() {
-		defer close(responseChan)
-		defer close(errChan)
-		response, err := client.DescribeFleetHistory(request)
-		if err != nil {
-			errChan <- err
-		} else {
-			responseChan <- response
-		}
-	})
-	if err != nil {
-		errChan <- err
-		close(responseChan)
-		close(errChan)
-	}
-	return responseChan, errChan
-}
-
-// DescribeFleetHistoryWithCallback invokes the ecs.DescribeFleetHistory API asynchronously
-// api document: https://help.aliyun.com/api/ecs/describefleethistory.html
-// asynchronous document: https://help.aliyun.com/document_detail/66220.html
-func (client *Client) DescribeFleetHistoryWithCallback(request *DescribeFleetHistoryRequest, callback func(response *DescribeFleetHistoryResponse, err error)) <-chan int {
-	result := make(chan int, 1)
-	err := client.AddAsyncTask(func() {
-		var response *DescribeFleetHistoryResponse
-		var err error
-		defer close(result)
-		response, err = client.DescribeFleetHistory(request)
-		callback(response, err)
-		result <- 1
-	})
-	if err != nil {
-		defer close(result)
-		callback(nil, err)
-		result <- 0
-	}
-	return result
-}
-
-// DescribeFleetHistoryRequest is the request struct for api DescribeFleetHistory
-type DescribeFleetHistoryRequest struct {
-	*requests.RpcRequest
-	ResourceOwnerId      requests.Integer `position:"Query" name:"ResourceOwnerId"`
-	ResourceOwnerAccount string           `position:"Query" name:"ResourceOwnerAccount"`
-	OwnerAccount         string           `position:"Query" name:"OwnerAccount"`
-	OwnerId              requests.Integer `position:"Query" name:"OwnerId"`
-	FleetId              string           `position:"Query" name:"FleetId"`
-}
-
-// DescribeFleetHistoryResponse is the response struct for api DescribeFleetHistory
-type DescribeFleetHistoryResponse 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"`
-	FleetHistorys FleetHistorys `json:"FleetHistorys" xml:"FleetHistorys"`
-}
-
-// CreateDescribeFleetHistoryRequest creates a request to invoke DescribeFleetHistory API
-func CreateDescribeFleetHistoryRequest() (request *DescribeFleetHistoryRequest) {
-	request = &DescribeFleetHistoryRequest{
-		RpcRequest: &requests.RpcRequest{},
-	}
-	request.InitWithApiInfo("Ecs", "2014-05-26", "DescribeFleetHistory", "ecs", "openAPI")
-	return
-}
-
-// CreateDescribeFleetHistoryResponse creates a response to parse from DescribeFleetHistory response
-func CreateDescribeFleetHistoryResponse() (response *DescribeFleetHistoryResponse) {
-	response = &DescribeFleetHistoryResponse{
-		BaseResponse: &responses.BaseResponse{},
-	}
-	return
-}

+ 0 - 113
services/ecs/describe_fleet_instances.go

@@ -1,113 +0,0 @@
-package ecs
-
-//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"
-)
-
-// DescribeFleetInstances invokes the ecs.DescribeFleetInstances API synchronously
-// api document: https://help.aliyun.com/api/ecs/describefleetinstances.html
-func (client *Client) DescribeFleetInstances(request *DescribeFleetInstancesRequest) (response *DescribeFleetInstancesResponse, err error) {
-	response = CreateDescribeFleetInstancesResponse()
-	err = client.DoAction(request, response)
-	return
-}
-
-// DescribeFleetInstancesWithChan invokes the ecs.DescribeFleetInstances API asynchronously
-// api document: https://help.aliyun.com/api/ecs/describefleetinstances.html
-// asynchronous document: https://help.aliyun.com/document_detail/66220.html
-func (client *Client) DescribeFleetInstancesWithChan(request *DescribeFleetInstancesRequest) (<-chan *DescribeFleetInstancesResponse, <-chan error) {
-	responseChan := make(chan *DescribeFleetInstancesResponse, 1)
-	errChan := make(chan error, 1)
-	err := client.AddAsyncTask(func() {
-		defer close(responseChan)
-		defer close(errChan)
-		response, err := client.DescribeFleetInstances(request)
-		if err != nil {
-			errChan <- err
-		} else {
-			responseChan <- response
-		}
-	})
-	if err != nil {
-		errChan <- err
-		close(responseChan)
-		close(errChan)
-	}
-	return responseChan, errChan
-}
-
-// DescribeFleetInstancesWithCallback invokes the ecs.DescribeFleetInstances API asynchronously
-// api document: https://help.aliyun.com/api/ecs/describefleetinstances.html
-// asynchronous document: https://help.aliyun.com/document_detail/66220.html
-func (client *Client) DescribeFleetInstancesWithCallback(request *DescribeFleetInstancesRequest, callback func(response *DescribeFleetInstancesResponse, err error)) <-chan int {
-	result := make(chan int, 1)
-	err := client.AddAsyncTask(func() {
-		var response *DescribeFleetInstancesResponse
-		var err error
-		defer close(result)
-		response, err = client.DescribeFleetInstances(request)
-		callback(response, err)
-		result <- 1
-	})
-	if err != nil {
-		defer close(result)
-		callback(nil, err)
-		result <- 0
-	}
-	return result
-}
-
-// DescribeFleetInstancesRequest is the request struct for api DescribeFleetInstances
-type DescribeFleetInstancesRequest struct {
-	*requests.RpcRequest
-	ResourceOwnerId      requests.Integer `position:"Query" name:"ResourceOwnerId"`
-	PageNumber           requests.Integer `position:"Query" name:"PageNumber"`
-	PageSize             requests.Integer `position:"Query" name:"PageSize"`
-	ResourceOwnerAccount string           `position:"Query" name:"ResourceOwnerAccount"`
-	OwnerAccount         string           `position:"Query" name:"OwnerAccount"`
-	OwnerId              requests.Integer `position:"Query" name:"OwnerId"`
-	FleetId              string           `position:"Query" name:"FleetId"`
-}
-
-// DescribeFleetInstancesResponse is the response struct for api DescribeFleetInstances
-type DescribeFleetInstancesResponse 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"`
-	Instances  InstancesInDescribeFleetInstances `json:"Instances" xml:"Instances"`
-}
-
-// CreateDescribeFleetInstancesRequest creates a request to invoke DescribeFleetInstances API
-func CreateDescribeFleetInstancesRequest() (request *DescribeFleetInstancesRequest) {
-	request = &DescribeFleetInstancesRequest{
-		RpcRequest: &requests.RpcRequest{},
-	}
-	request.InitWithApiInfo("Ecs", "2014-05-26", "DescribeFleetInstances", "ecs", "openAPI")
-	return
-}
-
-// CreateDescribeFleetInstancesResponse creates a response to parse from DescribeFleetInstances response
-func CreateDescribeFleetInstancesResponse() (response *DescribeFleetInstancesResponse) {
-	response = &DescribeFleetInstancesResponse{
-		BaseResponse: &responses.BaseResponse{},
-	}
-	return
-}

+ 0 - 115
services/ecs/describe_fleets.go

@@ -1,115 +0,0 @@
-package ecs
-
-//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"
-)
-
-// DescribeFleets invokes the ecs.DescribeFleets API synchronously
-// api document: https://help.aliyun.com/api/ecs/describefleets.html
-func (client *Client) DescribeFleets(request *DescribeFleetsRequest) (response *DescribeFleetsResponse, err error) {
-	response = CreateDescribeFleetsResponse()
-	err = client.DoAction(request, response)
-	return
-}
-
-// DescribeFleetsWithChan invokes the ecs.DescribeFleets API asynchronously
-// api document: https://help.aliyun.com/api/ecs/describefleets.html
-// asynchronous document: https://help.aliyun.com/document_detail/66220.html
-func (client *Client) DescribeFleetsWithChan(request *DescribeFleetsRequest) (<-chan *DescribeFleetsResponse, <-chan error) {
-	responseChan := make(chan *DescribeFleetsResponse, 1)
-	errChan := make(chan error, 1)
-	err := client.AddAsyncTask(func() {
-		defer close(responseChan)
-		defer close(errChan)
-		response, err := client.DescribeFleets(request)
-		if err != nil {
-			errChan <- err
-		} else {
-			responseChan <- response
-		}
-	})
-	if err != nil {
-		errChan <- err
-		close(responseChan)
-		close(errChan)
-	}
-	return responseChan, errChan
-}
-
-// DescribeFleetsWithCallback invokes the ecs.DescribeFleets API asynchronously
-// api document: https://help.aliyun.com/api/ecs/describefleets.html
-// asynchronous document: https://help.aliyun.com/document_detail/66220.html
-func (client *Client) DescribeFleetsWithCallback(request *DescribeFleetsRequest, callback func(response *DescribeFleetsResponse, err error)) <-chan int {
-	result := make(chan int, 1)
-	err := client.AddAsyncTask(func() {
-		var response *DescribeFleetsResponse
-		var err error
-		defer close(result)
-		response, err = client.DescribeFleets(request)
-		callback(response, err)
-		result <- 1
-	})
-	if err != nil {
-		defer close(result)
-		callback(nil, err)
-		result <- 0
-	}
-	return result
-}
-
-// DescribeFleetsRequest is the request struct for api DescribeFleets
-type DescribeFleetsRequest struct {
-	*requests.RpcRequest
-	ResourceOwnerId      requests.Integer `position:"Query" name:"ResourceOwnerId"`
-	PageNumber           requests.Integer `position:"Query" name:"PageNumber"`
-	FleetName            string           `position:"Query" name:"FleetName"`
-	FleetStatus          *[]string        `position:"Query" name:"FleetStatus"  type:"Repeated"`
-	PageSize             requests.Integer `position:"Query" name:"PageSize"`
-	ResourceOwnerAccount string           `position:"Query" name:"ResourceOwnerAccount"`
-	OwnerAccount         string           `position:"Query" name:"OwnerAccount"`
-	OwnerId              requests.Integer `position:"Query" name:"OwnerId"`
-	FleetId              *[]string        `position:"Query" name:"FleetId"  type:"Repeated"`
-}
-
-// DescribeFleetsResponse is the response struct for api DescribeFleets
-type DescribeFleetsResponse 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"`
-	Fleets     Fleets `json:"Fleets" xml:"Fleets"`
-}
-
-// CreateDescribeFleetsRequest creates a request to invoke DescribeFleets API
-func CreateDescribeFleetsRequest() (request *DescribeFleetsRequest) {
-	request = &DescribeFleetsRequest{
-		RpcRequest: &requests.RpcRequest{},
-	}
-	request.InitWithApiInfo("Ecs", "2014-05-26", "DescribeFleets", "ecs", "openAPI")
-	return
-}
-
-// CreateDescribeFleetsResponse creates a response to parse from DescribeFleets response
-func CreateDescribeFleetsResponse() (response *DescribeFleetsResponse) {
-	response = &DescribeFleetsResponse{
-		BaseResponse: &responses.BaseResponse{},
-	}
-	return
-}

+ 1 - 0
services/ecs/describe_invocations.go

@@ -78,6 +78,7 @@ type DescribeInvocationsRequest struct {
 	*requests.RpcRequest
 	ResourceOwnerId      requests.Integer `position:"Query" name:"ResourceOwnerId"`
 	InvokeStatus         string           `position:"Query" name:"InvokeStatus"`
+	IncludeOutput        requests.Boolean `position:"Query" name:"IncludeOutput"`
 	CommandId            string           `position:"Query" name:"CommandId"`
 	PageNumber           requests.Integer `position:"Query" name:"PageNumber"`
 	ContentEncoding      string           `position:"Query" name:"ContentEncoding"`

+ 1 - 0
services/ecs/describe_price.go

@@ -93,6 +93,7 @@ type DescribePriceRequest struct {
 	InternetMaxBandwidthOut    requests.Integer `position:"Query" name:"InternetMaxBandwidthOut"`
 	SystemDiskCategory         string           `position:"Query" name:"SystemDisk.Category"`
 	Platform                   string           `position:"Query" name:"Platform"`
+	Capacity                   requests.Integer `position:"Query" name:"Capacity"`
 	SystemDiskPerformanceLevel string           `position:"Query" name:"SystemDisk.PerformanceLevel"`
 	DataDisk4Category          string           `position:"Query" name:"DataDisk.4.Category"`
 	DataDisk4PerformanceLevel  string           `position:"Query" name:"DataDisk.4.PerformanceLevel"`

+ 1 - 0
services/ecs/modify_disk_attribute.go

@@ -80,6 +80,7 @@ type ModifyDiskAttributeRequest struct {
 	Description          string           `position:"Query" name:"Description"`
 	DiskName             string           `position:"Query" name:"DiskName"`
 	DeleteAutoSnapshot   requests.Boolean `position:"Query" name:"DeleteAutoSnapshot"`
+	DiskIds              *[]string        `position:"Query" name:"DiskIds"  type:"Repeated"`
 	DiskId               string           `position:"Query" name:"DiskId"`
 	DeleteWithInstance   requests.Boolean `position:"Query" name:"DeleteWithInstance"`
 	EnableAutoSnapshot   requests.Boolean `position:"Query" name:"EnableAutoSnapshot"`

+ 0 - 114
services/ecs/modify_fleet.go

@@ -1,114 +0,0 @@
-package ecs
-
-//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"
-)
-
-// ModifyFleet invokes the ecs.ModifyFleet API synchronously
-// api document: https://help.aliyun.com/api/ecs/modifyfleet.html
-func (client *Client) ModifyFleet(request *ModifyFleetRequest) (response *ModifyFleetResponse, err error) {
-	response = CreateModifyFleetResponse()
-	err = client.DoAction(request, response)
-	return
-}
-
-// ModifyFleetWithChan invokes the ecs.ModifyFleet API asynchronously
-// api document: https://help.aliyun.com/api/ecs/modifyfleet.html
-// asynchronous document: https://help.aliyun.com/document_detail/66220.html
-func (client *Client) ModifyFleetWithChan(request *ModifyFleetRequest) (<-chan *ModifyFleetResponse, <-chan error) {
-	responseChan := make(chan *ModifyFleetResponse, 1)
-	errChan := make(chan error, 1)
-	err := client.AddAsyncTask(func() {
-		defer close(responseChan)
-		defer close(errChan)
-		response, err := client.ModifyFleet(request)
-		if err != nil {
-			errChan <- err
-		} else {
-			responseChan <- response
-		}
-	})
-	if err != nil {
-		errChan <- err
-		close(responseChan)
-		close(errChan)
-	}
-	return responseChan, errChan
-}
-
-// ModifyFleetWithCallback invokes the ecs.ModifyFleet API asynchronously
-// api document: https://help.aliyun.com/api/ecs/modifyfleet.html
-// asynchronous document: https://help.aliyun.com/document_detail/66220.html
-func (client *Client) ModifyFleetWithCallback(request *ModifyFleetRequest, callback func(response *ModifyFleetResponse, err error)) <-chan int {
-	result := make(chan int, 1)
-	err := client.AddAsyncTask(func() {
-		var response *ModifyFleetResponse
-		var err error
-		defer close(result)
-		response, err = client.ModifyFleet(request)
-		callback(response, err)
-		result <- 1
-	})
-	if err != nil {
-		defer close(result)
-		callback(nil, err)
-		result <- 0
-	}
-	return result
-}
-
-// ModifyFleetRequest is the request struct for api ModifyFleet
-type ModifyFleetRequest struct {
-	*requests.RpcRequest
-	ResourceOwnerId                  requests.Integer `position:"Query" name:"ResourceOwnerId"`
-	TerminateInstancesWithExpiration requests.Boolean `position:"Query" name:"TerminateInstancesWithExpiration"`
-	OnDemandTargetCapacity           string           `position:"Query" name:"OnDemandTargetCapacity"`
-	DefaultTargetCapacityType        string           `position:"Query" name:"DefaultTargetCapacityType"`
-	ExcessCapacityTerminationPolicy  string           `position:"Query" name:"ExcessCapacityTerminationPolicy"`
-	ResourceOwnerAccount             string           `position:"Query" name:"ResourceOwnerAccount"`
-	OwnerAccount                     string           `position:"Query" name:"OwnerAccount"`
-	OwnerId                          requests.Integer `position:"Query" name:"OwnerId"`
-	FleetId                          string           `position:"Query" name:"FleetId"`
-	TotalTargetCapacity              string           `position:"Query" name:"TotalTargetCapacity"`
-	SpotTargetCapacity               string           `position:"Query" name:"SpotTargetCapacity"`
-	MaxSpotPrice                     requests.Float   `position:"Query" name:"MaxSpotPrice"`
-}
-
-// ModifyFleetResponse is the response struct for api ModifyFleet
-type ModifyFleetResponse struct {
-	*responses.BaseResponse
-	RequestId string `json:"RequestId" xml:"RequestId"`
-}
-
-// CreateModifyFleetRequest creates a request to invoke ModifyFleet API
-func CreateModifyFleetRequest() (request *ModifyFleetRequest) {
-	request = &ModifyFleetRequest{
-		RpcRequest: &requests.RpcRequest{},
-	}
-	request.InitWithApiInfo("Ecs", "2014-05-26", "ModifyFleet", "ecs", "openAPI")
-	return
-}
-
-// CreateModifyFleetResponse creates a response to parse from ModifyFleet response
-func CreateModifyFleetResponse() (response *ModifyFleetResponse) {
-	response = &ModifyFleetResponse{
-		BaseResponse: &responses.BaseResponse{},
-	}
-	return
-}

+ 1 - 0
services/ecs/purchase_reserved_instances_offering.go

@@ -79,6 +79,7 @@ type PurchaseReservedInstancesOfferingRequest struct {
 	ResourceOwnerId      requests.Integer `position:"Query" name:"ResourceOwnerId"`
 	ClientToken          string           `position:"Query" name:"ClientToken"`
 	Description          string           `position:"Query" name:"Description"`
+	Platform             string           `position:"Query" name:"Platform"`
 	ResourceGroupId      string           `position:"Query" name:"ResourceGroupId"`
 	Scope                string           `position:"Query" name:"Scope"`
 	InstanceType         string           `position:"Query" name:"InstanceType"`

+ 77 - 75
services/ecs/run_instances.go

@@ -76,71 +76,72 @@ func (client *Client) RunInstancesWithCallback(request *RunInstancesRequest, cal
 // RunInstancesRequest is the request struct for api RunInstances
 type RunInstancesRequest struct {
 	*requests.RpcRequest
-	LaunchTemplateName            string                          `position:"Query" name:"LaunchTemplateName"`
-	ResourceOwnerId               requests.Integer                `position:"Query" name:"ResourceOwnerId"`
-	UniqueSuffix                  requests.Boolean                `position:"Query" name:"UniqueSuffix"`
-	HpcClusterId                  string                          `position:"Query" name:"HpcClusterId"`
-	SecurityEnhancementStrategy   string                          `position:"Query" name:"SecurityEnhancementStrategy"`
-	KeyPairName                   string                          `position:"Query" name:"KeyPairName"`
-	MinAmount                     requests.Integer                `position:"Query" name:"MinAmount"`
-	SpotPriceLimit                requests.Float                  `position:"Query" name:"SpotPriceLimit"`
-	DeletionProtection            requests.Boolean                `position:"Query" name:"DeletionProtection"`
-	ResourceGroupId               string                          `position:"Query" name:"ResourceGroupId"`
-	HostName                      string                          `position:"Query" name:"HostName"`
-	Password                      string                          `position:"Query" name:"Password"`
-	StorageSetPartitionNumber     requests.Integer                `position:"Query" name:"StorageSetPartitionNumber"`
-	Tag                           *[]RunInstancesTag              `position:"Query" name:"Tag"  type:"Repeated"`
-	AutoRenewPeriod               requests.Integer                `position:"Query" name:"AutoRenewPeriod"`
-	Period                        requests.Integer                `position:"Query" name:"Period"`
-	DryRun                        requests.Boolean                `position:"Query" name:"DryRun"`
-	LaunchTemplateId              string                          `position:"Query" name:"LaunchTemplateId"`
-	Ipv6AddressCount              requests.Integer                `position:"Query" name:"Ipv6AddressCount"`
-	OwnerId                       requests.Integer                `position:"Query" name:"OwnerId"`
-	CapacityReservationPreference string                          `position:"Query" name:"CapacityReservationPreference"`
-	VSwitchId                     string                          `position:"Query" name:"VSwitchId"`
-	SpotStrategy                  string                          `position:"Query" name:"SpotStrategy"`
-	PrivateIpAddress              string                          `position:"Query" name:"PrivateIpAddress"`
-	PeriodUnit                    string                          `position:"Query" name:"PeriodUnit"`
-	InstanceName                  string                          `position:"Query" name:"InstanceName"`
-	AutoRenew                     requests.Boolean                `position:"Query" name:"AutoRenew"`
-	InternetChargeType            string                          `position:"Query" name:"InternetChargeType"`
-	ZoneId                        string                          `position:"Query" name:"ZoneId"`
-	Ipv6Address                   *[]string                       `position:"Query" name:"Ipv6Address"  type:"Repeated"`
-	InternetMaxBandwidthIn        requests.Integer                `position:"Query" name:"InternetMaxBandwidthIn"`
-	Affinity                      string                          `position:"Query" name:"Affinity"`
-	ImageId                       string                          `position:"Query" name:"ImageId"`
-	SpotInterruptionBehavior      string                          `position:"Query" name:"SpotInterruptionBehavior"`
-	ClientToken                   string                          `position:"Query" name:"ClientToken"`
-	IoOptimized                   string                          `position:"Query" name:"IoOptimized"`
-	SecurityGroupId               string                          `position:"Query" name:"SecurityGroupId"`
-	InternetMaxBandwidthOut       requests.Integer                `position:"Query" name:"InternetMaxBandwidthOut"`
-	Description                   string                          `position:"Query" name:"Description"`
-	SystemDiskCategory            string                          `position:"Query" name:"SystemDisk.Category"`
-	CapacityReservationId         string                          `position:"Query" name:"CapacityReservationId"`
-	SystemDiskPerformanceLevel    string                          `position:"Query" name:"SystemDisk.PerformanceLevel"`
-	UserData                      string                          `position:"Query" name:"UserData"`
-	PasswordInherit               requests.Boolean                `position:"Query" name:"PasswordInherit"`
-	InstanceType                  string                          `position:"Query" name:"InstanceType"`
-	HibernationConfigured         requests.Boolean                `position:"Query" name:"HibernationConfigured"`
-	InstanceChargeType            string                          `position:"Query" name:"InstanceChargeType"`
-	NetworkInterface              *[]RunInstancesNetworkInterface `position:"Query" name:"NetworkInterface"  type:"Repeated"`
-	DeploymentSetId               string                          `position:"Query" name:"DeploymentSetId"`
-	Amount                        requests.Integer                `position:"Query" name:"Amount"`
-	ResourceOwnerAccount          string                          `position:"Query" name:"ResourceOwnerAccount"`
-	OwnerAccount                  string                          `position:"Query" name:"OwnerAccount"`
-	Tenancy                       string                          `position:"Query" name:"Tenancy"`
-	SystemDiskDiskName            string                          `position:"Query" name:"SystemDisk.DiskName"`
-	RamRoleName                   string                          `position:"Query" name:"RamRoleName"`
-	AutoReleaseTime               string                          `position:"Query" name:"AutoReleaseTime"`
-	DedicatedHostId               string                          `position:"Query" name:"DedicatedHostId"`
-	CreditSpecification           string                          `position:"Query" name:"CreditSpecification"`
-	SecurityGroupIds              *[]string                       `position:"Query" name:"SecurityGroupIds"  type:"Repeated"`
-	SpotDuration                  requests.Integer                `position:"Query" name:"SpotDuration"`
-	DataDisk                      *[]RunInstancesDataDisk         `position:"Query" name:"DataDisk"  type:"Repeated"`
-	LaunchTemplateVersion         requests.Integer                `position:"Query" name:"LaunchTemplateVersion"`
-	StorageSetId                  string                          `position:"Query" name:"StorageSetId"`
-	SystemDiskSize                string                          `position:"Query" name:"SystemDisk.Size"`
-	SystemDiskDescription         string                          `position:"Query" name:"SystemDisk.Description"`
+	LaunchTemplateName             string                          `position:"Query" name:"LaunchTemplateName"`
+	ResourceOwnerId                requests.Integer                `position:"Query" name:"ResourceOwnerId"`
+	UniqueSuffix                   requests.Boolean                `position:"Query" name:"UniqueSuffix"`
+	HpcClusterId                   string                          `position:"Query" name:"HpcClusterId"`
+	SecurityEnhancementStrategy    string                          `position:"Query" name:"SecurityEnhancementStrategy"`
+	KeyPairName                    string                          `position:"Query" name:"KeyPairName"`
+	MinAmount                      requests.Integer                `position:"Query" name:"MinAmount"`
+	SpotPriceLimit                 requests.Float                  `position:"Query" name:"SpotPriceLimit"`
+	DeletionProtection             requests.Boolean                `position:"Query" name:"DeletionProtection"`
+	ResourceGroupId                string                          `position:"Query" name:"ResourceGroupId"`
+	HostName                       string                          `position:"Query" name:"HostName"`
+	Password                       string                          `position:"Query" name:"Password"`
+	StorageSetPartitionNumber      requests.Integer                `position:"Query" name:"StorageSetPartitionNumber"`
+	Tag                            *[]RunInstancesTag              `position:"Query" name:"Tag"  type:"Repeated"`
+	SystemDiskAutoSnapshotPolicyId string                          `position:"Query" name:"SystemDisk.AutoSnapshotPolicyId"`
+	AutoRenewPeriod                requests.Integer                `position:"Query" name:"AutoRenewPeriod"`
+	Period                         requests.Integer                `position:"Query" name:"Period"`
+	DryRun                         requests.Boolean                `position:"Query" name:"DryRun"`
+	LaunchTemplateId               string                          `position:"Query" name:"LaunchTemplateId"`
+	Ipv6AddressCount               requests.Integer                `position:"Query" name:"Ipv6AddressCount"`
+	OwnerId                        requests.Integer                `position:"Query" name:"OwnerId"`
+	CapacityReservationPreference  string                          `position:"Query" name:"CapacityReservationPreference"`
+	VSwitchId                      string                          `position:"Query" name:"VSwitchId"`
+	SpotStrategy                   string                          `position:"Query" name:"SpotStrategy"`
+	PrivateIpAddress               string                          `position:"Query" name:"PrivateIpAddress"`
+	PeriodUnit                     string                          `position:"Query" name:"PeriodUnit"`
+	InstanceName                   string                          `position:"Query" name:"InstanceName"`
+	AutoRenew                      requests.Boolean                `position:"Query" name:"AutoRenew"`
+	InternetChargeType             string                          `position:"Query" name:"InternetChargeType"`
+	ZoneId                         string                          `position:"Query" name:"ZoneId"`
+	Ipv6Address                    *[]string                       `position:"Query" name:"Ipv6Address"  type:"Repeated"`
+	InternetMaxBandwidthIn         requests.Integer                `position:"Query" name:"InternetMaxBandwidthIn"`
+	Affinity                       string                          `position:"Query" name:"Affinity"`
+	ImageId                        string                          `position:"Query" name:"ImageId"`
+	SpotInterruptionBehavior       string                          `position:"Query" name:"SpotInterruptionBehavior"`
+	ClientToken                    string                          `position:"Query" name:"ClientToken"`
+	IoOptimized                    string                          `position:"Query" name:"IoOptimized"`
+	SecurityGroupId                string                          `position:"Query" name:"SecurityGroupId"`
+	InternetMaxBandwidthOut        requests.Integer                `position:"Query" name:"InternetMaxBandwidthOut"`
+	Description                    string                          `position:"Query" name:"Description"`
+	SystemDiskCategory             string                          `position:"Query" name:"SystemDisk.Category"`
+	CapacityReservationId          string                          `position:"Query" name:"CapacityReservationId"`
+	SystemDiskPerformanceLevel     string                          `position:"Query" name:"SystemDisk.PerformanceLevel"`
+	UserData                       string                          `position:"Query" name:"UserData"`
+	PasswordInherit                requests.Boolean                `position:"Query" name:"PasswordInherit"`
+	InstanceType                   string                          `position:"Query" name:"InstanceType"`
+	HibernationConfigured          requests.Boolean                `position:"Query" name:"HibernationConfigured"`
+	InstanceChargeType             string                          `position:"Query" name:"InstanceChargeType"`
+	NetworkInterface               *[]RunInstancesNetworkInterface `position:"Query" name:"NetworkInterface"  type:"Repeated"`
+	DeploymentSetId                string                          `position:"Query" name:"DeploymentSetId"`
+	Amount                         requests.Integer                `position:"Query" name:"Amount"`
+	ResourceOwnerAccount           string                          `position:"Query" name:"ResourceOwnerAccount"`
+	OwnerAccount                   string                          `position:"Query" name:"OwnerAccount"`
+	Tenancy                        string                          `position:"Query" name:"Tenancy"`
+	SystemDiskDiskName             string                          `position:"Query" name:"SystemDisk.DiskName"`
+	RamRoleName                    string                          `position:"Query" name:"RamRoleName"`
+	AutoReleaseTime                string                          `position:"Query" name:"AutoReleaseTime"`
+	DedicatedHostId                string                          `position:"Query" name:"DedicatedHostId"`
+	CreditSpecification            string                          `position:"Query" name:"CreditSpecification"`
+	SecurityGroupIds               *[]string                       `position:"Query" name:"SecurityGroupIds"  type:"Repeated"`
+	SpotDuration                   requests.Integer                `position:"Query" name:"SpotDuration"`
+	DataDisk                       *[]RunInstancesDataDisk         `position:"Query" name:"DataDisk"  type:"Repeated"`
+	LaunchTemplateVersion          requests.Integer                `position:"Query" name:"LaunchTemplateVersion"`
+	StorageSetId                   string                          `position:"Query" name:"StorageSetId"`
+	SystemDiskSize                 string                          `position:"Query" name:"SystemDisk.Size"`
+	SystemDiskDescription          string                          `position:"Query" name:"SystemDisk.Description"`
 }
 
 // RunInstancesTag is a repeated param struct in RunInstancesRequest
@@ -160,16 +161,17 @@ type RunInstancesNetworkInterface struct {
 
 // RunInstancesDataDisk is a repeated param struct in RunInstancesRequest
 type RunInstancesDataDisk struct {
-	Size               string `name:"Size"`
-	SnapshotId         string `name:"SnapshotId"`
-	Category           string `name:"Category"`
-	Encrypted          string `name:"Encrypted"`
-	KMSKeyId           string `name:"KMSKeyId"`
-	DiskName           string `name:"DiskName"`
-	Description        string `name:"Description"`
-	Device             string `name:"Device"`
-	DeleteWithInstance string `name:"DeleteWithInstance"`
-	PerformanceLevel   string `name:"PerformanceLevel"`
+	Size                 string `name:"Size"`
+	SnapshotId           string `name:"SnapshotId"`
+	Category             string `name:"Category"`
+	Encrypted            string `name:"Encrypted"`
+	KMSKeyId             string `name:"KMSKeyId"`
+	DiskName             string `name:"DiskName"`
+	Description          string `name:"Description"`
+	Device               string `name:"Device"`
+	DeleteWithInstance   string `name:"DeleteWithInstance"`
+	PerformanceLevel     string `name:"PerformanceLevel"`
+	AutoSnapshotPolicyId string `name:"AutoSnapshotPolicyId"`
 }
 
 // RunInstancesResponse is the response struct for api RunInstances

+ 0 - 22
services/ecs/struct_activity_detail_in_describe_fleet_history.go

@@ -1,22 +0,0 @@
-package ecs
-
-//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.
-
-// ActivityDetailInDescribeFleetHistory is a nested struct in ecs response
-type ActivityDetailInDescribeFleetHistory struct {
-	Detail string  `json:"Detail" xml:"Detail"`
-	Status float64 `json:"Status" xml:"Status"`
-}

+ 2 - 2
services/ecs/struct_activity_details_in_describe_auto_provisioning_group_history.go → services/ecs/struct_activity_details.go

@@ -15,7 +15,7 @@ package ecs
 // Code generated by Alibaba Cloud SDK Code Generator.
 // Changes may cause incorrect behavior and will be lost if the code is regenerated.
 
-// ActivityDetailsInDescribeAutoProvisioningGroupHistory is a nested struct in ecs response
-type ActivityDetailsInDescribeAutoProvisioningGroupHistory struct {
+// ActivityDetails is a nested struct in ecs response
+type ActivityDetails struct {
 	ActivityDetail []ActivityDetail `json:"ActivityDetail" xml:"ActivityDetail"`
 }

+ 0 - 21
services/ecs/struct_activity_details_in_describe_fleet_history.go

@@ -1,21 +0,0 @@
-package ecs
-
-//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.
-
-// ActivityDetailsInDescribeFleetHistory is a nested struct in ecs response
-type ActivityDetailsInDescribeFleetHistory struct {
-	ActivityDetail []ActivityDetailInDescribeFleetHistory `json:"ActivityDetail" xml:"ActivityDetail"`
-}

+ 19 - 19
services/ecs/struct_auto_provisioning_group.go

@@ -17,23 +17,23 @@ package ecs
 
 // AutoProvisioningGroup is a nested struct in ecs response
 type AutoProvisioningGroup struct {
-	AutoProvisioningGroupId          string                                                `json:"AutoProvisioningGroupId" xml:"AutoProvisioningGroupId"`
-	AutoProvisioningGroupName        string                                                `json:"AutoProvisioningGroupName" xml:"AutoProvisioningGroupName"`
-	AutoProvisioningGroupType        string                                                `json:"AutoProvisioningGroupType" xml:"AutoProvisioningGroupType"`
-	Status                           string                                                `json:"Status" xml:"Status"`
-	State                            string                                                `json:"State" xml:"State"`
-	RegionId                         string                                                `json:"RegionId" xml:"RegionId"`
-	ValidFrom                        string                                                `json:"ValidFrom" xml:"ValidFrom"`
-	ValidUntil                       string                                                `json:"ValidUntil" xml:"ValidUntil"`
-	ExcessCapacityTerminationPolicy  string                                                `json:"ExcessCapacityTerminationPolicy" xml:"ExcessCapacityTerminationPolicy"`
-	MaxSpotPrice                     float64                                               `json:"MaxSpotPrice" xml:"MaxSpotPrice"`
-	LaunchTemplateId                 string                                                `json:"LaunchTemplateId" xml:"LaunchTemplateId"`
-	LaunchTemplateVersion            string                                                `json:"LaunchTemplateVersion" xml:"LaunchTemplateVersion"`
-	TerminateInstances               bool                                                  `json:"TerminateInstances" xml:"TerminateInstances"`
-	TerminateInstancesWithExpiration bool                                                  `json:"TerminateInstancesWithExpiration" xml:"TerminateInstancesWithExpiration"`
-	CreationTime                     string                                                `json:"CreationTime" xml:"CreationTime"`
-	SpotOptions                      SpotOptions                                           `json:"SpotOptions" xml:"SpotOptions"`
-	PayAsYouGoOptions                PayAsYouGoOptions                                     `json:"PayAsYouGoOptions" xml:"PayAsYouGoOptions"`
-	TargetCapacitySpecification      TargetCapacitySpecification                           `json:"TargetCapacitySpecification" xml:"TargetCapacitySpecification"`
-	LaunchTemplateConfigs            LaunchTemplateConfigsInDescribeAutoProvisioningGroups `json:"LaunchTemplateConfigs" xml:"LaunchTemplateConfigs"`
+	AutoProvisioningGroupId          string                      `json:"AutoProvisioningGroupId" xml:"AutoProvisioningGroupId"`
+	AutoProvisioningGroupName        string                      `json:"AutoProvisioningGroupName" xml:"AutoProvisioningGroupName"`
+	AutoProvisioningGroupType        string                      `json:"AutoProvisioningGroupType" xml:"AutoProvisioningGroupType"`
+	Status                           string                      `json:"Status" xml:"Status"`
+	State                            string                      `json:"State" xml:"State"`
+	RegionId                         string                      `json:"RegionId" xml:"RegionId"`
+	ValidFrom                        string                      `json:"ValidFrom" xml:"ValidFrom"`
+	ValidUntil                       string                      `json:"ValidUntil" xml:"ValidUntil"`
+	ExcessCapacityTerminationPolicy  string                      `json:"ExcessCapacityTerminationPolicy" xml:"ExcessCapacityTerminationPolicy"`
+	MaxSpotPrice                     float64                     `json:"MaxSpotPrice" xml:"MaxSpotPrice"`
+	LaunchTemplateId                 string                      `json:"LaunchTemplateId" xml:"LaunchTemplateId"`
+	LaunchTemplateVersion            string                      `json:"LaunchTemplateVersion" xml:"LaunchTemplateVersion"`
+	TerminateInstances               bool                        `json:"TerminateInstances" xml:"TerminateInstances"`
+	TerminateInstancesWithExpiration bool                        `json:"TerminateInstancesWithExpiration" xml:"TerminateInstancesWithExpiration"`
+	CreationTime                     string                      `json:"CreationTime" xml:"CreationTime"`
+	SpotOptions                      SpotOptions                 `json:"SpotOptions" xml:"SpotOptions"`
+	PayAsYouGoOptions                PayAsYouGoOptions           `json:"PayAsYouGoOptions" xml:"PayAsYouGoOptions"`
+	TargetCapacitySpecification      TargetCapacitySpecification `json:"TargetCapacitySpecification" xml:"TargetCapacitySpecification"`
+	LaunchTemplateConfigs            LaunchTemplateConfigs       `json:"LaunchTemplateConfigs" xml:"LaunchTemplateConfigs"`
 }

+ 5 - 5
services/ecs/struct_auto_provisioning_group_history.go

@@ -17,9 +17,9 @@ package ecs
 
 // AutoProvisioningGroupHistory is a nested struct in ecs response
 type AutoProvisioningGroupHistory struct {
-	TaskId          string                                                `json:"TaskId" xml:"TaskId"`
-	Status          string                                                `json:"Status" xml:"Status"`
-	LastEventTime   string                                                `json:"LastEventTime" xml:"LastEventTime"`
-	StartTime       string                                                `json:"StartTime" xml:"StartTime"`
-	ActivityDetails ActivityDetailsInDescribeAutoProvisioningGroupHistory `json:"ActivityDetails" xml:"ActivityDetails"`
+	TaskId          string          `json:"TaskId" xml:"TaskId"`
+	Status          string          `json:"Status" xml:"Status"`
+	LastEventTime   string          `json:"LastEventTime" xml:"LastEventTime"`
+	StartTime       string          `json:"StartTime" xml:"StartTime"`
+	ActivityDetails ActivityDetails `json:"ActivityDetails" xml:"ActivityDetails"`
 }

+ 0 - 39
services/ecs/struct_fleet.go

@@ -1,39 +0,0 @@
-package ecs
-
-//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.
-
-// Fleet is a nested struct in ecs response
-type Fleet struct {
-	FleetId                          string                                `json:"FleetId" xml:"FleetId"`
-	FleetName                        string                                `json:"FleetName" xml:"FleetName"`
-	FleetType                        string                                `json:"FleetType" xml:"FleetType"`
-	Status                           string                                `json:"Status" xml:"Status"`
-	State                            string                                `json:"State" xml:"State"`
-	RegionId                         string                                `json:"RegionId" xml:"RegionId"`
-	ValidFrom                        string                                `json:"ValidFrom" xml:"ValidFrom"`
-	ValidUntil                       string                                `json:"ValidUntil" xml:"ValidUntil"`
-	ExcessCapacityTerminationPolicy  string                                `json:"ExcessCapacityTerminationPolicy" xml:"ExcessCapacityTerminationPolicy"`
-	MaxSpotPrice                     float64                               `json:"MaxSpotPrice" xml:"MaxSpotPrice"`
-	LaunchTemplateId                 string                                `json:"LaunchTemplateId" xml:"LaunchTemplateId"`
-	LaunchTemplateVersion            string                                `json:"LaunchTemplateVersion" xml:"LaunchTemplateVersion"`
-	TerminateInstances               bool                                  `json:"TerminateInstances" xml:"TerminateInstances"`
-	TerminateInstancesWithExpiration bool                                  `json:"TerminateInstancesWithExpiration" xml:"TerminateInstancesWithExpiration"`
-	CreationTime                     string                                `json:"CreationTime" xml:"CreationTime"`
-	SpotOptions                      SpotOptions                           `json:"SpotOptions" xml:"SpotOptions"`
-	OnDemandOptions                  OnDemandOptions                       `json:"OnDemandOptions" xml:"OnDemandOptions"`
-	TargetCapacitySpecification      TargetCapacitySpecification           `json:"TargetCapacitySpecification" xml:"TargetCapacitySpecification"`
-	LaunchTemplateConfigs            LaunchTemplateConfigsInDescribeFleets `json:"launchTemplateConfigs" xml:"launchTemplateConfigs"`
-}

+ 0 - 25
services/ecs/struct_fleet_history.go

@@ -1,25 +0,0 @@
-package ecs
-
-//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.
-
-// FleetHistory is a nested struct in ecs response
-type FleetHistory struct {
-	TaskId          string                                `json:"TaskId" xml:"TaskId"`
-	Status          string                                `json:"Status" xml:"Status"`
-	LastEventTime   string                                `json:"LastEventTime" xml:"LastEventTime"`
-	StartTime       string                                `json:"StartTime" xml:"StartTime"`
-	ActivityDetails ActivityDetailsInDescribeFleetHistory `json:"ActivityDetails" xml:"ActivityDetails"`
-}

+ 0 - 21
services/ecs/struct_fleet_historys.go

@@ -1,21 +0,0 @@
-package ecs
-
-//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.
-
-// FleetHistorys is a nested struct in ecs response
-type FleetHistorys struct {
-	FleetHistory []FleetHistory `json:"FleetHistory" xml:"FleetHistory"`
-}

+ 0 - 21
services/ecs/struct_fleets.go

@@ -1,21 +0,0 @@
-package ecs
-
-//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.
-
-// Fleets is a nested struct in ecs response
-type Fleets struct {
-	Fleet []Fleet `json:"Fleet" xml:"Fleet"`
-}

+ 0 - 33
services/ecs/struct_instance_in_describe_fleet_instances.go

@@ -1,33 +0,0 @@
-package ecs
-
-//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.
-
-// InstanceInDescribeFleetInstances is a nested struct in ecs response
-type InstanceInDescribeFleetInstances struct {
-	InstanceId   string `json:"InstanceId" xml:"InstanceId"`
-	Status       string `json:"Status" xml:"Status"`
-	RegionId     string `json:"RegionId" xml:"RegionId"`
-	IzNo         string `json:"IzNo" xml:"IzNo"`
-	ZoneNo       string `json:"ZoneNo" xml:"ZoneNo"`
-	Cores        int    `json:"Cores" xml:"Cores"`
-	Memory       int    `json:"Memory" xml:"Memory"`
-	InstanceType string `json:"InstanceType" xml:"InstanceType"`
-	IsSpot       bool   `json:"IsSpot" xml:"IsSpot"`
-	IoOptimized  bool   `json:"IoOptimized" xml:"IoOptimized"`
-	NetworkType  bool   `json:"NetworkType" xml:"NetworkType"`
-	OsType       bool   `json:"OsType" xml:"OsType"`
-	CreationTime string `json:"CreationTime" xml:"CreationTime"`
-}

+ 0 - 21
services/ecs/struct_instances_in_describe_fleet_instances.go

@@ -1,21 +0,0 @@
-package ecs
-
-//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.
-
-// InstancesInDescribeFleetInstances is a nested struct in ecs response
-type InstancesInDescribeFleetInstances struct {
-	Instance []InstanceInDescribeFleetInstances `json:"Instance" xml:"Instance"`
-}

+ 2 - 0
services/ecs/struct_invoke_instance.go

@@ -19,6 +19,8 @@ package ecs
 type InvokeInstance struct {
 	InstanceId           string `json:"InstanceId" xml:"InstanceId"`
 	InstanceInvokeStatus string `json:"InstanceInvokeStatus" xml:"InstanceInvokeStatus"`
+	Output               string `json:"Output" xml:"Output"`
+	ExitCode             int64  `json:"ExitCode" xml:"ExitCode"`
 	CreationTime         string `json:"CreationTime" xml:"CreationTime"`
 	StartTime            string `json:"StartTime" xml:"StartTime"`
 	FinishTime           string `json:"FinishTime" xml:"FinishTime"`

+ 2 - 3
services/ecs/struct_launch_template_config.go

@@ -17,10 +17,9 @@ package ecs
 
 // LaunchTemplateConfig is a nested struct in ecs response
 type LaunchTemplateConfig struct {
-	VSWitchId        string  `json:"VSWitchId" xml:"VSWitchId"`
-	VSwitchId        string  `json:"VSwitchId" xml:"VSwitchId"`
 	InstanceType     string  `json:"InstanceType" xml:"InstanceType"`
-	WeightedCapacity float64 `json:"WeightedCapacity" xml:"WeightedCapacity"`
 	MaxPrice         float64 `json:"MaxPrice" xml:"MaxPrice"`
+	VSwitchId        string  `json:"VSwitchId" xml:"VSwitchId"`
+	WeightedCapacity float64 `json:"WeightedCapacity" xml:"WeightedCapacity"`
 	Priority         float64 `json:"Priority" xml:"Priority"`
 }

+ 2 - 2
services/ecs/struct_launch_template_configs_in_describe_fleets.go → services/ecs/struct_launch_template_configs.go

@@ -15,7 +15,7 @@ package ecs
 // Code generated by Alibaba Cloud SDK Code Generator.
 // Changes may cause incorrect behavior and will be lost if the code is regenerated.
 
-// LaunchTemplateConfigsInDescribeFleets is a nested struct in ecs response
-type LaunchTemplateConfigsInDescribeFleets struct {
+// LaunchTemplateConfigs is a nested struct in ecs response
+type LaunchTemplateConfigs struct {
 	LaunchTemplateConfig []LaunchTemplateConfig `json:"LaunchTemplateConfig" xml:"LaunchTemplateConfig"`
 }

+ 0 - 21
services/ecs/struct_launch_template_configs_in_describe_auto_provisioning_groups.go

@@ -1,21 +0,0 @@
-package ecs
-
-//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.
-
-// LaunchTemplateConfigsInDescribeAutoProvisioningGroups is a nested struct in ecs response
-type LaunchTemplateConfigsInDescribeAutoProvisioningGroups struct {
-	LaunchTemplateConfig []LaunchTemplateConfig `json:"LaunchTemplateConfig" xml:"LaunchTemplateConfig"`
-}

+ 0 - 21
services/ecs/struct_on_demand_options.go

@@ -1,21 +0,0 @@
-package ecs
-
-//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.
-
-// OnDemandOptions is a nested struct in ecs response
-type OnDemandOptions struct {
-	AllocationStrategy string `json:"AllocationStrategy" xml:"AllocationStrategy"`
-}

+ 1 - 1
services/ecs/struct_spot_options.go

@@ -17,7 +17,7 @@ package ecs
 
 // SpotOptions is a nested struct in ecs response
 type SpotOptions struct {
+	AllocationStrategy           string `json:"AllocationStrategy" xml:"AllocationStrategy"`
 	InstanceInterruptionBehavior string `json:"InstanceInterruptionBehavior" xml:"InstanceInterruptionBehavior"`
 	InstancePoolsToUseCount      int    `json:"InstancePoolsToUseCount" xml:"InstancePoolsToUseCount"`
-	AllocationStrategy           string `json:"AllocationStrategy" xml:"AllocationStrategy"`
 }

+ 2 - 4
services/ecs/struct_target_capacity_specification.go

@@ -17,10 +17,8 @@ package ecs
 
 // TargetCapacitySpecification is a nested struct in ecs response
 type TargetCapacitySpecification struct {
-	SpotTargetCapacity        float64 `json:"SpotTargetCapacity" xml:"SpotTargetCapacity"`
-	OnDemandTargetCapacity    float64 `json:"OnDemandTargetCapacity" xml:"OnDemandTargetCapacity"`
-	FillGapWithOnDemand       bool    `json:"FillGapWithOnDemand" xml:"FillGapWithOnDemand"`
-	PayAsYouGoTargetCapacity  float64 `json:"PayAsYouGoTargetCapacity" xml:"PayAsYouGoTargetCapacity"`
 	TotalTargetCapacity       float64 `json:"TotalTargetCapacity" xml:"TotalTargetCapacity"`
+	PayAsYouGoTargetCapacity  float64 `json:"PayAsYouGoTargetCapacity" xml:"PayAsYouGoTargetCapacity"`
+	SpotTargetCapacity        float64 `json:"SpotTargetCapacity" xml:"SpotTargetCapacity"`
 	DefaultTargetCapacityType string  `json:"DefaultTargetCapacityType" xml:"DefaultTargetCapacityType"`
 }