diff --git a/sdk/advisor/arm-advisor/LICENSE.txt b/sdk/advisor/arm-advisor/LICENSE.txt index ea8fb1516028..2d3163745319 100644 --- a/sdk/advisor/arm-advisor/LICENSE.txt +++ b/sdk/advisor/arm-advisor/LICENSE.txt @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2020 Microsoft +Copyright (c) 2021 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 diff --git a/sdk/advisor/arm-advisor/README.md b/sdk/advisor/arm-advisor/README.md index 6e851c5fd17e..4fbf83c05bc9 100644 --- a/sdk/advisor/arm-advisor/README.md +++ b/sdk/advisor/arm-advisor/README.md @@ -15,7 +15,7 @@ npm install @azure/arm-advisor ### How to use -#### nodejs - Authentication, client creation and get recommendationMetadata as an example written in TypeScript. +#### nodejs - client creation and get recommendationMetadata as an example written in TypeScript. ##### Install @azure/ms-rest-nodeauth @@ -26,11 +26,10 @@ npm install @azure/ms-rest-nodeauth@"^3.0.0" ##### 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 -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 { AdvisorManagementClient, AdvisorManagementModels, AdvisorManagementMappers } from "@azure/arm-advisor"; +const msRestNodeAuth = require("@azure/ms-rest-nodeauth"); +const { AdvisorManagementClient } = require("@azure/arm-advisor"); const subscriptionId = process.env["AZURE_SUBSCRIPTION_ID"]; msRestNodeAuth.interactiveLogin().then((creds) => { diff --git a/sdk/advisor/arm-advisor/rollup.config.js b/sdk/advisor/arm-advisor/rollup.config.js index 6d406ff2ce84..cdfbdf3becf5 100644 --- a/sdk/advisor/arm-advisor/rollup.config.js +++ b/sdk/advisor/arm-advisor/rollup.config.js @@ -21,8 +21,8 @@ const config = { "@azure/ms-rest-azure-js": "msRestAzure" }, banner: `/* - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. + * Copyright (c) Microsoft Corporation. + * Licensed under the MIT License. * * Code generated by Microsoft (R) AutoRest Code Generator. * Changes may cause incorrect behavior and will be lost if the code is regenerated. diff --git a/sdk/advisor/arm-advisor/src/advisorManagementClient.ts b/sdk/advisor/arm-advisor/src/advisorManagementClient.ts index a1de4884947a..a36889be7f7e 100644 --- a/sdk/advisor/arm-advisor/src/advisorManagementClient.ts +++ b/sdk/advisor/arm-advisor/src/advisorManagementClient.ts @@ -1,7 +1,6 @@ /* - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for - * license information. + * Copyright (c) Microsoft Corporation. + * Licensed under the MIT License. * * Code generated by Microsoft (R) AutoRest Code Generator. * Changes may cause incorrect behavior and will be lost if the code is diff --git a/sdk/advisor/arm-advisor/src/advisorManagementClientContext.ts b/sdk/advisor/arm-advisor/src/advisorManagementClientContext.ts index e75f0e19b91c..cd431215e56c 100644 --- a/sdk/advisor/arm-advisor/src/advisorManagementClientContext.ts +++ b/sdk/advisor/arm-advisor/src/advisorManagementClientContext.ts @@ -1,7 +1,6 @@ /* - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for - * license information. + * Copyright (c) Microsoft Corporation. + * Licensed under the MIT License. * * Code generated by Microsoft (R) AutoRest Code Generator. * Changes may cause incorrect behavior and will be lost if the code is diff --git a/sdk/advisor/arm-advisor/src/models/configurationsMappers.ts b/sdk/advisor/arm-advisor/src/models/configurationsMappers.ts index ff165cd05db1..2a18552a170b 100644 --- a/sdk/advisor/arm-advisor/src/models/configurationsMappers.ts +++ b/sdk/advisor/arm-advisor/src/models/configurationsMappers.ts @@ -1,6 +1,6 @@ /* - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. + * Copyright (c) Microsoft Corporation. + * Licensed under the MIT License. * * Code generated by Microsoft (R) AutoRest Code Generator. * Changes may cause incorrect behavior and will be lost if the code is regenerated. diff --git a/sdk/advisor/arm-advisor/src/models/index.ts b/sdk/advisor/arm-advisor/src/models/index.ts index aef287075a97..0f802593b669 100644 --- a/sdk/advisor/arm-advisor/src/models/index.ts +++ b/sdk/advisor/arm-advisor/src/models/index.ts @@ -1,6 +1,6 @@ /* - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. + * Copyright (c) Microsoft Corporation. + * Licensed under the MIT License. * * Code generated by Microsoft (R) AutoRest Code Generator. * Changes may cause incorrect behavior and will be lost if the code is regenerated. @@ -181,6 +181,18 @@ export interface ResourceMetadata { * Source from which recommendation is generated */ source?: string; + /** + * The action to view resource. + */ + action?: { [propertyName: string]: any }; + /** + * The singular user friendly name of resource type. eg: virtual machine + */ + singular?: string; + /** + * The plural user friendly name of resource type. eg: virtual machines + */ + plural?: string; } /** @@ -237,6 +249,34 @@ export interface ResourceRecommendationBase extends Resource { * Metadata of resource that was assessed */ resourceMetadata?: ResourceMetadata; + /** + * The detailed description of recommendation. + */ + description?: string; + /** + * The label of recommendation. + */ + label?: string; + /** + * The link to learn more about recommendation and generation logic. + */ + learnMoreLink?: string; + /** + * The potential benefit of implementing recommendation. + */ + potentialBenefits?: string; + /** + * The list of recommended actions to implement recommendation. + */ + actions?: { [propertyName: string]: any }[]; + /** + * The automated way to apply recommendation. + */ + remediation?: { [propertyName: string]: any }; + /** + * The recommendation metadata properties exposed to customer to provide additional information. + */ + exposedMetadataProperties?: { [propertyName: string]: any }; } /** @@ -288,6 +328,11 @@ export interface SuppressionContract extends Resource { * The duration for which the suppression is valid. */ ttl?: string; + /** + * Gets or sets the expiration time stamp. + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly expirationTimeStamp?: Date; } /** @@ -295,7 +340,31 @@ export interface SuppressionContract extends Resource { */ export interface RecommendationsListOptionalParams extends msRest.RequestOptionsBase { /** - * The filter to apply to the recommendations. + * The filter to apply to the recommendations.
Filter can be applied to properties + * ['ResourceId', 'ResourceGroup', 'RecommendationTypeGuid', '[Category](#category)'] with + * operators ['eq', 'and', 'or'].
Example:
- $filter=Category eq 'Cost' and ResourceGroup + * eq 'MyResourceGroup' + */ + filter?: string; + /** + * The number of recommendations per page if a paged version of this API is being used. + */ + top?: number; + /** + * The page-continuation token to use with a paged version of this API. + */ + skipToken?: string; +} + +/** + * Optional Parameters. + */ +export interface RecommendationsListNextOptionalParams extends msRest.RequestOptionsBase { + /** + * The filter to apply to the recommendations.
Filter can be applied to properties + * ['ResourceId', 'ResourceGroup', 'RecommendationTypeGuid', '[Category](#category)'] with + * operators ['eq', 'and', 'or'].
Example:
- $filter=Category eq 'Cost' and ResourceGroup + * eq 'MyResourceGroup' */ filter?: string; /** @@ -322,6 +391,20 @@ export interface SuppressionsListOptionalParams extends msRest.RequestOptionsBas skipToken?: string; } +/** + * Optional Parameters. + */ +export interface SuppressionsListNextOptionalParams extends msRest.RequestOptionsBase { + /** + * The number of suppressions per page if a paged version of this API is being used. + */ + top?: number; + /** + * The page-continuation token to use with a paged version of this API. + */ + skipToken?: string; +} + /** * An interface representing AdvisorManagementClientOptions. */ @@ -456,12 +539,7 @@ export type Risk = 'Error' | 'Warning' | 'None'; /** * Contains response data for the get operation. */ -export type RecommendationMetadataGetResponse = { - /** - * The parsed response body. - */ - body: any; - +export type RecommendationMetadataGetResponse = MetadataEntity & { /** * The underlying HTTP response. */ @@ -474,7 +552,7 @@ export type RecommendationMetadataGetResponse = { /** * The response body as parsed JSON or XML */ - parsedBody: any; + parsedBody: MetadataEntity; }; }; diff --git a/sdk/advisor/arm-advisor/src/models/mappers.ts b/sdk/advisor/arm-advisor/src/models/mappers.ts index 38a96c10028f..c7d21b07f961 100644 --- a/sdk/advisor/arm-advisor/src/models/mappers.ts +++ b/sdk/advisor/arm-advisor/src/models/mappers.ts @@ -1,6 +1,6 @@ /* - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. + * Copyright (c) Microsoft Corporation. + * Licensed under the MIT License. * * Code generated by Microsoft (R) AutoRest Code Generator. * Changes may cause incorrect behavior and will be lost if the code is regenerated. @@ -297,6 +297,29 @@ export const ResourceMetadata: msRest.CompositeMapper = { type: { name: "String" } + }, + action: { + serializedName: "action", + type: { + name: "Dictionary", + value: { + type: { + name: "Object" + } + } + } + }, + singular: { + serializedName: "singular", + type: { + name: "String" + } + }, + plural: { + serializedName: "plural", + type: { + name: "String" + } } } } @@ -397,6 +420,68 @@ export const ResourceRecommendationBase: msRest.CompositeMapper = { name: "Composite", className: "ResourceMetadata" } + }, + description: { + serializedName: "properties.description", + type: { + name: "String" + } + }, + label: { + serializedName: "properties.label", + type: { + name: "String" + } + }, + learnMoreLink: { + serializedName: "properties.learnMoreLink", + type: { + name: "String" + } + }, + potentialBenefits: { + serializedName: "properties.potentialBenefits", + type: { + name: "String" + } + }, + actions: { + serializedName: "properties.actions", + type: { + name: "Sequence", + element: { + type: { + name: "Dictionary", + value: { + type: { + name: "Object" + } + } + } + } + } + }, + remediation: { + serializedName: "properties.remediation", + type: { + name: "Dictionary", + value: { + type: { + name: "Object" + } + } + } + }, + exposedMetadataProperties: { + serializedName: "properties.exposedMetadataProperties", + type: { + name: "Dictionary", + value: { + type: { + name: "Object" + } + } + } } } } @@ -477,6 +562,13 @@ export const SuppressionContract: msRest.CompositeMapper = { type: { name: "String" } + }, + expirationTimeStamp: { + readOnly: true, + serializedName: "properties.expirationTimeStamp", + type: { + name: "DateTime" + } } } } diff --git a/sdk/advisor/arm-advisor/src/models/operationsMappers.ts b/sdk/advisor/arm-advisor/src/models/operationsMappers.ts index c83dbeabcc21..5a80d53e6e6a 100644 --- a/sdk/advisor/arm-advisor/src/models/operationsMappers.ts +++ b/sdk/advisor/arm-advisor/src/models/operationsMappers.ts @@ -1,13 +1,14 @@ /* - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. + * Copyright (c) Microsoft Corporation. + * Licensed under the MIT License. * * Code generated by Microsoft (R) AutoRest Code Generator. * Changes may cause incorrect behavior and will be lost if the code is regenerated. */ export { - CloudError, + ArmErrorResponse, + ARMErrorResponseBody, OperationDisplayInfo, OperationEntity, OperationEntityListResult diff --git a/sdk/advisor/arm-advisor/src/models/parameters.ts b/sdk/advisor/arm-advisor/src/models/parameters.ts index 0a32fd06e64c..f8d55f35b336 100644 --- a/sdk/advisor/arm-advisor/src/models/parameters.ts +++ b/sdk/advisor/arm-advisor/src/models/parameters.ts @@ -1,7 +1,6 @@ /* - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for - * license information. + * Copyright (c) Microsoft Corporation. + * Licensed under the MIT License. * * Code generated by Microsoft (R) AutoRest Code Generator. * Changes may cause incorrect behavior and will be lost if the code is diff --git a/sdk/advisor/arm-advisor/src/models/recommendationMetadataMappers.ts b/sdk/advisor/arm-advisor/src/models/recommendationMetadataMappers.ts index fca081125f33..84de1a857e4f 100644 --- a/sdk/advisor/arm-advisor/src/models/recommendationMetadataMappers.ts +++ b/sdk/advisor/arm-advisor/src/models/recommendationMetadataMappers.ts @@ -1,14 +1,14 @@ /* - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. + * Copyright (c) Microsoft Corporation. + * Licensed under the MIT License. * * Code generated by Microsoft (R) AutoRest Code Generator. * Changes may cause incorrect behavior and will be lost if the code is regenerated. */ export { + ArmErrorResponse, ARMErrorResponseBody, - CloudError, MetadataEntity, MetadataEntityListResult, MetadataSupportedValueDetail diff --git a/sdk/advisor/arm-advisor/src/models/recommendationsMappers.ts b/sdk/advisor/arm-advisor/src/models/recommendationsMappers.ts index d4cb0dcd832b..a164102c717f 100644 --- a/sdk/advisor/arm-advisor/src/models/recommendationsMappers.ts +++ b/sdk/advisor/arm-advisor/src/models/recommendationsMappers.ts @@ -1,14 +1,15 @@ /* - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. + * Copyright (c) Microsoft Corporation. + * Licensed under the MIT License. * * Code generated by Microsoft (R) AutoRest Code Generator. * Changes may cause incorrect behavior and will be lost if the code is regenerated. */ export { + ArmErrorResponse, + ARMErrorResponseBody, BaseResource, - CloudError, ConfigData, DigestConfig, RecommendationsGenerateHeaders, diff --git a/sdk/advisor/arm-advisor/src/models/suppressionsMappers.ts b/sdk/advisor/arm-advisor/src/models/suppressionsMappers.ts index b15519119bc5..eeaf63bb3663 100644 --- a/sdk/advisor/arm-advisor/src/models/suppressionsMappers.ts +++ b/sdk/advisor/arm-advisor/src/models/suppressionsMappers.ts @@ -1,14 +1,15 @@ /* - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. + * Copyright (c) Microsoft Corporation. + * Licensed under the MIT License. * * Code generated by Microsoft (R) AutoRest Code Generator. * Changes may cause incorrect behavior and will be lost if the code is regenerated. */ export { + ArmErrorResponse, + ARMErrorResponseBody, BaseResource, - CloudError, ConfigData, DigestConfig, Resource, diff --git a/sdk/advisor/arm-advisor/src/operations/configurations.ts b/sdk/advisor/arm-advisor/src/operations/configurations.ts index 9ea34dae1bff..787b3a58968d 100644 --- a/sdk/advisor/arm-advisor/src/operations/configurations.ts +++ b/sdk/advisor/arm-advisor/src/operations/configurations.ts @@ -1,7 +1,6 @@ /* - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for - * license information. + * Copyright (c) Microsoft Corporation. + * Licensed under the MIT License. * * Code generated by Microsoft (R) AutoRest Code Generator. * Changes may cause incorrect behavior and will be lost if the code is @@ -292,6 +291,9 @@ const listBySubscriptionNextOperationSpec: msRest.OperationSpec = { urlParameters: [ Parameters.nextPageLink ], + queryParameters: [ + Parameters.apiVersion + ], headerParameters: [ Parameters.acceptLanguage ], diff --git a/sdk/advisor/arm-advisor/src/operations/index.ts b/sdk/advisor/arm-advisor/src/operations/index.ts index 1b2399089695..bef23b04223a 100644 --- a/sdk/advisor/arm-advisor/src/operations/index.ts +++ b/sdk/advisor/arm-advisor/src/operations/index.ts @@ -1,7 +1,6 @@ /* - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for - * license information. + * Copyright (c) Microsoft Corporation. + * Licensed under the MIT License. * * Code generated by Microsoft (R) AutoRest Code Generator. * Changes may cause incorrect behavior and will be lost if the code is diff --git a/sdk/advisor/arm-advisor/src/operations/operations.ts b/sdk/advisor/arm-advisor/src/operations/operations.ts index 8dccfa50fbeb..8cdcccb5dc47 100644 --- a/sdk/advisor/arm-advisor/src/operations/operations.ts +++ b/sdk/advisor/arm-advisor/src/operations/operations.ts @@ -1,7 +1,6 @@ /* - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for - * license information. + * Copyright (c) Microsoft Corporation. + * Licensed under the MIT License. * * Code generated by Microsoft (R) AutoRest Code Generator. * Changes may cause incorrect behavior and will be lost if the code is @@ -95,7 +94,7 @@ const listOperationSpec: msRest.OperationSpec = { bodyMapper: Mappers.OperationEntityListResult }, default: { - bodyMapper: Mappers.CloudError + bodyMapper: Mappers.ArmErrorResponse } }, serializer @@ -108,6 +107,9 @@ const listNextOperationSpec: msRest.OperationSpec = { urlParameters: [ Parameters.nextPageLink ], + queryParameters: [ + Parameters.apiVersion + ], headerParameters: [ Parameters.acceptLanguage ], @@ -116,7 +118,7 @@ const listNextOperationSpec: msRest.OperationSpec = { bodyMapper: Mappers.OperationEntityListResult }, default: { - bodyMapper: Mappers.CloudError + bodyMapper: Mappers.ArmErrorResponse } }, serializer diff --git a/sdk/advisor/arm-advisor/src/operations/recommendationMetadata.ts b/sdk/advisor/arm-advisor/src/operations/recommendationMetadata.ts index 487abe86bdca..4a8d31b2d77a 100644 --- a/sdk/advisor/arm-advisor/src/operations/recommendationMetadata.ts +++ b/sdk/advisor/arm-advisor/src/operations/recommendationMetadata.ts @@ -1,7 +1,6 @@ /* - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for - * license information. + * Copyright (c) Microsoft Corporation. + * Licensed under the MIT License. * * Code generated by Microsoft (R) AutoRest Code Generator. * Changes may cause incorrect behavior and will be lost if the code is @@ -37,14 +36,14 @@ export class RecommendationMetadata { * @param name Name of metadata entity. * @param callback The callback */ - get(name: string, callback: msRest.ServiceCallback): void; + get(name: string, callback: msRest.ServiceCallback): void; /** * @param name Name of metadata entity. * @param options The optional parameters * @param callback The callback */ - get(name: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - get(name: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { + get(name: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; + get(name: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { name, @@ -129,7 +128,7 @@ const getOperationSpec: msRest.OperationSpec = { bodyMapper: Mappers.ARMErrorResponseBody }, default: { - bodyMapper: Mappers.CloudError + bodyMapper: Mappers.ArmErrorResponse } }, serializer @@ -149,7 +148,7 @@ const listOperationSpec: msRest.OperationSpec = { bodyMapper: Mappers.MetadataEntityListResult }, default: { - bodyMapper: Mappers.CloudError + bodyMapper: Mappers.ArmErrorResponse } }, serializer @@ -162,6 +161,9 @@ const listNextOperationSpec: msRest.OperationSpec = { urlParameters: [ Parameters.nextPageLink ], + queryParameters: [ + Parameters.apiVersion + ], headerParameters: [ Parameters.acceptLanguage ], @@ -170,7 +172,7 @@ const listNextOperationSpec: msRest.OperationSpec = { bodyMapper: Mappers.MetadataEntityListResult }, default: { - bodyMapper: Mappers.CloudError + bodyMapper: Mappers.ArmErrorResponse } }, serializer diff --git a/sdk/advisor/arm-advisor/src/operations/recommendations.ts b/sdk/advisor/arm-advisor/src/operations/recommendations.ts index 8ab48e349ad8..8faeee89b9f3 100644 --- a/sdk/advisor/arm-advisor/src/operations/recommendations.ts +++ b/sdk/advisor/arm-advisor/src/operations/recommendations.ts @@ -1,7 +1,6 @@ /* - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for - * license information. + * Copyright (c) Microsoft Corporation. + * Licensed under the MIT License. * * Code generated by Microsoft (R) AutoRest Code Generator. * Changes may cause incorrect behavior and will be lost if the code is @@ -152,7 +151,7 @@ export class Recommendations { * @param [options] The optional parameters * @returns Promise */ - listNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise; + listNext(nextPageLink: string, options?: Models.RecommendationsListNextOptionalParams): Promise; /** * @param nextPageLink The NextLink from the previous successful call to List operation. * @param callback The callback @@ -163,8 +162,8 @@ export class Recommendations { * @param options The optional parameters * @param callback The callback */ - listNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - listNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { + listNext(nextPageLink: string, options: Models.RecommendationsListNextOptionalParams, callback: msRest.ServiceCallback): void; + listNext(nextPageLink: string, options?: Models.RecommendationsListNextOptionalParams | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { nextPageLink, @@ -194,7 +193,8 @@ const generateOperationSpec: msRest.OperationSpec = { headersMapper: Mappers.RecommendationsGenerateHeaders }, default: { - bodyMapper: Mappers.CloudError + bodyMapper: Mappers.ArmErrorResponse, + headersMapper: Mappers.RecommendationsGenerateHeaders } }, serializer @@ -217,7 +217,7 @@ const getGenerateStatusOperationSpec: msRest.OperationSpec = { 202: {}, 204: {}, default: { - bodyMapper: Mappers.CloudError + bodyMapper: Mappers.ArmErrorResponse } }, serializer @@ -243,7 +243,7 @@ const listOperationSpec: msRest.OperationSpec = { bodyMapper: Mappers.ResourceRecommendationBaseListResult }, default: { - bodyMapper: Mappers.CloudError + bodyMapper: Mappers.ArmErrorResponse } }, serializer @@ -267,7 +267,7 @@ const getOperationSpec: msRest.OperationSpec = { bodyMapper: Mappers.ResourceRecommendationBase }, default: { - bodyMapper: Mappers.CloudError + bodyMapper: Mappers.ArmErrorResponse } }, serializer @@ -280,6 +280,12 @@ const listNextOperationSpec: msRest.OperationSpec = { urlParameters: [ Parameters.nextPageLink ], + queryParameters: [ + Parameters.apiVersion, + Parameters.filter, + Parameters.top, + Parameters.skipToken + ], headerParameters: [ Parameters.acceptLanguage ], @@ -288,7 +294,7 @@ const listNextOperationSpec: msRest.OperationSpec = { bodyMapper: Mappers.ResourceRecommendationBaseListResult }, default: { - bodyMapper: Mappers.CloudError + bodyMapper: Mappers.ArmErrorResponse } }, serializer diff --git a/sdk/advisor/arm-advisor/src/operations/suppressions.ts b/sdk/advisor/arm-advisor/src/operations/suppressions.ts index e0ac5c30e4b7..cd496def63b2 100644 --- a/sdk/advisor/arm-advisor/src/operations/suppressions.ts +++ b/sdk/advisor/arm-advisor/src/operations/suppressions.ts @@ -1,7 +1,6 @@ /* - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for - * license information. + * Copyright (c) Microsoft Corporation. + * Licensed under the MIT License. * * Code generated by Microsoft (R) AutoRest Code Generator. * Changes may cause incorrect behavior and will be lost if the code is @@ -182,7 +181,7 @@ export class Suppressions { * @param [options] The optional parameters * @returns Promise */ - listNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise; + listNext(nextPageLink: string, options?: Models.SuppressionsListNextOptionalParams): Promise; /** * @param nextPageLink The NextLink from the previous successful call to List operation. * @param callback The callback @@ -193,8 +192,8 @@ export class Suppressions { * @param options The optional parameters * @param callback The callback */ - listNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - listNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { + listNext(nextPageLink: string, options: Models.SuppressionsListNextOptionalParams, callback: msRest.ServiceCallback): void; + listNext(nextPageLink: string, options?: Models.SuppressionsListNextOptionalParams | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { nextPageLink, @@ -225,8 +224,11 @@ const getOperationSpec: msRest.OperationSpec = { 200: { bodyMapper: Mappers.SuppressionContract }, + 404: { + bodyMapper: Mappers.ArmErrorResponse + }, default: { - bodyMapper: Mappers.CloudError + bodyMapper: Mappers.ArmErrorResponse } }, serializer @@ -257,8 +259,11 @@ const createOperationSpec: msRest.OperationSpec = { 200: { bodyMapper: Mappers.SuppressionContract }, + 404: { + bodyMapper: Mappers.ArmErrorResponse + }, default: { - bodyMapper: Mappers.CloudError + bodyMapper: Mappers.ArmErrorResponse } }, serializer @@ -281,7 +286,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = { responses: { 204: {}, default: { - bodyMapper: Mappers.CloudError + bodyMapper: Mappers.ArmErrorResponse } }, serializer @@ -306,7 +311,7 @@ const listOperationSpec: msRest.OperationSpec = { bodyMapper: Mappers.SuppressionContractListResult }, default: { - bodyMapper: Mappers.CloudError + bodyMapper: Mappers.ArmErrorResponse } }, serializer @@ -319,6 +324,11 @@ const listNextOperationSpec: msRest.OperationSpec = { urlParameters: [ Parameters.nextPageLink ], + queryParameters: [ + Parameters.apiVersion, + Parameters.top, + Parameters.skipToken + ], headerParameters: [ Parameters.acceptLanguage ], @@ -327,7 +337,7 @@ const listNextOperationSpec: msRest.OperationSpec = { bodyMapper: Mappers.SuppressionContractListResult }, default: { - bodyMapper: Mappers.CloudError + bodyMapper: Mappers.ArmErrorResponse } }, serializer diff --git a/sdk/storage/storage-blob/CHANGELOG.md b/sdk/storage/storage-blob/CHANGELOG.md index 6feca4a719c9..2efdf6ef028a 100644 --- a/sdk/storage/storage-blob/CHANGELOG.md +++ b/sdk/storage/storage-blob/CHANGELOG.md @@ -2,6 +2,7 @@ ## 12.5.1 (Unreleased) +- Deprecated `destinationContainerName` in `ServiceUndeleteContainerOptions` for `BlobServiceClient.undeleteContainer()`. ## 12.5.0 (2021-03-10) diff --git a/sdk/storage/storage-blob/review/storage-blob.api.md b/sdk/storage/storage-blob/review/storage-blob.api.md index ab94c6bde0e9..21fdc03cefc0 100644 --- a/sdk/storage/storage-blob/review/storage-blob.api.md +++ b/sdk/storage/storage-blob/review/storage-blob.api.md @@ -2983,6 +2983,7 @@ export type ServiceSubmitBatchResponseModel = ServiceSubmitBatchHeaders & { // @public export interface ServiceUndeleteContainerOptions extends CommonOptions { abortSignal?: AbortSignalLike; + // @deprecated destinationContainerName?: string; } diff --git a/sdk/storage/storage-blob/src/BlobServiceClient.ts b/sdk/storage/storage-blob/src/BlobServiceClient.ts index bd272e1db96e..dd10da266fe5 100644 --- a/sdk/storage/storage-blob/src/BlobServiceClient.ts +++ b/sdk/storage/storage-blob/src/BlobServiceClient.ts @@ -336,6 +336,7 @@ export interface ServiceUndeleteContainerOptions extends CommonOptions { /** * Optional. Specifies the new name of the restored container. * Will use its original name if this is not specified. + * @deprecated Restore container to a different name is not supported by service anymore. */ destinationContainerName?: string; } diff --git a/sdk/storage/storage-blob/test/blobserviceclient.spec.ts b/sdk/storage/storage-blob/test/blobserviceclient.spec.ts index 6046a61f56f9..1e55b7aa8344 100644 --- a/sdk/storage/storage-blob/test/blobserviceclient.spec.ts +++ b/sdk/storage/storage-blob/test/blobserviceclient.spec.ts @@ -613,46 +613,6 @@ describe("BlobServiceClient", () => { assert.ok(listed); }); - it("restore container to a new name", async function() { - let blobServiceClient: BlobServiceClient; - try { - blobServiceClient = getGenericBSU("SOFT_DELETE_"); - } catch (err) { - this.skip(); - } - - const containerName = recorder.getUniqueName("container"); - const containerClient = blobServiceClient.getContainerClient(containerName); - - await containerClient.create(); - await containerClient.delete(); - await delay(30 * 1000); - - let listed = false; - for await (const containerItem of blobServiceClient.listContainers({ includeDeleted: true })) { - if (containerItem.deleted && containerItem.name === containerName) { - listed = true; - // check list container response - assert.ok(containerItem.version); - assert.ok(containerItem.properties.deletedOn); - assert.ok(containerItem.properties.remainingRetentionDays); - - const newContainerName = recorder.getUniqueName("newcontainer"); - const restoreRes = await blobServiceClient.undeleteContainer( - containerName, - containerItem.version!, - { - destinationContainerName: newContainerName - } - ); - assert.equal(restoreRes.containerClient.containerName, newContainerName); - await restoreRes.containerClient.delete(); - break; - } - } - assert.ok(listed); - }); - it("rename container", async function() { if (isLiveMode()) { // Turn on this case when the Container Rename feature is ready in the service side. diff --git a/sdk/storage/storage-file-datalake/CHANGELOG.md b/sdk/storage/storage-file-datalake/CHANGELOG.md index 525a5cf364e1..d17c6a19fd1c 100644 --- a/sdk/storage/storage-file-datalake/CHANGELOG.md +++ b/sdk/storage/storage-file-datalake/CHANGELOG.md @@ -2,6 +2,7 @@ ## 12.4.1 (Unreleased) +- Deprecated `destinationFileSystemName` in `ServiceUndeleteFileSystemOptions` for `DataLakeServiceClient.undeleteFileSystem()`. ## 12.4.0 (2021-03-10) diff --git a/sdk/storage/storage-file-datalake/review/storage-file-datalake.api.md b/sdk/storage/storage-file-datalake/review/storage-file-datalake.api.md index 7dfcce64fff7..b642314e4d3b 100644 --- a/sdk/storage/storage-file-datalake/review/storage-file-datalake.api.md +++ b/sdk/storage/storage-file-datalake/review/storage-file-datalake.api.md @@ -1991,6 +1991,7 @@ export type ServiceRenameFileSystemOptions = ServiceRenameContainerOptions; // @public export interface ServiceUndeleteFileSystemOptions extends CommonOptions { abortSignal?: AbortSignalLike; + // @deprecated destinationFileSystemName?: string; } diff --git a/sdk/storage/storage-file-datalake/src/models.ts b/sdk/storage/storage-file-datalake/src/models.ts index 7a2639879240..76ec2bf5d3f4 100644 --- a/sdk/storage/storage-file-datalake/src/models.ts +++ b/sdk/storage/storage-file-datalake/src/models.ts @@ -294,6 +294,7 @@ export interface ServiceUndeleteFileSystemOptions extends CommonOptions { /** * Optional. Specifies the new name of the restored File System. * Will use its original name if this is not specified. + * @deprecated Restore FileSystem to a different name is not supported by service anymore. */ destinationFileSystemName?: string; } diff --git a/sdk/storage/storage-file-datalake/test/serviceclient.spec.ts b/sdk/storage/storage-file-datalake/test/serviceclient.spec.ts index efb109879535..57eb724e538b 100644 --- a/sdk/storage/storage-file-datalake/test/serviceclient.spec.ts +++ b/sdk/storage/storage-file-datalake/test/serviceclient.spec.ts @@ -562,51 +562,4 @@ describe("DataLakeServiceClient", () => { } assert.ok(listed); }); - - it("undelete file system to a new name", async function() { - let serviceClient: DataLakeServiceClient; - try { - serviceClient = getGenericDataLakeServiceClient("DFS_SOFT_DELETE_"); - } catch (err) { - this.skip(); - } - - const fileSystemName = recorder.getUniqueName("filesystem"); - const fileSystemClient = serviceClient.getFileSystemClient(fileSystemName); - await fileSystemClient.create(); - await fileSystemClient.delete(); - await delay(30 * 1000); - - let listed = false; - for await (const page of serviceClient - .listFileSystems({ - includeDeleted: true - }) - .byPage()) { - for (const fileSystemItem of page.fileSystemItems) { - if (fileSystemItem.deleted && fileSystemItem.name === fileSystemName) { - listed = true; - // verify list container response - assert.ok(fileSystemItem.versionId); - assert.ok(fileSystemItem.deleted); - assert.ok(fileSystemItem.properties.deletedOn); - assert.ok(fileSystemItem.properties.remainingRetentionDays); - - const destinationFileSystemName = recorder.getUniqueName("newfilesystem"); - const restoreRes = await serviceClient.undeleteFileSystem( - fileSystemName, - fileSystemItem.versionId!, - { destinationFileSystemName } - ); - assert.equal(restoreRes.fileSystemClient.name, destinationFileSystemName); - await restoreRes.fileSystemClient.delete(); - break; - } - } - if (listed) { - break; - } - } - assert.ok(listed); - }); });