@alicloud/dts20200101 1.5.2 → 1.5.4

package/dist/client.d.ts

@@ -5,6 +5,11 @@ import * as $_model from './models/model';
 export * from './models/model';
 export default class Client extends OpenApi {
     constructor(config: $OpenApiUtil.Config);
+    _postOSSObject(bucketName: string, form: {
+        [key: string]: any;
+    }): Promise<{
+        [key: string]: any;
+    }>;
     getEndpoint(productId: string, regionId: string, endpointRule: string, network: string, suffix: string, endpointMap: {
         [key: string]: string;
     }, endpoint: string): string;

package/dist/client.js

@@ -35,17 +35,10 @@ var __importStar = (this && this.__importStar) || (function () {
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 // This file is auto-generated, don't edit it
 const $dara = __importStar(require("@darabonba/typescript"));
-const oss_client_1 = __importStar(require("@alicloud/oss-client")), $OSS = oss_client_1;
-const openplatform20191219_1 = __importStar(require("@alicloud/openplatform20191219")), $OpenPlatform = openplatform20191219_1;
-const $OSSUtil = __importStar(require("@alicloud/oss-util"));
-const $FileForm = __importStar(require("@alicloud/tea-fileform"));
-const openapi_core_1 = __importDefault(require("@alicloud/openapi-core"));
+const openapi_core_1 = __importStar(require("@alicloud/openapi-core")), $OpenApi = openapi_core_1;
 const openapi_core_2 = require("@alicloud/openapi-core");
 const $_model = __importStar(require("./models/model"));
 __exportStar(require("./models/model"), exports);
@@ -113,6 +106,38 @@ class Client extends openapi_core_1.default {
         this.checkConfig(config);
         this._endpoint = this.getEndpoint("dts", this._regionId, this._endpointRule, this._network, this._suffix, this._endpointMap, this._endpoint);
     }
+    async _postOSSObject(bucketName, form) {
+        let request_ = new $dara.Request();
+        let boundary = $dara.Form.getBoundary();
+        request_.protocol = "HTTPS";
+        request_.method = "POST";
+        request_.pathname = `/`;
+        request_.headers = {
+            host: String(form["host"]),
+            date: openapi_core_2.OpenApiUtil.getDateUTCString(),
+            'user-agent': openapi_core_2.OpenApiUtil.getUserAgent(""),
+        };
+        request_.headers["content-type"] = `multipart/form-data; boundary=${boundary}`;
+        request_.body = $dara.Form.toFileForm(form, boundary);
+        let response_ = await $dara.doAction(request_);
+        let respMap = null;
+        let bodyStr = await $dara.Stream.readAsString(response_.body);
+        if ((response_.statusCode >= 400) && (response_.statusCode < 600)) {
+            respMap = $dara.XML.parseXml(bodyStr, null);
+            let err = respMap["Error"];
+            throw new $OpenApi.ClientError({
+                code: String(err["Code"]),
+                message: String(err["Message"]),
+                data: {
+                    httpCode: response_.statusCode,
+                    requestId: String(err["RequestId"]),
+                    hostId: String(err["HostId"]),
+                },
+            });
+        }
+        respMap = $dara.XML.parseXml(bodyStr, null);
+        return Object.assign({}, respMap);
+    }
     getEndpoint(productId, regionId, endpointRule, network, suffix, endpointMap, endpoint) {
         if (!$dara.isNull(endpoint)) {
             return endpoint;
@@ -357,12 +382,19 @@ class Client extends openapi_core_1.default {
     }
     async configureDtsJobAdvance(request, runtime) {
         // Step 0: init client
-        let accessKeyId = await this._credential.getAccessKeyId();
-        let accessKeySecret = await this._credential.getAccessKeySecret();
-        let securityToken = await this._credential.getSecurityToken();
-        let credentialType = this._credential.getType();
+        if ($dara.isNull(this._credential)) {
+            throw new $OpenApi.ClientError({
+                code: "InvalidCredentials",
+                message: "Please set up the credentials correctly. If you are setting them through environment variables, please ensure that ALIBABA_CLOUD_ACCESS_KEY_ID and ALIBABA_CLOUD_ACCESS_KEY_SECRET are set correctly. See https://help.aliyun.com/zh/sdk/developer-reference/configure-the-alibaba-cloud-accesskey-environment-variable-on-linux-macos-and-windows-systems for more details.",
+            });
+        }
+        let credentialModel = await this._credential.getCredential();
+        let accessKeyId = credentialModel.accessKeyId;
+        let accessKeySecret = credentialModel.accessKeySecret;
+        let securityToken = credentialModel.securityToken;
+        let credentialType = credentialModel.type;
         let openPlatformEndpoint = this._openPlatformEndpoint;
-        if ($dara.isNull(openPlatformEndpoint)) {
+        if ($dara.isNull(openPlatformEndpoint) || openPlatformEndpoint == "") {
             openPlatformEndpoint = "openplatform.aliyuncs.com";
         }
         if ($dara.isNull(credentialType)) {
@@ -377,51 +409,54 @@ class Client extends openapi_core_1.default {
             protocol: this._protocol,
             regionId: this._regionId,
         });
-        let authClient = new openplatform20191219_1.default(authConfig);
-        let authRequest = new $OpenPlatform.AuthorizeFileUploadRequest({
-            product: "Dts",
-            regionId: this._regionId,
+        let authClient = new openapi_core_1.default(authConfig);
+        let authRequest = {
+            Product: "Dts",
+            RegionId: this._regionId,
+        };
+        let authReq = new openapi_core_2.$OpenApiUtil.OpenApiRequest({
+            query: openapi_core_2.OpenApiUtil.query(authRequest),
         });
-        let authResponse = new $OpenPlatform.AuthorizeFileUploadResponse({});
-        let ossConfig = new $OSS.Config({
-            accessKeyId: accessKeyId,
-            accessKeySecret: accessKeySecret,
-            type: "access_key",
-            protocol: this._protocol,
-            regionId: this._regionId,
+        let authParams = new openapi_core_2.$OpenApiUtil.Params({
+            action: "AuthorizeFileUpload",
+            version: "2019-12-19",
+            protocol: "HTTPS",
+            pathname: "/",
+            method: "GET",
+            authType: "AK",
+            style: "RPC",
+            reqBodyType: "formData",
+            bodyType: "json",
         });
-        let ossClient = new oss_client_1.default(ossConfig);
-        let fileObj = new $FileForm.FileField({});
-        let ossHeader = new $OSS.PostObjectRequestHeader({});
-        let uploadRequest = new $OSS.PostObjectRequest({});
-        let ossRuntime = new $OSSUtil.RuntimeOptions({});
-        openapi_core_2.OpenApiUtil.convert(runtime, ossRuntime);
+        let authResponse = {};
+        let fileObj = new $dara.FileField({});
+        let ossHeader = {};
+        let tmpBody = {};
+        let useAccelerate = false;
+        let authResponseBody = {};
         let configureDtsJobReq = new $_model.ConfigureDtsJobRequest({});
         openapi_core_2.OpenApiUtil.convert(request, configureDtsJobReq);
         if (!$dara.isNull(request.fileOssUrlObject)) {
-            authResponse = await authClient.authorizeFileUploadWithOptions(authRequest, runtime);
-            ossConfig.accessKeyId = authResponse.body.accessKeyId;
-            ossConfig.endpoint = openapi_core_2.OpenApiUtil.getEndpoint(authResponse.body.endpoint, authResponse.body.useAccelerate, this._endpointType);
-            ossClient = new oss_client_1.default(ossConfig);
-            fileObj = new $FileForm.FileField({
-                filename: authResponse.body.objectKey,
+            authResponse = await authClient.callApi(authParams, authReq, runtime);
+            tmpBody = authResponse["body"];
+            useAccelerate = Boolean(tmpBody["UseAccelerate"]);
+            authResponseBody = openapi_core_2.OpenApiUtil.stringifyMapValue(tmpBody);
+            fileObj = new $dara.FileField({
+                filename: authResponseBody["ObjectKey"],
                 content: request.fileOssUrlObject,
                 contentType: "",
             });
-            ossHeader = new $OSS.PostObjectRequestHeader({
-                accessKeyId: authResponse.body.accessKeyId,
-                policy: authResponse.body.encodedPolicy,
-                signature: authResponse.body.signature,
-                key: authResponse.body.objectKey,
+            ossHeader = {
+                host: `${authResponseBody["Bucket"]}.${openapi_core_2.OpenApiUtil.getEndpoint(authResponseBody["Endpoint"], useAccelerate, this._endpointType)}`,
+                OSSAccessKeyId: authResponseBody["AccessKeyId"],
+                policy: authResponseBody["EncodedPolicy"],
+                Signature: authResponseBody["Signature"],
+                key: authResponseBody["ObjectKey"],
                 file: fileObj,
-                successActionStatus: "201",
-            });
-            uploadRequest = new $OSS.PostObjectRequest({
-                bucketName: authResponse.body.bucket,
-                header: ossHeader,
-            });
-            await ossClient.postObject(uploadRequest, ossRuntime);
-            configureDtsJobReq.fileOssUrl = `http://${authResponse.body.bucket}.${authResponse.body.endpoint}/${authResponse.body.objectKey}`;
+                success_action_status: "201",
+            };
+            await this._postOSSObject(authResponseBody["Bucket"], ossHeader);
+            configureDtsJobReq.fileOssUrl = `http://${authResponseBody["Bucket"]}.${authResponseBody["Endpoint"]}/${authResponseBody["ObjectKey"]}`;
         }
         let configureDtsJobResp = await this.configureDtsJobWithOptions(configureDtsJobReq, runtime);
         return configureDtsJobResp;
@@ -3508,6 +3543,9 @@ class Client extends openapi_core_1.default {
     async describeGadInstancesWithOptions(request, runtime) {
         request.validate();
         let query = {};
+        if (!$dara.isNull(request.dbEngineTypes)) {
+            query["DbEngineTypes"] = request.dbEngineTypes;
+        }
         if (!$dara.isNull(request.instanceName)) {
             query["InstanceName"] = request.instanceName;
         }
@@ -5414,12 +5452,19 @@ class Client extends openapi_core_1.default {
     }
     async modifyDtsJobAdvance(request, runtime) {
         // Step 0: init client
-        let accessKeyId = await this._credential.getAccessKeyId();
-        let accessKeySecret = await this._credential.getAccessKeySecret();
-        let securityToken = await this._credential.getSecurityToken();
-        let credentialType = this._credential.getType();
+        if ($dara.isNull(this._credential)) {
+            throw new $OpenApi.ClientError({
+                code: "InvalidCredentials",
+                message: "Please set up the credentials correctly. If you are setting them through environment variables, please ensure that ALIBABA_CLOUD_ACCESS_KEY_ID and ALIBABA_CLOUD_ACCESS_KEY_SECRET are set correctly. See https://help.aliyun.com/zh/sdk/developer-reference/configure-the-alibaba-cloud-accesskey-environment-variable-on-linux-macos-and-windows-systems for more details.",
+            });
+        }
+        let credentialModel = await this._credential.getCredential();
+        let accessKeyId = credentialModel.accessKeyId;
+        let accessKeySecret = credentialModel.accessKeySecret;
+        let securityToken = credentialModel.securityToken;
+        let credentialType = credentialModel.type;
         let openPlatformEndpoint = this._openPlatformEndpoint;
-        if ($dara.isNull(openPlatformEndpoint)) {
+        if ($dara.isNull(openPlatformEndpoint) || openPlatformEndpoint == "") {
             openPlatformEndpoint = "openplatform.aliyuncs.com";
         }
         if ($dara.isNull(credentialType)) {
@@ -5434,51 +5479,54 @@ class Client extends openapi_core_1.default {
             protocol: this._protocol,
             regionId: this._regionId,
         });
-        let authClient = new openplatform20191219_1.default(authConfig);
-        let authRequest = new $OpenPlatform.AuthorizeFileUploadRequest({
-            product: "Dts",
-            regionId: this._regionId,
+        let authClient = new openapi_core_1.default(authConfig);
+        let authRequest = {
+            Product: "Dts",
+            RegionId: this._regionId,
+        };
+        let authReq = new openapi_core_2.$OpenApiUtil.OpenApiRequest({
+            query: openapi_core_2.OpenApiUtil.query(authRequest),
         });
-        let authResponse = new $OpenPlatform.AuthorizeFileUploadResponse({});
-        let ossConfig = new $OSS.Config({
-            accessKeyId: accessKeyId,
-            accessKeySecret: accessKeySecret,
-            type: "access_key",
-            protocol: this._protocol,
-            regionId: this._regionId,
+        let authParams = new openapi_core_2.$OpenApiUtil.Params({
+            action: "AuthorizeFileUpload",
+            version: "2019-12-19",
+            protocol: "HTTPS",
+            pathname: "/",
+            method: "GET",
+            authType: "AK",
+            style: "RPC",
+            reqBodyType: "formData",
+            bodyType: "json",
         });
-        let ossClient = new oss_client_1.default(ossConfig);
-        let fileObj = new $FileForm.FileField({});
-        let ossHeader = new $OSS.PostObjectRequestHeader({});
-        let uploadRequest = new $OSS.PostObjectRequest({});
-        let ossRuntime = new $OSSUtil.RuntimeOptions({});
-        openapi_core_2.OpenApiUtil.convert(runtime, ossRuntime);
+        let authResponse = {};
+        let fileObj = new $dara.FileField({});
+        let ossHeader = {};
+        let tmpBody = {};
+        let useAccelerate = false;
+        let authResponseBody = {};
         let modifyDtsJobReq = new $_model.ModifyDtsJobRequest({});
         openapi_core_2.OpenApiUtil.convert(request, modifyDtsJobReq);
         if (!$dara.isNull(request.fileOssUrlObject)) {
-            authResponse = await authClient.authorizeFileUploadWithOptions(authRequest, runtime);
-            ossConfig.accessKeyId = authResponse.body.accessKeyId;
-            ossConfig.endpoint = openapi_core_2.OpenApiUtil.getEndpoint(authResponse.body.endpoint, authResponse.body.useAccelerate, this._endpointType);
-            ossClient = new oss_client_1.default(ossConfig);
-            fileObj = new $FileForm.FileField({
-                filename: authResponse.body.objectKey,
+            authResponse = await authClient.callApi(authParams, authReq, runtime);
+            tmpBody = authResponse["body"];
+            useAccelerate = Boolean(tmpBody["UseAccelerate"]);
+            authResponseBody = openapi_core_2.OpenApiUtil.stringifyMapValue(tmpBody);
+            fileObj = new $dara.FileField({
+                filename: authResponseBody["ObjectKey"],
                 content: request.fileOssUrlObject,
                 contentType: "",
             });
-            ossHeader = new $OSS.PostObjectRequestHeader({
-                accessKeyId: authResponse.body.accessKeyId,
-                policy: authResponse.body.encodedPolicy,
-                signature: authResponse.body.signature,
-                key: authResponse.body.objectKey,
+            ossHeader = {
+                host: `${authResponseBody["Bucket"]}.${openapi_core_2.OpenApiUtil.getEndpoint(authResponseBody["Endpoint"], useAccelerate, this._endpointType)}`,
+                OSSAccessKeyId: authResponseBody["AccessKeyId"],
+                policy: authResponseBody["EncodedPolicy"],
+                Signature: authResponseBody["Signature"],
+                key: authResponseBody["ObjectKey"],
                 file: fileObj,
-                successActionStatus: "201",
-            });
-            uploadRequest = new $OSS.PostObjectRequest({
-                bucketName: authResponse.body.bucket,
-                header: ossHeader,
-            });
-            await ossClient.postObject(uploadRequest, ossRuntime);
-            modifyDtsJobReq.fileOssUrl = `http://${authResponse.body.bucket}.${authResponse.body.endpoint}/${authResponse.body.objectKey}`;
+                success_action_status: "201",
+            };
+            await this._postOSSObject(authResponseBody["Bucket"], ossHeader);
+            modifyDtsJobReq.fileOssUrl = `http://${authResponseBody["Bucket"]}.${authResponseBody["Endpoint"]}/${authResponseBody["ObjectKey"]}`;
         }
         let modifyDtsJobResp = await this.modifyDtsJobWithOptions(modifyDtsJobReq, runtime);
         return modifyDtsJobResp;
@@ -5996,9 +6044,15 @@ class Client extends openapi_core_1.default {
         if (!$dara.isNull(request.dtsJobId)) {
             query["DtsJobId"] = request.dtsJobId;
         }
+        if (!$dara.isNull(request.modifyType)) {
+            query["ModifyType"] = request.modifyType;
+        }
         if (!$dara.isNull(request.regionId)) {
             query["RegionId"] = request.regionId;
         }
+        if (!$dara.isNull(request.reserved)) {
+            query["Reserved"] = request.reserved;
+        }
         if (!$dara.isNull(request.resourceGroupId)) {
             query["ResourceGroupId"] = request.resourceGroupId;
         }
@@ -6163,6 +6217,18 @@ class Client extends openapi_core_1.default {
         if (!$dara.isNull(request.instanceId)) {
             query["InstanceId"] = request.instanceId;
         }
+        if (!$dara.isNull(request.masterDatabaseName)) {
+            query["MasterDatabaseName"] = request.masterDatabaseName;
+        }
+        if (!$dara.isNull(request.masterEngineArchType)) {
+            query["MasterEngineArchType"] = request.masterEngineArchType;
+        }
+        if (!$dara.isNull(request.masterShardAccountName)) {
+            query["MasterShardAccountName"] = request.masterShardAccountName;
+        }
+        if (!$dara.isNull(request.masterShardAccountPassword)) {
+            query["MasterShardAccountPassword"] = request.masterShardAccountPassword;
+        }
         if (!$dara.isNull(request.ownerId)) {
             query["OwnerId"] = request.ownerId;
         }
@@ -6172,12 +6238,18 @@ class Client extends openapi_core_1.default {
         if (!$dara.isNull(request.resourceGroupId)) {
             query["ResourceGroupId"] = request.resourceGroupId;
         }
+        if (!$dara.isNull(request.slaveDatabaseName)) {
+            query["SlaveDatabaseName"] = request.slaveDatabaseName;
+        }
         if (!$dara.isNull(request.slaveDbInstanceId)) {
             query["SlaveDbInstanceId"] = request.slaveDbInstanceId;
         }
         if (!$dara.isNull(request.slaveDbInstanceRegion)) {
             query["SlaveDbInstanceRegion"] = request.slaveDbInstanceRegion;
         }
+        if (!$dara.isNull(request.slaveEngineArchType)) {
+            query["SlaveEngineArchType"] = request.slaveEngineArchType;
+        }
         let req = new openapi_core_2.$OpenApiUtil.OpenApiRequest({
             query: openapi_core_2.OpenApiUtil.query(query),
         });