diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index 8e099cee31d4..80e16390b47d 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -3925,7 +3925,7 @@ packages: dependencies: semver: 7.3.8 shelljs: 0.8.5 - typescript: 5.1.0-dev.20230227 + typescript: 5.1.0-dev.20230301 dev: false /ecdsa-sig-formatter/1.0.11: @@ -8644,8 +8644,8 @@ packages: hasBin: true dev: false - /typescript/5.1.0-dev.20230227: - resolution: {integrity: sha512-nPxrgb/3C40X3eXsCPUpiVEgQltswKoAh3Zwm7tDIVE4ldDr3flXq63odqyWUuOZFc/+NCFdm80RpTB0nz2M8w==} + /typescript/5.1.0-dev.20230301: + resolution: {integrity: sha512-aJ0PIgQ00zlf9npD2tri7MWDAooMoh3iIn4v0hAMSRCSKqJjTzt7fVopvdtbvWPKripipxeXnX5mhkBZcGrEKQ==} engines: {node: '>=4.2.0'} hasBin: true dev: false @@ -13911,15 +13911,15 @@ packages: dev: false file:projects/arm-recoveryservicesbackup.tgz: - resolution: {integrity: sha512-Ud5XgJpsZBq5vtmnlseRPAZJyuySlBBzMClfqQBtsu+dT7yoIkp4G9rEcz/Df/AVxmXxJkD4Xkpnynndio88HQ==, tarball: file:projects/arm-recoveryservicesbackup.tgz} + resolution: {integrity: sha512-ujbREIL2OAvAl4obLe3bLdX5pWVhmoIotgheSrxKlwDSXlt1gfgiOPSpHziRnuORPeetdSjiSbRXLRrZIzSl2w==, tarball: file:projects/arm-recoveryservicesbackup.tgz} name: '@rush-temp/arm-recoveryservicesbackup' version: 0.0.0 dependencies: '@azure/identity': 2.1.0 '@microsoft/api-extractor': 7.34.4_@types+node@14.18.36 - '@rollup/plugin-commonjs': 24.0.1_rollup@2.79.1 - '@rollup/plugin-json': 6.0.0_rollup@2.79.1 - '@rollup/plugin-multi-entry': 6.0.0_rollup@2.79.1 + '@rollup/plugin-commonjs': 21.1.0_rollup@2.79.1 + '@rollup/plugin-json': 4.1.0_rollup@2.79.1 + '@rollup/plugin-multi-entry': 4.1.0_rollup@2.79.1 '@rollup/plugin-node-resolve': 13.3.0_rollup@2.79.1 '@types/chai': 4.3.4 '@types/node': 14.18.36 diff --git a/sdk/recoveryservicesbackup/arm-recoveryservicesbackup/CHANGELOG.md b/sdk/recoveryservicesbackup/arm-recoveryservicesbackup/CHANGELOG.md index 1e5bc8be956e..681977758937 100644 --- a/sdk/recoveryservicesbackup/arm-recoveryservicesbackup/CHANGELOG.md +++ b/sdk/recoveryservicesbackup/arm-recoveryservicesbackup/CHANGELOG.md @@ -1,15 +1,22 @@ # Release History + +## 10.1.0 (2023-03-01) + +**Features** -## 10.0.1 (Unreleased) - -### Features Added - -### Breaking Changes - -### Bugs Fixed - -### Other Changes - + - Added Interface ExtendedLocation + - Added Interface SecuredVMDetails + - Added Interface TargetDiskNetworkAccessSettings + - Added Type Alias TargetDiskNetworkAccessOption + - Interface BmsrpQueryObject has a new optional parameter includeSoftDeletedRP + - Interface IaasVMRecoveryPoint has a new optional parameter isPrivateAccessEnabledOnAnyDisk + - Interface IaasVMRecoveryPoint has a new optional parameter securityType + - Interface IaasVMRestoreRequest has a new optional parameter extendedLocation + - Interface IaasVMRestoreRequest has a new optional parameter securedVMDetails + - Interface IaasVMRestoreRequest has a new optional parameter targetDiskNetworkAccessSettings + - Interface RecoveryPointProperties has a new optional parameter isSoftDeleted + + ## 10.0.0 (2023-01-18) **Features** diff --git a/sdk/recoveryservicesbackup/arm-recoveryservicesbackup/_meta.json b/sdk/recoveryservicesbackup/arm-recoveryservicesbackup/_meta.json index e82a9b550866..7ddc5e571b87 100644 --- a/sdk/recoveryservicesbackup/arm-recoveryservicesbackup/_meta.json +++ b/sdk/recoveryservicesbackup/arm-recoveryservicesbackup/_meta.json @@ -1,8 +1,8 @@ { - "commit": "0e20dd2e4e2a40e83840c30cce2efc4847fd9cb9", + "commit": "bbf4bb04656aa83d1f6cbc53e49eb6e5aad6b351", "readme": "specification/recoveryservicesbackup/resource-manager/readme.md", - "autorest_command": "autorest --version=3.9.3 --typescript --modelerfour.lenient-model-deduplication --azure-arm --head-as-boolean=true --license-header=MICROSOFT_MIT_NO_VERSION --generate-test --typescript-sdks-folder=F:\\azure-sdk-for-js ..\\azure-rest-api-specs\\specification\\recoveryservicesbackup\\resource-manager\\readme.md --use=@autorest/typescript@6.0.0-rc.7 --generate-sample=true", + "autorest_command": "autorest --version=3.9.3 --typescript --modelerfour.lenient-model-deduplication --azure-arm --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-rc.5", "repository_url": "https://github.com/Azure/azure-rest-api-specs.git", - "release_tool": "@azure-tools/js-sdk-release-tools@2.5.4", - "use": "@autorest/typescript@6.0.0-rc.7" + "release_tool": "@azure-tools/js-sdk-release-tools@2.6.2", + "use": "@autorest/typescript@6.0.0-rc.5" } \ No newline at end of file diff --git a/sdk/recoveryservicesbackup/arm-recoveryservicesbackup/package.json b/sdk/recoveryservicesbackup/arm-recoveryservicesbackup/package.json index 486840565424..57443784282d 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": "10.0.1", + "version": "10.1.0", "engines": { "node": ">=14.0.0" }, @@ -29,9 +29,9 @@ "types": "./types/arm-recoveryservicesbackup.d.ts", "devDependencies": { "@microsoft/api-extractor": "^7.31.1", - "@rollup/plugin-commonjs": "^24.0.0", - "@rollup/plugin-json": "^6.0.0", - "@rollup/plugin-multi-entry": "^6.0.0", + "@rollup/plugin-commonjs": "^21.0.1", + "@rollup/plugin-json": "^4.1.0", + "@rollup/plugin-multi-entry": "^4.1.0", "@rollup/plugin-node-resolve": "^13.1.3", "mkdirp": "^1.0.4", "rollup": "^2.66.1", @@ -39,7 +39,6 @@ "typescript": "~4.8.0", "uglify-js": "^3.4.9", "rimraf": "^3.0.0", - "dotenv": "^16.0.0", "@azure/identity": "^2.0.1", "@azure-tools/test-recorder": "^2.0.0", "@azure-tools/test-credential": "^1.0.0", @@ -50,6 +49,7 @@ "@types/node": "^14.0.0", "@azure/dev-tool": "^1.0.0" }, + "homepage": "https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/recoveryservicesbackup/arm-recoveryservicesbackup", "repository": { "type": "git", "url": "https://github.com/Azure/azure-sdk-for-js.git" @@ -110,14 +110,5 @@ } ] }, - "autoPublish": true, - "homepage": "https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/recoveryservicesbackup/arm-recoveryservicesbackup", - "//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 8998529a9331..d68c74ea012f 100644 --- a/sdk/recoveryservicesbackup/arm-recoveryservicesbackup/review/arm-recoveryservicesbackup.api.md +++ b/sdk/recoveryservicesbackup/arm-recoveryservicesbackup/review/arm-recoveryservicesbackup.api.md @@ -1280,6 +1280,7 @@ export interface BMSRefreshContainersQueryObject { export interface BmsrpQueryObject { endDate?: Date; extendedInfo?: boolean; + includeSoftDeletedRP?: boolean; moveReadyRPOnly?: boolean; restorePointQueryType?: RestorePointQueryType; startDate?: Date; @@ -1594,6 +1595,12 @@ export interface ExportJobsOperationResultsGetOptionalParams extends coreClient. // @public export type ExportJobsOperationResultsGetResponse = OperationResultInfoBaseResource; +// @public +export interface ExtendedLocation { + name?: string; + type?: string; +} + // @public export interface ExtendedProperties { diskExclusionProperties?: DiskExclusionProperties; @@ -1745,6 +1752,7 @@ export type IaaSVMProtectableItemUnion = IaaSVMProtectableItem | AzureIaaSClassi export interface IaasVMRecoveryPoint extends RecoveryPoint { isInstantIlrSessionActive?: boolean; isManagedVirtualMachine?: boolean; + isPrivateAccessEnabledOnAnyDisk?: boolean; isSourceVMEncrypted?: boolean; keyAndSecret?: KeyAndSecretDetails; objectType: "IaasVMRecoveryPoint"; @@ -1759,6 +1767,7 @@ export interface IaasVMRecoveryPoint extends RecoveryPoint { recoveryPointTierDetails?: RecoveryPointTierInformationV2[]; recoveryPointTime?: Date; recoveryPointType?: string; + securityType?: string; sourceVMStorageType?: string; virtualMachineSize?: string; zones?: string[]; @@ -1770,6 +1779,7 @@ export interface IaasVMRestoreRequest extends RestoreRequest { createNewCloudService?: boolean; diskEncryptionSetId?: string; encryptionDetails?: EncryptionDetails; + extendedLocation?: ExtendedLocation; identityBasedRestoreDetails?: IdentityBasedRestoreDetails; identityInfo?: IdentityInfo; objectType: "IaasVMRestoreRequest" | "IaasVMRestoreWithRehydrationRequest"; @@ -1779,9 +1789,11 @@ export interface IaasVMRestoreRequest extends RestoreRequest { region?: string; restoreDiskLunList?: number[]; restoreWithManagedDisks?: boolean; + securedVMDetails?: SecuredVMDetails; sourceResourceId?: string; storageAccountId?: string; subnetId?: string; + targetDiskNetworkAccessSettings?: TargetDiskNetworkAccessSettings; targetDomainNameId?: string; targetResourceGroupId?: string; targetVirtualMachineId?: string; @@ -3363,6 +3375,7 @@ export interface RecoveryPointMoveReadinessInfo { // @public export interface RecoveryPointProperties { expiryTime?: string; + isSoftDeleted?: boolean; ruleName?: string; } @@ -3762,6 +3775,11 @@ export type SchedulePolicyUnion = SchedulePolicy | LogSchedulePolicy | LongTermS // @public export type ScheduleRunType = string; +// @public +export interface SecuredVMDetails { + securedVMOsDiskEncryptionSetId?: string; +} + // @public export interface SecurityPinBase { resourceGuardOperationRequests?: string[]; @@ -3858,6 +3876,15 @@ export interface TargetAFSRestoreInfo { targetResourceId?: string; } +// @public +export type TargetDiskNetworkAccessOption = "SameAsOnSourceDisks" | "EnablePrivateAccessForAllDisks" | "EnablePublicAccessForAllDisks"; + +// @public +export interface TargetDiskNetworkAccessSettings { + targetDiskAccessId?: string; + targetDiskNetworkAccessOption?: TargetDiskNetworkAccessOption; +} + // @public export interface TargetRestoreInfo { containerId?: string; diff --git a/sdk/recoveryservicesbackup/arm-recoveryservicesbackup/src/models/index.ts b/sdk/recoveryservicesbackup/arm-recoveryservicesbackup/src/models/index.ts index 2e99f73fc0e7..599628f304d7 100644 --- a/sdk/recoveryservicesbackup/arm-recoveryservicesbackup/src/models/index.ts +++ b/sdk/recoveryservicesbackup/arm-recoveryservicesbackup/src/models/index.ts @@ -1103,6 +1103,8 @@ export interface RecoveryPointProperties { expiryTime?: string; /** Rule name tagged on Recovery Point that governs life cycle */ ruleName?: string; + /** Bool to indicate whether RP is in soft delete state or not */ + isSoftDeleted?: boolean; } /** Restore file specs like file path, type and target folder path info. */ @@ -1466,6 +1468,8 @@ export interface BmsrpQueryObject { extendedInfo?: boolean; /** Whether the RP can be moved to another tier */ moveReadyRPOnly?: boolean; + /** Flag to indicate whether Soft Deleted RPs should be included/excluded from result. */ + includeSoftDeletedRP?: boolean; } /** Disk information */ @@ -1673,6 +1677,28 @@ export interface RecoveryPointDiskConfiguration { excludedDiskList?: DiskInformation[]; } +/** The extended location of Recovery point where VM was present. */ +export interface ExtendedLocation { + /** Name of the extended location. */ + name?: string; + /** Type of the extended location. Possible values include: 'EdgeZone' */ + type?: string; +} + +/** Restore request parameters for Secured VMs */ +export interface SecuredVMDetails { + /** Gets or Sets Disk Encryption Set Id for Secured VM OS Disk */ + securedVMOsDiskEncryptionSetId?: string; +} + +/** Specifies target network access settings for disks of VM to be restored. */ +export interface TargetDiskNetworkAccessSettings { + /** Network access settings to be used for restored disks */ + targetDiskNetworkAccessOption?: TargetDiskNetworkAccessOption; + /** Gets or sets the ARM resource ID of the target disk access to be used when TargetDiskNetworkAccessOption is set to TargetDiskNetworkAccessOption.UseNew */ + targetDiskAccessId?: string; +} + /** Filters to list the jobs. */ export interface JobQueryObject { /** Status of the job. */ @@ -2628,8 +2654,12 @@ export interface IaasVMRecoveryPoint extends RecoveryPoint { recoveryPointMoveReadinessInfo?: { [propertyName: string]: RecoveryPointMoveReadinessInfo; }; + /** Security Type of the Disk */ + securityType?: string; /** Properties of Recovery Point */ recoveryPointProperties?: RecoveryPointProperties; + /** This flag denotes if any of the disks in the VM are using Private access network setting */ + isPrivateAccessEnabledOnAnyDisk?: boolean; } /** AzureFileShare Restore Request */ @@ -2744,6 +2774,15 @@ export interface IaasVMRestoreRequest extends RestoreRequest { identityInfo?: IdentityInfo; /** IaaS VM workload specific restore details for restores using managed identity. */ identityBasedRestoreDetails?: IdentityBasedRestoreDetails; + /** + * Target extended location where the VM should be restored, + * should be null if restore is to be done in public cloud + */ + extendedLocation?: ExtendedLocation; + /** Stores Secured VM Details */ + securedVMDetails?: SecuredVMDetails; + /** Specifies target network access settings for disks of VM to be restored, */ + targetDiskNetworkAccessSettings?: TargetDiskNetworkAccessSettings; } /** Azure VM (Mercury) workload-specific backup policy. */ @@ -5483,6 +5522,11 @@ export type DayOfWeek = | "Thursday" | "Friday" | "Saturday"; +/** Defines values for TargetDiskNetworkAccessOption. */ +export type TargetDiskNetworkAccessOption = + | "SameAsOnSourceDisks" + | "EnablePrivateAccessForAllDisks" + | "EnablePublicAccessForAllDisks"; /** Defines values for WeekOfMonth. */ export type WeekOfMonth = | "First" diff --git a/sdk/recoveryservicesbackup/arm-recoveryservicesbackup/src/models/mappers.ts b/sdk/recoveryservicesbackup/arm-recoveryservicesbackup/src/models/mappers.ts index 8d62fe2dcceb..64e597009710 100644 --- a/sdk/recoveryservicesbackup/arm-recoveryservicesbackup/src/models/mappers.ts +++ b/sdk/recoveryservicesbackup/arm-recoveryservicesbackup/src/models/mappers.ts @@ -2378,6 +2378,12 @@ export const RecoveryPointProperties: coreClient.CompositeMapper = { type: { name: "String" } + }, + isSoftDeleted: { + serializedName: "isSoftDeleted", + type: { + name: "Boolean" + } } } } @@ -3352,6 +3358,12 @@ export const BmsrpQueryObject: coreClient.CompositeMapper = { type: { name: "Boolean" } + }, + includeSoftDeletedRP: { + serializedName: "includeSoftDeletedRP", + type: { + name: "Boolean" + } } } } @@ -3945,6 +3957,68 @@ export const RecoveryPointDiskConfiguration: coreClient.CompositeMapper = { } }; +export const ExtendedLocation: coreClient.CompositeMapper = { + type: { + name: "Composite", + className: "ExtendedLocation", + modelProperties: { + name: { + serializedName: "name", + type: { + name: "String" + } + }, + type: { + serializedName: "type", + type: { + name: "String" + } + } + } + } +}; + +export const SecuredVMDetails: coreClient.CompositeMapper = { + type: { + name: "Composite", + className: "SecuredVMDetails", + modelProperties: { + securedVMOsDiskEncryptionSetId: { + serializedName: "securedVMOsDiskEncryptionSetId", + type: { + name: "String" + } + } + } + } +}; + +export const TargetDiskNetworkAccessSettings: coreClient.CompositeMapper = { + type: { + name: "Composite", + className: "TargetDiskNetworkAccessSettings", + modelProperties: { + targetDiskNetworkAccessOption: { + serializedName: "targetDiskNetworkAccessOption", + type: { + name: "Enum", + allowedValues: [ + "SameAsOnSourceDisks", + "EnablePrivateAccessForAllDisks", + "EnablePublicAccessForAllDisks" + ] + } + }, + targetDiskAccessId: { + serializedName: "targetDiskAccessId", + type: { + name: "String" + } + } + } + } +}; + export const JobQueryObject: coreClient.CompositeMapper = { type: { name: "Composite", @@ -6636,12 +6710,24 @@ export const IaasVMRecoveryPoint: coreClient.CompositeMapper = { } } }, + securityType: { + serializedName: "securityType", + type: { + name: "String" + } + }, recoveryPointProperties: { serializedName: "recoveryPointProperties", type: { name: "Composite", className: "RecoveryPointProperties" } + }, + isPrivateAccessEnabledOnAnyDisk: { + serializedName: "isPrivateAccessEnabledOnAnyDisk", + type: { + name: "Boolean" + } } } } @@ -6901,6 +6987,27 @@ export const IaasVMRestoreRequest: coreClient.CompositeMapper = { name: "Composite", className: "IdentityBasedRestoreDetails" } + }, + extendedLocation: { + serializedName: "extendedLocation", + type: { + name: "Composite", + className: "ExtendedLocation" + } + }, + securedVMDetails: { + serializedName: "securedVMDetails", + type: { + name: "Composite", + className: "SecuredVMDetails" + } + }, + targetDiskNetworkAccessSettings: { + serializedName: "targetDiskNetworkAccessSettings", + type: { + name: "Composite", + className: "TargetDiskNetworkAccessSettings" + } } } } diff --git a/sdk/recoveryservicesbackup/arm-recoveryservicesbackup/src/models/parameters.ts b/sdk/recoveryservicesbackup/arm-recoveryservicesbackup/src/models/parameters.ts index 645e4572a4db..20f56c8be745 100644 --- a/sdk/recoveryservicesbackup/arm-recoveryservicesbackup/src/models/parameters.ts +++ b/sdk/recoveryservicesbackup/arm-recoveryservicesbackup/src/models/parameters.ts @@ -63,7 +63,7 @@ export const $host: OperationURLParameter = { export const apiVersion: OperationQueryParameter = { parameterPath: "apiVersion", mapper: { - defaultValue: "2023-01-01", + defaultValue: "2023-02-01", isConstant: true, serializedName: "api-version", type: { diff --git a/sdk/recoveryservicesbackup/arm-recoveryservicesbackup/src/recoveryServicesBackupClient.ts b/sdk/recoveryservicesbackup/arm-recoveryservicesbackup/src/recoveryServicesBackupClient.ts index caa8bcbb6b27..8acba9c87ee2 100644 --- a/sdk/recoveryservicesbackup/arm-recoveryservicesbackup/src/recoveryServicesBackupClient.ts +++ b/sdk/recoveryservicesbackup/arm-recoveryservicesbackup/src/recoveryServicesBackupClient.ts @@ -164,7 +164,7 @@ export class RecoveryServicesBackupClient extends coreClient.ServiceClient { credential: credentials }; - const packageDetails = `azsdk-js-arm-recoveryservicesbackup/10.0.1`; + const packageDetails = `azsdk-js-arm-recoveryservicesbackup/10.1.0`; const userAgentPrefix = options.userAgentOptions && options.userAgentOptions.userAgentPrefix ? `${options.userAgentOptions.userAgentPrefix} ${packageDetails}` @@ -217,7 +217,7 @@ export class RecoveryServicesBackupClient extends coreClient.ServiceClient { // Assigning values to Constant parameters this.$host = options.$host || "https://management.azure.com"; - this.apiVersion = options.apiVersion || "2023-01-01"; + this.apiVersion = options.apiVersion || "2023-02-01"; this.backupResourceStorageConfigsNonCRR = new BackupResourceStorageConfigsNonCRRImpl( this ); 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"