diff --git a/packages/@azure/arm-mediaservices/LICENSE.txt b/packages/@azure/arm-mediaservices/LICENSE.txt index a70e8cf66038..5431ba98b936 100644 --- a/packages/@azure/arm-mediaservices/LICENSE.txt +++ b/packages/@azure/arm-mediaservices/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-mediaservices/README.md b/packages/@azure/arm-mediaservices/README.md index cee73370e2bd..f6c028e92597 100644 --- a/packages/@azure/arm-mediaservices/README.md +++ b/packages/@azure/arm-mediaservices/README.md @@ -1,100 +1,81 @@ -## Azure AzureMediaServices SDK for JavaScript - -This package contains an isomorphic SDK for AzureMediaServices. - -### Currently supported environments - -- Node.js version 6.x.x or higher -- Browser JavaScript - -### How to Install - -``` -npm install @azure/arm-mediaservices -``` - -### How to use - -#### nodejs - Authentication, client creation and list accountFilters 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 { AzureMediaServices, AzureMediaServicesModels, AzureMediaServicesMappers } from "@azure/arm-mediaservices"; -const subscriptionId = process.env["AZURE_SUBSCRIPTION_ID"]; - -msRestNodeAuth.interactiveLogin().then((creds) => { - const client = new AzureMediaServices(creds, subscriptionId); - const resourceGroupName = "testresourceGroupName"; - const accountName = "testaccountName"; - client.accountFilters.list(resourceGroupName, accountName).then((result) => { - console.log("The result is:"); - console.log(result); - }); -}).catch((err) => { - console.error(err); -}); -``` - -#### browser - Authentication, client creation and list accountFilters 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-mediaservices sample - - - - - - - - -``` - -## Related projects - -- [Microsoft Azure SDK for Javascript](https://github.com/Azure/azure-sdk-for-js) +# Azure AzureMediaServices SDK for JavaScript +This package contains an isomorphic SDK for AzureMediaServices. + +## Currently supported environments +- Node.js version 6.x.x or higher +- Browser JavaScript + +## How to Install +``` +npm install @azure/arm-mediaservices +``` + + +## How to use + +### nodejs - Authentication, client creation and list accountFilters 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 { AzureMediaServices, AzureMediaServicesModels, AzureMediaServicesMappers } from "@azure/arm-mediaservices"; +const subscriptionId = process.env["AZURE_SUBSCRIPTION_ID"]; + +msRestNodeAuth.interactiveLogin().then((creds) => { + const client = new AzureMediaServices(creds, subscriptionId); + const resourceGroupName = "testresourceGroupName"; + const accountName = "testaccountName"; + client.accountFilters.list(resourceGroupName, accountName).then((result) => { + console.log("The result is:"); + console.log(result); + }); +}).catch((err) => { + console.error(err); +}); +``` + +### browser - Authentication, client creation and list accountFilters 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-mediaservices sample + + + + + + + + + +``` + +# Related projects + - [Microsoft Azure SDK for Javascript](https://github.com/Azure/azure-sdk-for-js) diff --git a/packages/@azure/arm-mediaservices/lib/azureMediaServices.ts b/packages/@azure/arm-mediaservices/lib/azureMediaServices.ts index 1a00cc2674c8..dbe0db4841bb 100644 --- a/packages/@azure/arm-mediaservices/lib/azureMediaServices.ts +++ b/packages/@azure/arm-mediaservices/lib/azureMediaServices.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-mediaservices/lib/azureMediaServicesContext.ts b/packages/@azure/arm-mediaservices/lib/azureMediaServicesContext.ts index c56a7c60b843..65667d4c945b 100644 --- a/packages/@azure/arm-mediaservices/lib/azureMediaServicesContext.ts +++ b/packages/@azure/arm-mediaservices/lib/azureMediaServicesContext.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-mediaservices"; const packageVersion = "0.1.0"; diff --git a/packages/@azure/arm-mediaservices/lib/models/index.ts b/packages/@azure/arm-mediaservices/lib/models/index.ts index bfa577bbafc8..53684d37a1ac 100644 --- a/packages/@azure/arm-mediaservices/lib/models/index.ts +++ b/packages/@azure/arm-mediaservices/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 }; @@ -23,31 +23,31 @@ export { BaseResource, CloudError }; */ export interface PresentationTimeRange { /** - * @member {number} startTimestamp The absolute start time boundary. + * @member {number} [startTimestamp] The absolute start time boundary. */ - startTimestamp: number; + startTimestamp?: number; /** - * @member {number} endTimestamp The absolute end time boundary. + * @member {number} [endTimestamp] The absolute end time boundary. */ - endTimestamp: number; + endTimestamp?: number; /** - * @member {number} presentationWindowDuration The relative to end sliding + * @member {number} [presentationWindowDuration] The relative to end sliding * window. */ - presentationWindowDuration: number; + presentationWindowDuration?: number; /** - * @member {number} liveBackoffDuration The relative to end right edge. + * @member {number} [liveBackoffDuration] The relative to end right edge. */ - liveBackoffDuration: number; + liveBackoffDuration?: number; /** - * @member {number} timescale The time scale of time stamps. + * @member {number} [timescale] The time scale of time stamps. */ - timescale: number; + timescale?: number; /** - * @member {boolean} forceEndTimestamp The indicator of forcing exsiting of + * @member {boolean} [forceEndTimestamp] The indicator of forcing exsiting of * end time stamp. */ - forceEndTimestamp: boolean; + forceEndTimestamp?: boolean; } /** @@ -2579,7 +2579,7 @@ export interface VideoAnalyzerPreset { /** * @member {InsightsType} [insightsToExtract] The type of insights to be * extracted. If not set then based on the content the type will selected. - * If the content is audi only then only audio insights are extraced and if + * If the content is audio only then only audio insights are extracted and if * it is video only. Possible values include: 'AudioInsightsOnly', * 'VideoInsightsOnly', 'AllInsights' */ @@ -2810,7 +2810,7 @@ export interface JobInputClip { /** * @interface * An interface representing JobInputs. - * Describes a list of of inputs to a Job. + * Describes a list of inputs to a Job. * */ export interface JobInputs { @@ -3389,7 +3389,7 @@ export interface EnvelopeEncryption { contentKeys?: StreamingPolicyContentKeys; /** * @member {string} [customKeyAcquisitionUrlTemplate] - * KeyAcquistionUrlTemplate is used to point to user specified service to + * KeyAcquisitionUrlTemplate is used to point to user specified service to * delivery content keys */ customKeyAcquisitionUrlTemplate?: string; @@ -3520,7 +3520,7 @@ export interface StreamingLocatorContentKey { */ labelReferenceInStreamingPolicy?: string; /** - * @member {string} [value] Value of of Content Key + * @member {string} [value] Value of Content Key */ value?: string; /** @@ -3898,7 +3898,7 @@ export interface LiveEventEncoding { /** * @member {LiveEventEncodingType} [encodingType] The encoding type for Live * Event. This value is specified at creation time and cannot be updated. - * Possible values include: 'None', 'Basic' + * Possible values include: 'None', 'Basic', 'Standard' */ encodingType?: LiveEventEncodingType; /** @@ -4238,17 +4238,10 @@ export interface TransformsListOptionalParams extends msRest.RequestOptionsBase */ filter?: string; /** - * @member {number} [top] Specifies a non-negative integer n that limits the - * number of items returned from a collection. The service returns the number - * of available items up to but not greater than the specified value n. - */ - top?: number; - /** - * @member {number} [skip] Specifies a non-negative integer n that excludes - * the first n items of the queried collection from the result. The service - * returns items starting at position n+1. + * @member {string} [orderby] Specifies the the key by which the result + * collection should be ordered. */ - skip?: number; + orderby?: string; } /** @@ -4264,17 +4257,10 @@ export interface JobsListOptionalParams extends msRest.RequestOptionsBase { */ filter?: string; /** - * @member {number} [top] Specifies a non-negative integer n that limits the - * number of items returned from a collection. The service returns the number - * of available items up to but not greater than the specified value n. - */ - top?: number; - /** - * @member {number} [skip] Specifies a non-negative integer n that excludes - * the first n items of the queried collection from the result. The service - * returns items starting at position n+1. + * @member {string} [orderby] Specifies the the key by which the result + * collection should be ordered. */ - skip?: number; + orderby?: string; } /** @@ -4296,7 +4282,7 @@ export interface StreamingPoliciesListOptionalParams extends msRest.RequestOptio */ top?: number; /** - * @member {string} [orderby] Specifies the the key by which the result + * @member {string} [orderby] Specifies the key by which the result * collection should be ordered. */ orderby?: string; @@ -4321,7 +4307,7 @@ export interface StreamingLocatorsListOptionalParams extends msRest.RequestOptio */ top?: number; /** - * @member {string} [orderby] Specifies the the key by which the result + * @member {string} [orderby] Specifies the key by which the result * collection should be ordered. */ orderby?: string; @@ -4916,11 +4902,11 @@ export type LiveEventInputProtocol = 'FragmentedMP4' | 'RTMP'; /** * Defines values for LiveEventEncodingType. - * Possible values include: 'None', 'Basic' + * Possible values include: 'None', 'Basic', 'Standard' * @readonly * @enum {string} */ -export type LiveEventEncodingType = 'None' | 'Basic'; +export type LiveEventEncodingType = 'None' | 'Basic' | 'Standard'; /** * Defines values for LiveEventResourceState. diff --git a/packages/@azure/arm-mediaservices/lib/models/mappers.ts b/packages/@azure/arm-mediaservices/lib/models/mappers.ts index 2a7fd1370d66..1855e132b7a0 100644 --- a/packages/@azure/arm-mediaservices/lib/models/mappers.ts +++ b/packages/@azure/arm-mediaservices/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; @@ -21,42 +21,36 @@ export const PresentationTimeRange: msRest.CompositeMapper = { className: "PresentationTimeRange", modelProperties: { startTimestamp: { - required: true, serializedName: "startTimestamp", type: { name: "Number" } }, endTimestamp: { - required: true, serializedName: "endTimestamp", type: { name: "Number" } }, presentationWindowDuration: { - required: true, serializedName: "presentationWindowDuration", type: { name: "Number" } }, liveBackoffDuration: { - required: true, serializedName: "liveBackoffDuration", type: { name: "Number" } }, timescale: { - required: true, serializedName: "timescale", type: { name: "Number" } }, forceEndTimestamp: { - required: true, serializedName: "forceEndTimestamp", type: { name: "Boolean" @@ -76,15 +70,7 @@ export const FilterTrackPropertyCondition: msRest.CompositeMapper = { required: true, serializedName: "property", type: { - name: "Enum", - allowedValues: [ - "Unknown", - "Type", - "Name", - "Language", - "FourCC", - "Bitrate" - ] + name: "String" } }, value: { @@ -98,11 +84,7 @@ export const FilterTrackPropertyCondition: msRest.CompositeMapper = { required: true, serializedName: "operation", type: { - name: "Enum", - allowedValues: [ - "Equal", - "NotEqual" - ] + name: "String" } } } @@ -428,12 +410,7 @@ export const Metric: msRest.CompositeMapper = { readOnly: true, serializedName: "unit", type: { - name: "Enum", - allowedValues: [ - "Bytes", - "Count", - "Milliseconds" - ] + name: "String" } }, aggregationType: { @@ -441,12 +418,7 @@ export const Metric: msRest.CompositeMapper = { readOnly: true, serializedName: "aggregationType", type: { - name: "Enum", - allowedValues: [ - "Average", - "Count", - "Total" - ] + name: "String" } }, dimensions: { @@ -606,11 +578,7 @@ export const StorageAccount: msRest.CompositeMapper = { required: true, serializedName: "type", type: { - name: "Enum", - allowedValues: [ - "Primary", - "Secondary" - ] + name: "String" } } } @@ -948,11 +916,7 @@ export const Asset: msRest.CompositeMapper = { readOnly: true, serializedName: "properties.storageEncryptionFormat", type: { - name: "Enum", - allowedValues: [ - "None", - "MediaStorageClientEncryption" - ] + name: "String" } } } @@ -1005,12 +969,7 @@ export const ListContainerSasInput: msRest.CompositeMapper = { permissions: { serializedName: "permissions", type: { - name: "Enum", - allowedValues: [ - "Read", - "ReadWrite", - "ReadWriteDelete" - ] + name: "String" } }, expiryTime: { @@ -1158,13 +1117,7 @@ export const ContentKeyPolicyPlayReadyPlayRight: msRest.CompositeMapper = { required: true, serializedName: "allowPassingVideoContentToUnknownOutput", type: { - name: "Enum", - allowedValues: [ - "Unknown", - "NotAllowed", - "Allowed", - "AllowedWithVideoConstriction" - ] + name: "String" } }, uncompressedDigitalVideoOpl: { @@ -1277,12 +1230,7 @@ export const ContentKeyPolicyPlayReadyLicense: msRest.CompositeMapper = { required: true, serializedName: "licenseType", type: { - name: "Enum", - allowedValues: [ - "Unknown", - "NonPersistent", - "Persistent" - ] + name: "String" } }, contentKeyLocation: { @@ -1290,6 +1238,11 @@ export const ContentKeyPolicyPlayReadyLicense: msRest.CompositeMapper = { serializedName: "contentKeyLocation", type: { name: "Composite", + polymorphicDiscriminator: { + serializedName: "@odata.type", + clientName: "odatatype" + }, + uberParent: "ContentKeyPolicyPlayReadyContentKeyLocation", className: "ContentKeyPolicyPlayReadyContentKeyLocation" } }, @@ -1297,13 +1250,7 @@ export const ContentKeyPolicyPlayReadyLicense: msRest.CompositeMapper = { required: true, serializedName: "contentType", type: { - name: "Enum", - allowedValues: [ - "Unknown", - "Unspecified", - "UltraVioletDownload", - "UltraVioletStreaming" - ] + name: "String" } } } @@ -1497,6 +1444,11 @@ export const ContentKeyPolicyTokenRestriction: msRest.CompositeMapper = { serializedName: "primaryVerificationKey", type: { name: "Composite", + polymorphicDiscriminator: { + serializedName: "@odata.type", + clientName: "odatatype" + }, + uberParent: "ContentKeyPolicyRestrictionTokenKey", className: "ContentKeyPolicyRestrictionTokenKey" } }, @@ -1507,6 +1459,11 @@ export const ContentKeyPolicyTokenRestriction: msRest.CompositeMapper = { element: { type: { name: "Composite", + polymorphicDiscriminator: { + serializedName: "@odata.type", + clientName: "odatatype" + }, + uberParent: "ContentKeyPolicyRestrictionTokenKey", className: "ContentKeyPolicyRestrictionTokenKey" } } @@ -1528,12 +1485,7 @@ export const ContentKeyPolicyTokenRestriction: msRest.CompositeMapper = { required: true, serializedName: "restrictionTokenType", type: { - name: "Enum", - allowedValues: [ - "Unknown", - "Swt", - "Jwt" - ] + name: "String" } }, openIdConnectDiscoveryDocument: { @@ -1658,13 +1610,7 @@ export const ContentKeyPolicyFairPlayConfiguration: msRest.CompositeMapper = { required: true, serializedName: "rentalAndLeaseKeyType", type: { - name: "Enum", - allowedValues: [ - "Unknown", - "Undefined", - "PersistentUnlimited", - "PersistentLimited" - ] + name: "String" } }, rentalDuration: { @@ -1703,6 +1649,11 @@ export const ContentKeyPolicyOption: msRest.CompositeMapper = { serializedName: "configuration", type: { name: "Composite", + polymorphicDiscriminator: { + serializedName: "@odata.type", + clientName: "odatatype" + }, + uberParent: "ContentKeyPolicyConfiguration", className: "ContentKeyPolicyConfiguration" } }, @@ -1711,6 +1662,11 @@ export const ContentKeyPolicyOption: msRest.CompositeMapper = { serializedName: "restriction", type: { name: "Composite", + polymorphicDiscriminator: { + serializedName: "@odata.type", + clientName: "odatatype" + }, + uberParent: "ContentKeyPolicyRestriction", className: "ContentKeyPolicyRestriction" } } @@ -1918,12 +1874,7 @@ export const AacAudio: msRest.CompositeMapper = { profile: { serializedName: "profile", type: { - name: "Enum", - allowedValues: [ - "AacLc", - "HeAacV1", - "HeAacV2" - ] + name: "String" } } } @@ -2051,12 +2002,7 @@ export const Video: msRest.CompositeMapper = { stretchMode: { serializedName: "stretchMode", type: { - name: "Enum", - allowedValues: [ - "None", - "AutoSize", - "AutoFit" - ] + name: "String" } } } @@ -2183,22 +2129,13 @@ export const Deinterlace: msRest.CompositeMapper = { parity: { serializedName: "parity", type: { - name: "Enum", - allowedValues: [ - "Auto", - "TopFieldFirst", - "BottomFieldFirst" - ] + name: "String" } }, mode: { serializedName: "mode", type: { - name: "Enum", - allowedValues: [ - "Off", - "AutoPixelAdaptive" - ] + name: "String" } } } @@ -2255,15 +2192,7 @@ export const Filters: msRest.CompositeMapper = { rotation: { serializedName: "rotation", type: { - name: "Enum", - allowedValues: [ - "Auto", - "None", - "Rotate0", - "Rotate90", - "Rotate180", - "Rotate270" - ] + name: "String" } }, crop: { @@ -2280,6 +2209,11 @@ export const Filters: msRest.CompositeMapper = { element: { type: { name: "Composite", + polymorphicDiscriminator: { + serializedName: "@odata.type", + clientName: "odatatype" + }, + uberParent: "Overlay", className: "Overlay" } } @@ -2390,15 +2324,7 @@ export const H264Layer: msRest.CompositeMapper = { profile: { serializedName: "profile", type: { - name: "Enum", - allowedValues: [ - "Auto", - "Baseline", - "Main", - "High", - "High422", - "High444" - ] + name: "String" } }, level: { @@ -2422,11 +2348,7 @@ export const H264Layer: msRest.CompositeMapper = { entropyMode: { serializedName: "entropyMode", type: { - name: "Enum", - allowedValues: [ - "Cabac", - "Cavlc" - ] + name: "String" } } } @@ -2451,12 +2373,7 @@ export const H264Video: msRest.CompositeMapper = { complexity: { serializedName: "complexity", type: { - name: "Enum", - allowedValues: [ - "Speed", - "Balanced", - "Quality" - ] + name: "String" } }, layers: { @@ -2466,6 +2383,8 @@ export const H264Video: msRest.CompositeMapper = { element: { type: { name: "Composite", + polymorphicDiscriminator: Layer.type.polymorphicDiscriminator, + uberParent: "Layer", className: "H264Layer" } } @@ -2510,6 +2429,8 @@ export const JpgImage: msRest.CompositeMapper = { element: { type: { name: "Composite", + polymorphicDiscriminator: Layer.type.polymorphicDiscriminator, + uberParent: "Layer", className: "JpgLayer" } } @@ -2607,6 +2528,8 @@ export const PngImage: msRest.CompositeMapper = { element: { type: { name: "Composite", + polymorphicDiscriminator: Layer.type.polymorphicDiscriminator, + uberParent: "Layer", className: "PngLayer" } } @@ -2629,17 +2552,7 @@ export const BuiltInStandardEncoderPreset: msRest.CompositeMapper = { required: true, serializedName: "presetName", type: { - name: "Enum", - allowedValues: [ - "H264SingleBitrateSD", - "H264SingleBitrate720p", - "H264SingleBitrate1080p", - "AdaptiveStreaming", - "AACGoodQualityAudio", - "H264MultipleBitrate1080p", - "H264MultipleBitrate720p", - "H264MultipleBitrateSD" - ] + name: "String" } } } @@ -2669,6 +2582,11 @@ export const StandardEncoderPreset: msRest.CompositeMapper = { element: { type: { name: "Composite", + polymorphicDiscriminator: { + serializedName: "@odata.type", + clientName: "odatatype" + }, + uberParent: "Codec", className: "Codec" } } @@ -2681,6 +2599,11 @@ export const StandardEncoderPreset: msRest.CompositeMapper = { element: { type: { name: "Composite", + polymorphicDiscriminator: { + serializedName: "@odata.type", + clientName: "odatatype" + }, + uberParent: "Format", className: "Format" } } @@ -2702,12 +2625,7 @@ export const VideoAnalyzerPreset: msRest.CompositeMapper = { insightsToExtract: { serializedName: "insightsToExtract", type: { - name: "Enum", - allowedValues: [ - "AudioInsightsOnly", - "VideoInsightsOnly", - "AllInsights" - ] + name: "String" } } } @@ -2769,22 +2687,13 @@ export const TransformOutput: msRest.CompositeMapper = { onError: { serializedName: "onError", type: { - name: "Enum", - allowedValues: [ - "StopProcessingJob", - "ContinueJob" - ] + name: "String" } }, relativePriority: { serializedName: "relativePriority", type: { - name: "Enum", - allowedValues: [ - "Low", - "Normal", - "High" - ] + name: "String" } }, preset: { @@ -2792,6 +2701,11 @@ export const TransformOutput: msRest.CompositeMapper = { serializedName: "preset", type: { name: "Composite", + polymorphicDiscriminator: { + serializedName: "@odata.type", + clientName: "odatatype" + }, + uberParent: "Preset", className: "Preset" } } @@ -2913,6 +2827,11 @@ export const JobInputs: msRest.CompositeMapper = { element: { type: { name: "Composite", + polymorphicDiscriminator: { + serializedName: "@odata.type", + clientName: "odatatype" + }, + uberParent: "JobInput", className: "JobInput" } } @@ -2996,18 +2915,7 @@ export const JobError: msRest.CompositeMapper = { readOnly: true, serializedName: "code", type: { - name: "Enum", - allowedValues: [ - "ServiceError", - "ServiceTransientError", - "DownloadNotAccessible", - "DownloadTransientError", - "UploadNotAccessible", - "UploadTransientError", - "ConfigurationUnsupported", - "ContentMalformed", - "ContentUnsupported" - ] + name: "String" } }, message: { @@ -3022,14 +2930,7 @@ export const JobError: msRest.CompositeMapper = { readOnly: true, serializedName: "category", type: { - name: "Enum", - allowedValues: [ - "Service", - "Download", - "Upload", - "Configuration", - "Content" - ] + name: "String" } }, retry: { @@ -3037,11 +2938,7 @@ export const JobError: msRest.CompositeMapper = { readOnly: true, serializedName: "retry", type: { - name: "Enum", - allowedValues: [ - "DoNotRetry", - "MayRetry" - ] + name: "String" } }, details: { @@ -3085,16 +2982,7 @@ export const JobOutput: msRest.CompositeMapper = { readOnly: true, serializedName: "state", type: { - name: "Enum", - allowedValues: [ - "Canceled", - "Canceling", - "Error", - "Finished", - "Processing", - "Queued", - "Scheduled" - ] + name: "String" } }, progress: { @@ -3162,16 +3050,7 @@ export const Job: msRest.CompositeMapper = { readOnly: true, serializedName: "properties.state", type: { - name: "Enum", - allowedValues: [ - "Canceled", - "Canceling", - "Error", - "Finished", - "Processing", - "Queued", - "Scheduled" - ] + name: "String" } }, description: { @@ -3185,6 +3064,11 @@ export const Job: msRest.CompositeMapper = { serializedName: "properties.input", type: { name: "Composite", + polymorphicDiscriminator: { + serializedName: "@odata.type", + clientName: "odatatype" + }, + uberParent: "JobInput", className: "JobInput" } }, @@ -3204,6 +3088,11 @@ export const Job: msRest.CompositeMapper = { element: { type: { name: "Composite", + polymorphicDiscriminator: { + serializedName: "@odata.type", + clientName: "odatatype" + }, + uberParent: "JobOutput", className: "JobOutput" } } @@ -3212,12 +3101,7 @@ export const Job: msRest.CompositeMapper = { priority: { serializedName: "properties.priority", type: { - name: "Enum", - allowedValues: [ - "Low", - "Normal", - "High" - ] + name: "String" } }, correlationData: { @@ -3245,22 +3129,14 @@ export const TrackPropertyCondition: msRest.CompositeMapper = { required: true, serializedName: "property", type: { - name: "Enum", - allowedValues: [ - "Unknown", - "FourCC" - ] + name: "String" } }, operation: { required: true, serializedName: "operation", type: { - name: "Enum", - allowedValues: [ - "Unknown", - "Equal" - ] + name: "String" } }, value: { @@ -3750,12 +3626,7 @@ export const StreamingLocatorContentKey: msRest.CompositeMapper = { readOnly: true, serializedName: "type", type: { - name: "Enum", - allowedValues: [ - "CommonEncryptionCenc", - "CommonEncryptionCbcs", - "EnvelopeEncryption" - ] + name: "String" } }, labelReferenceInStreamingPolicy: { @@ -3804,26 +3675,14 @@ export const StreamingPath: msRest.CompositeMapper = { required: true, serializedName: "streamingProtocol", type: { - name: "Enum", - allowedValues: [ - "Hls", - "Dash", - "SmoothStreaming", - "Download" - ] + name: "String" } }, encryptionScheme: { required: true, serializedName: "encryptionScheme", type: { - name: "Enum", - allowedValues: [ - "NoEncryption", - "EnvelopeEncryption", - "CommonEncryptionCenc", - "CommonEncryptionCbcs" - ] + name: "String" } }, paths: { @@ -4287,7 +4146,8 @@ export const LiveEventEncoding: msRest.CompositeMapper = { name: "Enum", allowedValues: [ "None", - "Basic" + "Basic", + "Standard" ] } }, diff --git a/packages/@azure/arm-mediaservices/lib/models/parameters.ts b/packages/@azure/arm-mediaservices/lib/models/parameters.ts index 8aa45c17e36a..6647296facaa 100644 --- a/packages/@azure/arm-mediaservices/lib/models/parameters.ts +++ b/packages/@azure/arm-mediaservices/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", @@ -177,18 +177,6 @@ export const resourceGroupName: msRest.OperationURLParameter = { } } }; -export const skip: msRest.OperationQueryParameter = { - parameterPath: [ - "options", - "skip" - ], - mapper: { - serializedName: "$skip", - type: { - name: "Number" - } - } -}; export const streamingEndpointName: msRest.OperationURLParameter = { parameterPath: "streamingEndpointName", mapper: { diff --git a/packages/@azure/arm-mediaservices/lib/operations/accountFilters.ts b/packages/@azure/arm-mediaservices/lib/operations/accountFilters.ts index f5ccd55c9f9d..da7de0d888e5 100644 --- a/packages/@azure/arm-mediaservices/lib/operations/accountFilters.ts +++ b/packages/@azure/arm-mediaservices/lib/operations/accountFilters.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/accountFiltersMappers"; import * as Parameters from "../models/parameters"; diff --git a/packages/@azure/arm-mediaservices/lib/operations/assetFilters.ts b/packages/@azure/arm-mediaservices/lib/operations/assetFilters.ts index 0f4b6a92b60a..45a4c0ec6005 100644 --- a/packages/@azure/arm-mediaservices/lib/operations/assetFilters.ts +++ b/packages/@azure/arm-mediaservices/lib/operations/assetFilters.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/assetFiltersMappers"; import * as Parameters from "../models/parameters"; diff --git a/packages/@azure/arm-mediaservices/lib/operations/assets.ts b/packages/@azure/arm-mediaservices/lib/operations/assets.ts index 0de2d62d4c7e..e41ad3eef825 100644 --- a/packages/@azure/arm-mediaservices/lib/operations/assets.ts +++ b/packages/@azure/arm-mediaservices/lib/operations/assets.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/assetsMappers"; import * as Parameters from "../models/parameters"; diff --git a/packages/@azure/arm-mediaservices/lib/operations/contentKeyPolicies.ts b/packages/@azure/arm-mediaservices/lib/operations/contentKeyPolicies.ts index 0dca3126d27a..b6b96d636853 100644 --- a/packages/@azure/arm-mediaservices/lib/operations/contentKeyPolicies.ts +++ b/packages/@azure/arm-mediaservices/lib/operations/contentKeyPolicies.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/contentKeyPoliciesMappers"; import * as Parameters from "../models/parameters"; diff --git a/packages/@azure/arm-mediaservices/lib/operations/jobs.ts b/packages/@azure/arm-mediaservices/lib/operations/jobs.ts index 14614615ff78..05519e22312c 100644 --- a/packages/@azure/arm-mediaservices/lib/operations/jobs.ts +++ b/packages/@azure/arm-mediaservices/lib/operations/jobs.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/jobsMappers"; import * as Parameters from "../models/parameters"; @@ -191,7 +191,9 @@ export class Jobs { } /** - * Updates a Job. + * Update is only supported for description and priority. Updating Priority will take effect when + * the Job state is Queued or Scheduled and depending on the timing the priority update may be + * ignored. * @summary Update Job * @param resourceGroupName The name of the resource group within the Azure subscription. * @param accountName The Media Services account name. @@ -320,8 +322,7 @@ const listOperationSpec: msRest.OperationSpec = { queryParameters: [ Parameters.apiVersion, Parameters.filter, - Parameters.top, - Parameters.skip + Parameters.orderby ], headerParameters: [ Parameters.acceptLanguage diff --git a/packages/@azure/arm-mediaservices/lib/operations/liveEvents.ts b/packages/@azure/arm-mediaservices/lib/operations/liveEvents.ts index c06e63ea4dae..ad2499ee690c 100644 --- a/packages/@azure/arm-mediaservices/lib/operations/liveEvents.ts +++ b/packages/@azure/arm-mediaservices/lib/operations/liveEvents.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/liveEventsMappers"; import * as Parameters from "../models/parameters"; diff --git a/packages/@azure/arm-mediaservices/lib/operations/liveOutputs.ts b/packages/@azure/arm-mediaservices/lib/operations/liveOutputs.ts index 2dec4c75f9fe..46dff3d13bae 100644 --- a/packages/@azure/arm-mediaservices/lib/operations/liveOutputs.ts +++ b/packages/@azure/arm-mediaservices/lib/operations/liveOutputs.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/liveOutputsMappers"; import * as Parameters from "../models/parameters"; diff --git a/packages/@azure/arm-mediaservices/lib/operations/locations.ts b/packages/@azure/arm-mediaservices/lib/operations/locations.ts index ee17d6ba2f2c..deafa70f4bb9 100644 --- a/packages/@azure/arm-mediaservices/lib/operations/locations.ts +++ b/packages/@azure/arm-mediaservices/lib/operations/locations.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/locationsMappers"; import * as Parameters from "../models/parameters"; diff --git a/packages/@azure/arm-mediaservices/lib/operations/mediaservices.ts b/packages/@azure/arm-mediaservices/lib/operations/mediaservices.ts index 7cc6495c02ac..efb7fae926a6 100644 --- a/packages/@azure/arm-mediaservices/lib/operations/mediaservices.ts +++ b/packages/@azure/arm-mediaservices/lib/operations/mediaservices.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/mediaservicesMappers"; import * as Parameters from "../models/parameters"; diff --git a/packages/@azure/arm-mediaservices/lib/operations/operations.ts b/packages/@azure/arm-mediaservices/lib/operations/operations.ts index 8b5ee4c6fecd..1c831699dd19 100644 --- a/packages/@azure/arm-mediaservices/lib/operations/operations.ts +++ b/packages/@azure/arm-mediaservices/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-mediaservices/lib/operations/streamingEndpoints.ts b/packages/@azure/arm-mediaservices/lib/operations/streamingEndpoints.ts index 51a00cbba68c..90cf621827fd 100644 --- a/packages/@azure/arm-mediaservices/lib/operations/streamingEndpoints.ts +++ b/packages/@azure/arm-mediaservices/lib/operations/streamingEndpoints.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/streamingEndpointsMappers"; import * as Parameters from "../models/parameters"; diff --git a/packages/@azure/arm-mediaservices/lib/operations/streamingLocators.ts b/packages/@azure/arm-mediaservices/lib/operations/streamingLocators.ts index 41ade18824cd..ee7ad23cd8e3 100644 --- a/packages/@azure/arm-mediaservices/lib/operations/streamingLocators.ts +++ b/packages/@azure/arm-mediaservices/lib/operations/streamingLocators.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/streamingLocatorsMappers"; import * as Parameters from "../models/parameters"; diff --git a/packages/@azure/arm-mediaservices/lib/operations/streamingPolicies.ts b/packages/@azure/arm-mediaservices/lib/operations/streamingPolicies.ts index c36bd009e7cb..08129d251280 100644 --- a/packages/@azure/arm-mediaservices/lib/operations/streamingPolicies.ts +++ b/packages/@azure/arm-mediaservices/lib/operations/streamingPolicies.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/streamingPoliciesMappers"; import * as Parameters from "../models/parameters"; diff --git a/packages/@azure/arm-mediaservices/lib/operations/transforms.ts b/packages/@azure/arm-mediaservices/lib/operations/transforms.ts index 58f3b5f1016e..cb41c6ffa482 100644 --- a/packages/@azure/arm-mediaservices/lib/operations/transforms.ts +++ b/packages/@azure/arm-mediaservices/lib/operations/transforms.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/transformsMappers"; import * as Parameters from "../models/parameters"; @@ -258,8 +258,7 @@ const listOperationSpec: msRest.OperationSpec = { queryParameters: [ Parameters.apiVersion, Parameters.filter, - Parameters.top, - Parameters.skip + Parameters.orderby ], headerParameters: [ Parameters.acceptLanguage diff --git a/packages/@azure/arm-mediaservices/package.json b/packages/@azure/arm-mediaservices/package.json index 7ed750d11871..14f72b6ee848 100644 --- a/packages/@azure/arm-mediaservices/package.json +++ b/packages/@azure/arm-mediaservices/package.json @@ -4,8 +4,8 @@ "description": "AzureMediaServices 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-mediaservices/rollup.config.js b/packages/@azure/arm-mediaservices/rollup.config.js index 7836a9b55843..8edd49957724 100644 --- a/packages/@azure/arm-mediaservices/rollup.config.js +++ b/packages/@azure/arm-mediaservices/rollup.config.js @@ -4,15 +4,15 @@ import nodeResolve from "rollup-plugin-node-resolve"; */ const config = { input: './esm/azureMediaServices.js', - external: ["@azure/ms-rest-js", "@azure/ms-rest-azure-js"], + external: ["ms-rest-js", "ms-rest-azure-js"], output: { file: "./dist/arm-mediaservices.js", format: "umd", name: "Azure.ArmMediaservices", 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-mediaservices/tsconfig.json b/packages/@azure/arm-mediaservices/tsconfig.json index 51ea90961ce5..f32d1664f320 100644 --- a/packages/@azure/arm-mediaservices/tsconfig.json +++ b/packages/@azure/arm-mediaservices/tsconfig.json @@ -14,6 +14,6 @@ "outDir": "./esm", "importHelpers": true }, - "include": ["./lib/**/*.ts"], + "include": ["./lib/**/*"], "exclude": ["node_modules"] }