diff --git a/packages/@azure/arm-monitor/README.md b/packages/@azure/arm-monitor/README.md index bbafdf637e5f..cefb7526c1df 100644 --- a/packages/@azure/arm-monitor/README.md +++ b/packages/@azure/arm-monitor/README.md @@ -1,18 +1,15 @@ -# Microsoft Azure SDK for isomorphic javascript - MonitorManagementClient -This project provides an isomorphic javascript package for accessing Azure. Right now it supports: -- node.js version 6.x.x or higher -- browser javascript +# Azure MonitorManagementClient SDK for JavaScript +This package contains an isomorphic SDK for MonitorManagementClient. -## How to Install +## Currently supported environments +- Node.js version 6.x.x or higher +- Browser JavaScript -- nodejs +## How to Install ``` npm install @azure/arm-monitor ``` -- browser -```html - -``` + ## How to use @@ -37,7 +34,8 @@ msRestNodeAuth.interactiveLogin().then((creds) => { }); ``` -### browser - Authentication, client creation and listByResourceGroup autoscaleSettings as an example written in javascript. +### browser - Authentication, client creation and listByResourceGroup autoscaleSettings 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 @@ -45,21 +43,30 @@ msRestNodeAuth.interactiveLogin().then((creds) => { @azure/arm-monitor sample - - - - + + + + diff --git a/packages/@azure/arm-monitor/lib/models/actionGroupsMappers.ts b/packages/@azure/arm-monitor/lib/models/actionGroupsMappers.ts index 6288030d767b..53d5695a1c78 100644 --- a/packages/@azure/arm-monitor/lib/models/actionGroupsMappers.ts +++ b/packages/@azure/arm-monitor/lib/models/actionGroupsMappers.ts @@ -22,6 +22,7 @@ export { VoiceReceiver, LogicAppReceiver, AzureFunctionReceiver, + ArmRoleReceiver, ErrorResponse, ActionGroupPatchBody, ActionGroupList, diff --git a/packages/@azure/arm-monitor/lib/models/activityLogAlertsMappers.ts b/packages/@azure/arm-monitor/lib/models/activityLogAlertsMappers.ts index 70c3e4610375..e4cc468d09ea 100644 --- a/packages/@azure/arm-monitor/lib/models/activityLogAlertsMappers.ts +++ b/packages/@azure/arm-monitor/lib/models/activityLogAlertsMappers.ts @@ -53,6 +53,7 @@ export { VoiceReceiver, LogicAppReceiver, AzureFunctionReceiver, + ArmRoleReceiver, MetricAlertResource, MetricAlertCriteria, MetricAlertAction, diff --git a/packages/@azure/arm-monitor/lib/models/alertRulesMappers.ts b/packages/@azure/arm-monitor/lib/models/alertRulesMappers.ts index dbb7c86f8c27..bbe7045ea932 100644 --- a/packages/@azure/arm-monitor/lib/models/alertRulesMappers.ts +++ b/packages/@azure/arm-monitor/lib/models/alertRulesMappers.ts @@ -58,6 +58,7 @@ export { VoiceReceiver, LogicAppReceiver, AzureFunctionReceiver, + ArmRoleReceiver, ActivityLogAlertResource, ActivityLogAlertAllOfCondition, ActivityLogAlertLeafCondition, diff --git a/packages/@azure/arm-monitor/lib/models/autoscaleSettingsMappers.ts b/packages/@azure/arm-monitor/lib/models/autoscaleSettingsMappers.ts index 116bf4b79752..8c7d0ba811f5 100644 --- a/packages/@azure/arm-monitor/lib/models/autoscaleSettingsMappers.ts +++ b/packages/@azure/arm-monitor/lib/models/autoscaleSettingsMappers.ts @@ -48,6 +48,7 @@ export { VoiceReceiver, LogicAppReceiver, AzureFunctionReceiver, + ArmRoleReceiver, ActivityLogAlertResource, ActivityLogAlertAllOfCondition, ActivityLogAlertLeafCondition, diff --git a/packages/@azure/arm-monitor/lib/models/diagnosticSettingsCategoryOperationsMappers.ts b/packages/@azure/arm-monitor/lib/models/diagnosticSettingsCategoryOperationsMappers.ts index 094b7d2eddcb..950be5c454e8 100644 --- a/packages/@azure/arm-monitor/lib/models/diagnosticSettingsCategoryOperationsMappers.ts +++ b/packages/@azure/arm-monitor/lib/models/diagnosticSettingsCategoryOperationsMappers.ts @@ -47,6 +47,7 @@ export { VoiceReceiver, LogicAppReceiver, AzureFunctionReceiver, + ArmRoleReceiver, ActivityLogAlertResource, ActivityLogAlertAllOfCondition, ActivityLogAlertLeafCondition, diff --git a/packages/@azure/arm-monitor/lib/models/diagnosticSettingsOperationsMappers.ts b/packages/@azure/arm-monitor/lib/models/diagnosticSettingsOperationsMappers.ts index ef344a10f028..789ae57fee33 100644 --- a/packages/@azure/arm-monitor/lib/models/diagnosticSettingsOperationsMappers.ts +++ b/packages/@azure/arm-monitor/lib/models/diagnosticSettingsOperationsMappers.ts @@ -47,6 +47,7 @@ export { VoiceReceiver, LogicAppReceiver, AzureFunctionReceiver, + ArmRoleReceiver, ActivityLogAlertResource, ActivityLogAlertAllOfCondition, ActivityLogAlertLeafCondition, diff --git a/packages/@azure/arm-monitor/lib/models/index.ts b/packages/@azure/arm-monitor/lib/models/index.ts index 816e7412e130..95bab139e222 100644 --- a/packages/@azure/arm-monitor/lib/models/index.ts +++ b/packages/@azure/arm-monitor/lib/models/index.ts @@ -1555,6 +1555,24 @@ export interface AzureFunctionReceiver { httpTriggerUrl: string; } +/** + * @interface + * An interface representing ArmRoleReceiver. + * An arm role receiver. + * + */ +export interface ArmRoleReceiver { + /** + * @member {string} name The name of the arm role receiver. Names must be + * unique across all receivers within an action group. + */ + name: string; + /** + * @member {string} roleId The arm role id. + */ + roleId: string; +} + /** * @interface * An interface representing ActionGroupResource. @@ -1619,6 +1637,12 @@ export interface ActionGroupResource extends Resource { * azure function receivers that are part of this action group. */ azureFunctionReceivers?: AzureFunctionReceiver[]; + /** + * @member {ArmRoleReceiver[]} [armRoleReceivers] The list of ARM role + * receivers that are part of this action group. Roles are Azure RBAC roles + * and only built-in roles are supported. + */ + armRoleReceivers?: ArmRoleReceiver[]; } /** diff --git a/packages/@azure/arm-monitor/lib/models/logProfilesMappers.ts b/packages/@azure/arm-monitor/lib/models/logProfilesMappers.ts index f8cd68db8e1f..9070b1ac4fca 100644 --- a/packages/@azure/arm-monitor/lib/models/logProfilesMappers.ts +++ b/packages/@azure/arm-monitor/lib/models/logProfilesMappers.ts @@ -49,6 +49,7 @@ export { VoiceReceiver, LogicAppReceiver, AzureFunctionReceiver, + ArmRoleReceiver, ActivityLogAlertResource, ActivityLogAlertAllOfCondition, ActivityLogAlertLeafCondition, diff --git a/packages/@azure/arm-monitor/lib/models/mappers.ts b/packages/@azure/arm-monitor/lib/models/mappers.ts index c565abe1539d..ce345c4239d3 100644 --- a/packages/@azure/arm-monitor/lib/models/mappers.ts +++ b/packages/@azure/arm-monitor/lib/models/mappers.ts @@ -2021,6 +2021,30 @@ export const AzureFunctionReceiver: msRest.CompositeMapper = { } }; +export const ArmRoleReceiver: msRest.CompositeMapper = { + serializedName: "ArmRoleReceiver", + type: { + name: "Composite", + className: "ArmRoleReceiver", + modelProperties: { + name: { + required: true, + serializedName: "name", + type: { + name: "String" + } + }, + roleId: { + required: true, + serializedName: "roleId", + type: { + name: "String" + } + } + } + } +}; + export const ActionGroupResource: msRest.CompositeMapper = { serializedName: "ActionGroupResource", type: { @@ -2153,6 +2177,18 @@ export const ActionGroupResource: msRest.CompositeMapper = { } } } + }, + armRoleReceivers: { + serializedName: "properties.armRoleReceivers", + type: { + name: "Sequence", + element: { + type: { + name: "Composite", + className: "ArmRoleReceiver" + } + } + } } } } diff --git a/packages/@azure/arm-monitor/lib/models/metricAlertsMappers.ts b/packages/@azure/arm-monitor/lib/models/metricAlertsMappers.ts index dab48d463c1e..e0f90d85c3a2 100644 --- a/packages/@azure/arm-monitor/lib/models/metricAlertsMappers.ts +++ b/packages/@azure/arm-monitor/lib/models/metricAlertsMappers.ts @@ -52,6 +52,7 @@ export { VoiceReceiver, LogicAppReceiver, AzureFunctionReceiver, + ArmRoleReceiver, ActivityLogAlertResource, ActivityLogAlertAllOfCondition, ActivityLogAlertLeafCondition, diff --git a/packages/@azure/arm-monitor/lib/models/parameters.ts b/packages/@azure/arm-monitor/lib/models/parameters.ts index 5c7d5793fe41..c87d05523625 100644 --- a/packages/@azure/arm-monitor/lib/models/parameters.ts +++ b/packages/@azure/arm-monitor/lib/models/parameters.ts @@ -94,7 +94,7 @@ export const apiVersion3: msRest.OperationQueryParameter = { required: true, isConstant: true, serializedName: "api-version", - defaultValue: '2018-03-01', + defaultValue: '2018-09-01', type: { name: "String" } @@ -142,13 +142,25 @@ export const apiVersion7: msRest.OperationQueryParameter = { required: true, isConstant: true, serializedName: "api-version", - defaultValue: '2018-04-16', + defaultValue: '2018-03-01', type: { name: "String" } } }; export const apiVersion8: msRest.OperationQueryParameter = { + parameterPath: "apiVersion", + mapper: { + required: true, + isConstant: true, + serializedName: "api-version", + defaultValue: '2018-04-16', + type: { + name: "String" + } + } +}; +export const apiVersion9: msRest.OperationQueryParameter = { parameterPath: "apiVersion", mapper: { required: true, diff --git a/packages/@azure/arm-monitor/lib/models/scheduledQueryRulesMappers.ts b/packages/@azure/arm-monitor/lib/models/scheduledQueryRulesMappers.ts index 6bb3988f9465..5e0f5a7ca486 100644 --- a/packages/@azure/arm-monitor/lib/models/scheduledQueryRulesMappers.ts +++ b/packages/@azure/arm-monitor/lib/models/scheduledQueryRulesMappers.ts @@ -52,6 +52,7 @@ export { VoiceReceiver, LogicAppReceiver, AzureFunctionReceiver, + ArmRoleReceiver, ActivityLogAlertResource, ActivityLogAlertAllOfCondition, ActivityLogAlertLeafCondition, diff --git a/packages/@azure/arm-monitor/lib/operations/metricAlerts.ts b/packages/@azure/arm-monitor/lib/operations/metricAlerts.ts index 06d7d5c9d2c5..d484e189a5f6 100644 --- a/packages/@azure/arm-monitor/lib/operations/metricAlerts.ts +++ b/packages/@azure/arm-monitor/lib/operations/metricAlerts.ts @@ -224,7 +224,7 @@ const listBySubscriptionOperationSpec: msRest.OperationSpec = { Parameters.subscriptionId ], queryParameters: [ - Parameters.apiVersion3 + Parameters.apiVersion7 ], headerParameters: [ Parameters.acceptLanguage @@ -248,7 +248,7 @@ const listByResourceGroupOperationSpec: msRest.OperationSpec = { Parameters.resourceGroupName ], queryParameters: [ - Parameters.apiVersion3 + Parameters.apiVersion7 ], headerParameters: [ Parameters.acceptLanguage @@ -273,7 +273,7 @@ const getOperationSpec: msRest.OperationSpec = { Parameters.ruleName ], queryParameters: [ - Parameters.apiVersion3 + Parameters.apiVersion7 ], headerParameters: [ Parameters.acceptLanguage @@ -298,7 +298,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = { Parameters.ruleName ], queryParameters: [ - Parameters.apiVersion3 + Parameters.apiVersion7 ], headerParameters: [ Parameters.acceptLanguage @@ -330,7 +330,7 @@ const updateOperationSpec: msRest.OperationSpec = { Parameters.ruleName ], queryParameters: [ - Parameters.apiVersion3 + Parameters.apiVersion7 ], headerParameters: [ Parameters.acceptLanguage @@ -362,7 +362,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = { Parameters.ruleName ], queryParameters: [ - Parameters.apiVersion3 + Parameters.apiVersion7 ], headerParameters: [ Parameters.acceptLanguage diff --git a/packages/@azure/arm-monitor/lib/operations/metricAlertsStatus.ts b/packages/@azure/arm-monitor/lib/operations/metricAlertsStatus.ts index f2f8c7006a2a..185df606e0e7 100644 --- a/packages/@azure/arm-monitor/lib/operations/metricAlertsStatus.ts +++ b/packages/@azure/arm-monitor/lib/operations/metricAlertsStatus.ts @@ -106,7 +106,7 @@ const listOperationSpec: msRest.OperationSpec = { Parameters.ruleName ], queryParameters: [ - Parameters.apiVersion3 + Parameters.apiVersion7 ], headerParameters: [ Parameters.acceptLanguage @@ -132,7 +132,7 @@ const listByNameOperationSpec: msRest.OperationSpec = { Parameters.statusName ], queryParameters: [ - Parameters.apiVersion3 + Parameters.apiVersion7 ], headerParameters: [ Parameters.acceptLanguage diff --git a/packages/@azure/arm-monitor/lib/operations/metricNamespaces.ts b/packages/@azure/arm-monitor/lib/operations/metricNamespaces.ts index b1b723af5762..26d22b214748 100644 --- a/packages/@azure/arm-monitor/lib/operations/metricNamespaces.ts +++ b/packages/@azure/arm-monitor/lib/operations/metricNamespaces.ts @@ -64,7 +64,7 @@ const listOperationSpec: msRest.OperationSpec = { Parameters.resourceUri ], queryParameters: [ - Parameters.apiVersion8, + Parameters.apiVersion9, Parameters.startTime ], headerParameters: [ diff --git a/packages/@azure/arm-monitor/lib/operations/scheduledQueryRules.ts b/packages/@azure/arm-monitor/lib/operations/scheduledQueryRules.ts index a6ab74f86ef1..0457f2661111 100644 --- a/packages/@azure/arm-monitor/lib/operations/scheduledQueryRules.ts +++ b/packages/@azure/arm-monitor/lib/operations/scheduledQueryRules.ts @@ -226,7 +226,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = { Parameters.ruleName ], queryParameters: [ - Parameters.apiVersion7 + Parameters.apiVersion8 ], headerParameters: [ Parameters.acceptLanguage @@ -261,7 +261,7 @@ const getOperationSpec: msRest.OperationSpec = { Parameters.subscriptionId ], queryParameters: [ - Parameters.apiVersion7 + Parameters.apiVersion8 ], headerParameters: [ Parameters.acceptLanguage @@ -286,7 +286,7 @@ const updateOperationSpec: msRest.OperationSpec = { Parameters.ruleName ], queryParameters: [ - Parameters.apiVersion7 + Parameters.apiVersion8 ], headerParameters: [ Parameters.acceptLanguage @@ -318,7 +318,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = { Parameters.subscriptionId ], queryParameters: [ - Parameters.apiVersion7 + Parameters.apiVersion8 ], headerParameters: [ Parameters.acceptLanguage @@ -340,7 +340,7 @@ const listBySubscriptionOperationSpec: msRest.OperationSpec = { Parameters.subscriptionId ], queryParameters: [ - Parameters.apiVersion7, + Parameters.apiVersion8, Parameters.filter ], headerParameters: [ @@ -365,7 +365,7 @@ const listByResourceGroupOperationSpec: msRest.OperationSpec = { Parameters.subscriptionId ], queryParameters: [ - Parameters.apiVersion7, + Parameters.apiVersion8, Parameters.filter ], headerParameters: [ diff --git a/packages/@azure/arm-monitor/package.json b/packages/@azure/arm-monitor/package.json index 524d29c91903..c0ccd0d9c606 100644 --- a/packages/@azure/arm-monitor/package.json +++ b/packages/@azure/arm-monitor/package.json @@ -4,7 +4,9 @@ "description": "MonitorManagementClient Library with typescript type definitions for node.js and browser.", "version": "1.1.0-preview", "dependencies": { - "ms-rest-azure-js": "~0.17.165" + "ms-rest-azure-js": "^1.0.166", + "ms-rest-js": "^1.0.439", + "tslib": "^1.9.3" }, "keywords": [ "node", @@ -14,16 +16,16 @@ "isomorphic" ], "license": "MIT", - "main": "./cjs/monitorManagementClient.js", + "main": "./dist/arm-monitor.js", "module": "./esm/monitorManagementClient.js", - "types": "./cjs/monitorManagementClient.d.ts", + "types": "./esm/monitorManagementClient.d.ts", "devDependencies": { - "tslib": "^1.9.3", - "typescript": "^3.0.3", - "webpack": "^4.17.2", - "webpack-cli": "^3.1.0" + "typescript": "^3.1.1", + "rollup": "^0.66.2", + "rollup-plugin-node-resolve": "^3.4.0", + "uglify-js": "^3.4.9" }, - "homepage": "https://github.com/azure/azure-sdk-for-js", + "homepage": "https://github.com/azure/azure-sdk-for-js/tree/master/packages/@azure/arm-monitor", "repository": { "type": "git", "url": "https://github.com/azure/azure-sdk-for-js.git" @@ -32,7 +34,9 @@ "url": "https://github.com/azure/azure-sdk-for-js/issues" }, "scripts": { - "build": "tsc && tsc -p tsconfig.esm.json && webpack", + "build": "tsc && rollup -c rollup.config.js && npm run minify", + "minify": "uglifyjs -c -m --comments --source-map \"content='./dist/arm-monitor.js.map'\" -o ./dist/arm-monitor.min.js ./dist/arm-monitor.js", "prepare": "npm run build" - } + }, + "sideEffects": false } diff --git a/packages/@azure/arm-monitor/tsconfig.json b/packages/@azure/arm-monitor/tsconfig.json index d5b25971c029..f32d1664f320 100644 --- a/packages/@azure/arm-monitor/tsconfig.json +++ b/packages/@azure/arm-monitor/tsconfig.json @@ -1,9 +1,9 @@ { "compilerOptions": { - "module": "commonjs", + "module": "es6", "moduleResolution": "node", "strict": true, - "target": "es6", + "target": "es5", "sourceMap": true, "declarationMap": true, "esModuleInterop": true, @@ -11,7 +11,8 @@ "forceConsistentCasingInFileNames": true, "lib": ["es6"], "declaration": true, - "outDir": "./cjs" + "outDir": "./esm", + "importHelpers": true }, "include": ["./lib/**/*"], "exclude": ["node_modules"]