From f7e65dd9cfd50fefdd9d8d5270710af717b059d7 Mon Sep 17 00:00:00 2001 From: SDKAuto Date: Fri, 4 Mar 2022 05:26:54 +0000 Subject: [PATCH] CodeGen from PR 16989 in Azure/azure-rest-api-specs Merge f8ed9c9124d302e0e7458645c79682165233f351 into 927500222855f07383d48b38596c2ca9835da71b --- sdk/databox/arm-databox/CHANGELOG.md | 16 +- sdk/databox/arm-databox/README.md | 2 +- sdk/databox/arm-databox/_meta.json | 6 +- sdk/databox/arm-databox/api-extractor.json | 25 +- sdk/databox/arm-databox/package.json | 4 +- .../arm-databox/review/arm-databox.api.md | 66 +++- .../src/dataBoxManagementClient.ts | 4 +- sdk/databox/arm-databox/src/models/index.ts | 202 +++++++++-- sdk/databox/arm-databox/src/models/mappers.ts | 320 ++++++++++++++++-- .../arm-databox/src/models/parameters.ts | 2 +- sdk/databox/arm-databox/tsconfig.json | 16 +- sdk/databox/ci.mgmt.yml | 7 +- 12 files changed, 580 insertions(+), 90 deletions(-) diff --git a/sdk/databox/arm-databox/CHANGELOG.md b/sdk/databox/arm-databox/CHANGELOG.md index 486b1fb570e7..f088c38cae92 100644 --- a/sdk/databox/arm-databox/CHANGELOG.md +++ b/sdk/databox/arm-databox/CHANGELOG.md @@ -1,18 +1,8 @@ # Release History + +## 5.0.0 (2022-03-04) -## 5.0.0-beta.2 (Unreleased) - -### Features Added - -### Breaking Changes - -### Bugs Fixed - -### Other Changes - -## 5.0.0-beta.1 (2022-01-12) - -The package of @azure/arm-databox is using our next generation design principles since version 5.0.0-beta.1, which contains breaking changes. +The package of @azure/arm-databox is using our next generation design principles since version 5.0.0, which contains breaking changes. To understand the detail of the change, please refer to [Changelog](https://aka.ms/js-track2-changelog). diff --git a/sdk/databox/arm-databox/README.md b/sdk/databox/arm-databox/README.md index 67ef1131e9b9..4768faefb440 100644 --- a/sdk/databox/arm-databox/README.md +++ b/sdk/databox/arm-databox/README.md @@ -6,7 +6,7 @@ This package contains an isomorphic SDK (runs both in Node.js and in browsers) f [Source code](https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/databox/arm-databox) | [Package (NPM)](https://www.npmjs.com/package/@azure/arm-databox) | -[API reference documentation](https://docs.microsoft.com/javascript/api/@azure/arm-databox?view=azure-node-preview) | +[API reference documentation](https://docs.microsoft.com/javascript/api/@azure/arm-databox) | [Samples](https://github.com/Azure-Samples/azure-samples-js-management) ## Getting started diff --git a/sdk/databox/arm-databox/_meta.json b/sdk/databox/arm-databox/_meta.json index cd2ebf43bec4..c8a774270646 100644 --- a/sdk/databox/arm-databox/_meta.json +++ b/sdk/databox/arm-databox/_meta.json @@ -1,7 +1,7 @@ { - "commit": "e6a2296d02ec6c4b2c32479198bfbcb9b16ea247", + "commit": "ccfdf6dbdcbfda578b026925f363b3b3232f9cae", "readme": "specification/databox/resource-manager/readme.md", - "autorest_command": "autorest --version=3.1.3 --typescript --modelerfour.lenient-model-deduplication --head-as-boolean=true --license-header=MICROSOFT_MIT_NO_VERSION --generate-test --typescript-sdks-folder=D:\\mydev\\azure-sdk-for-js ../azure-rest-api-specs/specification/databox/resource-manager/readme.md --use=@autorest/typescript@6.0.0-alpha.16.20211217.1", + "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=/home/vsts/work/1/s/azure-sdk-for-js ../azure-rest-api-specs/specification/databox/resource-manager/readme.md --use=@autorest/typescript@6.0.0-alpha.16.20220105.1", "repository_url": "https://github.com/Azure/azure-rest-api-specs.git", - "use": "@autorest/typescript@6.0.0-alpha.16.20211217.1" + "use": "@autorest/typescript@6.0.0-alpha.16.20220105.1" } \ No newline at end of file diff --git a/sdk/databox/arm-databox/api-extractor.json b/sdk/databox/arm-databox/api-extractor.json index b443f717559f..258560af2273 100644 --- a/sdk/databox/arm-databox/api-extractor.json +++ b/sdk/databox/arm-databox/api-extractor.json @@ -1,18 +1,31 @@ { "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json", "mainEntryPointFilePath": "./dist-esm/src/index.d.ts", - "docModel": { "enabled": true }, - "apiReport": { "enabled": true, "reportFolder": "./review" }, + "docModel": { + "enabled": true + }, + "apiReport": { + "enabled": true, + "reportFolder": "./review" + }, "dtsRollup": { "enabled": true, "untrimmedFilePath": "", "publicTrimmedFilePath": "./types/arm-databox.d.ts" }, "messages": { - "tsdocMessageReporting": { "default": { "logLevel": "none" } }, + "tsdocMessageReporting": { + "default": { + "logLevel": "none" + } + }, "extractorMessageReporting": { - "ae-missing-release-tag": { "logLevel": "none" }, - "ae-unresolved-link": { "logLevel": "none" } + "ae-missing-release-tag": { + "logLevel": "none" + }, + "ae-unresolved-link": { + "logLevel": "none" + } } } -} +} \ No newline at end of file diff --git a/sdk/databox/arm-databox/package.json b/sdk/databox/arm-databox/package.json index 5f5e7fd31f12..e279c2b13fd6 100644 --- a/sdk/databox/arm-databox/package.json +++ b/sdk/databox/arm-databox/package.json @@ -3,7 +3,7 @@ "sdk-type": "mgmt", "author": "Microsoft Corporation", "description": "A generated SDK for DataBoxManagementClient.", - "version": "5.0.0-beta.2", + "version": "1.0.0-beta.1", "engines": { "node": ">=12.0.0" }, @@ -99,4 +99,4 @@ }, "sideEffects": false, "autoPublish": true -} +} \ No newline at end of file diff --git a/sdk/databox/arm-databox/review/arm-databox.api.md b/sdk/databox/arm-databox/review/arm-databox.api.md index 14f686cf11df..5d7804e73ba1 100644 --- a/sdk/databox/arm-databox/review/arm-databox.api.md +++ b/sdk/databox/arm-databox/review/arm-databox.api.md @@ -177,7 +177,7 @@ export type CustomerDiskJobSecrets = JobSecrets & { }; // @public -export type CustomerResolutionCode = "None" | "MoveToCleanUpDevice" | "Resume"; +export type CustomerResolutionCode = "None" | "MoveToCleanUpDevice" | "Resume" | "Restart" | "ReachOutToOperation"; // @public export interface DataAccountDetails { @@ -244,6 +244,21 @@ export interface DataBoxDiskCopyProgress { readonly status?: CopyStatus; } +// @public +export type DataBoxDiskGranularCopyLogDetails = GranularCopyLogDetails & { + copyLogDetailsType: "DataBoxCustomerDisk"; + readonly serialNumber?: string; + readonly accountName?: string; + readonly errorLogLink?: string; + readonly verboseLogLink?: string; +}; + +// @public +export type DataBoxDiskGranularCopyProgress = GranularCopyProgress & { + readonly serialNumber?: string; + readonly copyStatus?: CopyStatus; +}; + // @public export type DataBoxDiskJobDetails = JobDetails & { jobDetailsType: "DataBoxDisk"; @@ -251,6 +266,7 @@ export type DataBoxDiskJobDetails = JobDetails & { [propertyName: string]: number; }; readonly copyProgress?: DataBoxDiskCopyProgress[]; + readonly granularCopyProgress?: DataBoxDiskGranularCopyProgress[]; readonly disksAndSizeDetails?: { [propertyName: string]: number; }; @@ -489,6 +505,33 @@ export interface FilterFileDetails { // @public export type FilterFileType = "AzureBlob" | "AzureFile"; +// @public +export interface GranularCopyLogDetails { + copyLogDetailsType: "DataBoxCustomerDisk"; +} + +// @public (undocumented) +export type GranularCopyLogDetailsUnion = GranularCopyLogDetails | DataBoxDiskGranularCopyLogDetails; + +// @public +export interface GranularCopyProgress { + readonly accountId?: string; + readonly bytesProcessed?: number; + readonly dataAccountType?: DataAccountType; + readonly directoriesErroredOut?: number; + readonly filesErroredOut?: number; + readonly filesProcessed?: number; + readonly invalidDirectoriesProcessed?: number; + readonly invalidFileBytesUploaded?: number; + readonly invalidFilesProcessed?: number; + readonly isEnumerationInProgress?: boolean; + readonly renamedContainerCount?: number; + readonly storageAccountName?: string; + readonly totalBytesToProcess?: number; + readonly totalFilesToProcess?: number; + readonly transferType?: TransferType; +} + // @public export type HeavyScheduleAvailabilityRequest = ScheduleAvailabilityRequest & { skuName: "DataBoxHeavy"; @@ -748,12 +791,16 @@ export enum KnownDataCenterCode { // (undocumented) BJB = "BJB", // (undocumented) + BJS20 = "BJS20", + // (undocumented) BL20 = "BL20", // (undocumented) BL7 = "BL7", // (undocumented) BN1 = "BN1", // (undocumented) + BN7 = "BN7", + // (undocumented) BOM01 = "BOM01", // (undocumented) BY1 = "BY1", @@ -778,6 +825,8 @@ export enum KnownDataCenterCode { // (undocumented) DSM05 = "DSM05", // (undocumented) + DUB07 = "DUB07", + // (undocumented) FRA22 = "FRA22", // (undocumented) HKG20 = "HKG20", @@ -800,8 +849,16 @@ export enum KnownDataCenterCode { // (undocumented) ORK70 = "ORK70", // (undocumented) + OSA02 = "OSA02", + // (undocumented) OSA20 = "OSA20", // (undocumented) + OSA22 = "OSA22", + // (undocumented) + PAR22 = "PAR22", + // (undocumented) + PNQ01 = "PNQ01", + // (undocumented) PUS20 = "PUS20", // (undocumented) SEL20 = "SEL20", @@ -816,10 +873,14 @@ export enum KnownDataCenterCode { // (undocumented) SN5 = "SN5", // (undocumented) + SN6 = "SN6", + // (undocumented) SN8 = "SN8", // (undocumented) SSE90 = "SSE90", // (undocumented) + SVG20 = "SVG20", + // (undocumented) SYD03 = "SYD03", // (undocumented) SYD23 = "SYD23", @@ -983,6 +1044,7 @@ export interface PackageShippingDetails { export interface Preferences { encryptionPreferences?: EncryptionPreferences; preferredDataCenterRegion?: string[]; + storageAccountAccessTierPreferences?: string[]; transportPreferences?: TransportPreferences; } @@ -1204,7 +1266,7 @@ export type SkuName = "DataBox" | "DataBoxDisk" | "DataBoxHeavy" | "DataBoxCusto export type StageName = string; // @public -export type StageStatus = "None" | "InProgress" | "Succeeded" | "Failed" | "Cancelled" | "Cancelling" | "SucceededWithErrors" | "WaitingForCustomerAction" | "SucceededWithWarnings" | "WaitingForCustomerActionForKek" | "WaitingForCustomerActionForCleanUp" | "CustomerActionPerformedForCleanUp"; +export type StageStatus = "None" | "InProgress" | "Succeeded" | "Failed" | "Cancelled" | "Cancelling" | "SucceededWithErrors" | "WaitingForCustomerAction" | "SucceededWithWarnings" | "WaitingForCustomerActionForKek" | "WaitingForCustomerActionForCleanUp" | "CustomerActionPerformedForCleanUp" | "CustomerActionPerformed"; // @public export type StorageAccountDetails = DataAccountDetails & { diff --git a/sdk/databox/arm-databox/src/dataBoxManagementClient.ts b/sdk/databox/arm-databox/src/dataBoxManagementClient.ts index 3f211a36f8e5..439ae9289dd1 100644 --- a/sdk/databox/arm-databox/src/dataBoxManagementClient.ts +++ b/sdk/databox/arm-databox/src/dataBoxManagementClient.ts @@ -50,7 +50,7 @@ export class DataBoxManagementClient extends coreClient.ServiceClient { credential: credentials }; - const packageDetails = `azsdk-js-arm-databox/5.0.0-beta.1`; + const packageDetails = `azsdk-js-arm-databox/5.0.0`; const userAgentPrefix = options.userAgentOptions && options.userAgentOptions.userAgentPrefix ? `${options.userAgentOptions.userAgentPrefix} ${packageDetails}` @@ -73,7 +73,7 @@ export class DataBoxManagementClient extends coreClient.ServiceClient { // Assigning values to Constant parameters this.$host = options.$host || "https://management.azure.com"; - this.apiVersion = options.apiVersion || "2021-08-01-preview"; + this.apiVersion = options.apiVersion || "2021-12-01"; this.operations = new OperationsImpl(this); this.jobs = new JobsImpl(this); this.service = new ServiceImpl(this); diff --git a/sdk/databox/arm-databox/src/models/index.ts b/sdk/databox/arm-databox/src/models/index.ts index 1786edc46313..4b77d74635df 100644 --- a/sdk/databox/arm-databox/src/models/index.ts +++ b/sdk/databox/arm-databox/src/models/index.ts @@ -56,6 +56,9 @@ export type ScheduleAvailabilityRequestUnion = | DataBoxScheduleAvailabilityRequest | DiskScheduleAvailabilityRequest | HeavyScheduleAvailabilityRequest; +export type GranularCopyLogDetailsUnion = + | GranularCopyLogDetails + | DataBoxDiskGranularCopyLogDetails; /** Operation Collection. */ export interface OperationList { @@ -130,32 +133,32 @@ export interface JobResourceList { nextLink?: string; } -/** Cloud error. */ +/** Provides additional information about an http error response. */ export interface CloudError { - /** Cloud error code. */ - code?: string; - /** Cloud error message. */ - message?: string; - /** Cloud error target. */ - target?: string; /** - * Cloud error details. + * Gets or sets additional error info. * NOTE: This property will not be serialized. It can only be populated by the server. */ - readonly details?: CloudError[]; + readonly additionalInfo?: AdditionalErrorInfo[]; + /** Error code. */ + code?: string; /** - * Cloud error additional info. + * Gets or sets details for the error. * NOTE: This property will not be serialized. It can only be populated by the server. */ - readonly additionalInfo?: AdditionalErrorInfo[]; + readonly details?: CloudError[]; + /** The error message parsed from the body of the http error response. */ + message?: string; + /** Gets or sets the target of the error. */ + target?: string; } -/** Additional error info. */ +/** This class represents additional info which Resource Providers pass when an error occurs. */ export interface AdditionalErrorInfo { - /** Additional error type. */ - type?: string; - /** Additional error info. */ + /** Additional information of the type of error. */ info?: Record; + /** Type of error (e.g. CustomerIntervention, PolicyViolation, SecurityViolation). */ + type?: string; } /** Job details. */ @@ -434,6 +437,8 @@ export interface Preferences { transportPreferences?: TransportPreferences; /** Preferences related to the Encryption. */ encryptionPreferences?: EncryptionPreferences; + /** Preferences related to the Access Tier of storage accounts. */ + storageAccountAccessTierPreferences?: string[]; } /** Preferences related to the shipment logistics of the sku */ @@ -1098,6 +1103,12 @@ export interface ArmBaseObject { readonly type?: string; } +/** Granular Details for log generated during copy. */ +export interface GranularCopyLogDetails { + /** Polymorphic discriminator, which specifies the different types this object can be */ + copyLogDetailsType: "DataBoxCustomerDisk"; +} + /** Copy progress. */ export interface CopyProgress { /** @@ -1178,6 +1189,86 @@ export interface CopyProgress { readonly isEnumerationInProgress?: boolean; } +/** Granular Copy progress. */ +export interface GranularCopyProgress { + /** + * Name of the storage account. This will be empty for data account types other than storage account. + * NOTE: This property will not be serialized. It can only be populated by the server. + */ + readonly storageAccountName?: string; + /** + * Transfer type of data + * NOTE: This property will not be serialized. It can only be populated by the server. + */ + readonly transferType?: TransferType; + /** + * Data Account Type. + * NOTE: This property will not be serialized. It can only be populated by the server. + */ + readonly dataAccountType?: DataAccountType; + /** + * Id of the account where the data needs to be uploaded. + * NOTE: This property will not be serialized. It can only be populated by the server. + */ + readonly accountId?: string; + /** + * To indicate bytes transferred. + * NOTE: This property will not be serialized. It can only be populated by the server. + */ + readonly bytesProcessed?: number; + /** + * Total amount of data to be processed by the job. + * NOTE: This property will not be serialized. It can only be populated by the server. + */ + readonly totalBytesToProcess?: number; + /** + * Number of files processed + * NOTE: This property will not be serialized. It can only be populated by the server. + */ + readonly filesProcessed?: number; + /** + * Total files to process + * NOTE: This property will not be serialized. It can only be populated by the server. + */ + readonly totalFilesToProcess?: number; + /** + * Number of files not adhering to azure naming conventions which were processed by automatic renaming + * NOTE: This property will not be serialized. It can only be populated by the server. + */ + readonly invalidFilesProcessed?: number; + /** + * Total amount of data not adhering to azure naming conventions which were processed by automatic renaming + * NOTE: This property will not be serialized. It can only be populated by the server. + */ + readonly invalidFileBytesUploaded?: number; + /** + * Number of folders not adhering to azure naming conventions which were processed by automatic renaming + * NOTE: This property will not be serialized. It can only be populated by the server. + */ + readonly renamedContainerCount?: number; + /** + * Number of files which could not be copied + * NOTE: This property will not be serialized. It can only be populated by the server. + */ + readonly filesErroredOut?: number; + /** + * To indicate directories errored out in the job. + * NOTE: This property will not be serialized. It can only be populated by the server. + */ + readonly directoriesErroredOut?: number; + /** + * To indicate directories renamed + * NOTE: This property will not be serialized. It can only be populated by the server. + */ + readonly invalidDirectoriesProcessed?: number; + /** + * To indicate if enumeration of data is in progress. + * Until this is true, the TotalBytesToProcess may not be valid. + * NOTE: This property will not be serialized. It can only be populated by the server. + */ + readonly isEnumerationInProgress?: boolean; +} + /** Import disk details */ export interface ImportDiskDetails { /** The relative path of the manifest file on the disk. */ @@ -1348,6 +1439,11 @@ export type DataBoxDiskJobDetails = JobDetails & { * NOTE: This property will not be serialized. It can only be populated by the server. */ readonly copyProgress?: DataBoxDiskCopyProgress[]; + /** + * Copy progress per disk. + * NOTE: This property will not be serialized. It can only be populated by the server. + */ + readonly granularCopyProgress?: DataBoxDiskGranularCopyProgress[]; /** * Contains the map of disk serial number to the disk size being used for the job. Is returned only after the disks are shipped to the customer. * NOTE: This property will not be serialized. It can only be populated by the server. @@ -1861,6 +1957,32 @@ export type HeavyScheduleAvailabilityRequest = ScheduleAvailabilityRequest & { skuName: "DataBoxHeavy"; }; +/** Granular Copy Log Details for customer disk */ +export type DataBoxDiskGranularCopyLogDetails = GranularCopyLogDetails & { + /** Polymorphic discriminator, which specifies the different types this object can be */ + copyLogDetailsType: "DataBoxCustomerDisk"; + /** + * Disk Serial Number. + * NOTE: This property will not be serialized. It can only be populated by the server. + */ + readonly serialNumber?: string; + /** + * Account name. + * NOTE: This property will not be serialized. It can only be populated by the server. + */ + readonly accountName?: string; + /** + * Link for copy error logs. + * NOTE: This property will not be serialized. It can only be populated by the server. + */ + readonly errorLogLink?: string; + /** + * Link for copy verbose logs. + * NOTE: This property will not be serialized. It can only be populated by the server. + */ + readonly verboseLogLink?: string; +}; + /** DataBox CustomerDisk Copy Progress */ export type DataBoxCustomerDiskCopyProgress = CopyProgress & { /** @@ -1875,6 +1997,20 @@ export type DataBoxCustomerDiskCopyProgress = CopyProgress & { readonly copyStatus?: CopyStatus; }; +/** DataBox Disk Granular Copy Progress */ +export type DataBoxDiskGranularCopyProgress = GranularCopyProgress & { + /** + * Disk Serial Number. + * NOTE: This property will not be serialized. It can only be populated by the server. + */ + readonly serialNumber?: string; + /** + * The Status of the copy + * NOTE: This property will not be serialized. It can only be populated by the server. + */ + readonly copyStatus?: CopyStatus; +}; + /** Known values of {@link StageName} that the service accepts. */ export enum KnownStageName { /** An order has been created. */ @@ -2037,7 +2173,16 @@ export enum KnownDataCenterCode { PUS20 = "PUS20", AdHoc = "AdHoc", CH1 = "CH1", - DSM05 = "DSM05" + DSM05 = "DSM05", + DUB07 = "DUB07", + PNQ01 = "PNQ01", + SVG20 = "SVG20", + OSA02 = "OSA02", + OSA22 = "OSA22", + PAR22 = "PAR22", + BN7 = "BN7", + SN6 = "SN6", + BJS20 = "BJS20" } /** @@ -2094,7 +2239,16 @@ export enum KnownDataCenterCode { * **PUS20** \ * **AdHoc** \ * **CH1** \ - * **DSM05** + * **DSM05** \ + * **DUB07** \ + * **PNQ01** \ + * **SVG20** \ + * **OSA02** \ + * **OSA22** \ + * **PAR22** \ + * **BN7** \ + * **SN6** \ + * **BJS20** */ export type DataCenterCode = string; @@ -2134,7 +2288,7 @@ export enum KnownCopyStatus { DriveNotDetected = "DriveNotDetected", /** Copy failed due to corrupted drive. */ DriveCorrupted = "DriveCorrupted", - /** Copy failed due to modified or removed metadata files. */ + /** Copy failed due to modified or removed metadata files. */ MetadataFilesModifiedOrRemoved = "MetadataFilesModifiedOrRemoved" } @@ -2160,7 +2314,7 @@ export enum KnownCopyStatus { * **OtherUserError**: Copy failed due to user error. \ * **DriveNotDetected**: Copy failed due to disk detection error. \ * **DriveCorrupted**: Copy failed due to corrupted drive. \ - * **MetadataFilesModifiedOrRemoved**: Copy failed due to modified or removed metadata files. + * **MetadataFilesModifiedOrRemoved**: Copy failed due to modified or removed metadata files. */ export type CopyStatus = string; /** Defines values for TransferType. */ @@ -2178,7 +2332,8 @@ export type StageStatus = | "SucceededWithWarnings" | "WaitingForCustomerActionForKek" | "WaitingForCustomerActionForCleanUp" - | "CustomerActionPerformedForCleanUp"; + | "CustomerActionPerformedForCleanUp" + | "CustomerActionPerformed"; /** Defines values for AddressType. */ export type AddressType = "None" | "Residential" | "Commercial"; /** Defines values for DataAccountType. */ @@ -2202,7 +2357,12 @@ export type DoubleEncryption = "Enabled" | "Disabled"; /** Defines values for KekType. */ export type KekType = "MicrosoftManaged" | "CustomerManaged"; /** Defines values for CustomerResolutionCode. */ -export type CustomerResolutionCode = "None" | "MoveToCleanUpDevice" | "Resume"; +export type CustomerResolutionCode = + | "None" + | "MoveToCleanUpDevice" + | "Resume" + | "Restart" + | "ReachOutToOperation"; /** Defines values for DatacenterAddressType. */ export type DatacenterAddressType = | "DatacenterAddressLocation" diff --git a/sdk/databox/arm-databox/src/models/mappers.ts b/sdk/databox/arm-databox/src/models/mappers.ts index a48a105ad0ce..2790df2b2698 100644 --- a/sdk/databox/arm-databox/src/models/mappers.ts +++ b/sdk/databox/arm-databox/src/models/mappers.ts @@ -225,20 +225,21 @@ export const CloudError: coreClient.CompositeMapper = { name: "Composite", className: "CloudError", modelProperties: { - code: { - serializedName: "code", - type: { - name: "String" - } - }, - message: { - serializedName: "message", + additionalInfo: { + serializedName: "additionalInfo", + readOnly: true, type: { - name: "String" + name: "Sequence", + element: { + type: { + name: "Composite", + className: "AdditionalErrorInfo" + } + } } }, - target: { - serializedName: "target", + code: { + serializedName: "code", type: { name: "String" } @@ -256,17 +257,16 @@ export const CloudError: coreClient.CompositeMapper = { } } }, - additionalInfo: { - serializedName: "additionalInfo", - readOnly: true, + message: { + serializedName: "message", type: { - name: "Sequence", - element: { - type: { - name: "Composite", - className: "AdditionalErrorInfo" - } - } + name: "String" + } + }, + target: { + serializedName: "target", + type: { + name: "String" } } } @@ -278,18 +278,18 @@ export const AdditionalErrorInfo: coreClient.CompositeMapper = { name: "Composite", className: "AdditionalErrorInfo", modelProperties: { - type: { - serializedName: "type", - type: { - name: "String" - } - }, info: { serializedName: "info", type: { name: "Dictionary", value: { type: { name: "any" } } } + }, + type: { + serializedName: "type", + type: { + name: "String" + } } } } @@ -438,7 +438,13 @@ export const JobDetails: coreClient.CompositeMapper = { element: { type: { name: "Enum", - allowedValues: ["None", "MoveToCleanUpDevice", "Resume"] + allowedValues: [ + "None", + "MoveToCleanUpDevice", + "Resume", + "Restart", + "ReachOutToOperation" + ] } } } @@ -504,7 +510,8 @@ export const JobStages: coreClient.CompositeMapper = { "SucceededWithWarnings", "WaitingForCustomerActionForKek", "WaitingForCustomerActionForCleanUp", - "CustomerActionPerformedForCleanUp" + "CustomerActionPerformedForCleanUp", + "CustomerActionPerformed" ] } }, @@ -1066,6 +1073,19 @@ export const Preferences: coreClient.CompositeMapper = { name: "Composite", className: "EncryptionPreferences" } + }, + storageAccountAccessTierPreferences: { + serializedName: "storageAccountAccessTierPreferences", + type: { + name: "Sequence", + element: { + defaultValue: "Archive", + isConstant: true, + type: { + name: "String" + } + } + } } } } @@ -1227,7 +1247,13 @@ export const LastMitigationActionOnJob: coreClient.CompositeMapper = { serializedName: "customerResolution", type: { name: "Enum", - allowedValues: ["None", "MoveToCleanUpDevice", "Resume"] + allowedValues: [ + "None", + "MoveToCleanUpDevice", + "Resume", + "Restart", + "ReachOutToOperation" + ] } } } @@ -1487,7 +1513,13 @@ export const MitigateJobRequest: coreClient.CompositeMapper = { required: true, type: { name: "Enum", - allowedValues: ["None", "MoveToCleanUpDevice", "Resume"] + allowedValues: [ + "None", + "MoveToCleanUpDevice", + "Resume", + "Restart", + "ReachOutToOperation" + ] } } } @@ -2605,6 +2637,33 @@ export const ArmBaseObject: coreClient.CompositeMapper = { } }; +export const GranularCopyLogDetails: coreClient.CompositeMapper = { + type: { + name: "Composite", + className: "GranularCopyLogDetails", + uberParent: "GranularCopyLogDetails", + polymorphicDiscriminator: { + serializedName: "copyLogDetailsType", + clientName: "copyLogDetailsType" + }, + modelProperties: { + copyLogDetailsType: { + serializedName: "copyLogDetailsType", + required: true, + type: { + name: "Enum", + allowedValues: [ + "DataBox", + "DataBoxDisk", + "DataBoxHeavy", + "DataBoxCustomerDisk" + ] + } + } + } + } +}; + export const CopyProgress: coreClient.CompositeMapper = { type: { name: "Composite", @@ -2721,6 +2780,122 @@ export const CopyProgress: coreClient.CompositeMapper = { } }; +export const GranularCopyProgress: coreClient.CompositeMapper = { + type: { + name: "Composite", + className: "GranularCopyProgress", + modelProperties: { + storageAccountName: { + serializedName: "storageAccountName", + readOnly: true, + type: { + name: "String" + } + }, + transferType: { + serializedName: "transferType", + readOnly: true, + type: { + name: "Enum", + allowedValues: ["ImportToAzure", "ExportFromAzure"] + } + }, + dataAccountType: { + serializedName: "dataAccountType", + readOnly: true, + type: { + name: "Enum", + allowedValues: ["StorageAccount", "ManagedDisk"] + } + }, + accountId: { + serializedName: "accountId", + readOnly: true, + type: { + name: "String" + } + }, + bytesProcessed: { + serializedName: "bytesProcessed", + readOnly: true, + type: { + name: "Number" + } + }, + totalBytesToProcess: { + serializedName: "totalBytesToProcess", + readOnly: true, + type: { + name: "Number" + } + }, + filesProcessed: { + serializedName: "filesProcessed", + readOnly: true, + type: { + name: "Number" + } + }, + totalFilesToProcess: { + serializedName: "totalFilesToProcess", + readOnly: true, + type: { + name: "Number" + } + }, + invalidFilesProcessed: { + serializedName: "invalidFilesProcessed", + readOnly: true, + type: { + name: "Number" + } + }, + invalidFileBytesUploaded: { + serializedName: "invalidFileBytesUploaded", + readOnly: true, + type: { + name: "Number" + } + }, + renamedContainerCount: { + serializedName: "renamedContainerCount", + readOnly: true, + type: { + name: "Number" + } + }, + filesErroredOut: { + serializedName: "filesErroredOut", + readOnly: true, + type: { + name: "Number" + } + }, + directoriesErroredOut: { + serializedName: "directoriesErroredOut", + readOnly: true, + type: { + name: "Number" + } + }, + invalidDirectoriesProcessed: { + serializedName: "invalidDirectoriesProcessed", + readOnly: true, + type: { + name: "Number" + } + }, + isEnumerationInProgress: { + serializedName: "isEnumerationInProgress", + readOnly: true, + type: { + name: "Boolean" + } + } + } + } +}; + export const ImportDiskDetails: coreClient.CompositeMapper = { type: { name: "Composite", @@ -3051,6 +3226,19 @@ export const DataBoxDiskJobDetails: coreClient.CompositeMapper = { } } }, + granularCopyProgress: { + serializedName: "granularCopyProgress", + readOnly: true, + type: { + name: "Sequence", + element: { + type: { + name: "Composite", + className: "DataBoxDiskGranularCopyProgress" + } + } + } + }, disksAndSizeDetails: { serializedName: "disksAndSizeDetails", readOnly: true, @@ -4138,6 +4326,48 @@ export const HeavyScheduleAvailabilityRequest: coreClient.CompositeMapper = { } }; +export const DataBoxDiskGranularCopyLogDetails: coreClient.CompositeMapper = { + serializedName: "DataBoxCustomerDisk", + type: { + name: "Composite", + className: "DataBoxDiskGranularCopyLogDetails", + uberParent: "GranularCopyLogDetails", + polymorphicDiscriminator: + GranularCopyLogDetails.type.polymorphicDiscriminator, + modelProperties: { + ...GranularCopyLogDetails.type.modelProperties, + serialNumber: { + serializedName: "serialNumber", + readOnly: true, + type: { + name: "String" + } + }, + accountName: { + serializedName: "accountName", + readOnly: true, + type: { + name: "String" + } + }, + errorLogLink: { + serializedName: "errorLogLink", + readOnly: true, + type: { + name: "String" + } + }, + verboseLogLink: { + serializedName: "verboseLogLink", + readOnly: true, + type: { + name: "String" + } + } + } + } +}; + export const DataBoxCustomerDiskCopyProgress: coreClient.CompositeMapper = { type: { name: "Composite", @@ -4162,6 +4392,30 @@ export const DataBoxCustomerDiskCopyProgress: coreClient.CompositeMapper = { } }; +export const DataBoxDiskGranularCopyProgress: coreClient.CompositeMapper = { + type: { + name: "Composite", + className: "DataBoxDiskGranularCopyProgress", + modelProperties: { + ...GranularCopyProgress.type.modelProperties, + serialNumber: { + serializedName: "serialNumber", + readOnly: true, + type: { + name: "String" + } + }, + copyStatus: { + serializedName: "copyStatus", + readOnly: true, + type: { + name: "String" + } + } + } + } +}; + export let discriminators = { JobDetails: JobDetails, DataAccountDetails: DataAccountDetails, @@ -4172,6 +4426,7 @@ export let discriminators = { ValidationRequest: ValidationRequest, JobSecrets: JobSecrets, ScheduleAvailabilityRequest: ScheduleAvailabilityRequest, + GranularCopyLogDetails: GranularCopyLogDetails, "JobDetails.DataBoxCustomerDisk": DataBoxCustomerDiskJobDetails, "JobDetails.DataBoxDisk": DataBoxDiskJobDetails, "JobDetails.DataBoxHeavy": DataBoxHeavyJobDetails, @@ -4203,5 +4458,6 @@ export let discriminators = { "JobSecrets.DataBox": DataboxJobSecrets, "ScheduleAvailabilityRequest.DataBox": DataBoxScheduleAvailabilityRequest, "ScheduleAvailabilityRequest.DataBoxDisk": DiskScheduleAvailabilityRequest, - "ScheduleAvailabilityRequest.DataBoxHeavy": HeavyScheduleAvailabilityRequest + "ScheduleAvailabilityRequest.DataBoxHeavy": HeavyScheduleAvailabilityRequest, + "GranularCopyLogDetails.DataBoxCustomerDisk": DataBoxDiskGranularCopyLogDetails }; diff --git a/sdk/databox/arm-databox/src/models/parameters.ts b/sdk/databox/arm-databox/src/models/parameters.ts index 71e340c9765a..328e540f0e79 100644 --- a/sdk/databox/arm-databox/src/models/parameters.ts +++ b/sdk/databox/arm-databox/src/models/parameters.ts @@ -51,7 +51,7 @@ export const $host: OperationURLParameter = { export const apiVersion: OperationQueryParameter = { parameterPath: "apiVersion", mapper: { - defaultValue: "2021-08-01-preview", + defaultValue: "2021-12-01", isConstant: true, serializedName: "api-version", type: { diff --git a/sdk/databox/arm-databox/tsconfig.json b/sdk/databox/arm-databox/tsconfig.json index 6e3251194117..3e6ae96443f3 100644 --- a/sdk/databox/arm-databox/tsconfig.json +++ b/sdk/databox/arm-databox/tsconfig.json @@ -9,11 +9,19 @@ "esModuleInterop": true, "allowSyntheticDefaultImports": true, "forceConsistentCasingInFileNames": true, - "lib": ["es6", "dom"], + "lib": [ + "es6", + "dom" + ], "declaration": true, "outDir": "./dist-esm", "importHelpers": true }, - "include": ["./src/**/*.ts", "./test/**/*.ts"], - "exclude": ["node_modules"] -} + "include": [ + "./src/**/*.ts", + "./test/**/*.ts" + ], + "exclude": [ + "node_modules" + ] +} \ No newline at end of file diff --git a/sdk/databox/ci.mgmt.yml b/sdk/databox/ci.mgmt.yml index a1b0a2bd1dce..f9401c781c88 100644 --- a/sdk/databox/ci.mgmt.yml +++ b/sdk/databox/ci.mgmt.yml @@ -1,5 +1,5 @@ # NOTE: Please refer to https://aka.ms/azsdk/engsys/ci-yaml before editing this file. - + trigger: branches: include: @@ -10,6 +10,7 @@ trigger: include: - sdk/databox/ci.mgmt.yml - sdk/databox/arm-databox/ + - sdk/databox/arm-databox pr: branches: include: @@ -23,11 +24,11 @@ pr: include: - sdk/databox/ci.mgmt.yml - sdk/databox/arm-databox/ - + - sdk/databox/arm-databox extends: template: /eng/pipelines/templates/stages/archetype-sdk-client.yml parameters: ServiceDirectory: databox Artifacts: - name: azure-arm-databox - safeName: azurearmdatabox \ No newline at end of file + safeName: azurearmdatabox