Skip to content

Commit

Permalink
CodeGen from PR 14225 in Azure/azure-rest-api-specs
Browse files Browse the repository at this point in the history
Merge e66ecbf1fa87b52659991795e3c978e24d6a02e9 into c00cf4ad1e2c44ccddb08b98a472cf9822b4d687
  • Loading branch information
SDKAuto committed May 21, 2021
1 parent e2406f8 commit 3676868
Show file tree
Hide file tree
Showing 27 changed files with 1,623 additions and 98 deletions.
2 changes: 1 addition & 1 deletion sdk/botservice/arm-botservice/LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2020 Microsoft
Copyright (c) 2021 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
9 changes: 4 additions & 5 deletions sdk/botservice/arm-botservice/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ npm install @azure/arm-botservice

### How to use

#### nodejs - Authentication, client creation and get bots as an example written in TypeScript.
#### nodejs - client creation and get bots as an example written in TypeScript.

##### Install @azure/ms-rest-nodeauth

Expand All @@ -26,11 +26,10 @@ npm install @azure/ms-rest-nodeauth@"^3.0.0"

##### Sample code

While the below sample uses the interactive login, other authentication options can be found in the [README.md file of @azure/ms-rest-nodeauth](https://www.npmjs.com/package/@azure/ms-rest-nodeauth) package
```typescript
import * as msRest from "@azure/ms-rest-js";
import * as msRestAzure from "@azure/ms-rest-azure-js";
import * as msRestNodeAuth from "@azure/ms-rest-nodeauth";
import { AzureBotService, AzureBotServiceModels, AzureBotServiceMappers } from "@azure/arm-botservice";
const msRestNodeAuth = require("@azure/ms-rest-nodeauth");
const { AzureBotService } = require("@azure/arm-botservice");
const subscriptionId = process.env["AZURE_SUBSCRIPTION_ID"];

msRestNodeAuth.interactiveLogin().then((creds) => {
Expand Down
4 changes: 2 additions & 2 deletions sdk/botservice/arm-botservice/rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ const config = {
"@azure/ms-rest-azure-js": "msRestAzure"
},
banner: `/*
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
* 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.
Expand Down
13 changes: 10 additions & 3 deletions sdk/botservice/arm-botservice/src/azureBotService.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
/*
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for
* license information.
* 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
Expand All @@ -22,6 +21,10 @@ class AzureBotService extends AzureBotServiceContext {
directLine: operations.DirectLine;
operations: operations.Operations;
botConnection: operations.BotConnection;
hostSettings: operations.HostSettings;
operationResults: operations.OperationResults;
privateEndpointConnections: operations.PrivateEndpointConnections;
privateLinkResources: operations.PrivateLinkResources;

/**
* Initializes a new instance of the AzureBotService class.
Expand All @@ -36,6 +39,10 @@ class AzureBotService extends AzureBotServiceContext {
this.directLine = new operations.DirectLine(this);
this.operations = new operations.Operations(this);
this.botConnection = new operations.BotConnection(this);
this.hostSettings = new operations.HostSettings(this);
this.operationResults = new operations.OperationResults(this);
this.privateEndpointConnections = new operations.PrivateEndpointConnections(this);
this.privateLinkResources = new operations.PrivateLinkResources(this);
}
}

Expand Down
13 changes: 6 additions & 7 deletions sdk/botservice/arm-botservice/src/azureBotServiceContext.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
/*
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for
* license information.
* 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
Expand Down Expand Up @@ -37,25 +36,25 @@ export class AzureBotServiceContext extends msRestAzure.AzureServiceClient {
if (!options) {
options = {};
}
if (!options.userAgent) {
if(!options.userAgent) {
const defaultUserAgent = msRestAzure.getDefaultUserAgentValue();
options.userAgent = `${packageName}/${packageVersion} ${defaultUserAgent}`;
}

super(credentials, options);

this.apiVersion = '2020-06-02';
this.apiVersion = '2021-05-01-preview';
this.acceptLanguage = 'en-US';
this.longRunningOperationRetryTimeout = 30;
this.baseUri = options.baseUri || this.baseUri || "https://management.azure.com";
this.requestContentType = "application/json; charset=utf-8";
this.credentials = credentials;
this.subscriptionId = subscriptionId;

if (options.acceptLanguage !== null && options.acceptLanguage !== undefined) {
if(options.acceptLanguage !== null && options.acceptLanguage !== undefined) {
this.acceptLanguage = options.acceptLanguage;
}
if (options.longRunningOperationRetryTimeout !== null && options.longRunningOperationRetryTimeout !== undefined) {
if(options.longRunningOperationRetryTimeout !== null && options.longRunningOperationRetryTimeout !== undefined) {
this.longRunningOperationRetryTimeout = options.longRunningOperationRetryTimeout;
}
}
Expand Down
12 changes: 10 additions & 2 deletions sdk/botservice/arm-botservice/src/models/botConnectionMappers.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
* 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.
Expand All @@ -10,6 +10,7 @@ export {
discriminators,
AlexaChannel,
AlexaChannelProperties,
AzureEntityResource,
BaseResource,
Bot,
BotChannel,
Expand Down Expand Up @@ -38,7 +39,13 @@ export {
LineRegistration,
MsTeamsChannel,
MsTeamsChannelProperties,
PrivateEndpoint,
PrivateEndpointConnection,
PrivateLinkResource,
PrivateLinkServiceConnectionState,
ProxyResource,
Resource,
ResourceCommon,
ServiceProvider,
ServiceProviderParameter,
ServiceProviderProperties,
Expand All @@ -52,6 +59,7 @@ export {
SmsChannelProperties,
TelegramChannel,
TelegramChannelProperties,
TrackedResource,
WebChatChannel,
WebChatChannelProperties,
WebChatSite
Expand Down
12 changes: 10 additions & 2 deletions sdk/botservice/arm-botservice/src/models/botsMappers.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
* 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.
Expand All @@ -10,6 +10,7 @@ export {
discriminators,
AlexaChannel,
AlexaChannelProperties,
AzureEntityResource,
BaseResource,
Bot,
BotChannel,
Expand Down Expand Up @@ -40,7 +41,13 @@ export {
LineRegistration,
MsTeamsChannel,
MsTeamsChannelProperties,
PrivateEndpoint,
PrivateEndpointConnection,
PrivateLinkResource,
PrivateLinkServiceConnectionState,
ProxyResource,
Resource,
ResourceCommon,
Sku,
SkypeChannel,
SkypeChannelProperties,
Expand All @@ -50,6 +57,7 @@ export {
SmsChannelProperties,
TelegramChannel,
TelegramChannelProperties,
TrackedResource,
WebChatChannel,
WebChatChannelProperties,
WebChatSite
Expand Down
12 changes: 10 additions & 2 deletions sdk/botservice/arm-botservice/src/models/channelsMappers.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
* 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.
Expand All @@ -10,6 +10,7 @@ export {
discriminators,
AlexaChannel,
AlexaChannelProperties,
AzureEntityResource,
BaseResource,
Bot,
BotChannel,
Expand Down Expand Up @@ -38,7 +39,13 @@ export {
LineRegistration,
MsTeamsChannel,
MsTeamsChannelProperties,
PrivateEndpoint,
PrivateEndpointConnection,
PrivateLinkResource,
PrivateLinkServiceConnectionState,
ProxyResource,
Resource,
ResourceCommon,
Sku,
SkypeChannel,
SkypeChannelProperties,
Expand All @@ -48,6 +55,7 @@ export {
SmsChannelProperties,
TelegramChannel,
TelegramChannelProperties,
TrackedResource,
WebChatChannel,
WebChatChannelProperties,
WebChatSite
Expand Down
12 changes: 10 additions & 2 deletions sdk/botservice/arm-botservice/src/models/directLineMappers.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
* 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.
Expand All @@ -10,6 +10,7 @@ export {
discriminators,
AlexaChannel,
AlexaChannelProperties,
AzureEntityResource,
BaseResource,
Bot,
BotChannel,
Expand Down Expand Up @@ -37,7 +38,13 @@ export {
LineRegistration,
MsTeamsChannel,
MsTeamsChannelProperties,
PrivateEndpoint,
PrivateEndpointConnection,
PrivateLinkResource,
PrivateLinkServiceConnectionState,
ProxyResource,
Resource,
ResourceCommon,
SiteInfo,
Sku,
SkypeChannel,
Expand All @@ -48,6 +55,7 @@ export {
SmsChannelProperties,
TelegramChannel,
TelegramChannelProperties,
TrackedResource,
WebChatChannel,
WebChatChannelProperties,
WebChatSite
Expand Down
14 changes: 14 additions & 0 deletions sdk/botservice/arm-botservice/src/models/hostSettingsMappers.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
/*
* 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.
*/

export {
discriminators,
ErrorBody,
ErrorModel,
HostSettingsResponse
} from "../models/mappers";
Loading

0 comments on commit 3676868

Please sign in to comment.