diff --git a/packages/@azure/arm-eventgrid/LICENSE.txt b/packages/@azure/arm-eventgrid/LICENSE.txt index a70e8cf66038..5431ba98b936 100644 --- a/packages/@azure/arm-eventgrid/LICENSE.txt +++ b/packages/@azure/arm-eventgrid/LICENSE.txt @@ -1,21 +1,21 @@ -The MIT License (MIT) - -Copyright (c) 2018 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 -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. +The MIT License (MIT) + +Copyright (c) 2018 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 +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/packages/@azure/arm-eventgrid/README.md b/packages/@azure/arm-eventgrid/README.md index 842f4b154697..8b02fd5752aa 100644 --- a/packages/@azure/arm-eventgrid/README.md +++ b/packages/@azure/arm-eventgrid/README.md @@ -1,100 +1,81 @@ -## Azure EventGridManagementClient SDK for JavaScript - -This package contains an isomorphic SDK for EventGridManagementClient. - -### Currently supported environments - -- Node.js version 6.x.x or higher -- Browser JavaScript - -### How to Install - -``` -npm install @azure/arm-eventgrid -``` - -### How to use - -#### nodejs - Authentication, client creation and get domains as an example written in TypeScript. - -##### Install @azure/ms-rest-nodeauth - -``` -npm install @azure/ms-rest-nodeauth -``` - -##### Sample code - -```ts -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 { EventGridManagementClient, EventGridManagementModels, EventGridManagementMappers } from "@azure/arm-eventgrid"; -const subscriptionId = process.env["AZURE_SUBSCRIPTION_ID"]; - -msRestNodeAuth.interactiveLogin().then((creds) => { - const client = new EventGridManagementClient(creds, subscriptionId); - const resourceGroupName = "testresourceGroupName"; - const domainName = "testdomainName"; - client.domains.get(resourceGroupName, domainName).then((result) => { - console.log("The result is:"); - console.log(result); - }); -}).catch((err) => { - console.error(err); -}); -``` - -#### browser - Authentication, client creation and get domains as an example written in JavaScript. - -##### Install @azure/ms-rest-browserauth - -``` -npm install @azure/ms-rest-browserauth -``` - -##### Sample code - -See https://github.com/Azure/ms-rest-browserauth to learn how to authenticate to Azure in the browser. - -- index.html -```html - - - - @azure/arm-eventgrid sample - - - - - - - - -``` - -## Related projects - -- [Microsoft Azure SDK for Javascript](https://github.com/Azure/azure-sdk-for-js) +# Azure EventGridManagementClient SDK for JavaScript +This package contains an isomorphic SDK for EventGridManagementClient. + +## Currently supported environments +- Node.js version 6.x.x or higher +- Browser JavaScript + +## How to Install +``` +npm install @azure/arm-eventgrid +``` + + +## How to use + +### nodejs - Authentication, client creation and get domains as an example written in TypeScript. + +```ts +import * as msRest from "ms-rest-js"; +import * as msRestAzure from "ms-rest-azure-js"; +import * as msRestNodeAuth from "ms-rest-nodeauth"; +import { EventGridManagementClient, EventGridManagementModels, EventGridManagementMappers } from "@azure/arm-eventgrid"; +const subscriptionId = process.env["AZURE_SUBSCRIPTION_ID"]; + +msRestNodeAuth.interactiveLogin().then((creds) => { + const client = new EventGridManagementClient(creds, subscriptionId); + const resourceGroupName = "testresourceGroupName"; + const domainName = "testdomainName"; + client.domains.get(resourceGroupName, domainName).then((result) => { + console.log("The result is:"); + console.log(result); + }); +}).catch((err) => { + console.error(err); +}); +``` + +### browser - Authentication, client creation and get domains as an example written in JavaScript. +See https://github.com/Azure/ms-rest-browserauth to learn how to authenticate to Azure in the browser. + +- index.html +```html + + + + @azure/arm-eventgrid sample + + + + + + + + + +``` + +# Related projects + - [Microsoft Azure SDK for Javascript](https://github.com/Azure/azure-sdk-for-js) diff --git a/packages/@azure/arm-eventgrid/lib/eventGridManagementClient.ts b/packages/@azure/arm-eventgrid/lib/eventGridManagementClient.ts index 62ae1023d48c..9e779f320171 100644 --- a/packages/@azure/arm-eventgrid/lib/eventGridManagementClient.ts +++ b/packages/@azure/arm-eventgrid/lib/eventGridManagementClient.ts @@ -8,7 +8,7 @@ * regenerated. */ -import * as msRest from "@azure/ms-rest-js"; +import * as msRest from "ms-rest-js"; import * as Models from "./models"; import * as Mappers from "./models/mappers"; import * as operations from "./operations"; diff --git a/packages/@azure/arm-eventgrid/lib/eventGridManagementClientContext.ts b/packages/@azure/arm-eventgrid/lib/eventGridManagementClientContext.ts index 36d249d7d75e..9e4379dc3bb7 100644 --- a/packages/@azure/arm-eventgrid/lib/eventGridManagementClientContext.ts +++ b/packages/@azure/arm-eventgrid/lib/eventGridManagementClientContext.ts @@ -9,8 +9,8 @@ */ import * as Models from "./models"; -import * as msRest from "@azure/ms-rest-js"; -import * as msRestAzure from "@azure/ms-rest-azure-js"; +import * as msRest from "ms-rest-js"; +import * as msRestAzure from "ms-rest-azure-js"; const packageName = "@azure/arm-eventgrid"; const packageVersion = "0.1.0"; diff --git a/packages/@azure/arm-eventgrid/lib/models/index.ts b/packages/@azure/arm-eventgrid/lib/models/index.ts index 7b9c0d0bdb99..2aa24db6c45d 100644 --- a/packages/@azure/arm-eventgrid/lib/models/index.ts +++ b/packages/@azure/arm-eventgrid/lib/models/index.ts @@ -8,8 +8,8 @@ * regenerated. */ -import { BaseResource, CloudError, AzureServiceClientOptions } from "@azure/ms-rest-azure-js"; -import * as msRest from "@azure/ms-rest-js"; +import { BaseResource, CloudError, AzureServiceClientOptions } from "ms-rest-azure-js"; +import * as msRest from "ms-rest-js"; export { BaseResource, CloudError }; @@ -209,7 +209,7 @@ export interface AdvancedFilter { operatorType: "AdvancedFilter"; /** * @member {string} [key] The filter key. Represents an event property with - * upto two levels of nesting. + * up to two levels of nesting. */ key?: string; } @@ -308,7 +308,7 @@ export interface NumberInAdvancedFilter { operatorType: "NumberIn"; /** * @member {string} [key] The filter key. Represents an event property with - * upto two levels of nesting. + * up to two levels of nesting. */ key?: string; /** @@ -353,7 +353,7 @@ export interface NumberNotInAdvancedFilter { operatorType: "NumberNotIn"; /** * @member {string} [key] The filter key. Represents an event property with - * upto two levels of nesting. + * up to two levels of nesting. */ key?: string; /** @@ -375,7 +375,7 @@ export interface NumberLessThanAdvancedFilter { operatorType: "NumberLessThan"; /** * @member {string} [key] The filter key. Represents an event property with - * upto two levels of nesting. + * up to two levels of nesting. */ key?: string; /** @@ -397,7 +397,7 @@ export interface NumberGreaterThanAdvancedFilter { operatorType: "NumberGreaterThan"; /** * @member {string} [key] The filter key. Represents an event property with - * upto two levels of nesting. + * up to two levels of nesting. */ key?: string; /** @@ -419,7 +419,7 @@ export interface NumberLessThanOrEqualsAdvancedFilter { operatorType: "NumberLessThanOrEquals"; /** * @member {string} [key] The filter key. Represents an event property with - * upto two levels of nesting. + * up to two levels of nesting. */ key?: string; /** @@ -441,7 +441,7 @@ export interface NumberGreaterThanOrEqualsAdvancedFilter { operatorType: "NumberGreaterThanOrEquals"; /** * @member {string} [key] The filter key. Represents an event property with - * upto two levels of nesting. + * up to two levels of nesting. */ key?: string; /** @@ -463,7 +463,7 @@ export interface BoolEqualsAdvancedFilter { operatorType: "BoolEquals"; /** * @member {string} [key] The filter key. Represents an event property with - * upto two levels of nesting. + * up to two levels of nesting. */ key?: string; /** @@ -485,7 +485,7 @@ export interface StringInAdvancedFilter { operatorType: "StringIn"; /** * @member {string} [key] The filter key. Represents an event property with - * upto two levels of nesting. + * up to two levels of nesting. */ key?: string; /** @@ -507,7 +507,7 @@ export interface StringNotInAdvancedFilter { operatorType: "StringNotIn"; /** * @member {string} [key] The filter key. Represents an event property with - * upto two levels of nesting. + * up to two levels of nesting. */ key?: string; /** @@ -529,7 +529,7 @@ export interface StringBeginsWithAdvancedFilter { operatorType: "StringBeginsWith"; /** * @member {string} [key] The filter key. Represents an event property with - * upto two levels of nesting. + * up to two levels of nesting. */ key?: string; /** @@ -551,7 +551,7 @@ export interface StringEndsWithAdvancedFilter { operatorType: "StringEndsWith"; /** * @member {string} [key] The filter key. Represents an event property with - * upto two levels of nesting. + * up to two levels of nesting. */ key?: string; /** @@ -573,7 +573,7 @@ export interface StringContainsAdvancedFilter { operatorType: "StringContains"; /** * @member {string} [key] The filter key. Represents an event property with - * upto two levels of nesting. + * up to two levels of nesting. */ key?: string; /** @@ -844,7 +844,7 @@ export interface Operation { * An interface representing JsonField. * This is used to express the source of an input schema mapping for a single * target field in the Event Grid Event schema. This is currently used in the - * mappings for the 'id','topic' and 'eventtime' properties. This represents a + * mappings for the 'id','topic' and 'eventTime' properties. This represents a * field in the input event schema. * */ @@ -861,7 +861,7 @@ export interface JsonField { * An interface representing JsonFieldWithDefault. * This is used to express the source of an input schema mapping for a single * target field in the Event Grid Event schema. This is currently used in the - * mappings for the 'subject','eventtype' and 'dataversion' properties. This + * mappings for the 'subject','eventType' and 'dataVersion' properties. This * represents a field in the input event schema along with a default value to * be used, and at least one of these two properties should be provided. * diff --git a/packages/@azure/arm-eventgrid/lib/models/mappers.ts b/packages/@azure/arm-eventgrid/lib/models/mappers.ts index 03369dae39de..c3cdaa7e132f 100644 --- a/packages/@azure/arm-eventgrid/lib/models/mappers.ts +++ b/packages/@azure/arm-eventgrid/lib/models/mappers.ts @@ -8,8 +8,8 @@ * regenerated. */ -import { CloudErrorMapper, BaseResourceMapper } from "@azure/ms-rest-azure-js"; -import * as msRest from "@azure/ms-rest-js"; +import { CloudErrorMapper, BaseResourceMapper } from "ms-rest-azure-js"; +import * as msRest from "ms-rest-js"; export const CloudError = CloudErrorMapper; export const BaseResource = BaseResourceMapper; @@ -127,6 +127,11 @@ export const Domain: msRest.CompositeMapper = { serializedName: "properties.inputSchemaMapping", type: { name: "Composite", + polymorphicDiscriminator: { + serializedName: "inputSchemaMappingType", + clientName: "inputSchemaMappingType" + }, + uberParent: "InputSchemaMapping", className: "InputSchemaMapping" } } @@ -298,6 +303,11 @@ export const EventSubscriptionFilter: msRest.CompositeMapper = { element: { type: { name: "Composite", + polymorphicDiscriminator: { + serializedName: "operatorType", + clientName: "operatorType" + }, + uberParent: "AdvancedFilter", className: "AdvancedFilter" } } @@ -753,6 +763,11 @@ export const EventSubscription: msRest.CompositeMapper = { serializedName: "properties.destination", type: { name: "Composite", + polymorphicDiscriminator: { + serializedName: "endpointType", + clientName: "endpointType" + }, + uberParent: "EventSubscriptionDestination", className: "EventSubscriptionDestination" } }, @@ -797,6 +812,11 @@ export const EventSubscription: msRest.CompositeMapper = { serializedName: "properties.deadLetterDestination", type: { name: "Composite", + polymorphicDiscriminator: { + serializedName: "endpointType", + clientName: "endpointType" + }, + uberParent: "DeadLetterDestination", className: "DeadLetterDestination" } } @@ -814,6 +834,11 @@ export const EventSubscriptionUpdateParameters: msRest.CompositeMapper = { serializedName: "destination", type: { name: "Composite", + polymorphicDiscriminator: { + serializedName: "endpointType", + clientName: "endpointType" + }, + uberParent: "EventSubscriptionDestination", className: "EventSubscriptionDestination" } }, @@ -858,6 +883,11 @@ export const EventSubscriptionUpdateParameters: msRest.CompositeMapper = { serializedName: "deadLetterDestination", type: { name: "Composite", + polymorphicDiscriminator: { + serializedName: "endpointType", + clientName: "endpointType" + }, + uberParent: "DeadLetterDestination", className: "DeadLetterDestination" } } @@ -1075,6 +1105,11 @@ export const Topic: msRest.CompositeMapper = { serializedName: "properties.inputSchemaMapping", type: { name: "Composite", + polymorphicDiscriminator: { + serializedName: "inputSchemaMappingType", + clientName: "inputSchemaMappingType" + }, + uberParent: "InputSchemaMapping", className: "InputSchemaMapping" } } diff --git a/packages/@azure/arm-eventgrid/lib/models/parameters.ts b/packages/@azure/arm-eventgrid/lib/models/parameters.ts index 743bb232ee3b..1f7804fc0e5d 100644 --- a/packages/@azure/arm-eventgrid/lib/models/parameters.ts +++ b/packages/@azure/arm-eventgrid/lib/models/parameters.ts @@ -8,7 +8,7 @@ * regenerated. */ -import * as msRest from "@azure/ms-rest-js"; +import * as msRest from "ms-rest-js"; export const acceptLanguage: msRest.OperationParameter = { parameterPath: "acceptLanguage", diff --git a/packages/@azure/arm-eventgrid/lib/operations/domainTopics.ts b/packages/@azure/arm-eventgrid/lib/operations/domainTopics.ts index 2385dad1e05d..2a2c1540cf20 100644 --- a/packages/@azure/arm-eventgrid/lib/operations/domainTopics.ts +++ b/packages/@azure/arm-eventgrid/lib/operations/domainTopics.ts @@ -8,7 +8,7 @@ * regenerated. */ -import * as msRest from "@azure/ms-rest-js"; +import * as msRest from "ms-rest-js"; import * as Models from "../models"; import * as Mappers from "../models/domainTopicsMappers"; import * as Parameters from "../models/parameters"; diff --git a/packages/@azure/arm-eventgrid/lib/operations/domains.ts b/packages/@azure/arm-eventgrid/lib/operations/domains.ts index 90b848421b5f..5cb8c110c570 100644 --- a/packages/@azure/arm-eventgrid/lib/operations/domains.ts +++ b/packages/@azure/arm-eventgrid/lib/operations/domains.ts @@ -8,8 +8,8 @@ * regenerated. */ -import * as msRest from "@azure/ms-rest-js"; -import * as msRestAzure from "@azure/ms-rest-azure-js"; +import * as msRest from "ms-rest-js"; +import * as msRestAzure from "ms-rest-azure-js"; import * as Models from "../models"; import * as Mappers from "../models/domainsMappers"; import * as Parameters from "../models/parameters"; diff --git a/packages/@azure/arm-eventgrid/lib/operations/eventSubscriptions.ts b/packages/@azure/arm-eventgrid/lib/operations/eventSubscriptions.ts index 658f282c5e9f..186c6b13a387 100644 --- a/packages/@azure/arm-eventgrid/lib/operations/eventSubscriptions.ts +++ b/packages/@azure/arm-eventgrid/lib/operations/eventSubscriptions.ts @@ -8,8 +8,8 @@ * regenerated. */ -import * as msRest from "@azure/ms-rest-js"; -import * as msRestAzure from "@azure/ms-rest-azure-js"; +import * as msRest from "ms-rest-js"; +import * as msRestAzure from "ms-rest-azure-js"; import * as Models from "../models"; import * as Mappers from "../models/eventSubscriptionsMappers"; import * as Parameters from "../models/parameters"; diff --git a/packages/@azure/arm-eventgrid/lib/operations/operations.ts b/packages/@azure/arm-eventgrid/lib/operations/operations.ts index e5eb867508ac..cbacbd8e5178 100644 --- a/packages/@azure/arm-eventgrid/lib/operations/operations.ts +++ b/packages/@azure/arm-eventgrid/lib/operations/operations.ts @@ -8,7 +8,7 @@ * regenerated. */ -import * as msRest from "@azure/ms-rest-js"; +import * as msRest from "ms-rest-js"; import * as Models from "../models"; import * as Mappers from "../models/operationsMappers"; import * as Parameters from "../models/parameters"; diff --git a/packages/@azure/arm-eventgrid/lib/operations/topicTypes.ts b/packages/@azure/arm-eventgrid/lib/operations/topicTypes.ts index 4d28e80098ce..0f8916ffa443 100644 --- a/packages/@azure/arm-eventgrid/lib/operations/topicTypes.ts +++ b/packages/@azure/arm-eventgrid/lib/operations/topicTypes.ts @@ -8,7 +8,7 @@ * regenerated. */ -import * as msRest from "@azure/ms-rest-js"; +import * as msRest from "ms-rest-js"; import * as Models from "../models"; import * as Mappers from "../models/topicTypesMappers"; import * as Parameters from "../models/parameters"; diff --git a/packages/@azure/arm-eventgrid/lib/operations/topics.ts b/packages/@azure/arm-eventgrid/lib/operations/topics.ts index 1eca0e483530..28692a883d25 100644 --- a/packages/@azure/arm-eventgrid/lib/operations/topics.ts +++ b/packages/@azure/arm-eventgrid/lib/operations/topics.ts @@ -8,8 +8,8 @@ * regenerated. */ -import * as msRest from "@azure/ms-rest-js"; -import * as msRestAzure from "@azure/ms-rest-azure-js"; +import * as msRest from "ms-rest-js"; +import * as msRestAzure from "ms-rest-azure-js"; import * as Models from "../models"; import * as Mappers from "../models/topicsMappers"; import * as Parameters from "../models/parameters"; diff --git a/packages/@azure/arm-eventgrid/package.json b/packages/@azure/arm-eventgrid/package.json index aee8b1d371a7..3e20b247943a 100644 --- a/packages/@azure/arm-eventgrid/package.json +++ b/packages/@azure/arm-eventgrid/package.json @@ -4,8 +4,8 @@ "description": "EventGridManagementClient Library with typescript type definitions for node.js and browser.", "version": "0.1.0", "dependencies": { - "@azure/ms-rest-azure-js": "^1.1.0", - "@azure/ms-rest-js": "^1.1.0", + "ms-rest-azure-js": "^1.0.181", + "ms-rest-js": "^1.0.460", "tslib": "^1.9.3" }, "keywords": [ diff --git a/packages/@azure/arm-eventgrid/rollup.config.js b/packages/@azure/arm-eventgrid/rollup.config.js index 5412277e3ddb..ffd31a980b45 100644 --- a/packages/@azure/arm-eventgrid/rollup.config.js +++ b/packages/@azure/arm-eventgrid/rollup.config.js @@ -4,15 +4,15 @@ import nodeResolve from "rollup-plugin-node-resolve"; */ const config = { input: './esm/eventGridManagementClient.js', - external: ["@azure/ms-rest-js", "@azure/ms-rest-azure-js"], + external: ["ms-rest-js", "ms-rest-azure-js"], output: { file: "./dist/arm-eventgrid.js", format: "umd", name: "Azure.ArmEventgrid", sourcemap: true, globals: { - "@azure/ms-rest-js": "msRest", - "@azure/ms-rest-azure-js": "msRestAzure" + "ms-rest-js": "msRest", + "ms-rest-azure-js": "msRestAzure" }, banner: `/* * Copyright (c) Microsoft Corporation. All rights reserved. diff --git a/packages/@azure/arm-eventgrid/tsconfig.json b/packages/@azure/arm-eventgrid/tsconfig.json index 51ea90961ce5..f32d1664f320 100644 --- a/packages/@azure/arm-eventgrid/tsconfig.json +++ b/packages/@azure/arm-eventgrid/tsconfig.json @@ -14,6 +14,6 @@ "outDir": "./esm", "importHelpers": true }, - "include": ["./lib/**/*.ts"], + "include": ["./lib/**/*"], "exclude": ["node_modules"] }