Skip to content

Commit

Permalink
CodeGen from PR 18149 in Azure/azure-rest-api-specs
Browse files Browse the repository at this point in the history
[BotService] Add OutlookChannel to channelNames (Azure#18149)

* Add OutlookChannel to channelNames

* revert the change in stable version
  • Loading branch information
SDKAuto committed Apr 7, 2022
1 parent 452047d commit 2ecb37f
Show file tree
Hide file tree
Showing 14 changed files with 151 additions and 50 deletions.
14 changes: 7 additions & 7 deletions common/config/rush/pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 3 additions & 13 deletions sdk/botservice/arm-botservice/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,18 +1,8 @@
# Release History

## 4.0.0-beta.3 (2022-04-07)

## 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).

Expand Down
2 changes: 1 addition & 1 deletion sdk/botservice/arm-botservice/LICENSE
Original file line number Diff line number Diff line change
@@ -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
Expand Down
7 changes: 4 additions & 3 deletions sdk/botservice/arm-botservice/_meta.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"commit": "c77c6c634dc3644d65d3e35df5d73a9c34d3c956",
"commit": "eecf176ecfdcf43bfc98219740a89103c9644599",
"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/[email protected].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=/mnt/vss/_work/1/s/azure-sdk-for-js ../azure-rest-api-specs/specification/botservice/resource-manager/readme.md --use=@autorest/[email protected].20220105.1",
"repository_url": "https://github.com/Azure/azure-rest-api-specs.git",
"use": "@autorest/[email protected]"
"release_tool": "@azure-tools/[email protected]",
"use": "@autorest/[email protected]"
}
25 changes: 19 additions & 6 deletions sdk/botservice/arm-botservice/api-extractor.json
Original file line number Diff line number Diff line change
@@ -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"
}
}
}
}
}
6 changes: 3 additions & 3 deletions sdk/botservice/arm-botservice/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -99,4 +99,4 @@
},
"sideEffects": false,
"autoPublish": true
}
}
9 changes: 6 additions & 3 deletions sdk/botservice/arm-botservice/review/arm-botservice.api.md
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ export interface BotProperties {
[propertyName: string]: string;
};
appPasswordHint?: string;
cmekEncryptionStatus?: string;
readonly cmekEncryptionStatus?: string;
cmekKeyVaultUrl?: string;
readonly configuredChannels?: string[];
description?: string;
Expand All @@ -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;
Expand Down Expand Up @@ -270,7 +270,7 @@ export interface Channel {
}

// @public
export type ChannelName = "AlexaChannel" | "FacebookChannel" | "EmailChannel" | "KikChannel" | "TelegramChannel" | "SlackChannel" | "MsTeamsChannel" | "SkypeChannel" | "WebChatChannel" | "DirectLineChannel" | "SmsChannel" | "LineChannel" | "DirectLineSpeechChannel";
export type ChannelName = "AlexaChannel" | "FacebookChannel" | "EmailChannel" | "KikChannel" | "TelegramChannel" | "SlackChannel" | "MsTeamsChannel" | "SkypeChannel" | "WebChatChannel" | "DirectLineChannel" | "SmsChannel" | "LineChannel" | "DirectLineSpeechChannel" | "OutlookChannel";

// @public
export interface ChannelResponseList {
Expand Down Expand Up @@ -658,6 +658,9 @@ export interface LineRegistration {
export type ListChannelWithKeysResponse = BotChannel & {
resource?: ChannelUnion;
setting?: ChannelSettings;
provisioningState?: string;
entityTag?: string;
changedTime?: string;
};

// @public
Expand Down
2 changes: 1 addition & 1 deletion sdk/botservice/arm-botservice/src/azureBotService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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}`
Expand Down
23 changes: 18 additions & 5 deletions sdk/botservice/arm-botservice/src/models/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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. */
Expand Down Expand Up @@ -1172,7 +1184,8 @@ export type ChannelName =
| "DirectLineChannel"
| "SmsChannel"
| "LineChannel"
| "DirectLineSpeechChannel";
| "DirectLineSpeechChannel"
| "OutlookChannel";
/** Defines values for RegenerateKeysChannelName. */
export type RegenerateKeysChannelName = "WebChatChannel" | "DirectLineChannel";
/** Defines values for Key. */
Expand Down
23 changes: 23 additions & 0 deletions sdk/botservice/arm-botservice/src/models/mappers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,7 @@ export const BotProperties: coreClient.CompositeMapper = {
},
cmekEncryptionStatus: {
serializedName: "cmekEncryptionStatus",
readOnly: true,
type: {
name: "String"
}
Expand All @@ -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"
}
Expand Down Expand Up @@ -511,6 +514,7 @@ export const Channel: coreClient.CompositeMapper = {
},
etag: {
serializedName: "etag",
nullable: true,
type: {
name: "String"
}
Expand All @@ -523,6 +527,7 @@ export const Channel: coreClient.CompositeMapper = {
}
},
location: {
defaultValue: "global",
serializedName: "location",
type: {
name: "String"
Expand Down Expand Up @@ -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"
}
}
}
}
Expand Down
3 changes: 2 additions & 1 deletion sdk/botservice/arm-botservice/src/models/parameters.ts
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,8 @@ export const channelName: OperationURLParameter = {
"DirectLineChannel",
"SmsChannel",
"LineChannel",
"DirectLineSpeechChannel"
"DirectLineSpeechChannel",
"OutlookChannel"
]
}
}
Expand Down
48 changes: 48 additions & 0 deletions sdk/botservice/arm-botservice/test/sampleTest.ts
Original file line number Diff line number Diff line change
@@ -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!");
});
});
16 changes: 12 additions & 4 deletions sdk/botservice/arm-botservice/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
}
Loading

0 comments on commit 2ecb37f

Please sign in to comment.