Browse Source

Update go sdk.

sdk-team 6 years ago
parent
commit
e6d1ff87e8

+ 3 - 0
ChangeLog.txt

@@ -1,3 +1,6 @@
+2019-12-02 Version: v1.60.278
+- Update go sdk.
+
 2019-12-02 Version: v1.60.277
 - Remove QuerySmsProdStatus OpenAPI.
 

+ 53 - 5
services/actiontrail/client.go

@@ -16,8 +16,11 @@ package actiontrail
 // Changes may cause incorrect behavior and will be lost if the code is regenerated.
 
 import (
+	"reflect"
+
 	"github.com/aliyun/alibaba-cloud-sdk-go/sdk"
 	"github.com/aliyun/alibaba-cloud-sdk-go/sdk/auth"
+	"github.com/aliyun/alibaba-cloud-sdk-go/sdk/auth/credentials/provider"
 )
 
 // Client is the sdk client struct, each func corresponds to an OpenAPI
@@ -25,10 +28,40 @@ type Client struct {
 	sdk.Client
 }
 
+// SetClientProperty Set Property by Reflect
+func SetClientProperty(client *Client, propertyName string, propertyValue interface{}) {
+	v := reflect.ValueOf(client).Elem()
+	if v.FieldByName(propertyName).IsValid() && v.FieldByName(propertyName).CanSet() {
+		v.FieldByName(propertyName).Set(reflect.ValueOf(propertyValue))
+	}
+}
+
+// SetEndpointDataToClient Set EndpointMap and ENdpointType
+func SetEndpointDataToClient(client *Client) {
+	SetClientProperty(client, "EndpointMap", GetEndpointMap())
+	SetClientProperty(client, "EndpointType", GetEndpointType())
+}
+
 // NewClient creates a sdk client with environment variables
 func NewClient() (client *Client, err error) {
 	client = &Client{}
 	err = client.Init()
+	SetEndpointDataToClient(client)
+	return
+}
+
+// NewClientWithProvider creates a sdk client with providers
+// usage: https://github.com/aliyun/alibaba-cloud-sdk-go/blob/master/docs/2-Client-EN.md
+func NewClientWithProvider(regionId string, providers ...provider.Provider) (client *Client, err error) {
+	client = &Client{}
+	var pc provider.Provider
+	if len(providers) == 0 {
+		pc = provider.DefaultChain
+	} else {
+		pc = provider.NewProviderChain(providers)
+	}
+	err = client.InitWithProviderChain(regionId, pc)
+	SetEndpointDataToClient(client)
 	return
 }
 
