Skip to content

Commit

Permalink
CodeGen from PR 14970 in Azure/azure-rest-api-specs
Browse files Browse the repository at this point in the history
[Hub Generated] Review request for Microsoft.Media to add version stable/2021-06-01  Part-1 (Azure#14970)

* Adds base for updating Microsoft.Media from version stable/2021-05-01 to version 2021-06-01

* Updates readme

* Updates API version in new specs and examples

* Update the branch with copy of all other services 2020-05-01 version files except encoding.

* update AMS to 2021-06-01 Part1 (All swaggers except encoding)

* fix some lint errors.

* Fix an unreferenced file.

* fix more linting errors

* remove some unreferenced files.

* Fix systemData in streamingservice

* fix more linting errors

* fix 404s

* fix more lint errors

* fix 204 issue for delete

* fix definitions to use v2 common-types

* remove type for the live event list list defenition

* Revert "remove type for the live event list list defenition"

This reverts commit 0f66253d284284037bf2c0d7a04c947d4dca7715.

* removed unused definition
  • Loading branch information
SDKAuto committed Jun 30, 2021
1 parent 20321ef commit 6b06177
Show file tree
Hide file tree
Showing 40 changed files with 2,652 additions and 8,998 deletions.
102 changes: 53 additions & 49 deletions sdk/mediaservices/arm-mediaservices/README.md
Original file line number Diff line number Diff line change
@@ -1,93 +1,97 @@
## Azure AzureMediaServices SDK for JavaScript

This package contains an isomorphic SDK for AzureMediaServices.
This package contains an isomorphic SDK (runs both in node.js and in browsers) for AzureMediaServices.

### Currently supported environments

- Node.js version 6.x.x or higher
- Browser JavaScript
- [LTS versions of Node.js](https://nodejs.org/about/releases/)
- Latest versions of Safari, Chrome, Edge and Firefox.

### How to Install
### Prerequisites

You must have an [Azure subscription](https://azure.microsoft.com/free/).

### How to install

To use this SDK in your project, you will need to install two packages.
- `@azure/arm-mediaservices` that contains the client.
- `@azure/identity` that provides different mechanisms for the client to authenticate your requests using Azure Active Directory.

Install both packages using the below command:
```bash
npm install @azure/arm-mediaservices
npm install --save @azure/arm-mediaservices @azure/identity
```
> **Note**: You may have used either `@azure/ms-rest-nodeauth` or `@azure/ms-rest-browserauth` in the past. These packages are in maintenance mode receiving critical bug fixes, but no new features.
If you are on a [Node.js that has LTS status](https://nodejs.org/about/releases/), or are writing a client side browser application, we strongly encourage you to upgrade to `@azure/identity` which uses the latest versions of Azure Active Directory and MSAL APIs and provides more authentication options.

### How to use

#### nodejs - client creation and list accountFilters as an example written in TypeScript.
- If you are writing a client side browser application,
- Follow the instructions in the section on Authenticating client side browser applications in [Azure Identity examples](https://aka.ms/azsdk/js/identity/examples) to register your application in the Microsoft identity platform and set the right permissions.
- Copy the client ID and tenant ID from the Overview section of your app registration in Azure portal and use it in the browser sample below.
- If you are writing a server side application,
- [Select a credential from `@azure/identity` based on the authentication method of your choice](https://aka.ms/azsdk/js/identity/examples)
- Complete the set up steps required by the credential if any.
- Use the credential you picked in the place of `DefaultAzureCredential` in the Node.js sample below.

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

- Please install minimum version of `"@azure/ms-rest-nodeauth": "^3.0.0"`.
```bash
npm install @azure/ms-rest-nodeauth@"^3.0.0"
```
In the below samples, we pass the credential and the Azure subscription id to instantiate the client.
Once the client is created, explore the operations on it either in your favorite editor or in our [API reference documentation](https://docs.microsoft.com/javascript/api) to get started.
#### nodejs - Authentication, client creation, and list operations as an example written in JavaScript.

##### 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
const msRestNodeAuth = require("@azure/ms-rest-nodeauth");
```javascript
const { DefaultAzureCredential } = require("@azure/identity");
const { AzureMediaServices } = require("@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);
});
// Use `DefaultAzureCredential` or any other credential of your choice based on https://aka.ms/azsdk/js/identity/examples
// Please note that you can also use credentials from the `@azure/ms-rest-nodeauth` package instead.
const creds = new DefaultAzureCredential();
const client = new AzureMediaServices(creds, subscriptionId);
client.operations.list().then((result) => {
console.log("The result is:");
console.log(result);
}).catch((err) => {
console.log("An error occurred:");
console.error(err);
});
```

#### browser - Authentication, client creation and list accountFilters as an example written in JavaScript.
#### browser - Authentication, client creation, and list operations as an example written in JavaScript.

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

```bash
npm install @azure/ms-rest-browserauth
```
In browser applications, we recommend using the `InteractiveBrowserCredential` that interactively authenticates using the default system browser.
- See [Single-page application: App registration guide](https://docs.microsoft.com/azure/active-directory/develop/scenario-spa-app-registration) to configure your app registration for the browser.
- Note down the client Id from the previous step and use it in the browser sample below.

##### Sample code

See https://github.com/Azure/ms-rest-browserauth to learn how to authenticate to Azure in the browser.

- index.html

```html
<!DOCTYPE html>
<html lang="en">
<head>
<title>@azure/arm-mediaservices sample</title>
<script src="node_modules/@azure/ms-rest-js/dist/msRest.browser.js"></script>
<script src="node_modules/@azure/ms-rest-azure-js/dist/msRestAzure.js"></script>
<script src="node_modules/@azure/ms-rest-browserauth/dist/msAuth.js"></script>
<script src="node_modules/@azure/identity/dist/index.js"></script>
<script src="node_modules/@azure/arm-mediaservices/dist/arm-mediaservices.js"></script>
<script type="text/javascript">
const subscriptionId = "<Subscription_Id>";
const authManager = new msAuth.AuthManager({
// Create credentials using the `@azure/identity` package.
// Please note that you can also use credentials from the `@azure/ms-rest-browserauth` package instead.
const credential = new InteractiveBrowserCredential(
{
clientId: "<client id for your Azure AD app>",
tenant: "<optional tenant for your organization>"
});
authManager.finalizeLogin().then((res) => {
if (!res.isLoggedIn) {
// may cause redirects
authManager.login();
}
const client = new Azure.ArmMediaservices.AzureMediaServices(res.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.log("An error occurred:");
console.error(err);
});
const client = new Azure.ArmMediaservices.AzureMediaServices(creds, subscriptionId);
client.operations.list().then((result) => {
console.log("The result is:");
console.log(result);
}).catch((err) => {
console.log("An error occurred:");
console.error(err);
});
</script>
</head>
Expand Down
9 changes: 5 additions & 4 deletions sdk/mediaservices/arm-mediaservices/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@
"description": "AzureMediaServices Library with typescript type definitions for node.js and browser.",
"version": "8.1.0",
"dependencies": {
"@azure/ms-rest-azure-js": "^2.0.1",
"@azure/ms-rest-js": "^2.0.4",
"@azure/ms-rest-azure-js": "^2.1.0",
"@azure/ms-rest-js": "^2.2.0",
"@azure/core-auth": "^1.1.4",
"tslib": "^1.10.0"
},
"keywords": [
Expand All @@ -20,13 +21,13 @@
"module": "./esm/azureMediaServices.js",
"types": "./esm/azureMediaServices.d.ts",
"devDependencies": {
"typescript": "^3.5.3",
"typescript": "^3.6.0",
"rollup": "^1.18.0",
"rollup-plugin-node-resolve": "^5.2.0",
"rollup-plugin-sourcemaps": "^0.4.2",
"uglify-js": "^3.6.0"
},
"homepage": "https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/mediaservices/arm-mediaservices",
"homepage": "https://github.com/Azure/azure-sdk-for-js/tree/master/sdk/mediaservices/arm-mediaservices",
"repository": {
"type": "git",
"url": "https://github.com/Azure/azure-sdk-for-js.git"
Expand Down
18 changes: 10 additions & 8 deletions sdk/mediaservices/arm-mediaservices/src/azureMediaServices.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
*/

import * as msRest from "@azure/ms-rest-js";
import { TokenCredential } from "@azure/core-auth";
import * as Models from "./models";
import * as Mappers from "./models/mappers";
import * as operations from "./operations";
Expand All @@ -16,17 +17,15 @@ import { AzureMediaServicesContext } from "./azureMediaServicesContext";

class AzureMediaServices extends AzureMediaServicesContext {
// Operation groups
accountFilters: operations.AccountFilters;
operations: operations.Operations;
mediaservices: operations.Mediaservices;
privateLinkResources: operations.PrivateLinkResources;
privateEndpointConnections: operations.PrivateEndpointConnections;
locations: operations.Locations;
accountFilters: operations.AccountFilters;
assets: operations.Assets;
assetFilters: operations.AssetFilters;
contentKeyPolicies: operations.ContentKeyPolicies;
transforms: operations.Transforms;
jobs: operations.Jobs;
streamingPolicies: operations.StreamingPolicies;
streamingLocators: operations.StreamingLocators;
liveEvents: operations.LiveEvents;
Expand All @@ -35,23 +34,26 @@ class AzureMediaServices extends AzureMediaServicesContext {

/**
* Initializes a new instance of the AzureMediaServices class.
* @param credentials Credentials needed for the client to connect to Azure.
* @param credentials Credentials needed for the client to connect to Azure. Credentials
* implementing the TokenCredential interface from the @azure/identity package are recommended. For
* more information about these credentials, see
* {@link https://www.npmjs.com/package/@azure/identity}. Credentials implementing the
* ServiceClientCredentials interface from the older packages @azure/ms-rest-nodeauth and
* @azure/ms-rest-browserauth are also supported.
* @param subscriptionId The unique identifier for a Microsoft Azure subscription.
* @param [options] The parameter options
*/
constructor(credentials: msRest.ServiceClientCredentials, subscriptionId: string, options?: Models.AzureMediaServicesOptions) {
constructor(credentials: msRest.ServiceClientCredentials | TokenCredential, subscriptionId: string, options?: Models.AzureMediaServicesOptions) {
super(credentials, subscriptionId, options);
this.accountFilters = new operations.AccountFilters(this);
this.operations = new operations.Operations(this);
this.mediaservices = new operations.Mediaservices(this);
this.privateLinkResources = new operations.PrivateLinkResources(this);
this.privateEndpointConnections = new operations.PrivateEndpointConnections(this);
this.locations = new operations.Locations(this);
this.accountFilters = new operations.AccountFilters(this);
this.assets = new operations.Assets(this);
this.assetFilters = new operations.AssetFilters(this);
this.contentKeyPolicies = new operations.ContentKeyPolicies(this);
this.transforms = new operations.Transforms(this);
this.jobs = new operations.Jobs(this);
this.streamingPolicies = new operations.StreamingPolicies(this);
this.streamingLocators = new operations.StreamingLocators(this);
this.liveEvents = new operations.LiveEvents(this);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,22 +10,28 @@
import * as Models from "./models";
import * as msRest from "@azure/ms-rest-js";
import * as msRestAzure from "@azure/ms-rest-azure-js";
import { TokenCredential } from "@azure/core-auth";

const packageName = "@azure/arm-mediaservices";
const packageVersion = "8.1.0";

export class AzureMediaServicesContext extends msRestAzure.AzureServiceClient {
credentials: msRest.ServiceClientCredentials;
credentials: msRest.ServiceClientCredentials | TokenCredential;
subscriptionId: string;
apiVersion?: string;

/**
* Initializes a new instance of the AzureMediaServices class.
* @param credentials Credentials needed for the client to connect to Azure.
* @param credentials Credentials needed for the client to connect to Azure. Credentials
* implementing the TokenCredential interface from the @azure/identity package are recommended. For
* more information about these credentials, see
* {@link https://www.npmjs.com/package/@azure/identity}. Credentials implementing the
* ServiceClientCredentials interface from the older packages @azure/ms-rest-nodeauth and
* @azure/ms-rest-browserauth are also supported.
* @param subscriptionId The unique identifier for a Microsoft Azure subscription.
* @param [options] The parameter options
*/
constructor(credentials: msRest.ServiceClientCredentials, subscriptionId: string, options?: Models.AzureMediaServicesOptions) {
constructor(credentials: msRest.ServiceClientCredentials | TokenCredential, subscriptionId: string, options?: Models.AzureMediaServicesOptions) {
if (credentials == undefined) {
throw new Error('\'credentials\' cannot be null.');
}
Expand All @@ -43,7 +49,7 @@ export class AzureMediaServicesContext extends msRestAzure.AzureServiceClient {

super(credentials, options);

this.apiVersion = '2020-05-01';
this.apiVersion = '2021-06-01';
this.acceptLanguage = 'en-US';
this.longRunningOperationRetryTimeout = 30;
this.baseUri = options.baseUri || this.baseUri || "https://management.azure.com";
Expand Down
Loading

0 comments on commit 6b06177

Please sign in to comment.