From bc64e681106bdcfd6c6ed02539f0fd74c555be4e Mon Sep 17 00:00:00 2001 From: SDKAuto Date: Thu, 21 Jan 2021 19:51:28 +0000 Subject: [PATCH] CodeGen from PR 12537 in Azure/azure-rest-api-specs Merge 3e1c1502b5e19bcf7727685dd2ce2f53f4f9a6fd into 111dc7ff1f271c38b04b913ec629b26f26561455 --- .../arm-storageimportexport/LICENSE.txt | 2 +- .../arm-storageimportexport/README.md | 23 +- .../arm-storageimportexport/package.json | 22 +- .../arm-storageimportexport/rollup.config.js | 24 +- .../src/models/bitLockerKeysMappers.ts | 13 +- .../src/models/index.ts | 626 ++++++++++-------- .../src/models/jobsMappers.ts | 31 +- .../src/models/locationsMappers.ts | 15 +- .../src/models/mappers.ts | 199 +++++- .../src/models/operationsMappers.ts | 15 +- .../src/models/parameters.ts | 5 +- .../src/operations/bitLockerKeys.ts | 5 +- .../src/operations/index.ts | 5 +- .../src/operations/jobs.ts | 27 +- .../src/operations/locations.ts | 5 +- .../src/operations/operations.ts | 5 +- .../storageImportExportManagementClient.ts | 5 +- ...rageImportExportManagementClientContext.ts | 7 +- .../arm-storageimportexport/tsconfig.json | 2 +- 19 files changed, 624 insertions(+), 412 deletions(-) diff --git a/sdk/storageimportexport/arm-storageimportexport/LICENSE.txt b/sdk/storageimportexport/arm-storageimportexport/LICENSE.txt index a70e8cf66038..2d3163745319 100644 --- a/sdk/storageimportexport/arm-storageimportexport/LICENSE.txt +++ b/sdk/storageimportexport/arm-storageimportexport/LICENSE.txt @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2018 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/storageimportexport/arm-storageimportexport/README.md b/sdk/storageimportexport/arm-storageimportexport/README.md index cb45c729d669..a6e335041c31 100644 --- a/sdk/storageimportexport/arm-storageimportexport/README.md +++ b/sdk/storageimportexport/arm-storageimportexport/README.md @@ -9,27 +9,27 @@ This package contains an isomorphic SDK for StorageImportExportManagementClient. ### How to Install -``` +```bash npm install @azure/arm-storageimportexport ``` ### How to use -#### nodejs - Authentication, client creation and list locations as an example written in TypeScript. +#### nodejs - client creation and list locations as an example written in TypeScript. ##### Install @azure/ms-rest-nodeauth -``` -npm install @azure/ms-rest-nodeauth +- Please install minimum version of `"@azure/ms-rest-nodeauth": "^3.0.0"`. +```bash +npm install @azure/ms-rest-nodeauth@"^3.0.0" ``` ##### Sample code -```ts -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 { StorageImportExportManagementClient, StorageImportExportManagementModels, StorageImportExportManagementMappers } from "@azure/arm-storageimportexport"; +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 +const msRestNodeAuth = require("@azure/ms-rest-nodeauth"); +const { StorageImportExportManagementClient } = require("@azure/arm-storageimportexport"); const subscriptionId = process.env["AZURE_SUBSCRIPTION_ID"]; msRestNodeAuth.interactiveLogin().then((creds) => { @@ -47,7 +47,7 @@ msRestNodeAuth.interactiveLogin().then((creds) => { ##### Install @azure/ms-rest-browserauth -``` +```bash npm install @azure/ms-rest-browserauth ``` @@ -95,5 +95,4 @@ See https://github.com/Azure/ms-rest-browserauth to learn how to authenticate to - [Microsoft Azure SDK for Javascript](https://github.com/Azure/azure-sdk-for-js) - -![Impressions](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-js%2Fsdk%2Fstorageimportexport%2Farm-storageimportexport%2FREADME.png) +![Impressions](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-js/sdk/storageimportexport/arm-storageimportexport/README.png) diff --git a/sdk/storageimportexport/arm-storageimportexport/package.json b/sdk/storageimportexport/arm-storageimportexport/package.json index 9fb220f65205..27c7616daa8b 100644 --- a/sdk/storageimportexport/arm-storageimportexport/package.json +++ b/sdk/storageimportexport/arm-storageimportexport/package.json @@ -4,9 +4,9 @@ "description": "StorageImportExportManagementClient Library with typescript type definitions for node.js and browser.", "version": "1.2.0", "dependencies": { - "@azure/ms-rest-azure-js": "^1.1.0", - "@azure/ms-rest-js": "^1.1.0", - "tslib": "^1.9.3" + "@azure/ms-rest-azure-js": "^2.0.1", + "@azure/ms-rest-js": "^2.0.4", + "tslib": "^1.10.0" }, "keywords": [ "node", @@ -20,18 +20,19 @@ "module": "./esm/storageImportExportManagementClient.js", "types": "./esm/storageImportExportManagementClient.d.ts", "devDependencies": { - "typescript": "^3.1.1", - "rollup": "^0.66.2", - "rollup-plugin-node-resolve": "^3.4.0", - "uglify-js": "^3.4.9" + "typescript": "^3.5.3", + "rollup": "^1.18.0", + "rollup-plugin-node-resolve": "^5.2.0", + "rollup-plugin-sourcemaps": "^0.4.2", + "uglify-js": "^3.6.0" }, - "homepage": "https://github.com/azure/azure-sdk-for-js/tree/master/sdk/storageimportexport/arm-storageimportexport", + "homepage": "https://github.com/Azure/azure-sdk-for-js/tree/master/sdk/storageimportexport/arm-storageimportexport", "repository": { "type": "git", - "url": "https://github.com/azure/azure-sdk-for-js.git" + "url": "https://github.com/Azure/azure-sdk-for-js.git" }, "bugs": { - "url": "https://github.com/azure/azure-sdk-for-js/issues" + "url": "https://github.com/Azure/azure-sdk-for-js/issues" }, "files": [ "dist/**/*.js", @@ -43,6 +44,7 @@ "esm/**/*.d.ts", "esm/**/*.d.ts.map", "src/**/*.ts", + "README.md", "rollup.config.js", "tsconfig.json" ], diff --git a/sdk/storageimportexport/arm-storageimportexport/rollup.config.js b/sdk/storageimportexport/arm-storageimportexport/rollup.config.js index 1c54cf6388e1..2c6baefa57ef 100644 --- a/sdk/storageimportexport/arm-storageimportexport/rollup.config.js +++ b/sdk/storageimportexport/arm-storageimportexport/rollup.config.js @@ -1,10 +1,16 @@ +import rollup from "rollup"; import nodeResolve from "rollup-plugin-node-resolve"; +import sourcemaps from "rollup-plugin-sourcemaps"; + /** - * @type {import('rollup').RollupFileOptions} + * @type {rollup.RollupFileOptions} */ const config = { - input: './esm/storageImportExportManagementClient.js', - external: ["@azure/ms-rest-js", "@azure/ms-rest-azure-js"], + input: "./esm/storageImportExportManagementClient.js", + external: [ + "@azure/ms-rest-js", + "@azure/ms-rest-azure-js" + ], output: { file: "./dist/arm-storageimportexport.js", format: "umd", @@ -15,17 +21,17 @@ 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. + * Changes may cause incorrect behavior and will be lost if the code is regenerated. */` }, plugins: [ - nodeResolve({ module: true }) + nodeResolve({ mainFields: ['module', 'main'] }), + sourcemaps() ] }; + export default config; diff --git a/sdk/storageimportexport/arm-storageimportexport/src/models/bitLockerKeysMappers.ts b/sdk/storageimportexport/arm-storageimportexport/src/models/bitLockerKeysMappers.ts index 90b1f4ca2007..04ee9cd0c188 100644 --- a/sdk/storageimportexport/arm-storageimportexport/src/models/bitLockerKeysMappers.ts +++ b/sdk/storageimportexport/arm-storageimportexport/src/models/bitLockerKeysMappers.ts @@ -1,17 +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. + * Changes may cause incorrect behavior and will be lost if the code is regenerated. */ export { - GetBitLockerKeysResponse, DriveBitLockerKey, ErrorResponse, - ErrorResponseErrorDetailsItem + ErrorResponseErrorDetailsItem, + GetBitLockerKeysResponse } from "../models/mappers"; - diff --git a/sdk/storageimportexport/arm-storageimportexport/src/models/index.ts b/sdk/storageimportexport/arm-storageimportexport/src/models/index.ts index 70a9a4fbdb5f..2b4b74f95380 100644 --- a/sdk/storageimportexport/arm-storageimportexport/src/models/index.ts +++ b/sdk/storageimportexport/arm-storageimportexport/src/models/index.ts @@ -1,11 +1,9 @@ /* - * 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. + * Changes may cause incorrect behavior and will be lost if the code is regenerated. */ import { BaseResource, CloudError, AzureServiceClientOptions } from "@azure/ms-rest-azure-js"; @@ -13,710 +11,725 @@ import * as msRest from "@azure/ms-rest-js"; export { BaseResource, CloudError }; - /** - * @interface * An interface representing ErrorResponseErrorDetailsItem. */ export interface ErrorResponseErrorDetailsItem { /** - * @member {string} [code] Provides information about the error code. + * Provides information about the error code. */ code?: string; /** - * @member {string} [target] Provides information about the error target. + * Provides information about the error target. */ target?: string; /** - * @member {string} [message] Provides information about the error message. + * Provides information about the error message. */ message?: string; } /** - * @interface - * An interface representing ErrorResponse. * Response when errors occurred - * */ export interface ErrorResponse { /** - * @member {string} [code] Provides information about the error code. + * Provides information about the error code. */ code?: string; /** - * @member {string} [message] Provides information about the error message. + * Provides information about the error message. */ message?: string; /** - * @member {string} [target] Provides information about the error target. + * Provides information about the error target. */ target?: string; /** - * @member {ErrorResponseErrorDetailsItem[]} [details] Describes the error - * details if present. + * Describes the error details if present. */ details?: ErrorResponseErrorDetailsItem[]; /** - * @member {any} [innererror] Inner error object if present. + * Inner error object if present. */ innererror?: any; } /** - * @interface - * An interface representing ReturnAddress. * Specifies the return address information for the job. - * */ export interface ReturnAddress { /** - * @member {string} recipientName The name of the recipient who will receive - * the hard drives when they are returned. + * The name of the recipient who will receive the hard drives when they are returned. */ recipientName: string; /** - * @member {string} streetAddress1 The first line of the street address to - * use when returning the drives. + * The first line of the street address to use when returning the drives. */ streetAddress1: string; /** - * @member {string} [streetAddress2] The second line of the street address to - * use when returning the drives. + * The second line of the street address to use when returning the drives. */ streetAddress2?: string; /** - * @member {string} city The city name to use when returning the drives. + * The city name to use when returning the drives. */ city: string; /** - * @member {string} [stateOrProvince] The state or province to use when - * returning the drives. + * The state or province to use when returning the drives. */ stateOrProvince?: string; /** - * @member {string} postalCode The postal code to use when returning the - * drives. + * The postal code to use when returning the drives. */ postalCode: string; /** - * @member {string} countryOrRegion The country or region to use when - * returning the drives. + * The country or region to use when returning the drives. */ countryOrRegion: string; /** - * @member {string} phone Phone number of the recipient of the returned - * drives. + * Phone number of the recipient of the returned drives. */ phone: string; /** - * @member {string} email Email address of the recipient of the returned - * drives. + * Email address of the recipient of the returned drives. */ email: string; } /** - * @interface - * An interface representing ReturnShipping. * Specifies the return carrier and customer's account with the carrier. - * */ export interface ReturnShipping { /** - * @member {string} carrierName The carrier's name. + * The carrier's name. */ carrierName: string; /** - * @member {string} carrierAccountNumber The customer's account number with - * the carrier. + * The customer's account number with the carrier. */ carrierAccountNumber: string; } /** - * @interface - * An interface representing ShippingInformation. - * Contains information about the Microsoft datacenter to which the drives - * should be shipped. - * + * Contains information about the Microsoft datacenter to which the drives should be shipped. */ export interface ShippingInformation { /** - * @member {string} recipientName The name of the recipient who will receive - * the hard drives when they are returned. + * The name of the recipient who will receive the hard drives when they are returned. */ - recipientName: string; + recipientName?: string; /** - * @member {string} streetAddress1 The first line of the street address to - * use when returning the drives. + * The first line of the street address to use when returning the drives. */ - streetAddress1: string; + streetAddress1?: string; /** - * @member {string} [streetAddress2] The second line of the street address to - * use when returning the drives. + * The second line of the street address to use when returning the drives. */ streetAddress2?: string; /** - * @member {string} city The city name to use when returning the drives. + * The city name to use when returning the drives. */ - city: string; + city?: string; /** - * @member {string} stateOrProvince The state or province to use when - * returning the drives. + * The state or province to use when returning the drives. */ - stateOrProvince: string; + stateOrProvince?: string; /** - * @member {string} postalCode The postal code to use when returning the - * drives. + * The postal code to use when returning the drives. */ - postalCode: string; + postalCode?: string; /** - * @member {string} countryOrRegion The country or region to use when - * returning the drives. + * The country or region to use when returning the drives. */ - countryOrRegion: string; + countryOrRegion?: string; /** - * @member {string} [phone] Phone number of the recipient of the returned - * drives. + * Phone number of the recipient of the returned drives. */ phone?: string; + /** + * Additional shipping information for customer, specific to datacenter to which customer should + * send their disks. + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly additionalInformation?: string; } /** - * @interface - * An interface representing PackageInfomation. - * Contains information about the package being shipped by the customer to the - * Microsoft data center. - * + * Contains information about the delivery package being shipped by the customer to the Microsoft + * data center. + */ +export interface DeliveryPackageInformation { + /** + * The name of the carrier that is used to ship the import or export drives. + */ + carrierName: string; + /** + * The tracking number of the package. + */ + trackingNumber: string; + /** + * The number of drives included in the package. + */ + driveCount?: number; + /** + * The date when the package is shipped. + */ + shipDate?: string; +} + +/** + * Contains information about the package being shipped by the customer to the Microsoft data + * center. */ export interface PackageInfomation { /** - * @member {string} carrierName The name of the carrier that is used to ship - * the import or export drives. + * The name of the carrier that is used to ship the import or export drives. */ carrierName: string; /** - * @member {string} trackingNumber The tracking number of the package. + * The tracking number of the package. */ trackingNumber: string; /** - * @member {number} driveCount The number of drives included in the package. + * The number of drives included in the package. */ driveCount: number; /** - * @member {string} shipDate The date when the package is shipped. + * The date when the package is shipped. */ shipDate: string; } /** - * @interface - * An interface representing DriveStatus. * Provides information about the drive's status - * */ export interface DriveStatus { /** - * @member {string} [driveId] The drive's hardware serial number, without - * spaces. + * The drive's hardware serial number, without spaces. */ driveId?: string; /** - * @member {string} [bitLockerKey] The BitLocker key used to encrypt the - * drive. + * The BitLocker key used to encrypt the drive. */ bitLockerKey?: string; /** - * @member {string} [manifestFile] The relative path of the manifest file on - * the drive. + * The relative path of the manifest file on the drive. */ manifestFile?: string; /** - * @member {string} [manifestHash] The Base16-encoded MD5 hash of the - * manifest file on the drive. + * The Base16-encoded MD5 hash of the manifest file on the drive. */ manifestHash?: string; /** - * @member {string} [driveHeaderHash] The drive header hash value. + * The drive header hash value. */ driveHeaderHash?: string; /** - * @member {DriveState} [state] The drive's current state. Possible values - * include: 'Specified', 'Received', 'NeverReceived', 'Transferring', - * 'Completed', 'CompletedMoreInfo', 'ShippedBack' + * The drive's current state. Possible values include: 'Specified', 'Received', 'NeverReceived', + * 'Transferring', 'Completed', 'CompletedMoreInfo', 'ShippedBack' */ state?: DriveState; /** - * @member {string} [copyStatus] Detailed status about the data transfer - * process. This field is not returned in the response until the drive is in - * the Transferring state. + * Detailed status about the data transfer process. This field is not returned in the response + * until the drive is in the Transferring state. */ copyStatus?: string; /** - * @member {number} [percentComplete] Percentage completed for the drive. + * Percentage completed for the drive. */ percentComplete?: number; /** - * @member {string} [verboseLogUri] A URI that points to the blob containing - * the verbose log for the data transfer operation. + * A URI that points to the blob containing the verbose log for the data transfer operation. */ verboseLogUri?: string; /** - * @member {string} [errorLogUri] A URI that points to the blob containing - * the error log for the data transfer operation. + * A URI that points to the blob containing the error log for the data transfer operation. */ errorLogUri?: string; /** - * @member {string} [manifestUri] A URI that points to the blob containing - * the drive manifest file. + * A URI that points to the blob containing the drive manifest file. */ manifestUri?: string; /** - * @member {number} [bytesSucceeded] Bytes successfully transferred for the - * drive. + * Bytes successfully transferred for the drive. */ bytesSucceeded?: number; } /** - * @interface - * An interface representing ExportModel. - * A property containing information about the blobs to be exported for an - * export job. This property is required for export jobs, but must not be - * specified for import jobs. - * + * A property containing information about the blobs to be exported for an export job. This + * property is required for export jobs, but must not be specified for import jobs. */ export interface ExportModel { /** - * @member {string[]} [blobPath] A collection of blob-path strings. + * A collection of blob-path strings. */ blobPath?: string[]; /** - * @member {string[]} [blobPathPrefix] A collection of blob-prefix strings. + * A collection of blob-prefix strings. */ blobPathPrefix?: string[]; /** - * @member {string} [blobListblobPath] The relative URI to the block blob - * that contains the list of blob paths or blob path prefixes as defined - * above, beginning with the container name. If the blob is in root - * container, the URI must begin with $root. + * The relative URI to the block blob that contains the list of blob paths or blob path prefixes + * as defined above, beginning with the container name. If the blob is in root container, the URI + * must begin with $root. */ - blobListblobPath?: string; + blobListBlobPath?: string; +} + +/** + * Specifies the encryption key properties + */ +export interface EncryptionKeyDetails { + /** + * The type of kek encryption key. Possible values include: 'MicrosoftManaged', + * 'CustomerManaged'. Default value: 'MicrosoftManaged'. + */ + kekType?: EncryptionKekType; + /** + * Specifies the url for kek encryption key. + */ + kekUrl?: string; + /** + * Specifies the keyvault resource id for kek encryption key. + */ + kekVaultResourceID?: string; } /** - * @interface - * An interface representing JobDetails. * Specifies the job properties - * */ export interface JobDetails { /** - * @member {string} [storageAccountId] The resource identifier of the storage - * account where data will be imported to or exported from. + * The resource identifier of the storage account where data will be imported to or exported + * from. */ storageAccountId?: string; /** - * @member {string} [jobType] The type of job + * The type of job */ jobType?: string; /** - * @member {ReturnAddress} [returnAddress] Specifies the return address - * information for the job. + * Specifies the return address information for the job. */ returnAddress?: ReturnAddress; /** - * @member {ReturnShipping} [returnShipping] Specifies the return carrier and - * customer's account with the carrier. + * Specifies the return carrier and customer's account with the carrier. */ returnShipping?: ReturnShipping; /** - * @member {ShippingInformation} [shippingInformation] Contains information - * about the Microsoft datacenter to which the drives should be shipped. + * Contains information about the Microsoft datacenter to which the drives should be shipped. */ shippingInformation?: ShippingInformation; /** - * @member {PackageInfomation} [deliveryPackage] Contains information about - * the package being shipped by the customer to the Microsoft data center. + * Contains information about the package being shipped by the customer to the Microsoft data + * center. */ - deliveryPackage?: PackageInfomation; + deliveryPackage?: DeliveryPackageInformation; /** - * @member {PackageInfomation} [returnPackage] Contains information about the - * package being shipped from the Microsoft data center to the customer to - * return the drives. The format is the same as the deliveryPackage property - * above. This property is not included if the drives have not yet been - * returned. + * Contains information about the package being shipped from the Microsoft data center to the + * customer to return the drives. The format is the same as the deliveryPackage property above. + * This property is not included if the drives have not yet been returned. */ returnPackage?: PackageInfomation; /** - * @member {string} [diagnosticsPath] The virtual blob directory to which the - * copy logs and backups of drive manifest files (if enabled) will be stored. + * The virtual blob directory to which the copy logs and backups of drive manifest files (if + * enabled) will be stored. */ diagnosticsPath?: string; /** - * @member {string} [logLevel] Default value is Error. Indicates whether - * error logging or verbose logging will be enabled. + * Default value is Error. Indicates whether error logging or verbose logging will be enabled. */ logLevel?: string; /** - * @member {boolean} [backupDriveManifest] Default value is false. Indicates - * whether the manifest files on the drives should be copied to block blobs. + * Default value is false. Indicates whether the manifest files on the drives should be copied to + * block blobs. */ backupDriveManifest?: boolean; /** - * @member {string} [state] Current state of the job. + * Current state of the job. */ state?: string; /** - * @member {boolean} [cancelRequested] Indicates whether a request has been - * submitted to cancel the job. + * Indicates whether a request has been submitted to cancel the job. */ cancelRequested?: boolean; /** - * @member {number} [percentComplete] Overall percentage completed for the - * job. + * Overall percentage completed for the job. */ percentComplete?: number; /** - * @member {string} [incompleteBlobListUri] A blob path that points to a - * block blob containing a list of blob names that were not exported due to - * insufficient drive space. If all blobs were exported successfully, then - * this element is not included in the response. + * A blob path that points to a block blob containing a list of blob names that were not exported + * due to insufficient drive space. If all blobs were exported successfully, then this element is + * not included in the response. */ incompleteBlobListUri?: string; /** - * @member {DriveStatus[]} [driveList] List of up to ten drives that comprise - * the job. The drive list is a required element for an import job; it is not - * specified for export jobs. + * List of up to ten drives that comprise the job. The drive list is a required element for an + * import job; it is not specified for export jobs. */ driveList?: DriveStatus[]; /** - * @member {ExportModel} [exportProperty] A property containing information - * about the blobs to be exported for an export job. This property is - * included for export jobs only. + * A property containing information about the blobs to be exported for an export job. This + * property is included for export jobs only. */ exportProperty?: ExportModel; /** - * @member {string} [provisioningState] Specifies the provisioning state of - * the job. + * Specifies the provisioning state of the job. */ provisioningState?: string; + /** + * Contains information about the encryption key. + */ + encryptionKey?: EncryptionKeyDetails; } /** - * @interface - * An interface representing PutJobParameters. * Put Job parameters - * */ export interface PutJobParameters { /** - * @member {string} [location] Specifies the supported Azure location where - * the job should be created + * Specifies the supported Azure location where the job should be created */ location?: string; /** - * @member {any} [tags] Specifies the tags that will be assigned to the job. + * Specifies the tags that will be assigned to the job. */ tags?: any; /** - * @member {JobDetails} [properties] Specifies the job properties + * Specifies the job properties */ properties?: JobDetails; } /** - * @interface - * An interface representing UpdateJobParameters. + * Specifies the identity properties. + */ +export interface IdentityDetails { + /** + * The type of identity. Possible values include: 'None', 'SystemAssigned', 'UserAssigned'. + * Default value: 'None'. + */ + type?: IdentityType; + /** + * Specifies the principal id for the identity for the job. + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly principalId?: string; + /** + * Specifies the tenant id for the identity for the job. + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly tenantId?: string; +} + +/** * Update Job parameters - * */ export interface UpdateJobParameters { /** - * @member {any} [tags] Specifies the tags that will be assigned to the job + * Specifies the tags that will be assigned to the job */ tags?: any; /** - * @member {boolean} [cancelRequested] If specified, the value must be true. - * The service will attempt to cancel the job. + * If specified, the value must be true. The service will attempt to cancel the job. */ cancelRequested?: boolean; /** - * @member {string} [state] If specified, the value must be Shipping, which - * tells the Import/Export service that the package for the job has been - * shipped. The ReturnAddress and DeliveryPackage properties must have been - * set either in this request or in a previous request, otherwise the request - * will fail. + * If specified, the value must be Shipping, which tells the Import/Export service that the + * package for the job has been shipped. The ReturnAddress and DeliveryPackage properties must + * have been set either in this request or in a previous request, otherwise the request will + * fail. */ state?: string; /** - * @member {ReturnAddress} [returnAddress] Specifies the return address - * information for the job. + * Specifies the return address information for the job. */ returnAddress?: ReturnAddress; /** - * @member {ReturnShipping} [returnShipping] Specifies the return carrier and - * customer's account with the carrier. + * Specifies the return carrier and customer's account with the carrier. */ returnShipping?: ReturnShipping; /** - * @member {PackageInfomation} [deliveryPackage] Contains information about - * the package being shipped by the customer to the Microsoft data center. + * Contains information about the package being shipped by the customer to the Microsoft data + * center. */ - deliveryPackage?: PackageInfomation; + deliveryPackage?: DeliveryPackageInformation; /** - * @member {string} [logLevel] Indicates whether error logging or verbose - * logging is enabled. + * Indicates whether error logging or verbose logging is enabled. */ logLevel?: string; /** - * @member {boolean} [backupDriveManifest] Indicates whether the manifest - * files on the drives should be copied to block blobs. + * Indicates whether the manifest files on the drives should be copied to block blobs. */ backupDriveManifest?: boolean; /** - * @member {DriveStatus[]} [driveList] List of drives that comprise the job. + * List of drives that comprise the job. */ driveList?: DriveStatus[]; } /** - * @interface - * An interface representing JobResponse. + * Metadata pertaining to creation and last modification of the resource. + */ +export interface SystemData { + /** + * The identity that created the resource. + */ + createdBy?: string; + /** + * The type of identity that created the resource. Possible values include: 'User', + * 'Application', 'ManagedIdentity', 'Key' + */ + createdByType?: CreatedByType; + /** + * The timestamp of resource creation (UTC). + */ + createdAt?: Date; + /** + * The identity that last modified the resource. + */ + lastModifiedBy?: string; + /** + * The type of identity that last modified the resource. Possible values include: 'User', + * 'Application', 'ManagedIdentity', 'Key' + */ + lastModifiedByType?: CreatedByType; + /** + * The type of identity that last modified the resource. + */ + lastModifiedAt?: Date; +} + +/** * Contains the job information. - * - * @extends BaseResource */ export interface JobResponse extends BaseResource { /** - * @member {string} [id] Specifies the resource identifier of the job. - * **NOTE: This property will not be serialized. It can only be populated by - * the server.** + * SystemData of ImportExport Jobs. + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly systemData?: SystemData; + /** + * Specifies the resource identifier of the job. + * **NOTE: This property will not be serialized. It can only be populated by the server.** */ readonly id?: string; /** - * @member {string} [name] Specifies the name of the job. - * **NOTE: This property will not be serialized. It can only be populated by - * the server.** + * Specifies the name of the job. + * **NOTE: This property will not be serialized. It can only be populated by the server.** */ readonly name?: string; /** - * @member {string} [type] Specifies the type of the job resource. - * **NOTE: This property will not be serialized. It can only be populated by - * the server.** + * Specifies the type of the job resource. + * **NOTE: This property will not be serialized. It can only be populated by the server.** */ readonly type?: string; /** - * @member {string} [location] Specifies the Azure location where the job is - * created. + * Specifies the Azure location where the job is created. */ location?: string; /** - * @member {any} [tags] Specifies the tags that are assigned to the job. + * Specifies the tags that are assigned to the job. */ tags?: any; /** - * @member {JobDetails} [properties] Specifies the job properties + * Specifies the job properties */ properties?: JobDetails; + /** + * Specifies the job identity details + */ + identity?: IdentityDetails; } /** - * @interface - * An interface representing Operation. * Describes a supported operation by the Storage Import/Export job API. - * */ export interface Operation { /** - * @member {string} name Name of the operation. + * Name of the operation. */ name: string; /** - * @member {string} [provider] The resource provider name to which the - * operation belongs. + * The resource provider name to which the operation belongs. */ provider?: string; /** - * @member {string} [resource] The name of the resource to which the - * operation belongs. + * The name of the resource to which the operation belongs. */ resource?: string; /** - * @member {string} [operation] The display name of the operation. + * The display name of the operation. */ operation?: string; /** - * @member {string} [description] Short description of the operation. + * Short description of the operation. */ description?: string; } /** - * @interface - * An interface representing Location. * Provides information about an Azure data center location. - * */ export interface Location { /** - * @member {string} [id] Specifies the resource identifier of the location. + * Specifies the resource identifier of the location. */ id?: string; /** - * @member {string} [name] Specifies the name of the location. Use List - * Locations to get all supported locations. + * Specifies the name of the location. Use List Locations to get all supported locations. */ name?: string; /** - * @member {string} [type] Specifies the type of the location. + * Specifies the type of the location. */ type?: string; /** - * @member {string} [recipientName] The recipient name to use when shipping - * the drives to the Azure data center. + * The recipient name to use when shipping the drives to the Azure data center. */ recipientName?: string; /** - * @member {string} [streetAddress1] The first line of the street address to - * use when shipping the drives to the Azure data center. + * The first line of the street address to use when shipping the drives to the Azure data center. */ streetAddress1?: string; /** - * @member {string} [streetAddress2] The second line of the street address to - * use when shipping the drives to the Azure data center. + * The second line of the street address to use when shipping the drives to the Azure data + * center. */ streetAddress2?: string; /** - * @member {string} [city] The city name to use when shipping the drives to - * the Azure data center. + * The city name to use when shipping the drives to the Azure data center. */ city?: string; /** - * @member {string} [stateOrProvince] The state or province to use when - * shipping the drives to the Azure data center. + * The state or province to use when shipping the drives to the Azure data center. */ stateOrProvince?: string; /** - * @member {string} [postalCode] The postal code to use when shipping the - * drives to the Azure data center. + * The postal code to use when shipping the drives to the Azure data center. */ postalCode?: string; /** - * @member {string} [countryOrRegion] The country or region to use when - * shipping the drives to the Azure data center. + * The country or region to use when shipping the drives to the Azure data center. */ countryOrRegion?: string; /** - * @member {string} [phone] The phone number for the Azure data center. + * The phone number for the Azure data center. */ phone?: string; /** - * @member {string[]} [supportedCarriers] A list of carriers that are - * supported at this location. + * Additional shipping information for customer, specific to datacenter to which customer should + * send their disks. + */ + additionalShippingInformation?: string; + /** + * A list of carriers that are supported at this location. */ supportedCarriers?: string[]; /** - * @member {string[]} [alternateLocations] A list of location IDs that should - * be used to ship shipping drives to for jobs created against the current - * location. If the current location is active, it will be part of the list. - * If it is temporarily closed due to maintenance, this list may contain - * other locations. + * A list of location IDs that should be used to ship shipping drives to for jobs created against + * the current location. If the current location is active, it will be part of the list. If it is + * temporarily closed due to maintenance, this list may contain other locations. */ alternateLocations?: string[]; } /** - * @interface - * An interface representing DriveBitLockerKey. * BitLocker recovery key or password to the specified drive - * */ export interface DriveBitLockerKey { /** - * @member {string} [bitLockerKey] BitLocker recovery key or password + * BitLocker recovery key or password */ bitLockerKey?: string; /** - * @member {string} [driveId] Drive ID + * Drive ID */ driveId?: string; } /** - * @interface - * An interface representing JobsListBySubscriptionOptionalParams. * Optional Parameters. - * - * @extends RequestOptionsBase */ export interface JobsListBySubscriptionOptionalParams extends msRest.RequestOptionsBase { /** - * @member {number} [top] An integer value that specifies how many jobs at - * most should be returned. The value cannot exceed 100. + * An integer value that specifies how many jobs at most should be returned. The value cannot + * exceed 100. */ top?: number; /** - * @member {string} [filter] Can be used to restrict the results to certain - * conditions. + * Can be used to restrict the results to certain conditions. */ filter?: string; } /** - * @interface - * An interface representing JobsListByResourceGroupOptionalParams. * Optional Parameters. - * - * @extends RequestOptionsBase */ export interface JobsListByResourceGroupOptionalParams extends msRest.RequestOptionsBase { /** - * @member {number} [top] An integer value that specifies how many jobs at - * most should be returned. The value cannot exceed 100. + * An integer value that specifies how many jobs at most should be returned. The value cannot + * exceed 100. */ top?: number; /** - * @member {string} [filter] Can be used to restrict the results to certain - * conditions. + * Can be used to restrict the results to certain conditions. */ filter?: string; } /** - * @interface - * An interface representing JobsCreateOptionalParams. * Optional Parameters. - * - * @extends RequestOptionsBase */ export interface JobsCreateOptionalParams extends msRest.RequestOptionsBase { /** - * @member {string} [clientTenantId] The tenant ID of the client making the - * request. + * The tenant ID of the client making the request. */ clientTenantId?: string; } /** - * @interface - * An interface representing StorageImportExportManagementClientOptions. - * @extends AzureServiceClientOptions + * Optional Parameters. */ -export interface StorageImportExportManagementClientOptions extends AzureServiceClientOptions { +export interface JobsListBySubscriptionNextOptionalParams extends msRest.RequestOptionsBase { /** - * @member {string} [baseUri] + * An integer value that specifies how many jobs at most should be returned. The value cannot + * exceed 100. */ - baseUri?: string; + top?: number; + /** + * Can be used to restrict the results to certain conditions. + */ + filter?: string; } +/** + * Optional Parameters. + */ +export interface JobsListByResourceGroupNextOptionalParams extends msRest.RequestOptionsBase { + /** + * An integer value that specifies how many jobs at most should be returned. The value cannot + * exceed 100. + */ + top?: number; + /** + * Can be used to restrict the results to certain conditions. + */ + filter?: string; +} + +/** + * An interface representing StorageImportExportManagementClientOptions. + */ +export interface StorageImportExportManagementClientOptions extends AzureServiceClientOptions { + baseUri?: string; +} /** * @interface - * An interface representing the LocationsResponse. * Locations response - * * @extends Array */ export interface LocationsResponse extends Array { @@ -724,23 +737,19 @@ export interface LocationsResponse extends Array { /** * @interface - * An interface representing the ListJobsResponse. * List jobs response - * * @extends Array */ export interface ListJobsResponse extends Array { /** - * @member {string} [nextLink] link to next batch of jobs + * link to next batch of jobs */ nextLink?: string; } /** * @interface - * An interface representing the GetBitLockerKeysResponse. * GetBitLockerKeys response - * * @extends Array */ export interface GetBitLockerKeysResponse extends Array { @@ -748,9 +757,7 @@ export interface GetBitLockerKeysResponse extends Array { /** * @interface - * An interface representing the ListOperationsResponse. * List operations response - * * @extends Array */ export interface ListOperationsResponse extends Array { @@ -765,6 +772,30 @@ export interface ListOperationsResponse extends Array { */ export type DriveState = 'Specified' | 'Received' | 'NeverReceived' | 'Transferring' | 'Completed' | 'CompletedMoreInfo' | 'ShippedBack'; +/** + * Defines values for EncryptionKekType. + * Possible values include: 'MicrosoftManaged', 'CustomerManaged' + * @readonly + * @enum {string} + */ +export type EncryptionKekType = 'MicrosoftManaged' | 'CustomerManaged'; + +/** + * Defines values for IdentityType. + * Possible values include: 'None', 'SystemAssigned', 'UserAssigned' + * @readonly + * @enum {string} + */ +export type IdentityType = 'None' | 'SystemAssigned' | 'UserAssigned'; + +/** + * Defines values for CreatedByType. + * Possible values include: 'User', 'Application', 'ManagedIdentity', 'Key' + * @readonly + * @enum {string} + */ +export type CreatedByType = 'User' | 'Application' | 'ManagedIdentity' | 'Key'; + /** * Contains response data for the list operation. */ @@ -777,6 +808,7 @@ export type LocationsListResponse = LocationsResponse & { * The response body as text (string format) */ bodyAsText: string; + /** * The response body as parsed JSON or XML */ @@ -796,6 +828,7 @@ export type LocationsGetResponse = Location & { * The response body as text (string format) */ bodyAsText: string; + /** * The response body as parsed JSON or XML */ @@ -815,6 +848,7 @@ export type JobsListBySubscriptionResponse = ListJobsResponse & { * The response body as text (string format) */ bodyAsText: string; + /** * The response body as parsed JSON or XML */ @@ -834,6 +868,7 @@ export type JobsListByResourceGroupResponse = ListJobsResponse & { * The response body as text (string format) */ bodyAsText: string; + /** * The response body as parsed JSON or XML */ @@ -853,6 +888,7 @@ export type JobsGetResponse = JobResponse & { * The response body as text (string format) */ bodyAsText: string; + /** * The response body as parsed JSON or XML */ @@ -872,6 +908,7 @@ export type JobsUpdateResponse = JobResponse & { * The response body as text (string format) */ bodyAsText: string; + /** * The response body as parsed JSON or XML */ @@ -891,6 +928,7 @@ export type JobsCreateResponse = JobResponse & { * The response body as text (string format) */ bodyAsText: string; + /** * The response body as parsed JSON or XML */ @@ -910,6 +948,7 @@ export type JobsListBySubscriptionNextResponse = ListJobsResponse & { * The response body as text (string format) */ bodyAsText: string; + /** * The response body as parsed JSON or XML */ @@ -929,6 +968,7 @@ export type JobsListByResourceGroupNextResponse = ListJobsResponse & { * The response body as text (string format) */ bodyAsText: string; + /** * The response body as parsed JSON or XML */ @@ -948,6 +988,7 @@ export type BitLockerKeysListResponse = GetBitLockerKeysResponse & { * The response body as text (string format) */ bodyAsText: string; + /** * The response body as parsed JSON or XML */ @@ -967,6 +1008,7 @@ export type OperationsListResponse = ListOperationsResponse & { * The response body as text (string format) */ bodyAsText: string; + /** * The response body as parsed JSON or XML */ diff --git a/sdk/storageimportexport/arm-storageimportexport/src/models/jobsMappers.ts b/sdk/storageimportexport/arm-storageimportexport/src/models/jobsMappers.ts index 3eee6ad014f3..3f13911c90aa 100644 --- a/sdk/storageimportexport/arm-storageimportexport/src/models/jobsMappers.ts +++ b/sdk/storageimportexport/arm-storageimportexport/src/models/jobsMappers.ts @@ -1,27 +1,28 @@ /* - * 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. + * Changes may cause incorrect behavior and will be lost if the code is regenerated. */ export { - ListJobsResponse, - JobResponse, BaseResource, + DeliveryPackageInformation, + DriveStatus, + EncryptionKeyDetails, + ErrorResponse, + ErrorResponseErrorDetailsItem, + ExportModel, + IdentityDetails, JobDetails, + JobResponse, + ListJobsResponse, + PackageInfomation, + PutJobParameters, ReturnAddress, ReturnShipping, ShippingInformation, - PackageInfomation, - DriveStatus, - ExportModel, - ErrorResponse, - ErrorResponseErrorDetailsItem, - UpdateJobParameters, - PutJobParameters + SystemData, + UpdateJobParameters } from "../models/mappers"; - diff --git a/sdk/storageimportexport/arm-storageimportexport/src/models/locationsMappers.ts b/sdk/storageimportexport/arm-storageimportexport/src/models/locationsMappers.ts index c99c5d6fc56d..22f6e32d7154 100644 --- a/sdk/storageimportexport/arm-storageimportexport/src/models/locationsMappers.ts +++ b/sdk/storageimportexport/arm-storageimportexport/src/models/locationsMappers.ts @@ -1,17 +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. + * Changes may cause incorrect behavior and will be lost if the code is regenerated. */ export { - LocationsResponse, - Location, ErrorResponse, - ErrorResponseErrorDetailsItem + ErrorResponseErrorDetailsItem, + Location, + LocationsResponse } from "../models/mappers"; - diff --git a/sdk/storageimportexport/arm-storageimportexport/src/models/mappers.ts b/sdk/storageimportexport/arm-storageimportexport/src/models/mappers.ts index 3aef69f61164..4879e32540fa 100644 --- a/sdk/storageimportexport/arm-storageimportexport/src/models/mappers.ts +++ b/sdk/storageimportexport/arm-storageimportexport/src/models/mappers.ts @@ -1,11 +1,9 @@ /* - * 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. + * Changes may cause incorrect behavior and will be lost if the code is regenerated. */ import { CloudErrorMapper, BaseResourceMapper } from "@azure/ms-rest-azure-js"; @@ -190,14 +188,12 @@ export const ShippingInformation: msRest.CompositeMapper = { className: "ShippingInformation", modelProperties: { recipientName: { - required: true, serializedName: "recipientName", type: { name: "String" } }, streetAddress1: { - required: true, serializedName: "streetAddress1", type: { name: "String" @@ -210,28 +206,24 @@ export const ShippingInformation: msRest.CompositeMapper = { } }, city: { - required: true, serializedName: "city", type: { name: "String" } }, stateOrProvince: { - required: true, serializedName: "stateOrProvince", type: { name: "String" } }, postalCode: { - required: true, serializedName: "postalCode", type: { name: "String" } }, countryOrRegion: { - required: true, serializedName: "countryOrRegion", type: { name: "String" @@ -242,6 +234,49 @@ export const ShippingInformation: msRest.CompositeMapper = { type: { name: "String" } + }, + additionalInformation: { + readOnly: true, + serializedName: "additionalInformation", + type: { + name: "String" + } + } + } + } +}; + +export const DeliveryPackageInformation: msRest.CompositeMapper = { + serializedName: "DeliveryPackageInformation", + type: { + name: "Composite", + className: "DeliveryPackageInformation", + modelProperties: { + carrierName: { + required: true, + serializedName: "carrierName", + type: { + name: "String" + } + }, + trackingNumber: { + required: true, + serializedName: "trackingNumber", + type: { + name: "String" + } + }, + driveCount: { + serializedName: "driveCount", + type: { + name: "Number" + } + }, + shipDate: { + serializedName: "shipDate", + type: { + name: "String" + } } } } @@ -395,8 +430,37 @@ export const ExportModel: msRest.CompositeMapper = { } } }, - blobListblobPath: { - serializedName: "blobListblobPath", + blobListBlobPath: { + serializedName: "blobListBlobPath", + type: { + name: "String" + } + } + } + } +}; + +export const EncryptionKeyDetails: msRest.CompositeMapper = { + serializedName: "EncryptionKeyDetails", + type: { + name: "Composite", + className: "EncryptionKeyDetails", + modelProperties: { + kekType: { + serializedName: "kekType", + defaultValue: 'MicrosoftManaged', + type: { + name: "String" + } + }, + kekUrl: { + serializedName: "kekUrl", + type: { + name: "String" + } + }, + kekVaultResourceID: { + serializedName: "kekVaultResourceID", type: { name: "String" } @@ -448,7 +512,7 @@ export const JobDetails: msRest.CompositeMapper = { serializedName: "deliveryPackage", type: { name: "Composite", - className: "PackageInfomation" + className: "DeliveryPackageInformation" } }, returnPackage: { @@ -524,6 +588,13 @@ export const JobDetails: msRest.CompositeMapper = { type: { name: "String" } + }, + encryptionKey: { + serializedName: "encryptionKey", + type: { + name: "Composite", + className: "EncryptionKeyDetails" + } } } } @@ -558,6 +629,37 @@ export const PutJobParameters: msRest.CompositeMapper = { } }; +export const IdentityDetails: msRest.CompositeMapper = { + serializedName: "IdentityDetails", + type: { + name: "Composite", + className: "IdentityDetails", + modelProperties: { + type: { + serializedName: "type", + defaultValue: 'None', + type: { + name: "String" + } + }, + principalId: { + readOnly: true, + serializedName: "principalId", + type: { + name: "String" + } + }, + tenantId: { + readOnly: true, + serializedName: "tenantId", + type: { + name: "String" + } + } + } + } +}; + export const UpdateJobParameters: msRest.CompositeMapper = { serializedName: "UpdateJobParameters", type: { @@ -600,7 +702,7 @@ export const UpdateJobParameters: msRest.CompositeMapper = { serializedName: "properties.deliveryPackage", type: { name: "Composite", - className: "PackageInfomation" + className: "DeliveryPackageInformation" } }, logLevel: { @@ -631,12 +733,66 @@ export const UpdateJobParameters: msRest.CompositeMapper = { } }; +export const SystemData: msRest.CompositeMapper = { + serializedName: "systemData", + type: { + name: "Composite", + className: "SystemData", + modelProperties: { + createdBy: { + serializedName: "createdBy", + type: { + name: "String" + } + }, + createdByType: { + serializedName: "createdByType", + type: { + name: "String" + } + }, + createdAt: { + serializedName: "createdAt", + type: { + name: "DateTime" + } + }, + lastModifiedBy: { + serializedName: "lastModifiedBy", + type: { + name: "String" + } + }, + lastModifiedByType: { + serializedName: "lastModifiedByType", + type: { + name: "String" + } + }, + lastModifiedAt: { + serializedName: "lastModifiedAt", + type: { + name: "DateTime" + } + } + } + } +}; + export const JobResponse: msRest.CompositeMapper = { serializedName: "JobResponse", type: { name: "Composite", className: "JobResponse", modelProperties: { + systemData: { + readOnly: true, + serializedName: "systemData", + type: { + name: "Composite", + className: "SystemData" + } + }, id: { readOnly: true, serializedName: "id", @@ -676,6 +832,13 @@ export const JobResponse: msRest.CompositeMapper = { name: "Composite", className: "JobDetails" } + }, + identity: { + serializedName: "identity", + type: { + name: "Composite", + className: "IdentityDetails" + } } } } @@ -794,6 +957,12 @@ export const Location: msRest.CompositeMapper = { name: "String" } }, + additionalShippingInformation: { + serializedName: "properties.additionalShippingInformation", + type: { + name: "String" + } + }, supportedCarriers: { serializedName: "properties.supportedCarriers", type: { diff --git a/sdk/storageimportexport/arm-storageimportexport/src/models/operationsMappers.ts b/sdk/storageimportexport/arm-storageimportexport/src/models/operationsMappers.ts index d56e37ad79d3..cf14f6bb05b9 100644 --- a/sdk/storageimportexport/arm-storageimportexport/src/models/operationsMappers.ts +++ b/sdk/storageimportexport/arm-storageimportexport/src/models/operationsMappers.ts @@ -1,17 +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. + * Changes may cause incorrect behavior and will be lost if the code is regenerated. */ export { - ListOperationsResponse, - Operation, ErrorResponse, - ErrorResponseErrorDetailsItem + ErrorResponseErrorDetailsItem, + ListOperationsResponse, + Operation } from "../models/mappers"; - diff --git a/sdk/storageimportexport/arm-storageimportexport/src/models/parameters.ts b/sdk/storageimportexport/arm-storageimportexport/src/models/parameters.ts index 7a39376106a9..0490b090437d 100644 --- a/sdk/storageimportexport/arm-storageimportexport/src/models/parameters.ts +++ b/sdk/storageimportexport/arm-storageimportexport/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/storageimportexport/arm-storageimportexport/src/operations/bitLockerKeys.ts b/sdk/storageimportexport/arm-storageimportexport/src/operations/bitLockerKeys.ts index 017fde106268..e446b7f81eba 100644 --- a/sdk/storageimportexport/arm-storageimportexport/src/operations/bitLockerKeys.ts +++ b/sdk/storageimportexport/arm-storageimportexport/src/operations/bitLockerKeys.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/storageimportexport/arm-storageimportexport/src/operations/index.ts b/sdk/storageimportexport/arm-storageimportexport/src/operations/index.ts index 6a1e95f64456..288f57481a6e 100644 --- a/sdk/storageimportexport/arm-storageimportexport/src/operations/index.ts +++ b/sdk/storageimportexport/arm-storageimportexport/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/storageimportexport/arm-storageimportexport/src/operations/jobs.ts b/sdk/storageimportexport/arm-storageimportexport/src/operations/jobs.ts index 13102ad4e34e..b6f871bc7144 100644 --- a/sdk/storageimportexport/arm-storageimportexport/src/operations/jobs.ts +++ b/sdk/storageimportexport/arm-storageimportexport/src/operations/jobs.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 @@ -237,7 +236,7 @@ export class Jobs { * @param [options] The optional parameters * @returns Promise */ - listBySubscriptionNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise; + listBySubscriptionNext(nextPageLink: string, options?: Models.JobsListBySubscriptionNextOptionalParams): Promise; /** * @param nextPageLink The NextLink from the previous successful call to List operation. * @param callback The callback @@ -248,8 +247,8 @@ export class Jobs { * @param options The optional parameters * @param callback The callback */ - listBySubscriptionNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - listBySubscriptionNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { + listBySubscriptionNext(nextPageLink: string, options: Models.JobsListBySubscriptionNextOptionalParams, callback: msRest.ServiceCallback): void; + listBySubscriptionNext(nextPageLink: string, options?: Models.JobsListBySubscriptionNextOptionalParams | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { nextPageLink, @@ -265,7 +264,7 @@ export class Jobs { * @param [options] The optional parameters * @returns Promise */ - listByResourceGroupNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise; + listByResourceGroupNext(nextPageLink: string, options?: Models.JobsListByResourceGroupNextOptionalParams): Promise; /** * @param nextPageLink The NextLink from the previous successful call to List operation. * @param callback The callback @@ -276,8 +275,8 @@ export class Jobs { * @param options The optional parameters * @param callback The callback */ - listByResourceGroupNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - listByResourceGroupNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { + listByResourceGroupNext(nextPageLink: string, options: Models.JobsListByResourceGroupNextOptionalParams, callback: msRest.ServiceCallback): void; + listByResourceGroupNext(nextPageLink: string, options?: Models.JobsListByResourceGroupNextOptionalParams | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { nextPageLink, @@ -464,6 +463,11 @@ const listBySubscriptionNextOperationSpec: msRest.OperationSpec = { urlParameters: [ Parameters.nextPageLink ], + queryParameters: [ + Parameters.top, + Parameters.filter, + Parameters.apiVersion + ], headerParameters: [ Parameters.acceptLanguage ], @@ -485,6 +489,11 @@ const listByResourceGroupNextOperationSpec: msRest.OperationSpec = { urlParameters: [ Parameters.nextPageLink ], + queryParameters: [ + Parameters.top, + Parameters.filter, + Parameters.apiVersion + ], headerParameters: [ Parameters.acceptLanguage ], diff --git a/sdk/storageimportexport/arm-storageimportexport/src/operations/locations.ts b/sdk/storageimportexport/arm-storageimportexport/src/operations/locations.ts index 66d5f3cfd809..9723b22b61b4 100644 --- a/sdk/storageimportexport/arm-storageimportexport/src/operations/locations.ts +++ b/sdk/storageimportexport/arm-storageimportexport/src/operations/locations.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/storageimportexport/arm-storageimportexport/src/operations/operations.ts b/sdk/storageimportexport/arm-storageimportexport/src/operations/operations.ts index 3d85bf6e3dc3..a10b8522af81 100644 --- a/sdk/storageimportexport/arm-storageimportexport/src/operations/operations.ts +++ b/sdk/storageimportexport/arm-storageimportexport/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 diff --git a/sdk/storageimportexport/arm-storageimportexport/src/storageImportExportManagementClient.ts b/sdk/storageimportexport/arm-storageimportexport/src/storageImportExportManagementClient.ts index fdc10047f102..7fc073ac1946 100644 --- a/sdk/storageimportexport/arm-storageimportexport/src/storageImportExportManagementClient.ts +++ b/sdk/storageimportexport/arm-storageimportexport/src/storageImportExportManagementClient.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/storageimportexport/arm-storageimportexport/src/storageImportExportManagementClientContext.ts b/sdk/storageimportexport/arm-storageimportexport/src/storageImportExportManagementClientContext.ts index 08a5786a8d6a..37b95bc29d02 100644 --- a/sdk/storageimportexport/arm-storageimportexport/src/storageImportExportManagementClientContext.ts +++ b/sdk/storageimportexport/arm-storageimportexport/src/storageImportExportManagementClientContext.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 @@ -13,7 +12,7 @@ import * as msRest from "@azure/ms-rest-js"; import * as msRestAzure from "@azure/ms-rest-azure-js"; const packageName = "@azure/arm-storageimportexport"; -const packageVersion = "0.1.0"; +const packageVersion = "1.2.0"; export class StorageImportExportManagementClientContext extends msRestAzure.AzureServiceClient { credentials: msRest.ServiceClientCredentials; diff --git a/sdk/storageimportexport/arm-storageimportexport/tsconfig.json b/sdk/storageimportexport/arm-storageimportexport/tsconfig.json index 87bbf5b5fa49..422b584abd5e 100644 --- a/sdk/storageimportexport/arm-storageimportexport/tsconfig.json +++ b/sdk/storageimportexport/arm-storageimportexport/tsconfig.json @@ -9,7 +9,7 @@ "esModuleInterop": true, "allowSyntheticDefaultImports": true, "forceConsistentCasingInFileNames": true, - "lib": ["es6"], + "lib": ["es6", "dom"], "declaration": true, "outDir": "./esm", "importHelpers": true