diff --git a/packages/@azure/arm-msi/LICENSE.txt b/packages/@azure/arm-msi/LICENSE.txt index a70e8cf66038..5431ba98b936 100644 --- a/packages/@azure/arm-msi/LICENSE.txt +++ b/packages/@azure/arm-msi/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-msi/README.md b/packages/@azure/arm-msi/README.md index 13ecdf9364f9..26532fda1a5d 100644 --- a/packages/@azure/arm-msi/README.md +++ b/packages/@azure/arm-msi/README.md @@ -1,96 +1,77 @@ -## Azure ManagedServiceIdentityClient SDK for JavaScript - -This package contains an isomorphic SDK for ManagedServiceIdentityClient. - -### Currently supported environments - -- Node.js version 6.x.x or higher -- Browser JavaScript - -### How to Install - -``` -npm install @azure/arm-msi -``` - -### How to use - -#### nodejs - Authentication, client creation and list operations 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 { ManagedServiceIdentityClient, ManagedServiceIdentityModels, ManagedServiceIdentityMappers } from "@azure/arm-msi"; -const subscriptionId = process.env["AZURE_SUBSCRIPTION_ID"]; - -msRestNodeAuth.interactiveLogin().then((creds) => { - const client = new ManagedServiceIdentityClient(creds, subscriptionId); - client.operations.list().then((result) => { - console.log("The result is:"); - console.log(result); - }); -}).catch((err) => { - console.error(err); -}); -``` - -#### browser - Authentication, client creation and list operations 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-msi sample - - - - - - - - -``` - -## Related projects - -- [Microsoft Azure SDK for Javascript](https://github.com/Azure/azure-sdk-for-js) +# Azure ManagedServiceIdentityClient SDK for JavaScript +This package contains an isomorphic SDK for ManagedServiceIdentityClient. + +## Currently supported environments +- Node.js version 6.x.x or higher +- Browser JavaScript + +## How to Install +``` +npm install @azure/arm-msi +``` + + +## How to use + +### nodejs - Authentication, client creation and list operations 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 { ManagedServiceIdentityClient, ManagedServiceIdentityModels, ManagedServiceIdentityMappers } from "@azure/arm-msi"; +const subscriptionId = process.env["AZURE_SUBSCRIPTION_ID"]; + +msRestNodeAuth.interactiveLogin().then((creds) => { + const client = new ManagedServiceIdentityClient(creds, subscriptionId); + client.operations.list().then((result) => { + console.log("The result is:"); + console.log(result); + }); +}).catch((err) => { + console.error(err); +}); +``` + +### browser - Authentication, client creation and list operations 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-msi sample + + + + + + + + + +``` + +# Related projects + - [Microsoft Azure SDK for Javascript](https://github.com/Azure/azure-sdk-for-js) diff --git a/packages/@azure/arm-msi/lib/managedServiceIdentityClient.ts b/packages/@azure/arm-msi/lib/managedServiceIdentityClient.ts index 2360b79199a9..e3a296a5c63a 100644 --- a/packages/@azure/arm-msi/lib/managedServiceIdentityClient.ts +++ b/packages/@azure/arm-msi/lib/managedServiceIdentityClient.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-msi/lib/managedServiceIdentityClientContext.ts b/packages/@azure/arm-msi/lib/managedServiceIdentityClientContext.ts index f96cd5df3f4a..3c3960a2af64 100644 --- a/packages/@azure/arm-msi/lib/managedServiceIdentityClientContext.ts +++ b/packages/@azure/arm-msi/lib/managedServiceIdentityClientContext.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-msi"; const packageVersion = "0.1.0"; @@ -44,7 +44,7 @@ export class ManagedServiceIdentityClientContext extends msRestAzure.AzureServic super(credentials, options); - this.apiVersion = '2015-08-31-preview'; + this.apiVersion = '2018-11-30'; this.acceptLanguage = 'en-US'; this.longRunningOperationRetryTimeout = 30; this.baseUri = options.baseUri || this.baseUri || "https://management.azure.com"; diff --git a/packages/@azure/arm-msi/lib/models/index.ts b/packages/@azure/arm-msi/lib/models/index.ts index f9a18808eae5..3a5247921775 100644 --- a/packages/@azure/arm-msi/lib/models/index.ts +++ b/packages/@azure/arm-msi/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 }; @@ -65,7 +65,9 @@ export interface Identity extends BaseResource { readonly clientId?: string; /** * @member {string} [clientSecretUrl] The ManagedServiceIdentity DataPlane - * URL that can be queried to obtain the identity credentials. + * URL that can be queried to obtain the identity credentials. If identity is + * user assigned, then the clientSecretUrl will not be present in the + * response, otherwise it will be present. * **NOTE: This property will not be serialized. It can only be populated by * the server.** */ diff --git a/packages/@azure/arm-msi/lib/models/mappers.ts b/packages/@azure/arm-msi/lib/models/mappers.ts index dea5dc5be474..173c9fd6975c 100644 --- a/packages/@azure/arm-msi/lib/models/mappers.ts +++ b/packages/@azure/arm-msi/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; diff --git a/packages/@azure/arm-msi/lib/models/parameters.ts b/packages/@azure/arm-msi/lib/models/parameters.ts index 52c2fc91f383..3dd33eebb6a9 100644 --- a/packages/@azure/arm-msi/lib/models/parameters.ts +++ b/packages/@azure/arm-msi/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-msi/lib/operations/operations.ts b/packages/@azure/arm-msi/lib/operations/operations.ts index 9084ea1a3fed..654a1e964993 100644 --- a/packages/@azure/arm-msi/lib/operations/operations.ts +++ b/packages/@azure/arm-msi/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-msi/lib/operations/userAssignedIdentities.ts b/packages/@azure/arm-msi/lib/operations/userAssignedIdentities.ts index 14db9b390413..be4d7d97ad62 100644 --- a/packages/@azure/arm-msi/lib/operations/userAssignedIdentities.ts +++ b/packages/@azure/arm-msi/lib/operations/userAssignedIdentities.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/userAssignedIdentitiesMappers"; import * as Parameters from "../models/parameters"; diff --git a/packages/@azure/arm-msi/package.json b/packages/@azure/arm-msi/package.json index 1b136eae9cc7..bee074f1605d 100644 --- a/packages/@azure/arm-msi/package.json +++ b/packages/@azure/arm-msi/package.json @@ -4,8 +4,8 @@ "description": "ManagedServiceIdentityClient 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-msi/rollup.config.js b/packages/@azure/arm-msi/rollup.config.js index 9a44f3d82402..9b1308b4fe0b 100644 --- a/packages/@azure/arm-msi/rollup.config.js +++ b/packages/@azure/arm-msi/rollup.config.js @@ -4,15 +4,15 @@ import nodeResolve from "rollup-plugin-node-resolve"; */ const config = { input: './esm/managedServiceIdentityClient.js', - external: ["@azure/ms-rest-js", "@azure/ms-rest-azure-js"], + external: ["ms-rest-js", "ms-rest-azure-js"], output: { file: "./dist/arm-msi.js", format: "umd", name: "Azure.ArmMsi", 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-msi/tsconfig.json b/packages/@azure/arm-msi/tsconfig.json index 51ea90961ce5..f32d1664f320 100644 --- a/packages/@azure/arm-msi/tsconfig.json +++ b/packages/@azure/arm-msi/tsconfig.json @@ -14,6 +14,6 @@ "outDir": "./esm", "importHelpers": true }, - "include": ["./lib/**/*.ts"], + "include": ["./lib/**/*"], "exclude": ["node_modules"] }