diff --git a/packages/@azure/arm-cdn/LICENSE.txt b/packages/@azure/arm-cdn/LICENSE.txt index a70e8cf66038..5431ba98b936 100644 --- a/packages/@azure/arm-cdn/LICENSE.txt +++ b/packages/@azure/arm-cdn/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-cdn/README.md b/packages/@azure/arm-cdn/README.md index e489e40d0266..2b7f1fc1932b 100644 --- a/packages/@azure/arm-cdn/README.md +++ b/packages/@azure/arm-cdn/README.md @@ -1,96 +1,77 @@ -## Azure CdnManagementClient SDK for JavaScript - -This package contains an isomorphic SDK for CdnManagementClient. - -### Currently supported environments - -- Node.js version 6.x.x or higher -- Browser JavaScript - -### How to Install - -``` -npm install @azure/arm-cdn -``` - -### How to use - -#### nodejs - Authentication, client creation and list profiles 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 { CdnManagementClient, CdnManagementModels, CdnManagementMappers } from "@azure/arm-cdn"; -const subscriptionId = process.env["AZURE_SUBSCRIPTION_ID"]; - -msRestNodeAuth.interactiveLogin().then((creds) => { - const client = new CdnManagementClient(creds, subscriptionId); - client.profiles.list().then((result) => { - console.log("The result is:"); - console.log(result); - }); -}).catch((err) => { - console.error(err); -}); -``` - -#### browser - Authentication, client creation and list profiles 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-cdn sample - - - - - - - - -``` - -## Related projects - -- [Microsoft Azure SDK for Javascript](https://github.com/Azure/azure-sdk-for-js) +# Azure CdnManagementClient SDK for JavaScript +This package contains an isomorphic SDK for CdnManagementClient. + +## Currently supported environments +- Node.js version 6.x.x or higher +- Browser JavaScript + +## How to Install +``` +npm install @azure/arm-cdn +``` + + +## How to use + +### nodejs - Authentication, client creation and list profiles 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 { CdnManagementClient, CdnManagementModels, CdnManagementMappers } from "@azure/arm-cdn"; +const subscriptionId = process.env["AZURE_SUBSCRIPTION_ID"]; + +msRestNodeAuth.interactiveLogin().then((creds) => { + const client = new CdnManagementClient(creds, subscriptionId); + client.profiles.list().then((result) => { + console.log("The result is:"); + console.log(result); + }); +}).catch((err) => { + console.error(err); +}); +``` + +### browser - Authentication, client creation and list profiles 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-cdn sample + + + + + + + + + +``` + +# Related projects + - [Microsoft Azure SDK for Javascript](https://github.com/Azure/azure-sdk-for-js) diff --git a/packages/@azure/arm-cdn/lib/cdnManagementClient.ts b/packages/@azure/arm-cdn/lib/cdnManagementClient.ts index d0659fd35c4c..0eb6b750de6b 100644 --- a/packages/@azure/arm-cdn/lib/cdnManagementClient.ts +++ b/packages/@azure/arm-cdn/lib/cdnManagementClient.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 Parameters from "./models/parameters"; diff --git a/packages/@azure/arm-cdn/lib/cdnManagementClientContext.ts b/packages/@azure/arm-cdn/lib/cdnManagementClientContext.ts index 6e500aa77b6c..da88732f3b69 100644 --- a/packages/@azure/arm-cdn/lib/cdnManagementClientContext.ts +++ b/packages/@azure/arm-cdn/lib/cdnManagementClientContext.ts @@ -9,11 +9,11 @@ */ 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-cdn"; -const packageVersion = "0.1.0"; +const packageVersion = "0.2.0"; export class CdnManagementClientContext extends msRestAzure.AzureServiceClient { credentials: msRest.ServiceClientCredentials; diff --git a/packages/@azure/arm-cdn/lib/models/index.ts b/packages/@azure/arm-cdn/lib/models/index.ts index e1cc94c7bb37..cff12e216b60 100644 --- a/packages/@azure/arm-cdn/lib/models/index.ts +++ b/packages/@azure/arm-cdn/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 }; @@ -201,7 +201,7 @@ export interface Endpoint extends TrackedResource { originHostHeader?: string; /** * @member {string} [originPath] A directory path on the origin that CDN can - * use to retreive content from, e.g. contoso.cloudapp.net/originpath. + * use to retrieve content from, e.g. contoso.cloudapp.net/originpath. */ originPath?: string; /** @@ -255,7 +255,7 @@ export interface Endpoint extends TrackedResource { probePath?: string; /** * @member {GeoFilter[]} [geoFilters] List of rules defining the user's geo - * access within a CDN endpoint. Each geo filter defines an acess rule to a + * access within a CDN endpoint. Each geo filter defines an access rule to a * specified path or content, e.g. block APAC for path /pictures/ */ geoFilters?: GeoFilter[]; @@ -267,7 +267,7 @@ export interface Endpoint extends TrackedResource { deliveryPolicy?: EndpointPropertiesUpdateParametersDeliveryPolicy; /** * @member {string} [hostName] The host name of the endpoint structured as - * {endpointName}.{DNSZone}, e.g. consoto.azureedge.net + * {endpointName}.{DNSZone}, e.g. contoso.azureedge.net * **NOTE: This property will not be serialized. It can only be populated by * the server.** */ @@ -419,7 +419,7 @@ export interface EndpointUpdateParameters extends BaseResource { originHostHeader?: string; /** * @member {string} [originPath] A directory path on the origin that CDN can - * use to retreive content from, e.g. contoso.cloudapp.net/originpath. + * use to retrieve content from, e.g. contoso.cloudapp.net/originpath. */ originPath?: string; /** @@ -473,7 +473,7 @@ export interface EndpointUpdateParameters extends BaseResource { probePath?: string; /** * @member {GeoFilter[]} [geoFilters] List of rules defining the user's geo - * access within a CDN endpoint. Each geo filter defines an acess rule to a + * access within a CDN endpoint. Each geo filter defines an access rule to a * specified path or content, e.g. block APAC for path /pictures/ */ geoFilters?: GeoFilter[]; @@ -567,8 +567,8 @@ export interface CacheExpirationActionParameters { */ cacheBehavior: CacheBehavior; /** - * @member {string} [cacheDuration] The duration for which the the content - * needs to be cached. Allowed format is [d.]hh:mm:ss + * @member {string} [cacheDuration] The duration for which the content needs + * to be cached. Allowed format is [d.]hh:mm:ss */ cacheDuration?: string; } @@ -699,7 +699,7 @@ export interface ProxyResource extends Resource { * @interface * An interface representing CustomDomain. * Friendly domain name mapping to the endpoint hostname that the customer - * provides for branding purposes, e.g. www.consoto.com. + * provides for branding purposes, e.g. www.contoso.com. * * @extends ProxyResource */ @@ -987,7 +987,7 @@ export interface Operation { */ export interface CidrIpAddress { /** - * @member {string} [baseIpAddress] Ip adress itself. + * @member {string} [baseIpAddress] Ip address itself. */ baseIpAddress?: string; /** @@ -1037,7 +1037,7 @@ export interface EdgeNode extends ProxyResource { /** * @interface * An interface representing ErrorResponse. - * Error reponse indicates CDN service is not able to process the incoming + * Error response indicates CDN service is not able to process the incoming * request. The reason is provided in the error message. * */ @@ -1102,7 +1102,7 @@ export interface CdnManagementClientOptions extends AzureServiceClientOptions { * @interface * An interface representing the ProfileListResult. * Result of the request to list profiles. It contains a list of profile - * objects and a URL link to get the the next set of results. + * objects and a URL link to get the next set of results. * * @extends Array */ @@ -1133,7 +1133,7 @@ export interface ResourceUsageListResult extends Array { * @interface * An interface representing the EndpointListResult. * Result of the request to list endpoints. It contains a list of endpoint - * objects and a URL link to get the the next set of results. + * objects and a URL link to get the next set of results. * * @extends Array */ diff --git a/packages/@azure/arm-cdn/lib/models/mappers.ts b/packages/@azure/arm-cdn/lib/models/mappers.ts index 236cec4d6a56..e5ff1a40ec39 100644 --- a/packages/@azure/arm-cdn/lib/models/mappers.ts +++ b/packages/@azure/arm-cdn/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; @@ -461,6 +461,11 @@ export const DeliveryRule: msRest.CompositeMapper = { element: { type: { name: "Composite", + polymorphicDiscriminator: { + serializedName: "name", + clientName: "name" + }, + uberParent: "DeliveryRuleAction", className: "DeliveryRuleAction" } } @@ -473,6 +478,11 @@ export const DeliveryRule: msRest.CompositeMapper = { element: { type: { name: "Composite", + polymorphicDiscriminator: { + serializedName: "name", + clientName: "name" + }, + uberParent: "DeliveryRuleCondition", className: "DeliveryRuleCondition" } } diff --git a/packages/@azure/arm-cdn/lib/models/parameters.ts b/packages/@azure/arm-cdn/lib/models/parameters.ts index dea0816e4379..9ac50dcd4fe1 100644 --- a/packages/@azure/arm-cdn/lib/models/parameters.ts +++ b/packages/@azure/arm-cdn/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-cdn/lib/operations/customDomains.ts b/packages/@azure/arm-cdn/lib/operations/customDomains.ts index f013b934ac50..07f5930ec9eb 100644 --- a/packages/@azure/arm-cdn/lib/operations/customDomains.ts +++ b/packages/@azure/arm-cdn/lib/operations/customDomains.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/customDomainsMappers"; import * as Parameters from "../models/parameters"; @@ -64,7 +64,7 @@ export class CustomDomains { } /** - * Gets an exisitng custom domain within an endpoint. + * Gets an existing custom domain within an endpoint. * @param resourceGroupName Name of the Resource group within the Azure subscription. * @param profileName Name of the CDN profile which is unique within the resource group. * @param endpointName Name of the endpoint under the profile which is unique globally. diff --git a/packages/@azure/arm-cdn/lib/operations/edgeNodes.ts b/packages/@azure/arm-cdn/lib/operations/edgeNodes.ts index 282fd57f895a..e730ecbee50f 100644 --- a/packages/@azure/arm-cdn/lib/operations/edgeNodes.ts +++ b/packages/@azure/arm-cdn/lib/operations/edgeNodes.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/edgeNodesMappers"; import * as Parameters from "../models/parameters"; diff --git a/packages/@azure/arm-cdn/lib/operations/endpoints.ts b/packages/@azure/arm-cdn/lib/operations/endpoints.ts index d5894f45add5..aa93cb531d2c 100644 --- a/packages/@azure/arm-cdn/lib/operations/endpoints.ts +++ b/packages/@azure/arm-cdn/lib/operations/endpoints.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/endpointsMappers"; import * as Parameters from "../models/parameters"; diff --git a/packages/@azure/arm-cdn/lib/operations/operations.ts b/packages/@azure/arm-cdn/lib/operations/operations.ts index 09c0ecfd5439..0e9676253c05 100644 --- a/packages/@azure/arm-cdn/lib/operations/operations.ts +++ b/packages/@azure/arm-cdn/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-cdn/lib/operations/origins.ts b/packages/@azure/arm-cdn/lib/operations/origins.ts index 88d68f8f92ee..f087753d1007 100644 --- a/packages/@azure/arm-cdn/lib/operations/origins.ts +++ b/packages/@azure/arm-cdn/lib/operations/origins.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/originsMappers"; import * as Parameters from "../models/parameters"; diff --git a/packages/@azure/arm-cdn/lib/operations/profiles.ts b/packages/@azure/arm-cdn/lib/operations/profiles.ts index 7303cf7aa950..990844747d1b 100644 --- a/packages/@azure/arm-cdn/lib/operations/profiles.ts +++ b/packages/@azure/arm-cdn/lib/operations/profiles.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/profilesMappers"; import * as Parameters from "../models/parameters"; @@ -153,7 +153,7 @@ export class Profiles { } /** - * Generates a dynamic SSO URI used to sign in to the CDN supplemental portal. Supplemnetal portal + * Generates a dynamic SSO URI used to sign in to the CDN supplemental portal. Supplemental portal * is used to configure advanced feature capabilities that are not yet available in the Azure * portal, such as core reports in a standard profile; rules engine, advanced HTTP reports, and * real-time stats and alerts in a premium profile. The SSO URI changes approximately every 10 diff --git a/packages/@azure/arm-cdn/lib/operations/resourceUsageOperations.ts b/packages/@azure/arm-cdn/lib/operations/resourceUsageOperations.ts index a8af3311c17b..7f9ee836e2a5 100644 --- a/packages/@azure/arm-cdn/lib/operations/resourceUsageOperations.ts +++ b/packages/@azure/arm-cdn/lib/operations/resourceUsageOperations.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/resourceUsageOperationsMappers"; import * as Parameters from "../models/parameters"; diff --git a/packages/@azure/arm-cdn/package.json b/packages/@azure/arm-cdn/package.json index ca9837b0f688..b5273b77cb3f 100644 --- a/packages/@azure/arm-cdn/package.json +++ b/packages/@azure/arm-cdn/package.json @@ -2,10 +2,10 @@ "name": "@azure/arm-cdn", "author": "Microsoft Corporation", "description": "CdnManagementClient Library with typescript type definitions for node.js and browser.", - "version": "0.1.0", + "version": "0.2.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-cdn/rollup.config.js b/packages/@azure/arm-cdn/rollup.config.js index d8c178b39239..15f0469ca97c 100644 --- a/packages/@azure/arm-cdn/rollup.config.js +++ b/packages/@azure/arm-cdn/rollup.config.js @@ -4,15 +4,15 @@ import nodeResolve from "rollup-plugin-node-resolve"; */ const config = { input: './esm/cdnManagementClient.js', - external: ["@azure/ms-rest-js", "@azure/ms-rest-azure-js"], + external: ["ms-rest-js", "ms-rest-azure-js"], output: { file: "./dist/arm-cdn.js", format: "umd", name: "Azure.ArmCdn", 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-cdn/tsconfig.json b/packages/@azure/arm-cdn/tsconfig.json index 51ea90961ce5..f32d1664f320 100644 --- a/packages/@azure/arm-cdn/tsconfig.json +++ b/packages/@azure/arm-cdn/tsconfig.json @@ -14,6 +14,6 @@ "outDir": "./esm", "importHelpers": true }, - "include": ["./lib/**/*.ts"], + "include": ["./lib/**/*"], "exclude": ["node_modules"] }