From cad14ebeba2b915302cc1ae8fca79bc6dbf6254b Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sat, 1 Apr 2023 00:54:06 +0000 Subject: [PATCH 1/2] fix(deps): Update module github.com/aliyun/alibaba-cloud-sdk-go to v1.62.266 --- plugins/source/alicloud/go.mod | 2 +- plugins/source/alicloud/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/source/alicloud/go.mod b/plugins/source/alicloud/go.mod index edc5b879706d23..d2c639b8718c2c 100644 --- a/plugins/source/alicloud/go.mod +++ b/plugins/source/alicloud/go.mod @@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/plugins/source/alicloud go 1.19 require ( - github.com/aliyun/alibaba-cloud-sdk-go v1.62.197 + github.com/aliyun/alibaba-cloud-sdk-go v1.62.266 github.com/aliyun/aliyun-oss-go-sdk v2.2.6+incompatible github.com/cloudquery/codegen v0.2.1 github.com/cloudquery/plugin-sdk v1.44.1 diff --git a/plugins/source/alicloud/go.sum b/plugins/source/alicloud/go.sum index e71d823c258a31..503068f29c72ee 100644 --- a/plugins/source/alicloud/go.sum +++ b/plugins/source/alicloud/go.sum @@ -33,8 +33,8 @@ cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/aliyun/alibaba-cloud-sdk-go v1.62.197 h1:rs6RDi5rMP+9vusvQjXVNAN0zLQDyhSq2yUUi0ly5gY= -github.com/aliyun/alibaba-cloud-sdk-go v1.62.197/go.mod h1:Api2AkmMgGaSUAhmk76oaFObkoeCPc/bKAqcyplPODs= +github.com/aliyun/alibaba-cloud-sdk-go v1.62.266 h1:KpDhGuvJMRVugaW5B+ZgwBxGne9J/jZpLDhV2gyhenk= +github.com/aliyun/alibaba-cloud-sdk-go v1.62.266/go.mod h1:Api2AkmMgGaSUAhmk76oaFObkoeCPc/bKAqcyplPODs= github.com/aliyun/aliyun-oss-go-sdk v2.2.6+incompatible h1:KXeJoM1wo9I/6xPTyt6qCxoSZnmASiAjlrr0dyTUKt8= github.com/aliyun/aliyun-oss-go-sdk v2.2.6+incompatible/go.mod h1:T/Aws4fEfogEE9v+HPhhw+CntffsBHJ8nXQCwKr0/g8= github.com/avast/retry-go/v4 v4.3.3 h1:G56Bp6mU0b5HE1SkaoVjscZjlQb0oy4mezwY/cGH19w= From f006812878849d89cc679f26e02e42a54887cafa Mon Sep 17 00:00:00 2001 From: cq-bot Date: Sat, 1 Apr 2023 00:58:06 +0000 Subject: [PATCH 2/2] chore: Update code and docs --- .../alicloud/client/mocks/bssopenapi.go | 44 +++++++++++++++++++ .../alicloud/client/services/bssopenapi.go | 3 ++ .../tables/alicloud/alicloud_ecs_instances.md | 1 + 3 files changed, 48 insertions(+) diff --git a/plugins/source/alicloud/client/mocks/bssopenapi.go b/plugins/source/alicloud/client/mocks/bssopenapi.go index a838cd1b089a37..be75741401410c 100644 --- a/plugins/source/alicloud/client/mocks/bssopenapi.go +++ b/plugins/source/alicloud/client/mocks/bssopenapi.go @@ -2479,6 +2479,50 @@ func (mr *MockBssopenapiClientMockRecorder) QueryResellerAvailableQuotaWithChan( return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "QueryResellerAvailableQuotaWithChan", reflect.TypeOf((*MockBssopenapiClient)(nil).QueryResellerAvailableQuotaWithChan), arg0) } +// QueryResellerUserAlarmThreshold mocks base method. +func (m *MockBssopenapiClient) QueryResellerUserAlarmThreshold(arg0 *bssopenapi.QueryResellerUserAlarmThresholdRequest) (*bssopenapi.QueryResellerUserAlarmThresholdResponse, error) { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "QueryResellerUserAlarmThreshold", arg0) + ret0, _ := ret[0].(*bssopenapi.QueryResellerUserAlarmThresholdResponse) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// QueryResellerUserAlarmThreshold indicates an expected call of QueryResellerUserAlarmThreshold. +func (mr *MockBssopenapiClientMockRecorder) QueryResellerUserAlarmThreshold(arg0 interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "QueryResellerUserAlarmThreshold", reflect.TypeOf((*MockBssopenapiClient)(nil).QueryResellerUserAlarmThreshold), arg0) +} + +// QueryResellerUserAlarmThresholdWithCallback mocks base method. +func (m *MockBssopenapiClient) QueryResellerUserAlarmThresholdWithCallback(arg0 *bssopenapi.QueryResellerUserAlarmThresholdRequest, arg1 func(*bssopenapi.QueryResellerUserAlarmThresholdResponse, error)) <-chan int { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "QueryResellerUserAlarmThresholdWithCallback", arg0, arg1) + ret0, _ := ret[0].(<-chan int) + return ret0 +} + +// QueryResellerUserAlarmThresholdWithCallback indicates an expected call of QueryResellerUserAlarmThresholdWithCallback. +func (mr *MockBssopenapiClientMockRecorder) QueryResellerUserAlarmThresholdWithCallback(arg0, arg1 interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "QueryResellerUserAlarmThresholdWithCallback", reflect.TypeOf((*MockBssopenapiClient)(nil).QueryResellerUserAlarmThresholdWithCallback), arg0, arg1) +} + +// QueryResellerUserAlarmThresholdWithChan mocks base method. +func (m *MockBssopenapiClient) QueryResellerUserAlarmThresholdWithChan(arg0 *bssopenapi.QueryResellerUserAlarmThresholdRequest) (<-chan *bssopenapi.QueryResellerUserAlarmThresholdResponse, <-chan error) { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "QueryResellerUserAlarmThresholdWithChan", arg0) + ret0, _ := ret[0].(<-chan *bssopenapi.QueryResellerUserAlarmThresholdResponse) + ret1, _ := ret[1].(<-chan error) + return ret0, ret1 +} + +// QueryResellerUserAlarmThresholdWithChan indicates an expected call of QueryResellerUserAlarmThresholdWithChan. +func (mr *MockBssopenapiClientMockRecorder) QueryResellerUserAlarmThresholdWithChan(arg0 interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "QueryResellerUserAlarmThresholdWithChan", reflect.TypeOf((*MockBssopenapiClient)(nil).QueryResellerUserAlarmThresholdWithChan), arg0) +} + // QueryResourcePackageInstances mocks base method. func (m *MockBssopenapiClient) QueryResourcePackageInstances(arg0 *bssopenapi.QueryResourcePackageInstancesRequest) (*bssopenapi.QueryResourcePackageInstancesResponse, error) { m.ctrl.T.Helper() diff --git a/plugins/source/alicloud/client/services/bssopenapi.go b/plugins/source/alicloud/client/services/bssopenapi.go index 4f00505f66b058..1a2027e253627d 100644 --- a/plugins/source/alicloud/client/services/bssopenapi.go +++ b/plugins/source/alicloud/client/services/bssopenapi.go @@ -174,6 +174,9 @@ type BssopenapiClient interface { QueryResellerAvailableQuota(*bssopenapi.QueryResellerAvailableQuotaRequest) (*bssopenapi.QueryResellerAvailableQuotaResponse, error) QueryResellerAvailableQuotaWithCallback(*bssopenapi.QueryResellerAvailableQuotaRequest, func(*bssopenapi.QueryResellerAvailableQuotaResponse, error)) <-chan int QueryResellerAvailableQuotaWithChan(*bssopenapi.QueryResellerAvailableQuotaRequest) (<-chan *bssopenapi.QueryResellerAvailableQuotaResponse, <-chan error) + QueryResellerUserAlarmThreshold(*bssopenapi.QueryResellerUserAlarmThresholdRequest) (*bssopenapi.QueryResellerUserAlarmThresholdResponse, error) + QueryResellerUserAlarmThresholdWithCallback(*bssopenapi.QueryResellerUserAlarmThresholdRequest, func(*bssopenapi.QueryResellerUserAlarmThresholdResponse, error)) <-chan int + QueryResellerUserAlarmThresholdWithChan(*bssopenapi.QueryResellerUserAlarmThresholdRequest) (<-chan *bssopenapi.QueryResellerUserAlarmThresholdResponse, <-chan error) QueryResourcePackageInstances(*bssopenapi.QueryResourcePackageInstancesRequest) (*bssopenapi.QueryResourcePackageInstancesResponse, error) QueryResourcePackageInstancesWithCallback(*bssopenapi.QueryResourcePackageInstancesRequest, func(*bssopenapi.QueryResourcePackageInstancesResponse, error)) <-chan int QueryResourcePackageInstancesWithChan(*bssopenapi.QueryResourcePackageInstancesRequest) (<-chan *bssopenapi.QueryResourcePackageInstancesResponse, <-chan error) diff --git a/website/tables/alicloud/alicloud_ecs_instances.md b/website/tables/alicloud/alicloud_ecs_instances.md index 24b81abf0e3d1c..febb7ec5840fee 100644 --- a/website/tables/alicloud/alicloud_ecs_instances.md +++ b/website/tables/alicloud/alicloud_ecs_instances.md @@ -51,6 +51,7 @@ The composite primary key for this table is (**account_id**, **region_id**, **in |os_version|String| |spot_price_limit|Float| |os_name|String| +|instance_owner_id|Int| |os_name_en|String| |serial_number|String| |region_id (PK)|String|