CodeGen from PR 18255 in Azure/azure-rest-api-specs

Merge 947333e51a47a11269064ddd0cb1eafa057a621f into 6354ca8bf06ea064f4f0fef331a10c1baf62ac35

sdk/botservice/arm-botservice/CHANGELOG.md

@@ -1,18 +1,8 @@
 # Release History
+
+## 4.0.0-beta.3 (2022-03-15)
 
-## 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).
 

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

sdk/botservice/arm-botservice/_meta.json

@@ -1,7 +1,8 @@
 {
-  "commit": "c77c6c634dc3644d65d3e35df5d73a9c34d3c956",
+  "commit": "fa7a4993aebfafce15bdc00b5af9a62ee64f20ab",
   "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"
+  "release_tool": "@azure-tools/js-sdk-release-tools@2.1.2",
+  "use": "@autorest/typescript@6.0.0-alpha.16.20220105.1"
 }

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"
+      }
     }
   }
-}
+}

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
-}
+}

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

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}`

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. */

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,13 +177,15 @@ export const BotProperties: coreClient.CompositeMapper = {
         }
       },
       isStreamingSupported: {
+        defaultValue: false,
         serializedName: "isStreamingSupported",
         type: {
           name: "Boolean"
         }
       },
       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"
+        }
       }
     }
   }

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!");
+  });
+});

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"
+  ]
+}

sdk/botservice/ci.mgmt.yml

@@ -1,5 +1,5 @@
 # NOTE: Please refer to https://aka.ms/azsdk/engsys/ci-yaml before editing this file.
-
+                
 trigger:
   branches:
     include:
@@ -10,6 +10,7 @@ trigger:
     include:
       - sdk/botservice/ci.mgmt.yml
       - sdk/botservice/arm-botservice/
+      - sdk/botservice/arm-botservice
 pr:
   branches:
     include:
@@ -23,11 +24,11 @@ pr:
     include:
       - sdk/botservice/ci.mgmt.yml
       - sdk/botservice/arm-botservice/
-
+      - sdk/botservice/arm-botservice
 extends:
   template: /eng/pipelines/templates/stages/archetype-sdk-client.yml
   parameters:
     ServiceDirectory: botservice
     Artifacts:
       - name: azure-arm-botservice
-        safeName: azurearmbotservice       
+        safeName: azurearmbotservice