diff --git a/sdk/recoveryservicesbackup/arm-recoveryservicesbackup/CHANGELOG.md b/sdk/recoveryservicesbackup/arm-recoveryservicesbackup/CHANGELOG.md index df3dda23c2ff..6dddf7314611 100644 --- a/sdk/recoveryservicesbackup/arm-recoveryservicesbackup/CHANGELOG.md +++ b/sdk/recoveryservicesbackup/arm-recoveryservicesbackup/CHANGELOG.md @@ -1,19 +1,10 @@ # Release History -## 8.2.0 (2022-05-11) +## 9.0.0 (2022-05-13) -**Features** +**Breaking Changes** - - Added Interface TieringPolicy - - Added Type Alias TieringMode - - Interface AzureIaaSVMProtectedItemExtendedInfo has a new optional parameter newestRecoveryPointInArchive - - Interface AzureIaaSVMProtectedItemExtendedInfo has a new optional parameter oldestRecoveryPointInArchive - - Interface AzureIaaSVMProtectedItemExtendedInfo has a new optional parameter oldestRecoveryPointInVault - - Interface AzureVmWorkloadProtectedItemExtendedInfo has a new optional parameter newestRecoveryPointInArchive - - Interface AzureVmWorkloadProtectedItemExtendedInfo has a new optional parameter oldestRecoveryPointInArchive - - Interface AzureVmWorkloadProtectedItemExtendedInfo has a new optional parameter oldestRecoveryPointInVault - - Interface SubProtectionPolicy has a new optional parameter tieringPolicy - - Added Enum KnownTieringMode + - Operation ResourceGuardProxy.put has a new signature ## 8.1.1 (2022-04-29) diff --git a/sdk/recoveryservicesbackup/arm-recoveryservicesbackup/_meta.json b/sdk/recoveryservicesbackup/arm-recoveryservicesbackup/_meta.json index aeacdd8ca06f..07010800c331 100644 --- a/sdk/recoveryservicesbackup/arm-recoveryservicesbackup/_meta.json +++ b/sdk/recoveryservicesbackup/arm-recoveryservicesbackup/_meta.json @@ -1,8 +1,8 @@ { - "commit": "4c25202569e348fc15275947be54acd191e70c0c", + "commit": "99d29c2fb433b468c4566901a9002435a530ff81", "readme": "specification/recoveryservicesbackup/resource-manager/readme.md", - "autorest_command": "autorest --version=3.7.3 --typescript --modelerfour.lenient-model-deduplication --head-as-boolean=true --license-header=MICROSOFT_MIT_NO_VERSION --generate-test --typescript-sdks-folder=D:\\work\\azure-sdk-for-js ..\\azure-rest-api-specs\\specification\\recoveryservicesbackup\\resource-manager\\readme.md --use=@autorest/typescript@6.0.0-alpha.19.20220408.1 --generate-sample=true", + "autorest_command": "autorest --version=3.7.3 --typescript --modelerfour.lenient-model-deduplication --head-as-boolean=true --license-header=MICROSOFT_MIT_NO_VERSION --generate-test --typescript-sdks-folder=/mnt/vss/_work/1/s/azure-sdk-for-js ../azure-rest-api-specs/specification/recoveryservicesbackup/resource-manager/readme.md --use=@autorest/typescript@6.0.0-alpha.19.20220425.1", "repository_url": "https://github.com/Azure/azure-rest-api-specs.git", "release_tool": "@azure-tools/js-sdk-release-tools@2.3.0", - "use": "@autorest/typescript@6.0.0-alpha.19.20220408.1" + "use": "@autorest/typescript@6.0.0-alpha.19.20220425.1" } \ No newline at end of file diff --git a/sdk/recoveryservicesbackup/arm-recoveryservicesbackup/package.json b/sdk/recoveryservicesbackup/arm-recoveryservicesbackup/package.json index 313d3d23b8c6..1aaaa6df1dd7 100644 --- a/sdk/recoveryservicesbackup/arm-recoveryservicesbackup/package.json +++ b/sdk/recoveryservicesbackup/arm-recoveryservicesbackup/package.json @@ -3,7 +3,7 @@ "sdk-type": "mgmt", "author": "Microsoft Corporation", "description": "A generated SDK for RecoveryServicesBackupClient.", - "version": "8.2.0", + "version": "9.0.0", "engines": { "node": ">=12.0.0" }, @@ -40,9 +40,11 @@ "uglify-js": "^3.4.9", "rimraf": "^3.0.0", "@azure/identity": "^2.0.1", - "@azure-tools/test-recorder": "^1.0.0", + "@azure-tools/test-recorder": "^2.0.0", + "@azure-tools/test-credential": "^1.0.0", "mocha": "^7.1.1", - "cross-env": "^7.0.2" + "cross-env": "^7.0.2", + "@azure/dev-tool": "^1.0.0" }, "homepage": "https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/recoveryservicesbackup/arm-recoveryservicesbackup", "repository": { @@ -93,7 +95,7 @@ "unit-test:node": "cross-env TEST_MODE=playback npm run integration-test:node", "unit-test:browser": "echo skipped", "integration-test": "npm run integration-test:node && npm run integration-test:browser", - "integration-test:node": "mocha -r esm --require ts-node/register --timeout 1200000 --full-trace test/*.ts --reporter ../../../common/tools/mocha-multi-reporter.js", + "integration-test:node": "dev-tool run test:node-ts-input -- --timeout 1200000 'test/*.ts'", "integration-test:browser": "echo skipped", "docs": "echo skipped" }, @@ -106,13 +108,5 @@ } ] }, - "autoPublish": true, - "//sampleConfiguration": { - "productName": "", - "productSlugs": [ - "azure" - ], - "disableDocsMs": true, - "apiRefLink": "https://docs.microsoft.com/javascript/api/@azure/arm-recoveryservicesbackup?view=azure-node-preview" - } -} + "autoPublish": true +} \ No newline at end of file diff --git a/sdk/recoveryservicesbackup/arm-recoveryservicesbackup/review/arm-recoveryservicesbackup.api.md b/sdk/recoveryservicesbackup/arm-recoveryservicesbackup/review/arm-recoveryservicesbackup.api.md index 44c33bc848b8..3a0b3c73a6c1 100644 --- a/sdk/recoveryservicesbackup/arm-recoveryservicesbackup/review/arm-recoveryservicesbackup.api.md +++ b/sdk/recoveryservicesbackup/arm-recoveryservicesbackup/review/arm-recoveryservicesbackup.api.md @@ -215,10 +215,7 @@ export type AzureIaaSVMProtectedItem = ProtectedItem & { // @public export interface AzureIaaSVMProtectedItemExtendedInfo { - newestRecoveryPointInArchive?: Date; oldestRecoveryPoint?: Date; - oldestRecoveryPointInArchive?: Date; - oldestRecoveryPointInVault?: Date; policyInconsistent?: boolean; recoveryPointCount?: number; } @@ -232,9 +229,6 @@ export type AzureIaaSVMProtectionPolicy = ProtectionPolicy & { instantRPDetails?: InstantRPAdditionalDetails; schedulePolicy?: SchedulePolicyUnion; retentionPolicy?: RetentionPolicyUnion; - tieringPolicy?: { - [propertyName: string]: TieringPolicy; - }; instantRpRetentionRangeInDays?: number; timeZone?: string; policyType?: IaasvmPolicyType; @@ -407,10 +401,7 @@ export type AzureVmWorkloadProtectedItem = ProtectedItem & { // @public export interface AzureVmWorkloadProtectedItemExtendedInfo { - newestRecoveryPointInArchive?: Date; oldestRecoveryPoint?: Date; - oldestRecoveryPointInArchive?: Date; - oldestRecoveryPointInVault?: Date; policyState?: string; recoveryModel?: string; recoveryPointCount?: number; @@ -2694,18 +2685,6 @@ export enum KnownSupportStatus { Supported = "Supported" } -// @public -export enum KnownTieringMode { - // (undocumented) - DoNotTier = "DoNotTier", - // (undocumented) - Invalid = "Invalid", - // (undocumented) - TierAfter = "TierAfter", - // (undocumented) - TierRecommended = "TierRecommended" -} - // @public export enum KnownType { // (undocumented) @@ -3883,7 +3862,7 @@ export type ResourceGuardProxiesGetResponse = ResourceGuardProxyBaseResourceList export interface ResourceGuardProxy { delete(vaultName: string, resourceGroupName: string, resourceGuardProxyName: string, options?: ResourceGuardProxyDeleteOptionalParams): Promise; get(vaultName: string, resourceGroupName: string, resourceGuardProxyName: string, options?: ResourceGuardProxyGetOptionalParams): Promise; - put(vaultName: string, resourceGroupName: string, resourceGuardProxyName: string, options?: ResourceGuardProxyPutOptionalParams): Promise; + put(vaultName: string, resourceGroupName: string, resourceGuardProxyName: string, parameters: ResourceGuardProxyBaseResource, options?: ResourceGuardProxyPutOptionalParams): Promise; unlockDelete(vaultName: string, resourceGroupName: string, resourceGuardProxyName: string, parameters: UnlockDeleteRequest, options?: ResourceGuardProxyUnlockDeleteOptionalParams): Promise; } @@ -4104,9 +4083,6 @@ export interface SubProtectionPolicy { policyType?: PolicyType; retentionPolicy?: RetentionPolicyUnion; schedulePolicy?: SchedulePolicyUnion; - tieringPolicy?: { - [propertyName: string]: TieringPolicy; - }; } // @public @@ -4126,16 +4102,6 @@ export interface TargetRestoreInfo { targetDirectoryForFileRestore?: string; } -// @public -export type TieringMode = string; - -// @public -export interface TieringPolicy { - duration?: number; - durationType?: RetentionDurationType; - tieringMode?: TieringMode; -} - // @public export interface TokenInformation { expiryTimeInUtcTicks?: number; diff --git a/sdk/recoveryservicesbackup/arm-recoveryservicesbackup/src/models/index.ts b/sdk/recoveryservicesbackup/arm-recoveryservicesbackup/src/models/index.ts index f843f580fa10..bee48345e1e9 100644 --- a/sdk/recoveryservicesbackup/arm-recoveryservicesbackup/src/models/index.ts +++ b/sdk/recoveryservicesbackup/arm-recoveryservicesbackup/src/models/index.ts @@ -1122,12 +1122,6 @@ export interface SubProtectionPolicy { schedulePolicy?: SchedulePolicyUnion; /** Retention policy with the details on backup copy retention ranges. */ retentionPolicy?: RetentionPolicyUnion; - /** - * Tiering policy to automatically move RPs to another tier. - * Key is Target Tier, defined in RecoveryPointTierType enum. - * Tiering policy specifies the criteria to move RP to the target tier. - */ - tieringPolicy?: { [propertyName: string]: TieringPolicy }; } /** Base class for backup schedule. */ @@ -1146,40 +1140,10 @@ export interface RetentionPolicy { retentionPolicyType: "LongTermRetentionPolicy" | "SimpleRetentionPolicy"; } -/** - * Tiering Policy for a target tier. - * If the policy is not specified for a given target tier, service retains the existing configured tiering policy for that tier - */ -export interface TieringPolicy { - /** - * Tiering Mode to control automatic tiering of recovery points. Supported values are: - * 1. TierRecommended: Tier all recovery points recommended to be tiered - * 2. TierAfter: Tier all recovery points after a fixed period, as specified in duration + durationType below. - * 3. DoNotTier: Do not tier any recovery points - */ - tieringMode?: TieringMode; - /** - * Number of days/weeks/months/years to retain backups in current tier before tiering. - * Used only if TieringMode is set to TierAfter - */ - duration?: number; - /** - * Retention duration type: days/weeks/months/years - * Used only if TieringMode is set to TierAfter - */ - durationType?: RetentionDurationType; -} - /** Additional information on Azure IaaS VM specific backup item. */ export interface AzureIaaSVMProtectedItemExtendedInfo { - /** The oldest backup copy available for this backup item across all tiers. */ + /** The oldest backup copy available for this backup item. */ oldestRecoveryPoint?: Date; - /** The oldest backup copy available for this backup item in vault tier */ - oldestRecoveryPointInVault?: Date; - /** The oldest backup copy available for this backup item in archive tier */ - oldestRecoveryPointInArchive?: Date; - /** The latest backup copy available for this backup item in archive tier */ - newestRecoveryPointInArchive?: Date; /** Number of backup copies available for this backup item. */ recoveryPointCount?: number; /** Specifies if backup policy associated with the backup item is inconsistent. */ @@ -1309,14 +1273,8 @@ export interface AzureStorageJobTaskDetails { /** Additional information on Azure Workload for SQL specific backup item. */ export interface AzureVmWorkloadProtectedItemExtendedInfo { - /** The oldest backup copy available for this backup item across all tiers. */ + /** The oldest backup copy available for this backup item. */ oldestRecoveryPoint?: Date; - /** The oldest backup copy available for this backup item in vault tier */ - oldestRecoveryPointInVault?: Date; - /** The oldest backup copy available for this backup item in archive tier */ - oldestRecoveryPointInArchive?: Date; - /** The latest backup copy available for this backup item in archive tier */ - newestRecoveryPointInArchive?: Date; /** Number of backup copies available for this backup item. */ recoveryPointCount?: number; /** Indicates consistency of policy object and policy applied to this backup item. */ @@ -2720,12 +2678,6 @@ export type AzureIaaSVMProtectionPolicy = ProtectionPolicy & { schedulePolicy?: SchedulePolicyUnion; /** Retention policy with the details on backup copy retention ranges. */ retentionPolicy?: RetentionPolicyUnion; - /** - * Tiering policy to automatically move RPs to another tier - * Key is Target Tier, defined in RecoveryPointTierType enum. - * Tiering policy specifies the criteria to move RP to the target tier. - */ - tieringPolicy?: { [propertyName: string]: TieringPolicy }; /** Instant RP retention policy range in days */ instantRpRetentionRangeInDays?: number; /** TimeZone optional input as string. For example: TimeZone = "Pacific Standard Time". */ @@ -4289,48 +4241,6 @@ export enum KnownPolicyType { */ export type PolicyType = string; -/** Known values of {@link TieringMode} that the service accepts. */ -export enum KnownTieringMode { - Invalid = "Invalid", - TierRecommended = "TierRecommended", - TierAfter = "TierAfter", - DoNotTier = "DoNotTier" -} - -/** - * Defines values for TieringMode. \ - * {@link KnownTieringMode} can be used interchangeably with TieringMode, - * this enum contains the known values that the service supports. - * ### Known values supported by the service - * **Invalid** \ - * **TierRecommended** \ - * **TierAfter** \ - * **DoNotTier** - */ -export type TieringMode = string; - -/** Known values of {@link RetentionDurationType} that the service accepts. */ -export enum KnownRetentionDurationType { - Invalid = "Invalid", - Days = "Days", - Weeks = "Weeks", - Months = "Months", - Years = "Years" -} - -/** - * Defines values for RetentionDurationType. \ - * {@link KnownRetentionDurationType} can be used interchangeably with RetentionDurationType, - * this enum contains the known values that the service supports. - * ### Known values supported by the service - * **Invalid** \ - * **Days** \ - * **Weeks** \ - * **Months** \ - * **Years** - */ -export type RetentionDurationType = string; - /** Known values of {@link HealthStatus} that the service accepts. */ export enum KnownHealthStatus { Passed = "Passed", @@ -4537,6 +4447,28 @@ export enum KnownRestorePointQueryType { */ export type RestorePointQueryType = string; +/** Known values of {@link RetentionDurationType} that the service accepts. */ +export enum KnownRetentionDurationType { + Invalid = "Invalid", + Days = "Days", + Weeks = "Weeks", + Months = "Months", + Years = "Years" +} + +/** + * Defines values for RetentionDurationType. \ + * {@link KnownRetentionDurationType} can be used interchangeably with RetentionDurationType, + * this enum contains the known values that the service supports. + * ### Known values supported by the service + * **Invalid** \ + * **Days** \ + * **Weeks** \ + * **Months** \ + * **Years** + */ +export type RetentionDurationType = string; + /** Known values of {@link JobStatus} that the service accepts. */ export enum KnownJobStatus { Invalid = "Invalid", diff --git a/sdk/recoveryservicesbackup/arm-recoveryservicesbackup/src/models/mappers.ts b/sdk/recoveryservicesbackup/arm-recoveryservicesbackup/src/models/mappers.ts index eb5dd0999ac7..9201787fa7fd 100644 --- a/sdk/recoveryservicesbackup/arm-recoveryservicesbackup/src/models/mappers.ts +++ b/sdk/recoveryservicesbackup/arm-recoveryservicesbackup/src/models/mappers.ts @@ -2413,13 +2413,6 @@ export const SubProtectionPolicy: coreClient.CompositeMapper = { name: "Composite", className: "RetentionPolicy" } - }, - tieringPolicy: { - serializedName: "tieringPolicy", - type: { - name: "Dictionary", - value: { type: { name: "Composite", className: "TieringPolicy" } } - } } } } @@ -2467,33 +2460,6 @@ export const RetentionPolicy: coreClient.CompositeMapper = { } }; -export const TieringPolicy: coreClient.CompositeMapper = { - type: { - name: "Composite", - className: "TieringPolicy", - modelProperties: { - tieringMode: { - serializedName: "tieringMode", - type: { - name: "String" - } - }, - duration: { - serializedName: "duration", - type: { - name: "Number" - } - }, - durationType: { - serializedName: "durationType", - type: { - name: "String" - } - } - } - } -}; - export const AzureIaaSVMProtectedItemExtendedInfo: coreClient.CompositeMapper = { type: { name: "Composite", @@ -2505,24 +2471,6 @@ export const AzureIaaSVMProtectedItemExtendedInfo: coreClient.CompositeMapper = name: "DateTime" } }, - oldestRecoveryPointInVault: { - serializedName: "oldestRecoveryPointInVault", - type: { - name: "DateTime" - } - }, - oldestRecoveryPointInArchive: { - serializedName: "oldestRecoveryPointInArchive", - type: { - name: "DateTime" - } - }, - newestRecoveryPointInArchive: { - serializedName: "newestRecoveryPointInArchive", - type: { - name: "DateTime" - } - }, recoveryPointCount: { serializedName: "recoveryPointCount", type: { @@ -2885,24 +2833,6 @@ export const AzureVmWorkloadProtectedItemExtendedInfo: coreClient.CompositeMappe name: "DateTime" } }, - oldestRecoveryPointInVault: { - serializedName: "oldestRecoveryPointInVault", - type: { - name: "DateTime" - } - }, - oldestRecoveryPointInArchive: { - serializedName: "oldestRecoveryPointInArchive", - type: { - name: "DateTime" - } - }, - newestRecoveryPointInArchive: { - serializedName: "newestRecoveryPointInArchive", - type: { - name: "DateTime" - } - }, recoveryPointCount: { serializedName: "recoveryPointCount", type: { @@ -6915,13 +6845,6 @@ export const AzureIaaSVMProtectionPolicy: coreClient.CompositeMapper = { className: "RetentionPolicy" } }, - tieringPolicy: { - serializedName: "tieringPolicy", - type: { - name: "Dictionary", - value: { type: { name: "Composite", className: "TieringPolicy" } } - } - }, instantRpRetentionRangeInDays: { serializedName: "instantRpRetentionRangeInDays", type: { diff --git a/sdk/recoveryservicesbackup/arm-recoveryservicesbackup/src/models/parameters.ts b/sdk/recoveryservicesbackup/arm-recoveryservicesbackup/src/models/parameters.ts index df79fabc0b4c..0050939e5d18 100644 --- a/sdk/recoveryservicesbackup/arm-recoveryservicesbackup/src/models/parameters.ts +++ b/sdk/recoveryservicesbackup/arm-recoveryservicesbackup/src/models/parameters.ts @@ -32,6 +32,7 @@ import { ILRRequestResource as ILRRequestResourceMapper, SecurityPinBase as SecurityPinBaseMapper, ListRecoveryPointsRecommendedForMoveRequest as ListRecoveryPointsRecommendedForMoveRequestMapper, + ResourceGuardProxyBaseResource as ResourceGuardProxyBaseResourceMapper, UnlockDeleteRequest as UnlockDeleteRequestMapper } from "../models/mappers"; @@ -62,7 +63,7 @@ export const $host: OperationURLParameter = { export const apiVersion: OperationQueryParameter = { parameterPath: "apiVersion", mapper: { - defaultValue: "2021-12-01", + defaultValue: "2022-02-01", isConstant: true, serializedName: "api-version", type: { @@ -381,6 +382,11 @@ export const resourceGuardProxyName: OperationURLParameter = { }; export const parameters20: OperationParameter = { + parameterPath: "parameters", + mapper: ResourceGuardProxyBaseResourceMapper +}; + +export const parameters21: OperationParameter = { parameterPath: "parameters", mapper: UnlockDeleteRequestMapper }; diff --git a/sdk/recoveryservicesbackup/arm-recoveryservicesbackup/src/operations/resourceGuardProxy.ts b/sdk/recoveryservicesbackup/arm-recoveryservicesbackup/src/operations/resourceGuardProxy.ts index cc2ed3cd1b18..b74d943cf5fb 100644 --- a/sdk/recoveryservicesbackup/arm-recoveryservicesbackup/src/operations/resourceGuardProxy.ts +++ b/sdk/recoveryservicesbackup/arm-recoveryservicesbackup/src/operations/resourceGuardProxy.ts @@ -14,6 +14,7 @@ import { RecoveryServicesBackupClient } from "../recoveryServicesBackupClient"; import { ResourceGuardProxyGetOptionalParams, ResourceGuardProxyGetResponse, + ResourceGuardProxyBaseResource, ResourceGuardProxyPutOptionalParams, ResourceGuardProxyPutResponse, ResourceGuardProxyDeleteOptionalParams, @@ -61,16 +62,24 @@ export class ResourceGuardProxyImpl implements ResourceGuardProxy { * @param resourceGroupName The name of the resource group where the recovery services vault is * present. * @param resourceGuardProxyName + * @param parameters Request body for operation * @param options The options parameters. */ put( vaultName: string, resourceGroupName: string, resourceGuardProxyName: string, + parameters: ResourceGuardProxyBaseResource, options?: ResourceGuardProxyPutOptionalParams ): Promise { return this.client.sendOperationRequest( - { vaultName, resourceGroupName, resourceGuardProxyName, options }, + { + vaultName, + resourceGroupName, + resourceGuardProxyName, + parameters, + options + }, putOperationSpec ); } @@ -161,6 +170,7 @@ const putOperationSpec: coreClient.OperationSpec = { bodyMapper: Mappers.CloudError } }, + requestBody: Parameters.parameters20, queryParameters: [Parameters.apiVersion], urlParameters: [ Parameters.$host, @@ -169,7 +179,8 @@ const putOperationSpec: coreClient.OperationSpec = { Parameters.subscriptionId, Parameters.resourceGuardProxyName ], - headerParameters: [Parameters.accept], + headerParameters: [Parameters.accept, Parameters.contentType], + mediaType: "json", serializer }; const deleteOperationSpec: coreClient.OperationSpec = { @@ -206,7 +217,7 @@ const unlockDeleteOperationSpec: coreClient.OperationSpec = { bodyMapper: Mappers.CloudError } }, - requestBody: Parameters.parameters20, + requestBody: Parameters.parameters21, queryParameters: [Parameters.apiVersion], urlParameters: [ Parameters.$host, diff --git a/sdk/recoveryservicesbackup/arm-recoveryservicesbackup/src/operationsInterfaces/resourceGuardProxy.ts b/sdk/recoveryservicesbackup/arm-recoveryservicesbackup/src/operationsInterfaces/resourceGuardProxy.ts index c3fafd6b4752..3a1881319eaa 100644 --- a/sdk/recoveryservicesbackup/arm-recoveryservicesbackup/src/operationsInterfaces/resourceGuardProxy.ts +++ b/sdk/recoveryservicesbackup/arm-recoveryservicesbackup/src/operationsInterfaces/resourceGuardProxy.ts @@ -9,6 +9,7 @@ import { ResourceGuardProxyGetOptionalParams, ResourceGuardProxyGetResponse, + ResourceGuardProxyBaseResource, ResourceGuardProxyPutOptionalParams, ResourceGuardProxyPutResponse, ResourceGuardProxyDeleteOptionalParams, @@ -40,12 +41,14 @@ export interface ResourceGuardProxy { * @param resourceGroupName The name of the resource group where the recovery services vault is * present. * @param resourceGuardProxyName + * @param parameters Request body for operation * @param options The options parameters. */ put( vaultName: string, resourceGroupName: string, resourceGuardProxyName: string, + parameters: ResourceGuardProxyBaseResource, options?: ResourceGuardProxyPutOptionalParams ): Promise; /** diff --git a/sdk/recoveryservicesbackup/arm-recoveryservicesbackup/src/recoveryServicesBackupClient.ts b/sdk/recoveryservicesbackup/arm-recoveryservicesbackup/src/recoveryServicesBackupClient.ts index 82cf5ab2bf16..64440e3fdcff 100644 --- a/sdk/recoveryservicesbackup/arm-recoveryservicesbackup/src/recoveryServicesBackupClient.ts +++ b/sdk/recoveryservicesbackup/arm-recoveryservicesbackup/src/recoveryServicesBackupClient.ts @@ -8,6 +8,11 @@ import * as coreClient from "@azure/core-client"; import * as coreRestPipeline from "@azure/core-rest-pipeline"; +import { + PipelineRequest, + PipelineResponse, + SendRequest +} from "@azure/core-rest-pipeline"; import * as coreAuth from "@azure/core-auth"; import { PollerLike, PollOperationState, LroEngine } from "@azure/core-lro"; import { LroImpl } from "./lroImpl"; @@ -157,7 +162,7 @@ export class RecoveryServicesBackupClient extends coreClient.ServiceClient { credential: credentials }; - const packageDetails = `azsdk-js-arm-recoveryservicesbackup/8.2.0`; + const packageDetails = `azsdk-js-arm-recoveryservicesbackup/9.0.0`; const userAgentPrefix = options.userAgentOptions && options.userAgentOptions.userAgentPrefix ? `${options.userAgentOptions.userAgentPrefix} ${packageDetails}` @@ -204,7 +209,7 @@ export class RecoveryServicesBackupClient extends coreClient.ServiceClient { // Assigning values to Constant parameters this.$host = options.$host || "https://management.azure.com"; - this.apiVersion = options.apiVersion || "2021-12-01"; + this.apiVersion = options.apiVersion || "2022-02-01"; this.backupResourceStorageConfigsNonCRR = new BackupResourceStorageConfigsNonCRRImpl( this ); @@ -277,6 +282,35 @@ export class RecoveryServicesBackupClient extends coreClient.ServiceClient { ); this.resourceGuardProxies = new ResourceGuardProxiesImpl(this); this.resourceGuardProxy = new ResourceGuardProxyImpl(this); + this.addCustomApiVersionPolicy(options.apiVersion); + } + + /** A function that adds a policy that sets the api-version (or equivalent) to reflect the library version. */ + private addCustomApiVersionPolicy(apiVersion?: string) { + if (!apiVersion) { + return; + } + const apiVersionPolicy = { + name: "CustomApiVersionPolicy", + async sendRequest( + request: PipelineRequest, + next: SendRequest + ): Promise { + const param = request.url.split("?"); + if (param.length > 1) { + const newParams = param[1].split("&").map((item) => { + if (item.indexOf("api-version") > -1) { + return item.replace(/(?<==).*$/, apiVersion); + } else { + return item; + } + }); + request.url = param[0] + "?" + newParams.join("&"); + } + return next(request); + } + }; + this.pipeline.addPolicy(apiVersionPolicy); } /** diff --git a/sdk/recoveryservicesbackup/arm-recoveryservicesbackup/test/sampleTest.ts b/sdk/recoveryservicesbackup/arm-recoveryservicesbackup/test/sampleTest.ts index 7ed89b043e1b..25aeb3ebcc36 100644 --- a/sdk/recoveryservicesbackup/arm-recoveryservicesbackup/test/sampleTest.ts +++ b/sdk/recoveryservicesbackup/arm-recoveryservicesbackup/test/sampleTest.ts @@ -7,35 +7,30 @@ */ import { - env, - record, - RecorderEnvironmentSetup, - Recorder + Recorder, + RecorderStartOptions, + env } from "@azure-tools/test-recorder"; -import * as assert from "assert"; +import { assert } from "chai"; +import { Context } from "mocha"; -const recorderEnvSetup: RecorderEnvironmentSetup = { - replaceableVariables: { - AZURE_CLIENT_ID: "azure_client_id", - AZURE_CLIENT_SECRET: "azure_client_secret", - AZURE_TENANT_ID: "88888888-8888-8888-8888-888888888888", - SUBSCRIPTION_ID: "azure_subscription_id" - }, - customizationsOnRecordings: [ - (recording: any): any => - recording.replace( - /"access_token":"[^"]*"/g, - `"access_token":"access_token"` - ) - ], - queryParametersToSkip: [] +const replaceableVariables: Record = { + AZURE_CLIENT_ID: "azure_client_id", + AZURE_CLIENT_SECRET: "azure_client_secret", + AZURE_TENANT_ID: "88888888-8888-8888-8888-888888888888", + SUBSCRIPTION_ID: "azure_subscription_id" +}; + +const recorderOptions: RecorderStartOptions = { + envSetupForPlayback: replaceableVariables }; describe("My test", () => { let recorder: Recorder; - beforeEach(async function() { - recorder = record(this, recorderEnvSetup); + beforeEach(async function(this: Context) { + recorder = new Recorder(this.currentTest); + await recorder.start(recorderOptions); }); afterEach(async function() { diff --git a/sdk/recoveryservicesbackup/arm-recoveryservicesbackup/tsconfig.json b/sdk/recoveryservicesbackup/arm-recoveryservicesbackup/tsconfig.json index a7e9eaf1a49b..3e6ae96443f3 100644 --- a/sdk/recoveryservicesbackup/arm-recoveryservicesbackup/tsconfig.json +++ b/sdk/recoveryservicesbackup/arm-recoveryservicesbackup/tsconfig.json @@ -15,17 +15,11 @@ ], "declaration": true, "outDir": "./dist-esm", - "importHelpers": true, - "paths": { - "@azure/arm-recoveryservicesbackup": [ - "./src/index" - ] - } + "importHelpers": true }, "include": [ "./src/**/*.ts", - "./test/**/*.ts", - "samples-dev/**/*.ts" + "./test/**/*.ts" ], "exclude": [ "node_modules"