From 2088818653afff2dcd12a2a77b2a7f023bea0c48 Mon Sep 17 00:00:00 2001 From: SDKAuto Date: Wed, 9 Feb 2022 06:14:08 +0000 Subject: [PATCH] CodeGen from PR 17617 in Azure/azure-rest-api-specs Merge 2ffa5f337f8dcc819504a096dbba7a5ab4dcdbf1 into 0f0d51a5a720d410b72f25c95759ccb146cdf1aa --- common/config/rush/pnpm-lock.yaml | 88 +++++++++---------- sdk/botservice/arm-botservice/CHANGELOG.md | 16 +--- sdk/botservice/arm-botservice/LICENSE | 2 +- sdk/botservice/arm-botservice/_meta.json | 6 +- .../arm-botservice/api-extractor.json | 25 ++++-- sdk/botservice/arm-botservice/package.json | 6 +- .../review/arm-botservice.api.md | 7 +- .../arm-botservice/src/azureBotService.ts | 2 +- .../arm-botservice/src/models/index.ts | 20 ++++- .../arm-botservice/src/models/mappers.ts | 23 +++++ .../arm-botservice/test/sampleTest.ts | 48 ++++++++++ sdk/botservice/arm-botservice/tsconfig.json | 16 +++- 12 files changed, 177 insertions(+), 82 deletions(-) create mode 100644 sdk/botservice/arm-botservice/test/sampleTest.ts diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index fb31c83fbf46..478fbbaed3d8 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -967,7 +967,7 @@ packages: resolution: {integrity: sha512-Q71Buur3RMcg6lCnisLL8Im562DBw+ybzgm+YQj/FbAaI8ZNu/zl/5z1fE4k3Q9LSIzYrz6HLRzlhdSBXpydlQ==} engines: {node: '>=8.0.0'} dependencies: - '@azure/core-http': 1.2.3 + '@azure/core-http': 1.2.6 '@azure/core-tracing': 1.0.0-preview.9 '@azure/logger': 1.0.3 '@azure/msal-node': 1.0.0-beta.6_debug@4.3.3 @@ -2128,7 +2128,7 @@ packages: resolution: {integrity: sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==} dependencies: '@types/connect': 3.4.35 - '@types/node': 12.20.43 + '@types/node': 17.0.15 dev: false /@types/chai-as-promised/7.1.4: @@ -2154,14 +2154,14 @@ packages: /@types/concurrently/6.4.0: resolution: {integrity: sha512-CYU1eyFHsIa2IZIsb8gfUOdiewfnZcyM2Hg1Zaq95xnmB0Ix/bTRM8SttqZ2Cjy6JGPZLttHjZewVsDg1yvnJg==} dependencies: - '@types/node': 12.20.43 + '@types/node': 17.0.15 chalk: 4.1.2 dev: false /@types/connect/3.4.35: resolution: {integrity: sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==} dependencies: - '@types/node': 12.20.43 + '@types/node': 17.0.15 dev: false /@types/cookie/0.4.1: @@ -2196,7 +2196,7 @@ packages: /@types/express-serve-static-core/4.17.28: resolution: {integrity: sha512-P1BJAEAW3E2DJUlkgq4tOL3RyMunoWXqbSCygWo5ZIWTjUgN1YnaXWW4VWl/oc8vs/XoYibEGBKP0uZyF4AHig==} dependencies: - '@types/node': 12.20.43 + '@types/node': 17.0.15 '@types/qs': 6.9.7 '@types/range-parser': 1.2.4 dev: false @@ -2213,26 +2213,26 @@ packages: /@types/fs-extra/8.1.2: resolution: {integrity: sha512-SvSrYXfWSc7R4eqnOzbQF4TZmfpNSM9FrSWLU3EUnWBuyZqNBOrv1B1JA3byUDPUl9z4Ab3jeZG2eDdySlgNMg==} dependencies: - '@types/node': 12.20.43 + '@types/node': 17.0.15 dev: false /@types/fs-extra/9.0.13: resolution: {integrity: sha512-nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA==} dependencies: - '@types/node': 12.20.43 + '@types/node': 17.0.15 dev: false /@types/glob/7.2.0: resolution: {integrity: sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==} dependencies: '@types/minimatch': 3.0.5 - '@types/node': 12.20.43 + '@types/node': 17.0.15 dev: false /@types/is-buffer/2.0.0: resolution: {integrity: sha512-0f7N/e3BAz32qDYvgB4d2cqv1DqUwvGxHkXsrucICn8la1Vb6Yl6Eg8mPScGwUiqHJeE7diXlzaK+QMA9m4Gxw==} dependencies: - '@types/node': 12.20.43 + '@types/node': 17.0.15 dev: false /@types/json-schema/7.0.9: @@ -2246,13 +2246,13 @@ packages: /@types/jsonwebtoken/8.5.8: resolution: {integrity: sha512-zm6xBQpFDIDM6o9r6HSgDeIcLy82TKWctCXEPbJJcXb5AKmi5BNNdLXneixK4lplX3PqIVcwLBCGE/kAGnlD4A==} dependencies: - '@types/node': 12.20.43 + '@types/node': 17.0.15 dev: false /@types/jws/3.2.4: resolution: {integrity: sha512-aqtH4dPw1wUjFZaeMD1ak/pf8iXlu/odFe+trJrvw0g1sTh93i+SCykg0Ek8C6B7rVK3oBORbfZAsKO7P10etg==} dependencies: - '@types/node': 12.20.43 + '@types/node': 17.0.15 dev: false /@types/long/4.0.1: @@ -2266,7 +2266,7 @@ packages: /@types/md5/2.3.1: resolution: {integrity: sha512-OK3oe+ALIoPSo262lnhAYwpqFNXbiwH2a+0+Z5YBnkQEwWD8fk5+PIeRhYA48PzvX9I4SGNpWy+9bLj8qz92RQ==} dependencies: - '@types/node': 12.20.43 + '@types/node': 17.0.15 dev: false /@types/mime/1.3.2: @@ -2292,13 +2292,13 @@ packages: /@types/mock-fs/4.13.1: resolution: {integrity: sha512-m6nFAJ3lBSnqbvDZioawRvpLXSaPyn52Srf7OfzjubYbYX8MTUdIgDxQl0wEapm4m/pNYSd9TXocpQ0TvZFlYA==} dependencies: - '@types/node': 12.20.43 + '@types/node': 17.0.15 dev: false /@types/mock-require/2.0.1: resolution: {integrity: sha512-O7U5DVGboY/Crueb5/huUCIRjKtRVRaLmRDbZJBlDQgJn966z3aiFDN+6AtYviu2ExwMkl34LjT/IiC0OPtKuQ==} dependencies: - '@types/node': 12.20.43 + '@types/node': 17.0.15 dev: false /@types/ms/0.7.31: @@ -2312,7 +2312,7 @@ packages: /@types/node-fetch/2.5.12: resolution: {integrity: sha512-MKgC4dlq4kKNa/mYrwpKfzQMB5X3ee5U6fSprkKpToBqBmX4nFZL9cW5jl6sWn+xpRJ7ypWh2yyqqr8UUCstSw==} dependencies: - '@types/node': 12.20.43 + '@types/node': 17.0.15 form-data: 3.0.1 dev: false @@ -2351,7 +2351,7 @@ packages: /@types/resolve/1.17.1: resolution: {integrity: sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==} dependencies: - '@types/node': 12.20.43 + '@types/node': 17.0.15 dev: false /@types/semaphore/1.1.1: @@ -2362,7 +2362,7 @@ packages: resolution: {integrity: sha512-nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ==} dependencies: '@types/mime': 1.3.2 - '@types/node': 12.20.43 + '@types/node': 17.0.15 dev: false /@types/sinon/10.0.10: @@ -2384,7 +2384,7 @@ packages: /@types/stoppable/1.1.1: resolution: {integrity: sha512-b8N+fCADRIYYrGZOcmOR8ZNBOqhktWTB/bMUl5LvGtT201QKJZOOH5UsFyI3qtteM6ZAJbJqZoBcLqqxKIwjhw==} dependencies: - '@types/node': 12.20.43 + '@types/node': 17.0.15 dev: false /@types/tough-cookie/4.0.1: @@ -2394,13 +2394,13 @@ packages: /@types/tunnel/0.0.1: resolution: {integrity: sha512-AOqu6bQu5MSWwYvehMXLukFHnupHrpZ8nvgae5Ggie9UwzDR1CCwoXgSSWNZJuyOlCdfdsWMA5F2LlmvyoTv8A==} dependencies: - '@types/node': 12.20.43 + '@types/node': 17.0.15 dev: false /@types/tunnel/0.0.3: resolution: {integrity: sha512-sOUTGn6h1SfQ+gbgqC364jLFBw2lnFqkgF3q0WovEHRLMrVD1sd5aufqi/aJObLekJO+Aq5z646U4Oxy6shXMA==} dependencies: - '@types/node': 12.20.43 + '@types/node': 17.0.15 dev: false /@types/underscore/1.11.4: @@ -2414,26 +2414,26 @@ packages: /@types/ws/7.4.7: resolution: {integrity: sha512-JQbbmxZTZehdc2iszGKs5oC3NFnjeay7mtAWrdt7qNtAVK0g19muApzAy4bm9byz79xa2ZnO/BOBC2R8RC5Lww==} dependencies: - '@types/node': 12.20.43 + '@types/node': 17.0.15 dev: false /@types/ws/8.2.2: resolution: {integrity: sha512-NOn5eIcgWLOo6qW8AcuLZ7G8PycXu0xTxxkS6Q18VWFxgPUSOwV0pBj2a/4viNZVu25i7RIB7GttdkAIUUXOOg==} dependencies: - '@types/node': 12.20.43 + '@types/node': 17.0.15 dev: false /@types/xml2js/0.4.9: resolution: {integrity: sha512-CHiCKIihl1pychwR2RNX5mAYmJDACgFVCMT5OArMaO3erzwXVcBqPcusr+Vl8yeeXukxZqtF8mZioqX+mpjjdw==} dependencies: - '@types/node': 12.20.43 + '@types/node': 17.0.15 dev: false /@types/yauzl/2.9.2: resolution: {integrity: sha512-8uALY5LTvSuHgloDVUvWP3pIauILm+8/0pDMokuDYIoNsOkSwd5AiHBTSEJjKTDcZr5z8UpgOWZkxBF4iJftoA==} requiresBuild: true dependencies: - '@types/node': 12.20.43 + '@types/node': 17.0.15 dev: false optional: true @@ -3422,7 +3422,7 @@ packages: resolution: {integrity: sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==} deprecated: Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797) dependencies: - ms: 2.1.1 + ms: 2.1.3 dev: false /debug/3.2.7: @@ -3643,7 +3643,7 @@ packages: dependencies: semver: 7.3.5 shelljs: 0.8.5 - typescript: 4.2.4 + typescript: 4.5.5 dev: false /ecdsa-sig-formatter/1.0.11: @@ -3696,7 +3696,7 @@ packages: dependencies: '@types/cookie': 0.4.1 '@types/cors': 2.8.12 - '@types/node': 12.20.43 + '@types/node': 17.0.15 accepts: 1.3.8 base64id: 2.0.0 cookie: 0.4.2 @@ -4531,7 +4531,7 @@ packages: fs.realpath: 1.0.0 inflight: 1.0.6 inherits: 2.0.4 - minimatch: 3.0.4 + minimatch: 3.0.5 once: 1.4.0 path-is-absolute: 1.0.1 dev: false @@ -8342,7 +8342,7 @@ packages: /wide-align/1.1.5: resolution: {integrity: sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==} dependencies: - string-width: 1.0.2 + string-width: 4.2.3 dev: false /word-wrap/1.2.3: @@ -8799,7 +8799,7 @@ packages: dev: false file:projects/ai-form-recognizer.tgz: - resolution: {integrity: sha512-P8TSFPYonsRq17g0lGwIkF+WP0G4EPS39m0rrFGbRB49fIQ2ZOTiACPH4pWPQWDa6q5CbXMKOvJZfDwkvArpHQ==, tarball: file:projects/ai-form-recognizer.tgz} + resolution: {integrity: sha512-ownHpGufsptjT7As1HseE8LnhkNj/td/UB99hRgXU0EcSo2f2FvKFmxvkhd2s9SGdoxt22yty5r1BzbkBIvrSw==, tarball: file:projects/ai-form-recognizer.tgz} name: '@rush-temp/ai-form-recognizer' version: 0.0.0 dependencies: @@ -8840,7 +8840,6 @@ packages: transitivePeerDependencies: - bufferutil - debug - - encoding - supports-color - utf-8-validate dev: false @@ -9351,22 +9350,22 @@ packages: dev: false file:projects/arm-botservice.tgz: - resolution: {integrity: sha512-boMMAUjnK9cgFRR0ELu4rB4UpLRyWvhqVphsbs5MoGoz918/vGCt3VT3V1QW91n/Nxedrf68ndzxv7MIqVz+5Q==, tarball: file:projects/arm-botservice.tgz} + resolution: {integrity: sha512-4SWzvJHQgV0XLoBAqApUZf7gfuMrC2ayHu0gaDmBRdHizZslTniUJ+2i5KSq+ySXEwbK1ft0KNI3xhzRWu2gMg==, tarball: file:projects/arm-botservice.tgz} name: '@rush-temp/arm-botservice' version: 0.0.0 dependencies: '@azure-tools/test-recorder': 1.0.2 '@microsoft/api-extractor': 7.19.4 - '@rollup/plugin-commonjs': 21.0.1_rollup@2.67.1 - '@rollup/plugin-json': 4.1.0_rollup@2.67.1 - '@rollup/plugin-multi-entry': 3.0.1_rollup@2.67.1 - '@rollup/plugin-node-resolve': 8.4.0_rollup@2.67.1 + '@rollup/plugin-commonjs': 11.0.2_rollup@1.32.1 + '@rollup/plugin-json': 4.1.0_rollup@1.32.1 + '@rollup/plugin-multi-entry': 3.0.1_rollup@1.32.1 + '@rollup/plugin-node-resolve': 8.4.0_rollup@1.32.1 cross-env: 7.0.3 mkdirp: 1.0.4 mocha: 7.2.0 rimraf: 3.0.2 - rollup: 2.67.1 - rollup-plugin-sourcemaps: 0.4.2_rollup@2.67.1 + rollup: 1.32.1 + rollup-plugin-sourcemaps: 0.4.2_rollup@1.32.1 tslib: 2.3.1 typescript: 4.2.4 uglify-js: 3.15.1 @@ -14022,7 +14021,7 @@ packages: dev: false file:projects/eventgrid.tgz: - resolution: {integrity: sha512-9BGMqsBlp2lJdjX4ZlpoQuRKM/sLcpaIHFI7xaztqIaCq17bheVkFsBqw6izuZ59sn4DkAmcsovdtlA4S+jO5w==, tarball: file:projects/eventgrid.tgz} + resolution: {integrity: sha512-cRipNDlfS0co7HptArkxqp6lbNAffyBqpvSVSDhMe/ZR5cBJs6ywzCsV/QxHhxBpp6Z7p5To9h98IYOOIhMp+A==, tarball: file:projects/eventgrid.tgz} name: '@rush-temp/eventgrid' version: 0.0.0 dependencies: @@ -14076,7 +14075,7 @@ packages: dev: false file:projects/eventhubs-checkpointstore-blob.tgz: - resolution: {integrity: sha512-mGcs2vWqVqLXm7vXEIvHN5fB82d0MGEuCUFxZkmnwISHGLgj0Eg/yGM4WsDouYtUFdboeTrNSg1gaORB+WrC5A==, tarball: file:projects/eventhubs-checkpointstore-blob.tgz} + resolution: {integrity: sha512-Zjderk9z4yJ2X0VCX+Bg2mv4sRQQVGvPYhz4bqwQe8ekduCFek0KT0230RKdGANBSmWtYN/zbxmPbjexRtOv8A==, tarball: file:projects/eventhubs-checkpointstore-blob.tgz} name: '@rush-temp/eventhubs-checkpointstore-blob' version: 0.0.0 dependencies: @@ -14330,7 +14329,7 @@ packages: dev: false file:projects/iot-device-update.tgz: - resolution: {integrity: sha512-XwF1/EW7RR/mN5meDZOLMADblUIf6RywLM7pIbHeDfDxcfkihfXEMTvl7aLF26rA04TPxRah4r+OKrCbi8Sv7g==, tarball: file:projects/iot-device-update.tgz} + resolution: {integrity: sha512-rsm9IpQrX4PDeRoGSnfHltpD9jmpulpHFNu/lxAyTKHQPAk2Ji9ag1panuQZwQp+2ASA3AoA6DzbB2Q2Mx29cQ==, tarball: file:projects/iot-device-update.tgz} name: '@rush-temp/iot-device-update' version: 0.0.0 dependencies: @@ -15216,7 +15215,7 @@ packages: dev: false file:projects/perf-service-bus.tgz: - resolution: {integrity: sha512-pKuhxHEjhyGAKk5t/XaVzB6JHLSGzv/PE9Q5zgt+fEkcKrw19H7qsWJsBqPU2TIHjX1ddRgv+GW0c79shGEWbg==, tarball: file:projects/perf-service-bus.tgz} + resolution: {integrity: sha512-I9NPyEoKnxP89clzbNdSHyCWIYH86+mEBa8PR9tZLv7waQHsjFtuQj6tBhkqEqODTLjmKpJgr5ikmc7ZufEKBQ==, tarball: file:projects/perf-service-bus.tgz} name: '@rush-temp/perf-service-bus' version: 0.0.0 dependencies: @@ -15234,7 +15233,6 @@ packages: transitivePeerDependencies: - '@swc/core' - '@swc/wasm' - - encoding - supports-color dev: false @@ -15560,7 +15558,7 @@ packages: dev: false file:projects/schema-registry-avro.tgz: - resolution: {integrity: sha512-oLhIB2Nqhk9vYYmhFaVfP0XdBJigpfdN37dHtNKbCjaUp9Vg5g9XyRCkqTdNrsDT6aNDpvQAW8g9Vm2V/roZgQ==, tarball: file:projects/schema-registry-avro.tgz} + resolution: {integrity: sha512-RzaQoBIbNzOWnTtlJWWGMSWRWwqeu2hPKKCXc32ZOnpj5F/VJHN+TXdCxB2luIMRam7ufqbhPSM218df4+nulA==, tarball: file:projects/schema-registry-avro.tgz} name: '@rush-temp/schema-registry-avro' version: 0.0.0 dependencies: @@ -16156,7 +16154,7 @@ packages: dev: false file:projects/synapse-access-control.tgz: - resolution: {integrity: sha512-r+K5go02ZzvB1eNv2HgJluelwAinqtfhWqRX4/yV5lfL7RMk3gizbot6n8Ne8aBVxiXRWPNRDKnEz9l8bTju7Q==, tarball: file:projects/synapse-access-control.tgz} + resolution: {integrity: sha512-8OFSsIvvqKFB4r7z6QtpS+ElPHWoYwnnd8q25qy7+sD5Y6Fke1y/IQ16i0Se/DEnUbO7qOMaLgs1vF0PT/VJkg==, tarball: file:projects/synapse-access-control.tgz} name: '@rush-temp/synapse-access-control' version: 0.0.0 dependencies: diff --git a/sdk/botservice/arm-botservice/CHANGELOG.md b/sdk/botservice/arm-botservice/CHANGELOG.md index 7af483f98da5..d9825700696c 100644 --- a/sdk/botservice/arm-botservice/CHANGELOG.md +++ b/sdk/botservice/arm-botservice/CHANGELOG.md @@ -1,18 +1,8 @@ # Release History + +## 4.0.0-beta.3 (2022-02-09) -## 4.0.0-beta.3 (Unreleased) - -### Features Added - -### Breaking Changes - -### Bugs Fixed - -### Other Changes - -## 4.0.0-beta.2 (2021-12-27) - -The package of @azure/arm-botservice is using our next generation design principles since version 4.0.0-beta.2, which contains breaking changes. +The package of @azure/arm-botservice is using our next generation design principles since version 4.0.0-beta.3, which contains breaking changes. To understand the detail of the change, please refer to [Changelog](https://aka.ms/js-track2-changelog). diff --git a/sdk/botservice/arm-botservice/LICENSE b/sdk/botservice/arm-botservice/LICENSE index ccb63b166732..5d1d36e0af80 100644 --- a/sdk/botservice/arm-botservice/LICENSE +++ b/sdk/botservice/arm-botservice/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2021 Microsoft +Copyright (c) 2022 Microsoft Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/sdk/botservice/arm-botservice/_meta.json b/sdk/botservice/arm-botservice/_meta.json index e2f7e0545982..a7117beb0b39 100644 --- a/sdk/botservice/arm-botservice/_meta.json +++ b/sdk/botservice/arm-botservice/_meta.json @@ -1,7 +1,7 @@ { - "commit": "c77c6c634dc3644d65d3e35df5d73a9c34d3c956", + "commit": "a05f464c93248ea78509805abaeecb1376b1e8bb", "readme": "specification/botservice/resource-manager/readme.md", - "autorest_command": "autorest --version=3.1.3 --typescript --modelerfour.lenient-model-deduplication --head-as-boolean=true --license-header=MICROSOFT_MIT_NO_VERSION --generate-test --typescript-sdks-folder=D:\\mydev\\azure-sdk-for-js ../azure-rest-api-specs/specification/botservice/resource-manager/readme.md --use=@autorest/typescript@6.0.0-alpha.16.20211217.1", + "autorest_command": "autorest --version=3.7.3 --typescript --modelerfour.lenient-model-deduplication --head-as-boolean=true --license-header=MICROSOFT_MIT_NO_VERSION --generate-test --typescript-sdks-folder=/home/vsts/work/1/s/azure-sdk-for-js ../azure-rest-api-specs/specification/botservice/resource-manager/readme.md --use=@autorest/typescript@6.0.0-alpha.16.20220105.1", "repository_url": "https://github.com/Azure/azure-rest-api-specs.git", - "use": "@autorest/typescript@6.0.0-alpha.16.20211217.1" + "use": "@autorest/typescript@6.0.0-alpha.16.20220105.1" } \ No newline at end of file diff --git a/sdk/botservice/arm-botservice/api-extractor.json b/sdk/botservice/arm-botservice/api-extractor.json index 95669bca5560..90af16436306 100644 --- a/sdk/botservice/arm-botservice/api-extractor.json +++ b/sdk/botservice/arm-botservice/api-extractor.json @@ -1,18 +1,31 @@ { "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json", "mainEntryPointFilePath": "./dist-esm/src/index.d.ts", - "docModel": { "enabled": true }, - "apiReport": { "enabled": true, "reportFolder": "./review" }, + "docModel": { + "enabled": true + }, + "apiReport": { + "enabled": true, + "reportFolder": "./review" + }, "dtsRollup": { "enabled": true, "untrimmedFilePath": "", "publicTrimmedFilePath": "./types/arm-botservice.d.ts" }, "messages": { - "tsdocMessageReporting": { "default": { "logLevel": "none" } }, + "tsdocMessageReporting": { + "default": { + "logLevel": "none" + } + }, "extractorMessageReporting": { - "ae-missing-release-tag": { "logLevel": "none" }, - "ae-unresolved-link": { "logLevel": "none" } + "ae-missing-release-tag": { + "logLevel": "none" + }, + "ae-unresolved-link": { + "logLevel": "none" + } } } -} +} \ No newline at end of file diff --git a/sdk/botservice/arm-botservice/package.json b/sdk/botservice/arm-botservice/package.json index b3a1f5b23aca..e148393fd2d6 100644 --- a/sdk/botservice/arm-botservice/package.json +++ b/sdk/botservice/arm-botservice/package.json @@ -29,12 +29,12 @@ "types": "./types/arm-botservice.d.ts", "devDependencies": { "@microsoft/api-extractor": "^7.18.11", - "@rollup/plugin-commonjs": "^21.0.1", + "@rollup/plugin-commonjs": "11.0.2", "@rollup/plugin-json": "^4.0.0", "@rollup/plugin-multi-entry": "^3.0.0", "@rollup/plugin-node-resolve": "^8.0.0", "mkdirp": "^1.0.4", - "rollup": "^2.0.0", + "rollup": "^1.16.3", "rollup-plugin-sourcemaps": "^0.4.2", "typescript": "~4.2.0", "uglify-js": "^3.4.9", @@ -99,4 +99,4 @@ }, "sideEffects": false, "autoPublish": true -} +} \ No newline at end of file diff --git a/sdk/botservice/arm-botservice/review/arm-botservice.api.md b/sdk/botservice/arm-botservice/review/arm-botservice.api.md index ffedb68c3833..3bb7db50323b 100644 --- a/sdk/botservice/arm-botservice/review/arm-botservice.api.md +++ b/sdk/botservice/arm-botservice/review/arm-botservice.api.md @@ -140,7 +140,7 @@ export interface BotProperties { [propertyName: string]: string; }; appPasswordHint?: string; - cmekEncryptionStatus?: string; + readonly cmekEncryptionStatus?: string; cmekKeyVaultUrl?: string; readonly configuredChannels?: string[]; description?: string; @@ -154,7 +154,7 @@ export interface BotProperties { readonly endpointVersion?: string; iconUrl?: string; isCmekEnabled?: boolean; - isDeveloperAppInsightsApiKeySet?: boolean; + readonly isDeveloperAppInsightsApiKeySet?: boolean; isStreamingSupported?: boolean; luisAppIds?: string[]; luisKey?: string; @@ -658,6 +658,9 @@ export interface LineRegistration { export type ListChannelWithKeysResponse = BotChannel & { resource?: ChannelUnion; setting?: ChannelSettings; + provisioningState?: string; + entityTag?: string; + changedTime?: string; }; // @public diff --git a/sdk/botservice/arm-botservice/src/azureBotService.ts b/sdk/botservice/arm-botservice/src/azureBotService.ts index 3a0f1e297759..369d64740b62 100644 --- a/sdk/botservice/arm-botservice/src/azureBotService.ts +++ b/sdk/botservice/arm-botservice/src/azureBotService.ts @@ -64,7 +64,7 @@ export class AzureBotService extends coreClient.ServiceClient { credential: credentials }; - const packageDetails = `azsdk-js-arm-botservice/4.0.0-beta.2`; + const packageDetails = `azsdk-js-arm-botservice/4.0.0-beta.3`; const userAgentPrefix = options.userAgentOptions && options.userAgentOptions.userAgentPrefix ? `${options.userAgentOptions.userAgentPrefix} ${packageDetails}` diff --git a/sdk/botservice/arm-botservice/src/models/index.ts b/sdk/botservice/arm-botservice/src/models/index.ts index 833aaa17e909..a9f57ff706b1 100644 --- a/sdk/botservice/arm-botservice/src/models/index.ts +++ b/sdk/botservice/arm-botservice/src/models/index.ts @@ -77,14 +77,20 @@ export interface BotProperties { isCmekEnabled?: boolean; /** The CMK Url */ cmekKeyVaultUrl?: string; - /** The CMK encryption status */ - cmekEncryptionStatus?: string; + /** + * The CMK encryption status + * NOTE: This property will not be serialized. It can only be populated by the server. + */ + readonly cmekEncryptionStatus?: string; /** Whether the bot is in an isolated network */ publicNetworkAccess?: PublicNetworkAccess; /** Whether the bot is streaming supported */ isStreamingSupported?: boolean; - /** Whether the bot is developerAppInsightsApiKey set */ - isDeveloperAppInsightsApiKeySet?: boolean; + /** + * Whether the bot is developerAppInsightsApiKey set + * NOTE: This property will not be serialized. It can only be populated by the server. + */ + readonly isDeveloperAppInsightsApiKeySet?: boolean; /** * Token used to migrate non Azure bot to azure subscription * NOTE: This property will not be serialized. It can only be populated by the server. @@ -1009,6 +1015,12 @@ export type ListChannelWithKeysResponse = BotChannel & { resource?: ChannelUnion; /** Channel settings */ setting?: ChannelSettings; + /** Provisioning state of the resource */ + provisioningState?: string; + /** Entity tag of the resource */ + entityTag?: string; + /** Changed time of the resource */ + changedTime?: string; }; /** Known values of {@link MsaAppType} that the service accepts. */ diff --git a/sdk/botservice/arm-botservice/src/models/mappers.ts b/sdk/botservice/arm-botservice/src/models/mappers.ts index 972dbf9e8e44..be14096baa88 100644 --- a/sdk/botservice/arm-botservice/src/models/mappers.ts +++ b/sdk/botservice/arm-botservice/src/models/mappers.ts @@ -164,6 +164,7 @@ export const BotProperties: coreClient.CompositeMapper = { }, cmekEncryptionStatus: { serializedName: "cmekEncryptionStatus", + readOnly: true, type: { name: "String" } @@ -176,6 +177,7 @@ export const BotProperties: coreClient.CompositeMapper = { } }, isStreamingSupported: { + defaultValue: false, serializedName: "isStreamingSupported", type: { name: "Boolean" @@ -183,6 +185,7 @@ export const BotProperties: coreClient.CompositeMapper = { }, isDeveloperAppInsightsApiKeySet: { serializedName: "isDeveloperAppInsightsApiKeySet", + readOnly: true, type: { name: "Boolean" } @@ -511,6 +514,7 @@ export const Channel: coreClient.CompositeMapper = { }, etag: { serializedName: "etag", + nullable: true, type: { name: "String" } @@ -523,6 +527,7 @@ export const Channel: coreClient.CompositeMapper = { } }, location: { + defaultValue: "global", serializedName: "location", type: { name: "String" @@ -2424,6 +2429,24 @@ export const ListChannelWithKeysResponse: coreClient.CompositeMapper = { name: "Composite", className: "ChannelSettings" } + }, + provisioningState: { + serializedName: "provisioningState", + type: { + name: "String" + } + }, + entityTag: { + serializedName: "entityTag", + type: { + name: "String" + } + }, + changedTime: { + serializedName: "changedTime", + type: { + name: "String" + } } } } diff --git a/sdk/botservice/arm-botservice/test/sampleTest.ts b/sdk/botservice/arm-botservice/test/sampleTest.ts new file mode 100644 index 000000000000..7ed89b043e1b --- /dev/null +++ b/sdk/botservice/arm-botservice/test/sampleTest.ts @@ -0,0 +1,48 @@ +/* + * Copyright (c) Microsoft Corporation. + * Licensed under the MIT License. + * + * Code generated by Microsoft (R) AutoRest Code Generator. + * Changes may cause incorrect behavior and will be lost if the code is regenerated. + */ + +import { + env, + record, + RecorderEnvironmentSetup, + Recorder +} from "@azure-tools/test-recorder"; +import * as assert from "assert"; + +const recorderEnvSetup: RecorderEnvironmentSetup = { + replaceableVariables: { + AZURE_CLIENT_ID: "azure_client_id", + AZURE_CLIENT_SECRET: "azure_client_secret", + AZURE_TENANT_ID: "88888888-8888-8888-8888-888888888888", + SUBSCRIPTION_ID: "azure_subscription_id" + }, + customizationsOnRecordings: [ + (recording: any): any => + recording.replace( + /"access_token":"[^"]*"/g, + `"access_token":"access_token"` + ) + ], + queryParametersToSkip: [] +}; + +describe("My test", () => { + let recorder: Recorder; + + beforeEach(async function() { + recorder = record(this, recorderEnvSetup); + }); + + afterEach(async function() { + await recorder.stop(); + }); + + it("sample test", async function() { + console.log("Hi, I'm a test!"); + }); +}); diff --git a/sdk/botservice/arm-botservice/tsconfig.json b/sdk/botservice/arm-botservice/tsconfig.json index 6e3251194117..3e6ae96443f3 100644 --- a/sdk/botservice/arm-botservice/tsconfig.json +++ b/sdk/botservice/arm-botservice/tsconfig.json @@ -9,11 +9,19 @@ "esModuleInterop": true, "allowSyntheticDefaultImports": true, "forceConsistentCasingInFileNames": true, - "lib": ["es6", "dom"], + "lib": [ + "es6", + "dom" + ], "declaration": true, "outDir": "./dist-esm", "importHelpers": true }, - "include": ["./src/**/*.ts", "./test/**/*.ts"], - "exclude": ["node_modules"] -} + "include": [ + "./src/**/*.ts", + "./test/**/*.ts" + ], + "exclude": [ + "node_modules" + ] +} \ No newline at end of file