Pārlūkot izejas kodu

ECS SDK Auto Released By wujin.lhr,Version:1.19.5

Signed-off-by: haowei.yao <haowei.yao@alibaba-inc.com>
haowei.yao 7 gadi atpakaļ
vecāks
revīzija
ae6bc4591f

+ 3 - 0
ChangeLog.txt

@@ -1,3 +1,6 @@
+2018-06-14 Version: 1.19.5
+1, Add passwordInherit.
+
 2018-06-13 Version: 1.19.4
 1, Add API AddCasterEpisodeGroupContent,CreateCaster.
 2, Add Parameter fillMode for AddCasterLayout,ModifyCasterLayout.

+ 1 - 0
services/ecs/create_image.go

@@ -86,6 +86,7 @@ type CreateImageRequest struct {
 	Tag3Key              string                          `position:"Query" name:"Tag.3.Key"`
 	Platform             string                          `position:"Query" name:"Platform"`
 	Tag1Value            string                          `position:"Query" name:"Tag.1.Value"`
+	ResourceGroupId      string                          `position:"Query" name:"ResourceGroupId"`
 	ImageName            string                          `position:"Query" name:"ImageName"`
 	Tag3Value            string                          `position:"Query" name:"Tag.3.Value"`
 	Architecture         string                          `position:"Query" name:"Architecture"`

+ 1 - 0
services/ecs/create_instance.go

@@ -115,6 +115,7 @@ type CreateInstanceRequest struct {
 	Description                 string                    `position:"Query" name:"Description"`
 	SystemDiskCategory          string                    `position:"Query" name:"SystemDisk.Category"`
 	UserData                    string                    `position:"Query" name:"UserData"`
+	PasswordInherit             requests.Boolean          `position:"Query" name:"PasswordInherit"`
 	InstanceType                string                    `position:"Query" name:"InstanceType"`
 	InstanceChargeType          string                    `position:"Query" name:"InstanceChargeType"`
 	Tag3Value                   string                    `position:"Query" name:"Tag.3.Value"`

+ 11 - 0
services/ecs/create_launch_template.go

@@ -78,24 +78,31 @@ type CreateLaunchTemplateRequest struct {
 	*requests.RpcRequest
 	LaunchTemplateName          string                                  `position:"Query" name:"LaunchTemplateName"`
 	ResourceOwnerId             requests.Integer                        `position:"Query" name:"ResourceOwnerId"`
+	TemplateTag4Key             string                                  `position:"Query" name:"TemplateTag.4.Key"`
 	SecurityEnhancementStrategy string                                  `position:"Query" name:"SecurityEnhancementStrategy"`
 	NetworkType                 string                                  `position:"Query" name:"NetworkType"`
 	KeyPairName                 string                                  `position:"Query" name:"KeyPairName"`
 	SpotPriceLimit              requests.Float                          `position:"Query" name:"SpotPriceLimit"`
 	ImageOwnerAlias             string                                  `position:"Query" name:"ImageOwnerAlias"`
 	ResourceGroupId             string                                  `position:"Query" name:"ResourceGroupId"`
+	TemplateTag3Key             string                                  `position:"Query" name:"TemplateTag.3.Key"`
 	HostName                    string                                  `position:"Query" name:"HostName"`
 	SystemDiskIops              requests.Integer                        `position:"Query" name:"SystemDisk.Iops"`
+	TemplateTag3Value           string                                  `position:"Query" name:"TemplateTag.3.Value"`
 	Tag                         *[]CreateLaunchTemplateTag              `position:"Query" name:"Tag"  type:"Repeated"`
 	Period                      requests.Integer                        `position:"Query" name:"Period"`
+	TemplateResourceGroupId     string                                  `position:"Query" name:"TemplateResourceGroupId"`
+	TemplateTag2Value           string                                  `position:"Query" name:"TemplateTag.2.Value"`
 	OwnerId                     requests.Integer                        `position:"Query" name:"OwnerId"`
 	VSwitchId                   string                                  `position:"Query" name:"VSwitchId"`
 	SpotStrategy                string                                  `position:"Query" name:"SpotStrategy"`
 	InstanceName                string                                  `position:"Query" name:"InstanceName"`
 	InternetChargeType          string                                  `position:"Query" name:"InternetChargeType"`
+	TemplateTag5Key             string                                  `position:"Query" name:"TemplateTag.5.Key"`
 	ZoneId                      string                                  `position:"Query" name:"ZoneId"`
 	InternetMaxBandwidthIn      requests.Integer                        `position:"Query" name:"InternetMaxBandwidthIn"`
 	VersionDescription          string                                  `position:"Query" name:"VersionDescription"`
+	TemplateTag1Value           string                                  `position:"Query" name:"TemplateTag.1.Value"`
 	ImageId                     string                                  `position:"Query" name:"ImageId"`
 	IoOptimized                 string                                  `position:"Query" name:"IoOptimized"`
 	SecurityGroupId             string                                  `position:"Query" name:"SecurityGroupId"`
@@ -103,10 +110,12 @@ type CreateLaunchTemplateRequest struct {
 	Description                 string                                  `position:"Query" name:"Description"`
 	SystemDiskCategory          string                                  `position:"Query" name:"SystemDisk.Category"`
 	UserData                    string                                  `position:"Query" name:"UserData"`
+	TemplateTag5Value           string                                  `position:"Query" name:"TemplateTag.5.Value"`
 	InstanceType                string                                  `position:"Query" name:"InstanceType"`
 	InstanceChargeType          string                                  `position:"Query" name:"InstanceChargeType"`
 	EnableVmOsConfig            requests.Boolean                        `position:"Query" name:"EnableVmOsConfig"`
 	NetworkInterface            *[]CreateLaunchTemplateNetworkInterface `position:"Query" name:"NetworkInterface"  type:"Repeated"`
+	TemplateTag2Key             string                                  `position:"Query" name:"TemplateTag.2.Key"`
 	ResourceOwnerAccount        string                                  `position:"Query" name:"ResourceOwnerAccount"`
 	OwnerAccount                string                                  `position:"Query" name:"OwnerAccount"`
 	SystemDiskDiskName          string                                  `position:"Query" name:"SystemDisk.DiskName"`
@@ -114,8 +123,10 @@ type CreateLaunchTemplateRequest struct {
 	AutoReleaseTime             string                                  `position:"Query" name:"AutoReleaseTime"`
 	SpotDuration                requests.Integer                        `position:"Query" name:"SpotDuration"`
 	DataDisk                    *[]CreateLaunchTemplateDataDisk         `position:"Query" name:"DataDisk"  type:"Repeated"`
+	TemplateTag4Value           string                                  `position:"Query" name:"TemplateTag.4.Value"`
 	SystemDiskSize              requests.Integer                        `position:"Query" name:"SystemDisk.Size"`
 	VpcId                       string                                  `position:"Query" name:"VpcId"`
+	TemplateTag1Key             string                                  `position:"Query" name:"TemplateTag.1.Key"`
 	SystemDiskDescription       string                                  `position:"Query" name:"SystemDisk.Description"`
 }
 

+ 11 - 0
services/ecs/create_network_interface.go

@@ -76,15 +76,26 @@ func (client *Client) CreateNetworkInterfaceWithCallback(request *CreateNetworkI
 // CreateNetworkInterfaceRequest is the request struct for api CreateNetworkInterface
 type CreateNetworkInterfaceRequest struct {
 	*requests.RpcRequest
+	Tag4Value            string           `position:"Query" name:"Tag.4.Value"`
 	ResourceOwnerId      requests.Integer `position:"Query" name:"ResourceOwnerId"`
+	Tag2Key              string           `position:"Query" name:"Tag.2.Key"`
 	ClientToken          string           `position:"Query" name:"ClientToken"`
 	SecurityGroupId      string           `position:"Query" name:"SecurityGroupId"`
 	Description          string           `position:"Query" name:"Description"`
+	Tag3Key              string           `position:"Query" name:"Tag.3.Key"`
+	Tag1Value            string           `position:"Query" name:"Tag.1.Value"`
+	ResourceGroupId      string           `position:"Query" name:"ResourceGroupId"`
+	Tag3Value            string           `position:"Query" name:"Tag.3.Value"`
 	NetworkInterfaceName string           `position:"Query" name:"NetworkInterfaceName"`
+	Tag5Key              string           `position:"Query" name:"Tag.5.Key"`
 	ResourceOwnerAccount string           `position:"Query" name:"ResourceOwnerAccount"`
 	OwnerAccount         string           `position:"Query" name:"OwnerAccount"`
 	OwnerId              requests.Integer `position:"Query" name:"OwnerId"`
+	Tag5Value            string           `position:"Query" name:"Tag.5.Value"`
+	Tag1Key              string           `position:"Query" name:"Tag.1.Key"`
 	VSwitchId            string           `position:"Query" name:"VSwitchId"`
+	Tag2Value            string           `position:"Query" name:"Tag.2.Value"`
+	Tag4Key              string           `position:"Query" name:"Tag.4.Key"`
 	PrimaryIpAddress     string           `position:"Query" name:"PrimaryIpAddress"`
 }
 

+ 0 - 117
services/ecs/describe_events.go

@@ -1,117 +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"
-)
-
-// DescribeEvents invokes the ecs.DescribeEvents API synchronously
-// api document: https://help.aliyun.com/api/ecs/describeevents.html
-func (client *Client) DescribeEvents(request *DescribeEventsRequest) (response *DescribeEventsResponse, err error) {
-	response = CreateDescribeEventsResponse()
-	err = client.DoAction(request, response)
-	return
-}
-
-// DescribeEventsWithChan invokes the ecs.DescribeEvents API asynchronously
-// api document: https://help.aliyun.com/api/ecs/describeevents.html
-// asynchronous document: https://help.aliyun.com/document_detail/66220.html
-func (client *Client) DescribeEventsWithChan(request *DescribeEventsRequest) (<-chan *DescribeEventsResponse, <-chan error) {
-	responseChan := make(chan *DescribeEventsResponse, 1)
-	errChan := make(chan error, 1)
-	err := client.AddAsyncTask(func() {
-		defer close(responseChan)
-		defer close(errChan)
-		response, err := client.DescribeEvents(request)
-		if err != nil {
-			errChan <- err
-		} else {
-			responseChan <- response
-		}
-	})
-	if err != nil {
-		errChan <- err
-		close(responseChan)
-		close(errChan)
-	}
-	return responseChan, errChan
-}
-
-// DescribeEventsWithCallback invokes the ecs.DescribeEvents API asynchronously
-// api document: https://help.aliyun.com/api/ecs/describeevents.html
-// asynchronous document: https://help.aliyun.com/document_detail/66220.html
-func (client *Client) DescribeEventsWithCallback(request *DescribeEventsRequest, callback func(response *DescribeEventsResponse, err error)) <-chan int {
-	result := make(chan int, 1)
-	err := client.AddAsyncTask(func() {
-		var response *DescribeEventsResponse
-		var err error
-		defer close(result)
-		response, err = client.DescribeEvents(request)
-		callback(response, err)
-		result <- 1
-	})
-	if err != nil {
-		defer close(result)
-		callback(nil, err)
-		result <- 0
-	}
-	return result
-}
-
-// DescribeEventsRequest is the request struct for api DescribeEvents
-type DescribeEventsRequest struct {
-	*requests.RpcRequest
-	EventId              string           `position:"Query" name:"EventId"`
-	ResourceOwnerId      requests.Integer `position:"Query" name:"ResourceOwnerId"`
-	PageNumber           requests.Integer `position:"Query" name:"PageNumber"`
-	PageSize             requests.Integer `position:"Query" name:"PageSize"`
-	PlanTime             string           `position:"Query" name:"PlanTime"`
-	ExpireTime           string           `position:"Query" name:"ExpireTime"`
-	ResourceId           string           `position:"Query" name:"ResourceId"`
-	ResourceOwnerAccount string           `position:"Query" name:"ResourceOwnerAccount"`
-	OwnerId              requests.Integer `position:"Query" name:"OwnerId"`
-	EventType            string           `position:"Query" name:"EventType"`
-	Status               string           `position:"Query" name:"Status"`
-}
-
-// DescribeEventsResponse is the response struct for api DescribeEvents
-type DescribeEventsResponse struct {
-	*responses.BaseResponse
-	RequestId  string `json:"RequestId" xml:"RequestId"`
-	PageNumber int    `json:"PageNumber" xml:"PageNumber"`
-	PageSize   int    `json:"PageSize" xml:"PageSize"`
-	TotalCount int    `json:"TotalCount" xml:"TotalCount"`
-	Events     Events `json:"Events" xml:"Events"`
-}
-
-// CreateDescribeEventsRequest creates a request to invoke DescribeEvents API
-func CreateDescribeEventsRequest() (request *DescribeEventsRequest) {
-	request = &DescribeEventsRequest{
-		RpcRequest: &requests.RpcRequest{},
-	}
-	request.InitWithApiInfo("Ecs", "2014-05-26", "DescribeEvents", "ecs", "openAPI")
-	return
-}
-
-// CreateDescribeEventsResponse creates a response to parse from DescribeEvents response
-func CreateDescribeEventsResponse() (response *DescribeEventsResponse) {
-	response = &DescribeEventsResponse{
-		BaseResponse: &responses.BaseResponse{},
-	}
-	return
-}

+ 1 - 0
services/ecs/describe_images.go

@@ -87,6 +87,7 @@ type DescribeImagesRequest struct {
 	PageNumber           requests.Integer        `position:"Query" name:"PageNumber"`
 	ImageOwnerAlias      string                  `position:"Query" name:"ImageOwnerAlias"`
 	Tag1Value            string                  `position:"Query" name:"Tag.1.Value"`
+	ResourceGroupId      string                  `position:"Query" name:"ResourceGroupId"`
 	IsSupportIoOptimized requests.Boolean        `position:"Query" name:"IsSupportIoOptimized"`
 	ImageName            string                  `position:"Query" name:"ImageName"`
 	IsSupportCloudinit   requests.Boolean        `position:"Query" name:"IsSupportCloudinit"`

+ 19 - 8
services/ecs/describe_launch_templates.go

@@ -76,14 +76,25 @@ func (client *Client) DescribeLaunchTemplatesWithCallback(request *DescribeLaunc
 // DescribeLaunchTemplatesRequest is the request struct for api DescribeLaunchTemplates
 type DescribeLaunchTemplatesRequest struct {
 	*requests.RpcRequest
-	LaunchTemplateName   *[]string        `position:"Query" name:"LaunchTemplateName"  type:"Repeated"`
-	ResourceOwnerId      requests.Integer `position:"Query" name:"ResourceOwnerId"`
-	PageNumber           requests.Integer `position:"Query" name:"PageNumber"`
-	PageSize             requests.Integer `position:"Query" name:"PageSize"`
-	LaunchTemplateId     *[]string        `position:"Query" name:"LaunchTemplateId"  type:"Repeated"`
-	ResourceOwnerAccount string           `position:"Query" name:"ResourceOwnerAccount"`
-	OwnerAccount         string           `position:"Query" name:"OwnerAccount"`
-	OwnerId              requests.Integer `position:"Query" name:"OwnerId"`
+	TemplateTag1Value       string           `position:"Query" name:"TemplateTag.1.Value"`
+	LaunchTemplateName      *[]string        `position:"Query" name:"LaunchTemplateName"  type:"Repeated"`
+	ResourceOwnerId         requests.Integer `position:"Query" name:"ResourceOwnerId"`
+	TemplateTag4Key         string           `position:"Query" name:"TemplateTag.4.Key"`
+	PageNumber              requests.Integer `position:"Query" name:"PageNumber"`
+	TemplateTag3Key         string           `position:"Query" name:"TemplateTag.3.Key"`
+	TemplateTag5Value       string           `position:"Query" name:"TemplateTag.5.Value"`
+	PageSize                requests.Integer `position:"Query" name:"PageSize"`
+	TemplateTag3Value       string           `position:"Query" name:"TemplateTag.3.Value"`
+	TemplateTag2Key         string           `position:"Query" name:"TemplateTag.2.Key"`
+	LaunchTemplateId        *[]string        `position:"Query" name:"LaunchTemplateId"  type:"Repeated"`
+	ResourceOwnerAccount    string           `position:"Query" name:"ResourceOwnerAccount"`
+	OwnerAccount            string           `position:"Query" name:"OwnerAccount"`
+	TemplateResourceGroupId string           `position:"Query" name:"TemplateResourceGroupId"`
+	TemplateTag2Value       string           `position:"Query" name:"TemplateTag.2.Value"`
+	OwnerId                 requests.Integer `position:"Query" name:"OwnerId"`
+	TemplateTag4Value       string           `position:"Query" name:"TemplateTag.4.Value"`
+	TemplateTag5Key         string           `position:"Query" name:"TemplateTag.5.Key"`
+	TemplateTag1Key         string           `position:"Query" name:"TemplateTag.1.Key"`
 }
 
 // DescribeLaunchTemplatesResponse is the response struct for api DescribeLaunchTemplates

+ 11 - 0
services/ecs/describe_network_interfaces.go

@@ -76,17 +76,28 @@ func (client *Client) DescribeNetworkInterfacesWithCallback(request *DescribeNet
 // DescribeNetworkInterfacesRequest is the request struct for api DescribeNetworkInterfaces
 type DescribeNetworkInterfacesRequest struct {
 	*requests.RpcRequest
+	Tag4Value            string           `position:"Query" name:"Tag.4.Value"`
 	ResourceOwnerId      requests.Integer `position:"Query" name:"ResourceOwnerId"`
+	Tag2Key              string           `position:"Query" name:"Tag.2.Key"`
 	SecurityGroupId      string           `position:"Query" name:"SecurityGroupId"`
+	Tag3Key              string           `position:"Query" name:"Tag.3.Key"`
 	Type                 string           `position:"Query" name:"Type"`
 	PageNumber           requests.Integer `position:"Query" name:"PageNumber"`
+	Tag1Value            string           `position:"Query" name:"Tag.1.Value"`
+	ResourceGroupId      string           `position:"Query" name:"ResourceGroupId"`
 	PageSize             requests.Integer `position:"Query" name:"PageSize"`
+	Tag3Value            string           `position:"Query" name:"Tag.3.Value"`
 	NetworkInterfaceName string           `position:"Query" name:"NetworkInterfaceName"`
+	Tag5Key              string           `position:"Query" name:"Tag.5.Key"`
 	ResourceOwnerAccount string           `position:"Query" name:"ResourceOwnerAccount"`
 	OwnerAccount         string           `position:"Query" name:"OwnerAccount"`
 	OwnerId              requests.Integer `position:"Query" name:"OwnerId"`
+	Tag5Value            string           `position:"Query" name:"Tag.5.Value"`
+	Tag1Key              string           `position:"Query" name:"Tag.1.Key"`
 	VSwitchId            string           `position:"Query" name:"VSwitchId"`
 	InstanceId           string           `position:"Query" name:"InstanceId"`
+	Tag2Value            string           `position:"Query" name:"Tag.2.Value"`
+	Tag4Key              string           `position:"Query" name:"Tag.4.Key"`
 	PrimaryIpAddress     string           `position:"Query" name:"PrimaryIpAddress"`
 	NetworkInterfaceId   *[]string        `position:"Query" name:"NetworkInterfaceId"  type:"Repeated"`
 }

+ 1 - 0
services/ecs/replace_system_disk.go

@@ -87,6 +87,7 @@ type ReplaceSystemDiskRequest struct {
 	Platform                    string           `position:"Query" name:"Platform"`
 	Password                    string           `position:"Query" name:"Password"`
 	InstanceId                  string           `position:"Query" name:"InstanceId"`
+	PasswordInherit             requests.Boolean `position:"Query" name:"PasswordInherit"`
 	SystemDiskSize              requests.Integer `position:"Query" name:"SystemDisk.Size"`
 	DiskId                      string           `position:"Query" name:"DiskId"`
 	UseAdditionalService        requests.Boolean `position:"Query" name:"UseAdditionalService"`

+ 2 - 0
services/ecs/run_instances.go

@@ -82,6 +82,7 @@ type RunInstancesRequest struct {
 	SecurityEnhancementStrategy string                          `position:"Query" name:"SecurityEnhancementStrategy"`
 	KeyPairName                 string                          `position:"Query" name:"KeyPairName"`
 	SpotPriceLimit              requests.Float                  `position:"Query" name:"SpotPriceLimit"`
+	ResourceGroupId             string                          `position:"Query" name:"ResourceGroupId"`
 	HostName                    string                          `position:"Query" name:"HostName"`
 	Password                    string                          `position:"Query" name:"Password"`
 	Tag                         *[]RunInstancesTag              `position:"Query" name:"Tag"  type:"Repeated"`
@@ -103,6 +104,7 @@ type RunInstancesRequest struct {
 	Description                 string                          `position:"Query" name:"Description"`
 	SystemDiskCategory          string                          `position:"Query" name:"SystemDisk.Category"`
 	UserData                    string                          `position:"Query" name:"UserData"`
+	PasswordInherit             requests.Boolean                `position:"Query" name:"PasswordInherit"`
 	InstanceType                string                          `position:"Query" name:"InstanceType"`
 	NetworkInterface            *[]RunInstancesNetworkInterface `position:"Query" name:"NetworkInterface"  type:"Repeated"`
 	Amount                      requests.Integer                `position:"Query" name:"Amount"`

+ 0 - 28
services/ecs/struct_event.go

@@ -1,28 +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.
-
-// Event is a nested struct in ecs response
-type Event struct {
-	ResourceId    string `json:"ResourceId" xml:"ResourceId"`
-	EventType     string `json:"EventType" xml:"EventType"`
-	EventCategory string `json:"EventCategory" xml:"EventCategory"`
-	Status        string `json:"Status" xml:"Status"`
-	SupportModify string `json:"SupportModify" xml:"SupportModify"`
-	PlanTime      string `json:"PlanTime" xml:"PlanTime"`
-	ExpireTime    string `json:"ExpireTime" xml:"ExpireTime"`
-	EventId       string `json:"EventId" xml:"EventId"`
-}

+ 0 - 21
services/ecs/struct_events.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.
-
-// Events is a nested struct in ecs response
-type Events struct {
-	Event []Event `json:"Event" xml:"Event"`
-}

+ 1 - 0
services/ecs/struct_snapshot.go

@@ -31,5 +31,6 @@ type Snapshot struct {
 	Status            string                  `json:"Status" xml:"Status"`
 	Usage             string                  `json:"Usage" xml:"Usage"`
 	SourceStorageType string                  `json:"SourceStorageType" xml:"SourceStorageType"`
+	RemainTime        int                     `json:"RemainTime" xml:"RemainTime"`
 	Tags              TagsInDescribeSnapshots `json:"Tags" xml:"Tags"`
 }