@@ -37,45 +70,60 @@ func NewClient() (client *Client, err error) {
 func NewClientWithOptions(regionId string, config *sdk.Config, credential auth.Credential) (client *Client, err error) {
 	client = &Client{}
 	err = client.InitWithOptions(regionId, config, credential)
+	SetEndpointDataToClient(client)
 	return
 }
 
 // NewClientWithAccessKey is a shortcut to create sdk client with accesskey
-// usage: https://help.aliyun.com/document_detail/66217.html
+// usage: https://github.com/aliyun/alibaba-cloud-sdk-go/blob/master/docs/2-Client-EN.md
 func NewClientWithAccessKey(regionId, accessKeyId, accessKeySecret string) (client *Client, err error) {
 	client = &Client{}
 	err = client.InitWithAccessKey(regionId, accessKeyId, accessKeySecret)
+	SetEndpointDataToClient(client)
 	return
 }
 
 // NewClientWithStsToken is a shortcut to create sdk client with sts token
-// usage: https://help.aliyun.com/document_detail/66222.html
+// usage: https://github.com/aliyun/alibaba-cloud-sdk-go/blob/master/docs/2-Client-EN.md
 func NewClientWithStsToken(regionId, stsAccessKeyId, stsAccessKeySecret, stsToken string) (client *Client, err error) {
 	client = &Client{}
 	err = client.InitWithStsToken(regionId, stsAccessKeyId, stsAccessKeySecret, stsToken)
+	SetEndpointDataToClient(client)
 	return
 }
 
 // NewClientWithRamRoleArn is a shortcut to create sdk client with ram roleArn
-// usage: https://help.aliyun.com/document_detail/66222.html
+// usage: https://github.com/aliyun/alibaba-cloud-sdk-go/blob/master/docs/2-Client-EN.md
 func NewClientWithRamRoleArn(regionId string, accessKeyId, accessKeySecret, roleArn, roleSessionName string) (client *Client, err error) {
 	client = &Client{}
 	err = client.InitWithRamRoleArn(regionId, accessKeyId, accessKeySecret, roleArn, roleSessionName)
+	SetEndpointDataToClient(client)
+	return
+}
+
+// NewClientWithRamRoleArn is a shortcut to create sdk client with ram roleArn and policy
+// usage: https://github.com/aliyun/alibaba-cloud-sdk-go/blob/master/docs/2-Client-EN.md
+func NewClientWithRamRoleArnAndPolicy(regionId string, accessKeyId, accessKeySecret, roleArn, roleSessionName, policy string) (client *Client, err error) {
+	client = &Client{}
+	err = client.InitWithRamRoleArnAndPolicy(regionId, accessKeyId, accessKeySecret, roleArn, roleSessionName, policy)
+	SetEndpointDataToClient(client)
 	return
 }
 
 // NewClientWithEcsRamRole is a shortcut to create sdk client with ecs ram role
-// usage: https://help.aliyun.com/document_detail/66223.html
+// usage: https://github.com/aliyun/alibaba-cloud-sdk-go/blob/master/docs/2-Client-EN.md
 func NewClientWithEcsRamRole(regionId string, roleName string) (client *Client, err error) {
 	client = &Client{}
 	err = client.InitWithEcsRamRole(regionId, roleName)
+	SetEndpointDataToClient(client)
 	return
 }
 
 // NewClientWithRsaKeyPair is a shortcut to create sdk client with rsa key pair
-// attention: rsa key pair auth is only Japan regions available
+// usage: https://github.com/aliyun/alibaba-cloud-sdk-go/blob/master/docs/2-Client-EN.md
 func NewClientWithRsaKeyPair(regionId string, publicKeyId, privateKey string, sessionExpiration int) (client *Client, err error) {
 	client = &Client{}
 	err = client.InitWithRsaKeyPair(regionId, publicKeyId, privateKey, sessionExpiration)
+	SetEndpointDataToClient(client)
 	return
 }

+ 2 - 2
services/actiontrail/create_trail.go

@@ -78,11 +78,11 @@ type CreateTrailRequest struct {
 	*requests.RpcRequest
 	SlsProjectArn   string `position:"Query" name:"SlsProjectArn"`
 	SlsWriteRoleArn string `position:"Query" name:"SlsWriteRoleArn"`
+	OssKeyPrefix    string `position:"Query" name:"OssKeyPrefix"`
 	RoleName        string `position:"Query" name:"RoleName"`
+	EventRW         string `position:"Query" name:"EventRW"`
 	Name            string `position:"Query" name:"Name"`
 	OssBucketName   string `position:"Query" name:"OssBucketName"`
-	OssKeyPrefix    string `position:"Query" name:"OssKeyPrefix"`
-	EventRW         string `position:"Query" name:"EventRW"`
 }
 
 // CreateTrailResponse is the response struct for api CreateTrail

+ 0 - 0
services/actiontrail/delete_trail.go


+ 0 - 0
services/actiontrail/describe_regions.go


+ 1 - 1
services/actiontrail/describe_trails.go

@@ -76,8 +76,8 @@ func (client *Client) DescribeTrailsWithCallback(request *DescribeTrailsRequest,
 // DescribeTrailsRequest is the request struct for api DescribeTrails
 type DescribeTrailsRequest struct {
 	*requests.RpcRequest
-	NameList            string           `position:"Query" name:"NameList"`
 	IncludeShadowTrails requests.Boolean `position:"Query" name:"IncludeShadowTrails"`
+	NameList            string           `position:"Query" name:"NameList"`
 }
 
 // DescribeTrailsResponse is the response struct for api DescribeTrails

+ 53 - 0
services/actiontrail/endpoint.go

@@ -0,0 +1,53 @@
+package actiontrail
+
+// EndpointMap Endpoint Data
+var EndpointMap map[string]string
+
+// EndpointType regional or central
+var EndpointType = "regional"
+
+// GetEndpointMap Get Endpoint Data Map
+func GetEndpointMap() map[string]string {
+	if EndpointMap == nil {
+		EndpointMap = map[string]string{
+			"cn-shanghai-internal-test-1": "actiontrail.aliyuncs.com",
+			"cn-beijing-gov-1":            "actiontrail.aliyuncs.com",
+			"cn-shenzhen-su18-b01":        "actiontrail.aliyuncs.com",
+			"cn-shanghai-inner":           "actiontrail.aliyuncs.com",
+			"cn-shenzhen-st4-d01":         "actiontrail.aliyuncs.com",
+			"cn-haidian-cm12-c01":         "actiontrail.aliyuncs.com",
+			"cn-hangzhou-internal-prod-1": "actiontrail.aliyuncs.com",
+			"cn-yushanfang":               "actiontrail.aliyuncs.com",
+			"cn-hongkong-finance-pop":     "actiontrail.aliyuncs.com",
+			"cn-qingdao-nebula":           "actiontrail.aliyuncs.com",
+			"cn-beijing-finance-pop":      "actiontrail.aliyuncs.com",
+			"cn-wuhan":                    "actiontrail.aliyuncs.com",
+			"cn-zhengzhou-nebula-1":       "actiontrail.aliyuncs.com",
+			"rus-west-1-pop":              "actiontrail.ap-northeast-1.aliyuncs.com",
+			"cn-shanghai-et15-b01":        "actiontrail.aliyuncs.com",
+			"cn-hangzhou-bj-b01":          "actiontrail.aliyuncs.com",
+			"cn-hangzhou-internal-test-1": "actiontrail.aliyuncs.com",
+			"eu-west-1-oxs":               "actiontrail.ap-northeast-1.aliyuncs.com",
+			"cn-zhangbei-na61-b01":        "actiontrail.aliyuncs.com",
+			"cn-beijing-finance-1":        "actiontrail.aliyuncs.com",
+			"cn-hangzhou-internal-test-3": "actiontrail.aliyuncs.com",
+			"cn-hangzhou-internal-test-2": "actiontrail.aliyuncs.com",
+			"cn-shenzhen-finance-1":       "actiontrail.aliyuncs.com",
+			"cn-hangzhou-test-306":        "actiontrail.aliyuncs.com",
+			"cn-shanghai-et2-b01":         "actiontrail.aliyuncs.com",
+			"cn-hangzhou-finance":         "actiontrail.aliyuncs.com",
+			"cn-beijing-nu16-b01":         "actiontrail.aliyuncs.com",
+			"cn-edge-1":                   "actiontrail.aliyuncs.com",
+			"cn-fujian":                   "actiontrail.aliyuncs.com",
+			"ap-northeast-2-pop":          "actiontrail.ap-northeast-1.aliyuncs.com",
+			"cn-shenzhen-inner":           "actiontrail.aliyuncs.com",
+			"cn-zhangjiakou-na62-a01":     "actiontrail.aliyuncs.com",
+		}
+	}
+	return EndpointMap
+}
+
+// GetEndpointType Get Endpoint Type Value
+func GetEndpointType() string {
+	return EndpointType
+}

+ 0 - 0
services/actiontrail/get_trail_status.go


+ 10 - 10
services/actiontrail/lookup_events.go

@@ -77,29 +77,29 @@ func (client *Client) LookupEventsWithCallback(request *LookupEventsRequest, cal
 type LookupEventsRequest struct {
 	*requests.RpcRequest
 	Request          string `position:"Query" name:"Request"`
+	StartTime        string `position:"Query" name:"StartTime"`
+	EventName        string `position:"Query" name:"EventName"`
+	NextToken        string `position:"Query" name:"NextToken"`
+	ServiceName      string `position:"Query" name:"ServiceName"`
+	Event            string `position:"Query" name:"Event"`
 	EventAccessKeyId string `position:"Query" name:"EventAccessKeyId"`
 	EndTime          string `position:"Query" name:"EndTime"`
 	EventRW          string `position:"Query" name:"EventRW"`
-	StartTime        string `position:"Query" name:"StartTime"`
 	ResourceType     string `position:"Query" name:"ResourceType"`
-	EventName        string `position:"Query" name:"EventName"`
-	NextToken        string `position:"Query" name:"NextToken"`
 	MaxResults       string `position:"Query" name:"MaxResults"`
 	EventType        string `position:"Query" name:"EventType"`
-	ServiceName      string `position:"Query" name:"ServiceName"`
 	ResourceName     string `position:"Query" name:"ResourceName"`
-	Event            string `position:"Query" name:"Event"`
 	User             string `position:"Query" name:"User"`
 }
 
 // LookupEventsResponse is the response struct for api LookupEvents
 type LookupEventsResponse struct {
 	*responses.BaseResponse
-	RequestId string   `json:"RequestId" xml:"RequestId"`
-	NextToken string   `json:"NextToken" xml:"NextToken"`
-	StartTime string   `json:"StartTime" xml:"StartTime"`
-	EndTime   string   `json:"EndTime" xml:"EndTime"`
-	Events    []string `json:"Events" xml:"Events"`
+	RequestId string                   `json:"RequestId" xml:"RequestId"`
+	NextToken string                   `json:"NextToken" xml:"NextToken"`
+	StartTime string                   `json:"StartTime" xml:"StartTime"`
+	EndTime   string                   `json:"EndTime" xml:"EndTime"`
+	Events    []map[string]interface{} `json:"Events" xml:"Events"`
 }
 
 // CreateLookupEventsRequest creates a request to invoke LookupEvents API

+ 0 - 0
services/actiontrail/start_logging.go


+ 0 - 2
services/actiontrail/stop_logging.go

@@ -83,8 +83,6 @@ type StopLoggingRequest struct {
 type StopLoggingResponse struct {
 	*responses.BaseResponse
 	RequestId string `json:"RequestId" xml:"RequestId"`
-	Param     string `json:"Param" xml:"Param"`
-	Result    string `json:"Result" xml:"Result"`
 }
 
 // CreateStopLoggingRequest creates a request to invoke StopLogging API

+ 0 - 0
services/actiontrail/struct_events.go


+ 1 - 1
services/actiontrail/struct_region.go

@@ -17,5 +17,5 @@ package actiontrail
 
 // Region is a nested struct in actiontrail response
 type Region struct {
-	RegionItem []RegionItem `json:"RegionItem" xml:"RegionItem"`
+	RegionItem []RegionItem `json:"Region" xml:"Region"`
 }

+ 0 - 0
services/actiontrail/struct_region_item.go


+ 0 - 0
services/actiontrail/struct_regions.go


+ 1 - 1
services/actiontrail/struct_trail_list.go

@@ -17,5 +17,5 @@ package actiontrail
 
 // TrailList is a nested struct in actiontrail response
 type TrailList struct {
-	TrailListItem []TrailListItem `json:"TrailListItem" xml:"TrailListItem"`
+	TrailListItem []TrailListItem `json:"TrailList" xml:"TrailList"`
 }

+ 8 - 12
services/actiontrail/struct_trail_list_item.go

@@ -17,16 +17,12 @@ package actiontrail
 
 // TrailListItem is a nested struct in actiontrail response
 type TrailListItem struct {
-	Name                      string `json:"Name" xml:"Name"`
-	HomeRegion                string `json:"HomeRegion" xml:"HomeRegion"`
-	RoleName                  string `json:"RoleName" xml:"RoleName"`
-	Status                    string `json:"Status" xml:"Status"`
-	IncludeGlobalServiceEvent string `json:"IncludeGlobalServiceEvent" xml:"IncludeGlobalServiceEvent"`
-	OssBucketName             string `json:"OssBucketName" xml:"OssBucketName"`
-	OssKeyPrefix              string `json:"OssKeyPrefix" xml:"OssKeyPrefix"`
-	Region                    string `json:"Region" xml:"Region"`
-	EventRW                   string `json:"EventRW" xml:"EventRW"`
-	Type                      string `json:"Type" xml:"Type"`
-	SlsWriteRoleArn           string `json:"SlsWriteRoleArn" xml:"SlsWriteRoleArn"`
-	SlsProjectArn             string `json:"SlsProjectArn" xml:"SlsProjectArn"`
+	Name            string `json:"Name" xml:"Name"`
+	HomeRegion      string `json:"HomeRegion" xml:"HomeRegion"`
+	RoleName        string `json:"RoleName" xml:"RoleName"`
+	OssBucketName   string `json:"OssBucketName" xml:"OssBucketName"`
+	OssKeyPrefix    string `json:"OssKeyPrefix" xml:"OssKeyPrefix"`
+	EventRW         string `json:"EventRW" xml:"EventRW"`
+	SlsWriteRoleArn string `json:"SlsWriteRoleArn" xml:"SlsWriteRoleArn"`
+	SlsProjectArn   string `json:"SlsProjectArn" xml:"SlsProjectArn"`
 }

+ 2 - 4
services/actiontrail/update_trail.go

@@ -78,19 +78,17 @@ type UpdateTrailRequest struct {
 	*requests.RpcRequest
 	SlsProjectArn   string `position:"Query" name:"SlsProjectArn"`
 	SlsWriteRoleArn string `position:"Query" name:"SlsWriteRoleArn"`
+	OssKeyPrefix    string `position:"Query" name:"OssKeyPrefix"`
 	RoleName        string `position:"Query" name:"RoleName"`
+	EventRW         string `position:"Query" name:"EventRW"`
 	Name            string `position:"Query" name:"Name"`
 	OssBucketName   string `position:"Query" name:"OssBucketName"`
-	OssKeyPrefix    string `position:"Query" name:"OssKeyPrefix"`
-	EventRW         string `position:"Query" name:"EventRW"`
 }
 
 // UpdateTrailResponse is the response struct for api UpdateTrail
 type UpdateTrailResponse struct {
 	*responses.BaseResponse
 	RequestId       string `json:"RequestId" xml:"RequestId"`
-	Param           string `json:"Param" xml:"Param"`
-	Result          string `json:"Result" xml:"Result"`
 	Name            string `json:"Name" xml:"Name"`
 	HomeRegion      string `json:"HomeRegion" xml:"HomeRegion"`
 	OssBucketName   string `json:"OssBucketName" xml:"OssBucketName"`