From 5692612a5bc00d6d5f8d427fa68b44818e16aeb6 Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Wed, 28 Mar 2018 20:08:05 +0000 Subject: [PATCH 1/3] Generated from 5a552c2f744276781d3212880dcb007e801483d4 Add GeoRestore to MySQL and PostgreSQL --- .../mysqlManagement/lib/models/index.d.ts | 15 +- .../mysqlManagement/lib/models/index.js | 4 +- .../models/serverPropertiesForGeoRestore.js | 93 +++++++ .../lib/models/serverPropertiesForRestore.js | 2 +- .../lib/models/index.d.ts | 133 +++++++--- .../postgresqlManagement/lib/models/index.js | 5 +- .../lib/models/logFile.js | 10 +- .../lib/models/nameAvailabilityRequest.js | 4 +- .../lib/models/performanceTierProperties.js | 9 - .../performanceTierServiceLevelObjectives.js | 49 +++- .../postgresqlManagement/lib/models/server.js | 41 ++- .../lib/models/serverForCreate.js | 16 +- .../lib/models/serverPropertiesForCreate.js | 29 ++- .../serverPropertiesForDefaultCreate.js | 24 +- .../models/serverPropertiesForGeoRestore.js | 93 +++++++ .../lib/models/serverPropertiesForRestore.js | 26 +- .../lib/models/serverUpdateParameters.js | 24 +- .../postgresqlManagement/lib/models/sku.js | 6 +- .../lib/models/storageProfile.js | 70 +++++ .../lib/operations/checkNameAvailability.js | 6 +- .../lib/operations/index.d.ts | 225 ++++++++-------- .../lib/operations/index.js | 1 - .../lib/operations/servers.js | 240 +++++++++++++----- .../lib/postgreSQLManagementClient.d.ts | 6 +- .../lib/postgreSQLManagementClient.js | 6 +- 25 files changed, 834 insertions(+), 303 deletions(-) create mode 100644 lib/services/mysqlManagement/lib/models/serverPropertiesForGeoRestore.js create mode 100644 lib/services/postgresqlManagement/lib/models/serverPropertiesForGeoRestore.js create mode 100644 lib/services/postgresqlManagement/lib/models/storageProfile.js diff --git a/lib/services/mysqlManagement/lib/models/index.d.ts b/lib/services/mysqlManagement/lib/models/index.d.ts index 203defddaf..d6f0b43496 100755 --- a/lib/services/mysqlManagement/lib/models/index.d.ts +++ b/lib/services/mysqlManagement/lib/models/index.d.ts @@ -111,7 +111,7 @@ export interface ServerPropertiesForDefaultCreate extends ServerPropertiesForCre * @class * Initializes a new instance of the ServerPropertiesForRestore class. * @constructor - * The properties to a new server by restoring from a backup. + * The properties used to create a new server by restoring from a backup. * * @member {string} sourceServerId The source server id to restore from. * @member {date} restorePointInTime Restore point creation time (ISO8601 @@ -122,6 +122,19 @@ export interface ServerPropertiesForRestore extends ServerPropertiesForCreate { restorePointInTime: Date; } +/** + * @class + * Initializes a new instance of the ServerPropertiesForGeoRestore class. + * @constructor + * The properties used to create a new server by restoring to a different + * region from a geo replicated backup. + * + * @member {string} sourceServerId The source server id to restore from. + */ +export interface ServerPropertiesForGeoRestore extends ServerPropertiesForCreate { + sourceServerId: string; +} + /** * @class * Initializes a new instance of the Sku class. diff --git a/lib/services/mysqlManagement/lib/models/index.js b/lib/services/mysqlManagement/lib/models/index.js index 4808847a00..d95f9e5901 100755 --- a/lib/services/mysqlManagement/lib/models/index.js +++ b/lib/services/mysqlManagement/lib/models/index.js @@ -24,6 +24,7 @@ exports.StorageProfile = require('./storageProfile'); exports.ServerPropertiesForCreate = require('./serverPropertiesForCreate'); exports.ServerPropertiesForDefaultCreate = require('./serverPropertiesForDefaultCreate'); exports.ServerPropertiesForRestore = require('./serverPropertiesForRestore'); +exports.ServerPropertiesForGeoRestore = require('./serverPropertiesForGeoRestore'); exports.Sku = require('./sku'); exports.Server = require('./server'); exports.ServerForCreate = require('./serverForCreate'); @@ -48,5 +49,6 @@ exports.PerformanceTierListResult = require('./performanceTierListResult'); exports.discriminators = { 'ServerPropertiesForCreate' : exports.ServerPropertiesForCreate, 'ServerPropertiesForCreate.Default' : exports.ServerPropertiesForDefaultCreate, - 'ServerPropertiesForCreate.PointInTimeRestore' : exports.ServerPropertiesForRestore + 'ServerPropertiesForCreate.PointInTimeRestore' : exports.ServerPropertiesForRestore, + 'ServerPropertiesForCreate.GeoRestore' : exports.ServerPropertiesForGeoRestore }; diff --git a/lib/services/mysqlManagement/lib/models/serverPropertiesForGeoRestore.js b/lib/services/mysqlManagement/lib/models/serverPropertiesForGeoRestore.js new file mode 100644 index 0000000000..f4b909b096 --- /dev/null +++ b/lib/services/mysqlManagement/lib/models/serverPropertiesForGeoRestore.js @@ -0,0 +1,93 @@ +/* + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for + * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. + * Changes may cause incorrect behavior and will be lost if the code is + * regenerated. + */ + +'use strict'; + +const models = require('./index'); + +/** + * The properties used to create a new server by restoring to a different + * region from a geo replicated backup. + * + * @extends models['ServerPropertiesForCreate'] + */ +class ServerPropertiesForGeoRestore extends models['ServerPropertiesForCreate'] { + /** + * Create a ServerPropertiesForGeoRestore. + * @member {string} sourceServerId The source server id to restore from. + */ + constructor() { + super(); + } + + /** + * Defines the metadata of ServerPropertiesForGeoRestore + * + * @returns {object} metadata of ServerPropertiesForGeoRestore + * + */ + mapper() { + return { + required: false, + serializedName: 'GeoRestore', + type: { + name: 'Composite', + polymorphicDiscriminator: { + serializedName: 'createMode', + clientName: 'createMode' + }, + uberParent: 'ServerPropertiesForCreate', + className: 'ServerPropertiesForGeoRestore', + modelProperties: { + version: { + required: false, + serializedName: 'version', + type: { + name: 'String' + } + }, + sslEnforcement: { + required: false, + serializedName: 'sslEnforcement', + type: { + name: 'Enum', + allowedValues: [ 'Enabled', 'Disabled' ] + } + }, + storageProfile: { + required: false, + serializedName: 'storageProfile', + type: { + name: 'Composite', + className: 'StorageProfile' + } + }, + createMode: { + required: true, + serializedName: 'createMode', + isPolymorphicDiscriminator: true, + type: { + name: 'String' + } + }, + sourceServerId: { + required: true, + serializedName: 'sourceServerId', + type: { + name: 'String' + } + } + } + } + }; + } +} + +module.exports = ServerPropertiesForGeoRestore; diff --git a/lib/services/mysqlManagement/lib/models/serverPropertiesForRestore.js b/lib/services/mysqlManagement/lib/models/serverPropertiesForRestore.js index 8abb796c5d..ab3576dc01 100755 --- a/lib/services/mysqlManagement/lib/models/serverPropertiesForRestore.js +++ b/lib/services/mysqlManagement/lib/models/serverPropertiesForRestore.js @@ -13,7 +13,7 @@ const models = require('./index'); /** - * The properties to a new server by restoring from a backup. + * The properties used to create a new server by restoring from a backup. * * @extends models['ServerPropertiesForCreate'] */ diff --git a/lib/services/postgresqlManagement/lib/models/index.d.ts b/lib/services/postgresqlManagement/lib/models/index.d.ts index 31b323b297..e415ce954f 100755 --- a/lib/services/postgresqlManagement/lib/models/index.d.ts +++ b/lib/services/postgresqlManagement/lib/models/index.d.ts @@ -47,23 +47,46 @@ export interface TrackedResource extends ProxyResource { tags?: { [propertyName: string]: string }; } +/** + * @class + * Initializes a new instance of the StorageProfile class. + * @constructor + * Storage Profile properties of a server + * + * @member {number} [backupRetentionDays] Backup retention days for the server. + * @member {string} [geoRedundantBackup] Enable Geo-redundant or not for server + * backup. Possible values include: 'Enabled', 'Disabled' + * @member {number} [storageMB] Max storage allowed for a server. + */ +export interface StorageProfile { + backupRetentionDays?: number; + geoRedundantBackup?: string; + storageMB?: number; +} + /** * @class * Initializes a new instance of the ServerPropertiesForCreate class. * @constructor * The properties used to create a new server. * - * @member {number} [storageMB] The maximum storage allowed for a server. * @member {string} [version] Server version. Possible values include: '9.5', * '9.6' * @member {string} [sslEnforcement] Enable ssl enforcement or not when connect * to server. Possible values include: 'Enabled', 'Disabled' + * @member {object} [storageProfile] Storage profile of a server. + * @member {number} [storageProfile.backupRetentionDays] Backup retention days + * for the server. + * @member {string} [storageProfile.geoRedundantBackup] Enable Geo-redundant or + * not for server backup. Possible values include: 'Enabled', 'Disabled' + * @member {number} [storageProfile.storageMB] Max storage allowed for a + * server. * @member {string} createMode Polymorphic Discriminator */ export interface ServerPropertiesForCreate { - storageMB?: number; version?: string; sslEnforcement?: string; + storageProfile?: StorageProfile; createMode: string; } @@ -88,7 +111,7 @@ export interface ServerPropertiesForDefaultCreate extends ServerPropertiesForCre * @class * Initializes a new instance of the ServerPropertiesForRestore class. * @constructor - * The properties to a new server by restoring from a backup. + * The properties used to create a new server by restoring from a backup. * * @member {string} sourceServerId The source server id to restore from. * @member {date} restorePointInTime Restore point creation time (ISO8601 @@ -99,16 +122,29 @@ export interface ServerPropertiesForRestore extends ServerPropertiesForCreate { restorePointInTime: Date; } +/** + * @class + * Initializes a new instance of the ServerPropertiesForGeoRestore class. + * @constructor + * The properties used to create a new server by restoring to a different + * region from a geo replicated backup. + * + * @member {string} sourceServerId The source server id to restore from. + */ +export interface ServerPropertiesForGeoRestore extends ServerPropertiesForCreate { + sourceServerId: string; +} + /** * @class * Initializes a new instance of the Sku class. * @constructor * Billing information related properties of a server. * - * @member {string} [name] The name of the sku, typically, a letter + Number - * code, e.g. P3. + * @member {string} [name] The name of the sku, typically, tier + family + + * cores, e.g. B_Gen4_1, GP_Gen5_8. * @member {string} [tier] The tier of the particular SKU, e.g. Basic. Possible - * values include: 'Basic', 'Standard' + * values include: 'Basic', 'GeneralPurpose', 'MemoryOptimized' * @member {number} [capacity] The scale up/out capacity, representing server's * compute units. * @member {string} [size] The size code, to be interpreted by resource as @@ -130,10 +166,10 @@ export interface Sku { * Represents a server. * * @member {object} [sku] The SKU (pricing tier) of the server. - * @member {string} [sku.name] The name of the sku, typically, a letter + - * Number code, e.g. P3. + * @member {string} [sku.name] The name of the sku, typically, tier + family + + * cores, e.g. B_Gen4_1, GP_Gen5_8. * @member {string} [sku.tier] The tier of the particular SKU, e.g. Basic. - * Possible values include: 'Basic', 'Standard' + * Possible values include: 'Basic', 'GeneralPurpose', 'MemoryOptimized' * @member {number} [sku.capacity] The scale up/out capacity, representing * server's compute units. * @member {string} [sku.size] The size code, to be interpreted by resource as @@ -142,7 +178,6 @@ export interface Sku { * @member {string} [administratorLogin] The administrator's login name of a * server. Can only be specified when the server is being created (and is * required for creation). - * @member {number} [storageMB] The maximum storage allowed for a server. * @member {string} [version] Server version. Possible values include: '9.5', * '9.6' * @member {string} [sslEnforcement] Enable ssl enforcement or not when connect @@ -151,15 +186,25 @@ export interface Sku { * user. Possible values include: 'Ready', 'Dropping', 'Disabled' * @member {string} [fullyQualifiedDomainName] The fully qualified domain name * of a server. + * @member {date} [earliestRestoreDate] Earliest restore point creation time + * (ISO8601 format) + * @member {object} [storageProfile] Storage profile of a server. + * @member {number} [storageProfile.backupRetentionDays] Backup retention days + * for the server. + * @member {string} [storageProfile.geoRedundantBackup] Enable Geo-redundant or + * not for server backup. Possible values include: 'Enabled', 'Disabled' + * @member {number} [storageProfile.storageMB] Max storage allowed for a + * server. */ export interface Server extends TrackedResource { sku?: Sku; administratorLogin?: string; - storageMB?: number; version?: string; sslEnforcement?: string; userVisibleState?: string; fullyQualifiedDomainName?: string; + earliestRestoreDate?: Date; + storageProfile?: StorageProfile; } /** @@ -169,22 +214,28 @@ export interface Server extends TrackedResource { * Represents a server to be created. * * @member {object} [sku] The SKU (pricing tier) of the server. - * @member {string} [sku.name] The name of the sku, typically, a letter + - * Number code, e.g. P3. + * @member {string} [sku.name] The name of the sku, typically, tier + family + + * cores, e.g. B_Gen4_1, GP_Gen5_8. * @member {string} [sku.tier] The tier of the particular SKU, e.g. Basic. - * Possible values include: 'Basic', 'Standard' + * Possible values include: 'Basic', 'GeneralPurpose', 'MemoryOptimized' * @member {number} [sku.capacity] The scale up/out capacity, representing * server's compute units. * @member {string} [sku.size] The size code, to be interpreted by resource as * appropriate. * @member {string} [sku.family] The family of hardware. * @member {object} properties Properties of the server. - * @member {number} [properties.storageMB] The maximum storage allowed for a - * server. * @member {string} [properties.version] Server version. Possible values * include: '9.5', '9.6' * @member {string} [properties.sslEnforcement] Enable ssl enforcement or not * when connect to server. Possible values include: 'Enabled', 'Disabled' + * @member {object} [properties.storageProfile] Storage profile of a server. + * @member {number} [properties.storageProfile.backupRetentionDays] Backup + * retention days for the server. + * @member {string} [properties.storageProfile.geoRedundantBackup] Enable + * Geo-redundant or not for server backup. Possible values include: 'Enabled', + * 'Disabled' + * @member {number} [properties.storageProfile.storageMB] Max storage allowed + * for a server. * @member {string} [properties.createMode] Polymorphic Discriminator * @member {string} location The location the resource resides in. * @member {object} [tags] Application-specific metadata in the form of @@ -204,16 +255,22 @@ export interface ServerForCreate { * Parameters allowd to update for a server. * * @member {object} [sku] The SKU (pricing tier) of the server. - * @member {string} [sku.name] The name of the sku, typically, a letter + - * Number code, e.g. P3. + * @member {string} [sku.name] The name of the sku, typically, tier + family + + * cores, e.g. B_Gen4_1, GP_Gen5_8. * @member {string} [sku.tier] The tier of the particular SKU, e.g. Basic. - * Possible values include: 'Basic', 'Standard' + * Possible values include: 'Basic', 'GeneralPurpose', 'MemoryOptimized' * @member {number} [sku.capacity] The scale up/out capacity, representing * server's compute units. * @member {string} [sku.size] The size code, to be interpreted by resource as * appropriate. * @member {string} [sku.family] The family of hardware. - * @member {number} [storageMB] The max storage allowed for a server. + * @member {object} [storageProfile] Storage profile of a server. + * @member {number} [storageProfile.backupRetentionDays] Backup retention days + * for the server. + * @member {string} [storageProfile.geoRedundantBackup] Enable Geo-redundant or + * not for server backup. Possible values include: 'Enabled', 'Disabled' + * @member {number} [storageProfile.storageMB] Max storage allowed for a + * server. * @member {string} [administratorLoginPassword] The password of the * administrator login. * @member {string} [version] The version of a server. Possible values include: @@ -225,7 +282,7 @@ export interface ServerForCreate { */ export interface ServerUpdateParameters { sku?: Sku; - storageMB?: number; + storageProfile?: StorageProfile; administratorLoginPassword?: string; version?: string; sslEnforcement?: string; @@ -347,7 +404,6 @@ export interface OperationListResult { * @constructor * Represents a log file. * - * @member {string} [logFileName] Log file name. * @member {number} [sizeInKB] Size of the log file. * @member {date} [createdTime] Creation timestamp of the log file. * @member {date} [lastModifiedTime] Last modified timestamp of the log file. @@ -355,10 +411,9 @@ export interface OperationListResult { * @member {string} [url] The url to download the log file from. */ export interface LogFile extends ProxyResource { - logFileName?: string; sizeInKB?: number; - createdTime?: Date; - lastModifiedTime?: Date; + readonly createdTime?: Date; + readonly lastModifiedTime?: Date; logFileType?: string; url?: string; } @@ -371,16 +426,25 @@ export interface LogFile extends ProxyResource { * * @member {string} [id] ID for the service level objective. * @member {string} [edition] Edition of the performance tier. - * @member {number} [dtu] Database throughput unit associated with the service - * level objective - * @member {number} [storageMB] Maximum storage in MB associated with the - * service level objective + * @member {number} [vCore] vCore associated with the service level objective + * @member {string} [hardwareGeneration] Hardware generation associated with + * the service level objective + * @member {number} [maxBackupRetentionDays] Maximum Backup retention in days + * for the performance tier edition + * @member {number} [minBackupRetentionDays] Minimum Backup retention in days + * for the performance tier edition + * @member {number} [maxStorageMB] Max storage allowed for a server. + * @member {number} [minStorageMB] Max storage allowed for a server. */ export interface PerformanceTierServiceLevelObjectives { id?: string; edition?: string; - dtu?: number; - storageMB?: number; + vCore?: number; + hardwareGeneration?: string; + maxBackupRetentionDays?: number; + minBackupRetentionDays?: number; + maxStorageMB?: number; + minStorageMB?: number; } /** @@ -390,14 +454,11 @@ export interface PerformanceTierServiceLevelObjectives { * Performance tier properties * * @member {string} [id] ID of the performance tier. - * @member {number} [backupRetentionDays] Backup retention in days for the - * performance tier edition * @member {array} [serviceLevelObjectives] Service level objectives associated * with the performance tier */ export interface PerformanceTierProperties { id?: string; - backupRetentionDays?: number; serviceLevelObjectives?: PerformanceTierServiceLevelObjectives[]; } @@ -407,11 +468,11 @@ export interface PerformanceTierProperties { * @constructor * Request from client to check resource name availability. * - * @member {string} [name] Resource name to verify. + * @member {string} name Resource name to verify. * @member {string} [type] Resource type used for verification. */ export interface NameAvailabilityRequest { - name?: string; + name: string; type?: string; } diff --git a/lib/services/postgresqlManagement/lib/models/index.js b/lib/services/postgresqlManagement/lib/models/index.js index fe7557da1e..d95f9e5901 100755 --- a/lib/services/postgresqlManagement/lib/models/index.js +++ b/lib/services/postgresqlManagement/lib/models/index.js @@ -20,9 +20,11 @@ exports.BaseResource = msRestAzure.BaseResource; exports.CloudError = msRestAzure.CloudError; exports.ProxyResource = require('./proxyResource'); exports.TrackedResource = require('./trackedResource'); +exports.StorageProfile = require('./storageProfile'); exports.ServerPropertiesForCreate = require('./serverPropertiesForCreate'); exports.ServerPropertiesForDefaultCreate = require('./serverPropertiesForDefaultCreate'); exports.ServerPropertiesForRestore = require('./serverPropertiesForRestore'); +exports.ServerPropertiesForGeoRestore = require('./serverPropertiesForGeoRestore'); exports.Sku = require('./sku'); exports.Server = require('./server'); exports.ServerForCreate = require('./serverForCreate'); @@ -47,5 +49,6 @@ exports.PerformanceTierListResult = require('./performanceTierListResult'); exports.discriminators = { 'ServerPropertiesForCreate' : exports.ServerPropertiesForCreate, 'ServerPropertiesForCreate.Default' : exports.ServerPropertiesForDefaultCreate, - 'ServerPropertiesForCreate.PointInTimeRestore' : exports.ServerPropertiesForRestore + 'ServerPropertiesForCreate.PointInTimeRestore' : exports.ServerPropertiesForRestore, + 'ServerPropertiesForCreate.GeoRestore' : exports.ServerPropertiesForGeoRestore }; diff --git a/lib/services/postgresqlManagement/lib/models/logFile.js b/lib/services/postgresqlManagement/lib/models/logFile.js index f481d5f84b..18fa915e88 100755 --- a/lib/services/postgresqlManagement/lib/models/logFile.js +++ b/lib/services/postgresqlManagement/lib/models/logFile.js @@ -20,7 +20,6 @@ const models = require('./index'); class LogFile extends models['ProxyResource'] { /** * Create a LogFile. - * @member {string} [logFileName] Log file name. * @member {number} [sizeInKB] Size of the log file. * @member {date} [createdTime] Creation timestamp of the log file. * @member {date} [lastModifiedTime] Last modified timestamp of the log file. @@ -69,13 +68,6 @@ class LogFile extends models['ProxyResource'] { name: 'String' } }, - logFileName: { - required: false, - serializedName: 'properties.name', - type: { - name: 'String' - } - }, sizeInKB: { required: false, serializedName: 'properties.sizeInKB', @@ -85,6 +77,7 @@ class LogFile extends models['ProxyResource'] { }, createdTime: { required: false, + readOnly: true, serializedName: 'properties.createdTime', type: { name: 'DateTime' @@ -92,6 +85,7 @@ class LogFile extends models['ProxyResource'] { }, lastModifiedTime: { required: false, + readOnly: true, serializedName: 'properties.lastModifiedTime', type: { name: 'DateTime' diff --git a/lib/services/postgresqlManagement/lib/models/nameAvailabilityRequest.js b/lib/services/postgresqlManagement/lib/models/nameAvailabilityRequest.js index 47cb885891..0384b36691 100644 --- a/lib/services/postgresqlManagement/lib/models/nameAvailabilityRequest.js +++ b/lib/services/postgresqlManagement/lib/models/nameAvailabilityRequest.js @@ -17,7 +17,7 @@ class NameAvailabilityRequest { /** * Create a NameAvailabilityRequest. - * @member {string} [name] Resource name to verify. + * @member {string} name Resource name to verify. * @member {string} [type] Resource type used for verification. */ constructor() { @@ -38,7 +38,7 @@ class NameAvailabilityRequest { className: 'NameAvailabilityRequest', modelProperties: { name: { - required: false, + required: true, serializedName: 'name', type: { name: 'String' diff --git a/lib/services/postgresqlManagement/lib/models/performanceTierProperties.js b/lib/services/postgresqlManagement/lib/models/performanceTierProperties.js index 70118a12ed..edd69a1229 100644 --- a/lib/services/postgresqlManagement/lib/models/performanceTierProperties.js +++ b/lib/services/postgresqlManagement/lib/models/performanceTierProperties.js @@ -20,8 +20,6 @@ class PerformanceTierProperties { /** * Create a PerformanceTierProperties. * @member {string} [id] ID of the performance tier. - * @member {number} [backupRetentionDays] Backup retention in days for the - * performance tier edition * @member {array} [serviceLevelObjectives] Service level objectives * associated with the performance tier */ @@ -49,13 +47,6 @@ class PerformanceTierProperties { name: 'String' } }, - backupRetentionDays: { - required: false, - serializedName: 'backupRetentionDays', - type: { - name: 'Number' - } - }, serviceLevelObjectives: { required: false, serializedName: 'serviceLevelObjectives', diff --git a/lib/services/postgresqlManagement/lib/models/performanceTierServiceLevelObjectives.js b/lib/services/postgresqlManagement/lib/models/performanceTierServiceLevelObjectives.js index 6574d8ffcf..13493d1388 100644 --- a/lib/services/postgresqlManagement/lib/models/performanceTierServiceLevelObjectives.js +++ b/lib/services/postgresqlManagement/lib/models/performanceTierServiceLevelObjectives.js @@ -19,10 +19,15 @@ class PerformanceTierServiceLevelObjectives { * Create a PerformanceTierServiceLevelObjectives. * @member {string} [id] ID for the service level objective. * @member {string} [edition] Edition of the performance tier. - * @member {number} [dtu] Database throughput unit associated with the - * service level objective - * @member {number} [storageMB] Maximum storage in MB associated with the - * service level objective + * @member {number} [vCore] vCore associated with the service level objective + * @member {string} [hardwareGeneration] Hardware generation associated with + * the service level objective + * @member {number} [maxBackupRetentionDays] Maximum Backup retention in days + * for the performance tier edition + * @member {number} [minBackupRetentionDays] Minimum Backup retention in days + * for the performance tier edition + * @member {number} [maxStorageMB] Max storage allowed for a server. + * @member {number} [minStorageMB] Max storage allowed for a server. */ constructor() { } @@ -55,16 +60,44 @@ class PerformanceTierServiceLevelObjectives { name: 'String' } }, - dtu: { + vCore: { required: false, - serializedName: 'dtu', + serializedName: 'vCore', type: { name: 'Number' } }, - storageMB: { + hardwareGeneration: { required: false, - serializedName: 'storageMB', + serializedName: 'hardwareGeneration', + type: { + name: 'String' + } + }, + maxBackupRetentionDays: { + required: false, + serializedName: 'maxBackupRetentionDays', + type: { + name: 'Number' + } + }, + minBackupRetentionDays: { + required: false, + serializedName: 'minBackupRetentionDays', + type: { + name: 'Number' + } + }, + maxStorageMB: { + required: false, + serializedName: 'maxStorageMB', + type: { + name: 'Number' + } + }, + minStorageMB: { + required: false, + serializedName: 'minStorageMB', type: { name: 'Number' } diff --git a/lib/services/postgresqlManagement/lib/models/server.js b/lib/services/postgresqlManagement/lib/models/server.js index eebd893523..49ffbb6b2f 100755 --- a/lib/services/postgresqlManagement/lib/models/server.js +++ b/lib/services/postgresqlManagement/lib/models/server.js @@ -21,10 +21,10 @@ class Server extends models['TrackedResource'] { /** * Create a Server. * @member {object} [sku] The SKU (pricing tier) of the server. - * @member {string} [sku.name] The name of the sku, typically, a letter + - * Number code, e.g. P3. + * @member {string} [sku.name] The name of the sku, typically, tier + family + * + cores, e.g. B_Gen4_1, GP_Gen5_8. * @member {string} [sku.tier] The tier of the particular SKU, e.g. Basic. - * Possible values include: 'Basic', 'Standard' + * Possible values include: 'Basic', 'GeneralPurpose', 'MemoryOptimized' * @member {number} [sku.capacity] The scale up/out capacity, representing * server's compute units. * @member {string} [sku.size] The size code, to be interpreted by resource @@ -33,7 +33,6 @@ class Server extends models['TrackedResource'] { * @member {string} [administratorLogin] The administrator's login name of a * server. Can only be specified when the server is being created (and is * required for creation). - * @member {number} [storageMB] The maximum storage allowed for a server. * @member {string} [version] Server version. Possible values include: '9.5', * '9.6' * @member {string} [sslEnforcement] Enable ssl enforcement or not when @@ -42,6 +41,15 @@ class Server extends models['TrackedResource'] { * user. Possible values include: 'Ready', 'Dropping', 'Disabled' * @member {string} [fullyQualifiedDomainName] The fully qualified domain * name of a server. + * @member {date} [earliestRestoreDate] Earliest restore point creation time + * (ISO8601 format) + * @member {object} [storageProfile] Storage profile of a server. + * @member {number} [storageProfile.backupRetentionDays] Backup retention + * days for the server. + * @member {string} [storageProfile.geoRedundantBackup] Enable Geo-redundant + * or not for server backup. Possible values include: 'Enabled', 'Disabled' + * @member {number} [storageProfile.storageMB] Max storage allowed for a + * server. */ constructor() { super(); @@ -121,16 +129,6 @@ class Server extends models['TrackedResource'] { name: 'String' } }, - storageMB: { - required: false, - serializedName: 'properties.storageMB', - constraints: { - InclusiveMinimum: 1024 - }, - type: { - name: 'Number' - } - }, version: { required: false, serializedName: 'properties.version', @@ -159,6 +157,21 @@ class Server extends models['TrackedResource'] { type: { name: 'String' } + }, + earliestRestoreDate: { + required: false, + serializedName: 'properties.earliestRestoreDate', + type: { + name: 'DateTime' + } + }, + storageProfile: { + required: false, + serializedName: 'properties.storageProfile', + type: { + name: 'Composite', + className: 'StorageProfile' + } } } } diff --git a/lib/services/postgresqlManagement/lib/models/serverForCreate.js b/lib/services/postgresqlManagement/lib/models/serverForCreate.js index 124b0e82b2..53f7a38600 100755 --- a/lib/services/postgresqlManagement/lib/models/serverForCreate.js +++ b/lib/services/postgresqlManagement/lib/models/serverForCreate.js @@ -20,22 +20,28 @@ class ServerForCreate { /** * Create a ServerForCreate. * @member {object} [sku] The SKU (pricing tier) of the server. - * @member {string} [sku.name] The name of the sku, typically, a letter + - * Number code, e.g. P3. + * @member {string} [sku.name] The name of the sku, typically, tier + family + * + cores, e.g. B_Gen4_1, GP_Gen5_8. * @member {string} [sku.tier] The tier of the particular SKU, e.g. Basic. - * Possible values include: 'Basic', 'Standard' + * Possible values include: 'Basic', 'GeneralPurpose', 'MemoryOptimized' * @member {number} [sku.capacity] The scale up/out capacity, representing * server's compute units. * @member {string} [sku.size] The size code, to be interpreted by resource * as appropriate. * @member {string} [sku.family] The family of hardware. * @member {object} properties Properties of the server. - * @member {number} [properties.storageMB] The maximum storage allowed for a - * server. * @member {string} [properties.version] Server version. Possible values * include: '9.5', '9.6' * @member {string} [properties.sslEnforcement] Enable ssl enforcement or not * when connect to server. Possible values include: 'Enabled', 'Disabled' + * @member {object} [properties.storageProfile] Storage profile of a server. + * @member {number} [properties.storageProfile.backupRetentionDays] Backup + * retention days for the server. + * @member {string} [properties.storageProfile.geoRedundantBackup] Enable + * Geo-redundant or not for server backup. Possible values include: + * 'Enabled', 'Disabled' + * @member {number} [properties.storageProfile.storageMB] Max storage allowed + * for a server. * @member {string} [properties.createMode] Polymorphic Discriminator * @member {string} location The location the resource resides in. * @member {object} [tags] Application-specific metadata in the form of diff --git a/lib/services/postgresqlManagement/lib/models/serverPropertiesForCreate.js b/lib/services/postgresqlManagement/lib/models/serverPropertiesForCreate.js index 160fe7c6e8..d267d99180 100755 --- a/lib/services/postgresqlManagement/lib/models/serverPropertiesForCreate.js +++ b/lib/services/postgresqlManagement/lib/models/serverPropertiesForCreate.js @@ -10,6 +10,8 @@ 'use strict'; +const models = require('./index'); + /** * The properties used to create a new server. * @@ -17,11 +19,17 @@ class ServerPropertiesForCreate { /** * Create a ServerPropertiesForCreate. - * @member {number} [storageMB] The maximum storage allowed for a server. * @member {string} [version] Server version. Possible values include: '9.5', * '9.6' * @member {string} [sslEnforcement] Enable ssl enforcement or not when * connect to server. Possible values include: 'Enabled', 'Disabled' + * @member {object} [storageProfile] Storage profile of a server. + * @member {number} [storageProfile.backupRetentionDays] Backup retention + * days for the server. + * @member {string} [storageProfile.geoRedundantBackup] Enable Geo-redundant + * or not for server backup. Possible values include: 'Enabled', 'Disabled' + * @member {number} [storageProfile.storageMB] Max storage allowed for a + * server. * @member {string} createMode Polymorphic Discriminator */ constructor() { @@ -46,16 +54,6 @@ class ServerPropertiesForCreate { uberParent: 'ServerPropertiesForCreate', className: 'ServerPropertiesForCreate', modelProperties: { - storageMB: { - required: false, - serializedName: 'storageMB', - constraints: { - InclusiveMinimum: 1024 - }, - type: { - name: 'Number' - } - }, version: { required: false, serializedName: 'version', @@ -71,9 +69,18 @@ class ServerPropertiesForCreate { allowedValues: [ 'Enabled', 'Disabled' ] } }, + storageProfile: { + required: false, + serializedName: 'storageProfile', + type: { + name: 'Composite', + className: 'StorageProfile' + } + }, createMode: { required: true, serializedName: 'createMode', + isPolymorphicDiscriminator: true, type: { name: 'String' } diff --git a/lib/services/postgresqlManagement/lib/models/serverPropertiesForDefaultCreate.js b/lib/services/postgresqlManagement/lib/models/serverPropertiesForDefaultCreate.js index 83143d3a3c..55ae2939e6 100755 --- a/lib/services/postgresqlManagement/lib/models/serverPropertiesForDefaultCreate.js +++ b/lib/services/postgresqlManagement/lib/models/serverPropertiesForDefaultCreate.js @@ -42,18 +42,13 @@ class ServerPropertiesForDefaultCreate extends models['ServerPropertiesForCreate serializedName: 'Default', type: { name: 'Composite', + polymorphicDiscriminator: { + serializedName: 'createMode', + clientName: 'createMode' + }, + uberParent: 'ServerPropertiesForCreate', className: 'ServerPropertiesForDefaultCreate', modelProperties: { - storageMB: { - required: false, - serializedName: 'storageMB', - constraints: { - InclusiveMinimum: 1024 - }, - type: { - name: 'Number' - } - }, version: { required: false, serializedName: 'version', @@ -69,9 +64,18 @@ class ServerPropertiesForDefaultCreate extends models['ServerPropertiesForCreate allowedValues: [ 'Enabled', 'Disabled' ] } }, + storageProfile: { + required: false, + serializedName: 'storageProfile', + type: { + name: 'Composite', + className: 'StorageProfile' + } + }, createMode: { required: true, serializedName: 'createMode', + isPolymorphicDiscriminator: true, type: { name: 'String' } diff --git a/lib/services/postgresqlManagement/lib/models/serverPropertiesForGeoRestore.js b/lib/services/postgresqlManagement/lib/models/serverPropertiesForGeoRestore.js new file mode 100644 index 0000000000..f4b909b096 --- /dev/null +++ b/lib/services/postgresqlManagement/lib/models/serverPropertiesForGeoRestore.js @@ -0,0 +1,93 @@ +/* + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for + * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. + * Changes may cause incorrect behavior and will be lost if the code is + * regenerated. + */ + +'use strict'; + +const models = require('./index'); + +/** + * The properties used to create a new server by restoring to a different + * region from a geo replicated backup. + * + * @extends models['ServerPropertiesForCreate'] + */ +class ServerPropertiesForGeoRestore extends models['ServerPropertiesForCreate'] { + /** + * Create a ServerPropertiesForGeoRestore. + * @member {string} sourceServerId The source server id to restore from. + */ + constructor() { + super(); + } + + /** + * Defines the metadata of ServerPropertiesForGeoRestore + * + * @returns {object} metadata of ServerPropertiesForGeoRestore + * + */ + mapper() { + return { + required: false, + serializedName: 'GeoRestore', + type: { + name: 'Composite', + polymorphicDiscriminator: { + serializedName: 'createMode', + clientName: 'createMode' + }, + uberParent: 'ServerPropertiesForCreate', + className: 'ServerPropertiesForGeoRestore', + modelProperties: { + version: { + required: false, + serializedName: 'version', + type: { + name: 'String' + } + }, + sslEnforcement: { + required: false, + serializedName: 'sslEnforcement', + type: { + name: 'Enum', + allowedValues: [ 'Enabled', 'Disabled' ] + } + }, + storageProfile: { + required: false, + serializedName: 'storageProfile', + type: { + name: 'Composite', + className: 'StorageProfile' + } + }, + createMode: { + required: true, + serializedName: 'createMode', + isPolymorphicDiscriminator: true, + type: { + name: 'String' + } + }, + sourceServerId: { + required: true, + serializedName: 'sourceServerId', + type: { + name: 'String' + } + } + } + } + }; + } +} + +module.exports = ServerPropertiesForGeoRestore; diff --git a/lib/services/postgresqlManagement/lib/models/serverPropertiesForRestore.js b/lib/services/postgresqlManagement/lib/models/serverPropertiesForRestore.js index dba85aaf85..ab3576dc01 100755 --- a/lib/services/postgresqlManagement/lib/models/serverPropertiesForRestore.js +++ b/lib/services/postgresqlManagement/lib/models/serverPropertiesForRestore.js @@ -13,7 +13,7 @@ const models = require('./index'); /** - * The properties to a new server by restoring from a backup. + * The properties used to create a new server by restoring from a backup. * * @extends models['ServerPropertiesForCreate'] */ @@ -40,18 +40,13 @@ class ServerPropertiesForRestore extends models['ServerPropertiesForCreate'] { serializedName: 'PointInTimeRestore', type: { name: 'Composite', + polymorphicDiscriminator: { + serializedName: 'createMode', + clientName: 'createMode' + }, + uberParent: 'ServerPropertiesForCreate', className: 'ServerPropertiesForRestore', modelProperties: { - storageMB: { - required: false, - serializedName: 'storageMB', - constraints: { - InclusiveMinimum: 1024 - }, - type: { - name: 'Number' - } - }, version: { required: false, serializedName: 'version', @@ -67,9 +62,18 @@ class ServerPropertiesForRestore extends models['ServerPropertiesForCreate'] { allowedValues: [ 'Enabled', 'Disabled' ] } }, + storageProfile: { + required: false, + serializedName: 'storageProfile', + type: { + name: 'Composite', + className: 'StorageProfile' + } + }, createMode: { required: true, serializedName: 'createMode', + isPolymorphicDiscriminator: true, type: { name: 'String' } diff --git a/lib/services/postgresqlManagement/lib/models/serverUpdateParameters.js b/lib/services/postgresqlManagement/lib/models/serverUpdateParameters.js index 3cca9ef51d..bf6027ebd2 100755 --- a/lib/services/postgresqlManagement/lib/models/serverUpdateParameters.js +++ b/lib/services/postgresqlManagement/lib/models/serverUpdateParameters.js @@ -20,16 +20,22 @@ class ServerUpdateParameters { /** * Create a ServerUpdateParameters. * @member {object} [sku] The SKU (pricing tier) of the server. - * @member {string} [sku.name] The name of the sku, typically, a letter + - * Number code, e.g. P3. + * @member {string} [sku.name] The name of the sku, typically, tier + family + * + cores, e.g. B_Gen4_1, GP_Gen5_8. * @member {string} [sku.tier] The tier of the particular SKU, e.g. Basic. - * Possible values include: 'Basic', 'Standard' + * Possible values include: 'Basic', 'GeneralPurpose', 'MemoryOptimized' * @member {number} [sku.capacity] The scale up/out capacity, representing * server's compute units. * @member {string} [sku.size] The size code, to be interpreted by resource * as appropriate. * @member {string} [sku.family] The family of hardware. - * @member {number} [storageMB] The max storage allowed for a server. + * @member {object} [storageProfile] Storage profile of a server. + * @member {number} [storageProfile.backupRetentionDays] Backup retention + * days for the server. + * @member {string} [storageProfile.geoRedundantBackup] Enable Geo-redundant + * or not for server backup. Possible values include: 'Enabled', 'Disabled' + * @member {number} [storageProfile.storageMB] Max storage allowed for a + * server. * @member {string} [administratorLoginPassword] The password of the * administrator login. * @member {string} [version] The version of a server. Possible values @@ -64,14 +70,12 @@ class ServerUpdateParameters { className: 'Sku' } }, - storageMB: { + storageProfile: { required: false, - serializedName: 'properties.storageMB', - constraints: { - InclusiveMinimum: 1024 - }, + serializedName: 'properties.storageProfile', type: { - name: 'Number' + name: 'Composite', + className: 'StorageProfile' } }, administratorLoginPassword: { diff --git a/lib/services/postgresqlManagement/lib/models/sku.js b/lib/services/postgresqlManagement/lib/models/sku.js index 3e0ab9e4ea..8bfd1c8ece 100755 --- a/lib/services/postgresqlManagement/lib/models/sku.js +++ b/lib/services/postgresqlManagement/lib/models/sku.js @@ -17,10 +17,10 @@ class Sku { /** * Create a Sku. - * @member {string} [name] The name of the sku, typically, a letter + Number - * code, e.g. P3. + * @member {string} [name] The name of the sku, typically, tier + family + + * cores, e.g. B_Gen4_1, GP_Gen5_8. * @member {string} [tier] The tier of the particular SKU, e.g. Basic. - * Possible values include: 'Basic', 'Standard' + * Possible values include: 'Basic', 'GeneralPurpose', 'MemoryOptimized' * @member {number} [capacity] The scale up/out capacity, representing * server's compute units. * @member {string} [size] The size code, to be interpreted by resource as diff --git a/lib/services/postgresqlManagement/lib/models/storageProfile.js b/lib/services/postgresqlManagement/lib/models/storageProfile.js new file mode 100644 index 0000000000..196082d938 --- /dev/null +++ b/lib/services/postgresqlManagement/lib/models/storageProfile.js @@ -0,0 +1,70 @@ +/* + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for + * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. + * Changes may cause incorrect behavior and will be lost if the code is + * regenerated. + */ + +'use strict'; + +/** + * Storage Profile properties of a server + * + */ +class StorageProfile { + /** + * Create a StorageProfile. + * @member {number} [backupRetentionDays] Backup retention days for the + * server. + * @member {string} [geoRedundantBackup] Enable Geo-redundant or not for + * server backup. Possible values include: 'Enabled', 'Disabled' + * @member {number} [storageMB] Max storage allowed for a server. + */ + constructor() { + } + + /** + * Defines the metadata of StorageProfile + * + * @returns {object} metadata of StorageProfile + * + */ + mapper() { + return { + required: false, + serializedName: 'StorageProfile', + type: { + name: 'Composite', + className: 'StorageProfile', + modelProperties: { + backupRetentionDays: { + required: false, + serializedName: 'backupRetentionDays', + type: { + name: 'Number' + } + }, + geoRedundantBackup: { + required: false, + serializedName: 'geoRedundantBackup', + type: { + name: 'String' + } + }, + storageMB: { + required: false, + serializedName: 'storageMB', + type: { + name: 'Number' + } + } + } + } + }; + } +} + +module.exports = StorageProfile; diff --git a/lib/services/postgresqlManagement/lib/operations/checkNameAvailability.js b/lib/services/postgresqlManagement/lib/operations/checkNameAvailability.js index b719ed4532..51804b7b19 100644 --- a/lib/services/postgresqlManagement/lib/operations/checkNameAvailability.js +++ b/lib/services/postgresqlManagement/lib/operations/checkNameAvailability.js @@ -20,7 +20,7 @@ const WebResource = msRest.WebResource; * @param {object} nameAvailabilityRequest The required parameters for checking * if resource name is available. * - * @param {string} [nameAvailabilityRequest.name] Resource name to verify. + * @param {string} nameAvailabilityRequest.name Resource name to verify. * * @param {string} [nameAvailabilityRequest.type] Resource type used for * verification. @@ -189,7 +189,7 @@ class CheckNameAvailability { * @param {object} nameAvailabilityRequest The required parameters for checking * if resource name is available. * - * @param {string} [nameAvailabilityRequest.name] Resource name to verify. + * @param {string} nameAvailabilityRequest.name Resource name to verify. * * @param {string} [nameAvailabilityRequest.type] Resource type used for * verification. @@ -225,7 +225,7 @@ class CheckNameAvailability { * @param {object} nameAvailabilityRequest The required parameters for checking * if resource name is available. * - * @param {string} [nameAvailabilityRequest.name] Resource name to verify. + * @param {string} nameAvailabilityRequest.name Resource name to verify. * * @param {string} [nameAvailabilityRequest.type] Resource type used for * verification. diff --git a/lib/services/postgresqlManagement/lib/operations/index.d.ts b/lib/services/postgresqlManagement/lib/operations/index.d.ts index 1f3ecd145c..c167c23853 100755 --- a/lib/services/postgresqlManagement/lib/operations/index.d.ts +++ b/lib/services/postgresqlManagement/lib/operations/index.d.ts @@ -35,11 +35,11 @@ export interface Servers { * * @param {object} [parameters.sku] The SKU (pricing tier) of the server. * - * @param {string} [parameters.sku.name] The name of the sku, typically, a - * letter + Number code, e.g. P3. + * @param {string} [parameters.sku.name] The name of the sku, typically, tier + + * family + cores, e.g. B_Gen4_1, GP_Gen5_8. * * @param {string} [parameters.sku.tier] The tier of the particular SKU, e.g. - * Basic. Possible values include: 'Basic', 'Standard' + * Basic. Possible values include: 'Basic', 'GeneralPurpose', 'MemoryOptimized' * * @param {number} [parameters.sku.capacity] The scale up/out capacity, * representing server's compute units. @@ -51,9 +51,6 @@ export interface Servers { * * @param {object} parameters.properties Properties of the server. * - * @param {number} [parameters.properties.storageMB] The maximum storage - * allowed for a server. - * * @param {string} [parameters.properties.version] Server version. Possible * values include: '9.5', '9.6' * @@ -61,6 +58,19 @@ export interface Servers { * enforcement or not when connect to server. Possible values include: * 'Enabled', 'Disabled' * + * @param {object} [parameters.properties.storageProfile] Storage profile of a + * server. + * + * @param {number} [parameters.properties.storageProfile.backupRetentionDays] + * Backup retention days for the server. + * + * @param {string} [parameters.properties.storageProfile.geoRedundantBackup] + * Enable Geo-redundant or not for server backup. Possible values include: + * 'Enabled', 'Disabled' + * + * @param {number} [parameters.properties.storageProfile.storageMB] Max storage + * allowed for a server. + * * @param {string} parameters.properties.createMode Polymorphic Discriminator * * @param {string} parameters.location The location the resource resides in. @@ -95,11 +105,11 @@ export interface Servers { * * @param {object} [parameters.sku] The SKU (pricing tier) of the server. * - * @param {string} [parameters.sku.name] The name of the sku, typically, a - * letter + Number code, e.g. P3. + * @param {string} [parameters.sku.name] The name of the sku, typically, tier + + * family + cores, e.g. B_Gen4_1, GP_Gen5_8. * * @param {string} [parameters.sku.tier] The tier of the particular SKU, e.g. - * Basic. Possible values include: 'Basic', 'Standard' + * Basic. Possible values include: 'Basic', 'GeneralPurpose', 'MemoryOptimized' * * @param {number} [parameters.sku.capacity] The scale up/out capacity, * representing server's compute units. @@ -111,9 +121,6 @@ export interface Servers { * * @param {object} parameters.properties Properties of the server. * - * @param {number} [parameters.properties.storageMB] The maximum storage - * allowed for a server. - * * @param {string} [parameters.properties.version] Server version. Possible * values include: '9.5', '9.6' * @@ -121,6 +128,19 @@ export interface Servers { * enforcement or not when connect to server. Possible values include: * 'Enabled', 'Disabled' * + * @param {object} [parameters.properties.storageProfile] Storage profile of a + * server. + * + * @param {number} [parameters.properties.storageProfile.backupRetentionDays] + * Backup retention days for the server. + * + * @param {string} [parameters.properties.storageProfile.geoRedundantBackup] + * Enable Geo-redundant or not for server backup. Possible values include: + * 'Enabled', 'Disabled' + * + * @param {number} [parameters.properties.storageProfile.storageMB] Max storage + * allowed for a server. + * * @param {string} parameters.properties.createMode Polymorphic Discriminator * * @param {string} parameters.location The location the resource resides in. @@ -174,11 +194,11 @@ export interface Servers { * * @param {object} [parameters.sku] The SKU (pricing tier) of the server. * - * @param {string} [parameters.sku.name] The name of the sku, typically, a - * letter + Number code, e.g. P3. + * @param {string} [parameters.sku.name] The name of the sku, typically, tier + + * family + cores, e.g. B_Gen4_1, GP_Gen5_8. * * @param {string} [parameters.sku.tier] The tier of the particular SKU, e.g. - * Basic. Possible values include: 'Basic', 'Standard' + * Basic. Possible values include: 'Basic', 'GeneralPurpose', 'MemoryOptimized' * * @param {number} [parameters.sku.capacity] The scale up/out capacity, * representing server's compute units. @@ -188,7 +208,17 @@ export interface Servers { * * @param {string} [parameters.sku.family] The family of hardware. * - * @param {number} [parameters.storageMB] The max storage allowed for a server. + * @param {object} [parameters.storageProfile] Storage profile of a server. + * + * @param {number} [parameters.storageProfile.backupRetentionDays] Backup + * retention days for the server. + * + * @param {string} [parameters.storageProfile.geoRedundantBackup] Enable + * Geo-redundant or not for server backup. Possible values include: 'Enabled', + * 'Disabled' + * + * @param {number} [parameters.storageProfile.storageMB] Max storage allowed + * for a server. * * @param {string} [parameters.administratorLoginPassword] The password of the * administrator login. @@ -229,11 +259,11 @@ export interface Servers { * * @param {object} [parameters.sku] The SKU (pricing tier) of the server. * - * @param {string} [parameters.sku.name] The name of the sku, typically, a - * letter + Number code, e.g. P3. + * @param {string} [parameters.sku.name] The name of the sku, typically, tier + + * family + cores, e.g. B_Gen4_1, GP_Gen5_8. * * @param {string} [parameters.sku.tier] The tier of the particular SKU, e.g. - * Basic. Possible values include: 'Basic', 'Standard' + * Basic. Possible values include: 'Basic', 'GeneralPurpose', 'MemoryOptimized' * * @param {number} [parameters.sku.capacity] The scale up/out capacity, * representing server's compute units. @@ -243,7 +273,17 @@ export interface Servers { * * @param {string} [parameters.sku.family] The family of hardware. * - * @param {number} [parameters.storageMB] The max storage allowed for a server. + * @param {object} [parameters.storageProfile] Storage profile of a server. + * + * @param {number} [parameters.storageProfile.backupRetentionDays] Backup + * retention days for the server. + * + * @param {string} [parameters.storageProfile.geoRedundantBackup] Enable + * Geo-redundant or not for server backup. Possible values include: 'Enabled', + * 'Disabled' + * + * @param {number} [parameters.storageProfile.storageMB] Max storage allowed + * for a server. * * @param {string} [parameters.administratorLoginPassword] The password of the * administrator login. @@ -538,11 +578,11 @@ export interface Servers { * * @param {object} [parameters.sku] The SKU (pricing tier) of the server. * - * @param {string} [parameters.sku.name] The name of the sku, typically, a - * letter + Number code, e.g. P3. + * @param {string} [parameters.sku.name] The name of the sku, typically, tier + + * family + cores, e.g. B_Gen4_1, GP_Gen5_8. * * @param {string} [parameters.sku.tier] The tier of the particular SKU, e.g. - * Basic. Possible values include: 'Basic', 'Standard' + * Basic. Possible values include: 'Basic', 'GeneralPurpose', 'MemoryOptimized' * * @param {number} [parameters.sku.capacity] The scale up/out capacity, * representing server's compute units. @@ -554,9 +594,6 @@ export interface Servers { * * @param {object} parameters.properties Properties of the server. * - * @param {number} [parameters.properties.storageMB] The maximum storage - * allowed for a server. - * * @param {string} [parameters.properties.version] Server version. Possible * values include: '9.5', '9.6' * @@ -564,6 +601,19 @@ export interface Servers { * enforcement or not when connect to server. Possible values include: * 'Enabled', 'Disabled' * + * @param {object} [parameters.properties.storageProfile] Storage profile of a + * server. + * + * @param {number} [parameters.properties.storageProfile.backupRetentionDays] + * Backup retention days for the server. + * + * @param {string} [parameters.properties.storageProfile.geoRedundantBackup] + * Enable Geo-redundant or not for server backup. Possible values include: + * 'Enabled', 'Disabled' + * + * @param {number} [parameters.properties.storageProfile.storageMB] Max storage + * allowed for a server. + * * @param {string} parameters.properties.createMode Polymorphic Discriminator * * @param {string} parameters.location The location the resource resides in. @@ -598,11 +648,11 @@ export interface Servers { * * @param {object} [parameters.sku] The SKU (pricing tier) of the server. * - * @param {string} [parameters.sku.name] The name of the sku, typically, a - * letter + Number code, e.g. P3. + * @param {string} [parameters.sku.name] The name of the sku, typically, tier + + * family + cores, e.g. B_Gen4_1, GP_Gen5_8. * * @param {string} [parameters.sku.tier] The tier of the particular SKU, e.g. - * Basic. Possible values include: 'Basic', 'Standard' + * Basic. Possible values include: 'Basic', 'GeneralPurpose', 'MemoryOptimized' * * @param {number} [parameters.sku.capacity] The scale up/out capacity, * representing server's compute units. @@ -614,9 +664,6 @@ export interface Servers { * * @param {object} parameters.properties Properties of the server. * - * @param {number} [parameters.properties.storageMB] The maximum storage - * allowed for a server. - * * @param {string} [parameters.properties.version] Server version. Possible * values include: '9.5', '9.6' * @@ -624,6 +671,19 @@ export interface Servers { * enforcement or not when connect to server. Possible values include: * 'Enabled', 'Disabled' * + * @param {object} [parameters.properties.storageProfile] Storage profile of a + * server. + * + * @param {number} [parameters.properties.storageProfile.backupRetentionDays] + * Backup retention days for the server. + * + * @param {string} [parameters.properties.storageProfile.geoRedundantBackup] + * Enable Geo-redundant or not for server backup. Possible values include: + * 'Enabled', 'Disabled' + * + * @param {number} [parameters.properties.storageProfile.storageMB] Max storage + * allowed for a server. + * * @param {string} parameters.properties.createMode Polymorphic Discriminator * * @param {string} parameters.location The location the resource resides in. @@ -677,11 +737,11 @@ export interface Servers { * * @param {object} [parameters.sku] The SKU (pricing tier) of the server. * - * @param {string} [parameters.sku.name] The name of the sku, typically, a - * letter + Number code, e.g. P3. + * @param {string} [parameters.sku.name] The name of the sku, typically, tier + + * family + cores, e.g. B_Gen4_1, GP_Gen5_8. * * @param {string} [parameters.sku.tier] The tier of the particular SKU, e.g. - * Basic. Possible values include: 'Basic', 'Standard' + * Basic. Possible values include: 'Basic', 'GeneralPurpose', 'MemoryOptimized' * * @param {number} [parameters.sku.capacity] The scale up/out capacity, * representing server's compute units. @@ -691,7 +751,17 @@ export interface Servers { * * @param {string} [parameters.sku.family] The family of hardware. * - * @param {number} [parameters.storageMB] The max storage allowed for a server. + * @param {object} [parameters.storageProfile] Storage profile of a server. + * + * @param {number} [parameters.storageProfile.backupRetentionDays] Backup + * retention days for the server. + * + * @param {string} [parameters.storageProfile.geoRedundantBackup] Enable + * Geo-redundant or not for server backup. Possible values include: 'Enabled', + * 'Disabled' + * + * @param {number} [parameters.storageProfile.storageMB] Max storage allowed + * for a server. * * @param {string} [parameters.administratorLoginPassword] The password of the * administrator login. @@ -732,11 +802,11 @@ export interface Servers { * * @param {object} [parameters.sku] The SKU (pricing tier) of the server. * - * @param {string} [parameters.sku.name] The name of the sku, typically, a - * letter + Number code, e.g. P3. + * @param {string} [parameters.sku.name] The name of the sku, typically, tier + + * family + cores, e.g. B_Gen4_1, GP_Gen5_8. * * @param {string} [parameters.sku.tier] The tier of the particular SKU, e.g. - * Basic. Possible values include: 'Basic', 'Standard' + * Basic. Possible values include: 'Basic', 'GeneralPurpose', 'MemoryOptimized' * * @param {number} [parameters.sku.capacity] The scale up/out capacity, * representing server's compute units. @@ -746,7 +816,17 @@ export interface Servers { * * @param {string} [parameters.sku.family] The family of hardware. * - * @param {number} [parameters.storageMB] The max storage allowed for a server. + * @param {object} [parameters.storageProfile] Storage profile of a server. + * + * @param {number} [parameters.storageProfile.backupRetentionDays] Backup + * retention days for the server. + * + * @param {string} [parameters.storageProfile.geoRedundantBackup] Enable + * Geo-redundant or not for server backup. Possible values include: 'Enabled', + * 'Disabled' + * + * @param {number} [parameters.storageProfile.storageMB] Max storage allowed + * for a server. * * @param {string} [parameters.administratorLoginPassword] The password of the * administrator login. @@ -2103,67 +2183,6 @@ export interface LogFiles { listByServer(resourceGroupName: string, serverName: string, options: { customHeaders? : { [headerName: string]: string; } }, callback: ServiceCallback): void; } -/** - * @class - * PerformanceTiers - * __NOTE__: An instance of this class is automatically created for an - * instance of the PostgreSQLManagementClient. - */ -export interface PerformanceTiers { - - - /** - * List all the performance tiers in a given subscription. - * - * @param {object} [options] Optional Parameters. - * - * @param {object} [options.customHeaders] Headers that will be added to the - * request - * - * @returns {Promise} A promise is returned - * - * @resolve {HttpOperationResponse} - The deserialized result object. - * - * @reject {Error|ServiceError} - The error object. - */ - listWithHttpOperationResponse(options?: { customHeaders? : { [headerName: string]: string; } }): Promise>; - - /** - * List all the performance tiers in a given subscription. - * - * @param {object} [options] Optional Parameters. - * - * @param {object} [options.customHeaders] Headers that will be added to the - * request - * - * @param {ServiceCallback} [optionalCallback] - The optional callback. - * - * @returns {ServiceCallback|Promise} If a callback was passed as the last - * parameter then it returns the callback else returns a Promise. - * - * {Promise} A promise is returned. - * - * @resolve {PerformanceTierListResult} - The deserialized result object. - * - * @reject {Error|ServiceError} - The error object. - * - * {ServiceCallback} optionalCallback(err, result, request, response) - * - * {Error|ServiceError} err - The Error object if an error occurred, null otherwise. - * - * {PerformanceTierListResult} [result] - The deserialized result object if an error did not occur. - * See {@link PerformanceTierListResult} for more - * information. - * - * {WebResource} [request] - The HTTP Request object if an error did not occur. - * - * {http.IncomingMessage} [response] - The HTTP Response stream if an error did not occur. - */ - list(options?: { customHeaders? : { [headerName: string]: string; } }): Promise; - list(callback: ServiceCallback): void; - list(options: { customHeaders? : { [headerName: string]: string; } }, callback: ServiceCallback): void; -} - /** * @class * LocationBasedPerformanceTier @@ -2246,7 +2265,7 @@ export interface CheckNameAvailability { * @param {object} nameAvailabilityRequest The required parameters for checking * if resource name is available. * - * @param {string} [nameAvailabilityRequest.name] Resource name to verify. + * @param {string} nameAvailabilityRequest.name Resource name to verify. * * @param {string} [nameAvailabilityRequest.type] Resource type used for * verification. @@ -2270,7 +2289,7 @@ export interface CheckNameAvailability { * @param {object} nameAvailabilityRequest The required parameters for checking * if resource name is available. * - * @param {string} [nameAvailabilityRequest.name] Resource name to verify. + * @param {string} nameAvailabilityRequest.name Resource name to verify. * * @param {string} [nameAvailabilityRequest.type] Resource type used for * verification. diff --git a/lib/services/postgresqlManagement/lib/operations/index.js b/lib/services/postgresqlManagement/lib/operations/index.js index 6eced5fcd6..bfae53f651 100755 --- a/lib/services/postgresqlManagement/lib/operations/index.js +++ b/lib/services/postgresqlManagement/lib/operations/index.js @@ -19,7 +19,6 @@ exports.FirewallRules = require('./firewallRules'); exports.Databases = require('./databases'); exports.Configurations = require('./configurations'); exports.LogFiles = require('./logFiles'); -exports.PerformanceTiers = require('./performanceTiers'); exports.LocationBasedPerformanceTier = require('./locationBasedPerformanceTier'); exports.CheckNameAvailability = require('./checkNameAvailability'); exports.Operations = require('./operations'); diff --git a/lib/services/postgresqlManagement/lib/operations/servers.js b/lib/services/postgresqlManagement/lib/operations/servers.js index 8992cfcd65..d0188505c9 100755 --- a/lib/services/postgresqlManagement/lib/operations/servers.js +++ b/lib/services/postgresqlManagement/lib/operations/servers.js @@ -29,11 +29,11 @@ const WebResource = msRest.WebResource; * * @param {object} [parameters.sku] The SKU (pricing tier) of the server. * - * @param {string} [parameters.sku.name] The name of the sku, typically, a - * letter + Number code, e.g. P3. + * @param {string} [parameters.sku.name] The name of the sku, typically, tier + + * family + cores, e.g. B_Gen4_1, GP_Gen5_8. * * @param {string} [parameters.sku.tier] The tier of the particular SKU, e.g. - * Basic. Possible values include: 'Basic', 'Standard' + * Basic. Possible values include: 'Basic', 'GeneralPurpose', 'MemoryOptimized' * * @param {number} [parameters.sku.capacity] The scale up/out capacity, * representing server's compute units. @@ -45,9 +45,6 @@ const WebResource = msRest.WebResource; * * @param {object} parameters.properties Properties of the server. * - * @param {number} [parameters.properties.storageMB] The maximum storage - * allowed for a server. - * * @param {string} [parameters.properties.version] Server version. Possible * values include: '9.5', '9.6' * @@ -55,6 +52,19 @@ const WebResource = msRest.WebResource; * enforcement or not when connect to server. Possible values include: * 'Enabled', 'Disabled' * + * @param {object} [parameters.properties.storageProfile] Storage profile of a + * server. + * + * @param {number} [parameters.properties.storageProfile.backupRetentionDays] + * Backup retention days for the server. + * + * @param {string} [parameters.properties.storageProfile.geoRedundantBackup] + * Enable Geo-redundant or not for server backup. Possible values include: + * 'Enabled', 'Disabled' + * + * @param {number} [parameters.properties.storageProfile.storageMB] Max storage + * allowed for a server. + * * @param {string} parameters.properties.createMode Polymorphic Discriminator * * @param {string} parameters.location The location the resource resides in. @@ -147,11 +157,11 @@ function _create(resourceGroupName, serverName, parameters, options, callback) { * * @param {object} [parameters.sku] The SKU (pricing tier) of the server. * - * @param {string} [parameters.sku.name] The name of the sku, typically, a - * letter + Number code, e.g. P3. + * @param {string} [parameters.sku.name] The name of the sku, typically, tier + + * family + cores, e.g. B_Gen4_1, GP_Gen5_8. * * @param {string} [parameters.sku.tier] The tier of the particular SKU, e.g. - * Basic. Possible values include: 'Basic', 'Standard' + * Basic. Possible values include: 'Basic', 'GeneralPurpose', 'MemoryOptimized' * * @param {number} [parameters.sku.capacity] The scale up/out capacity, * representing server's compute units. @@ -161,7 +171,17 @@ function _create(resourceGroupName, serverName, parameters, options, callback) { * * @param {string} [parameters.sku.family] The family of hardware. * - * @param {number} [parameters.storageMB] The max storage allowed for a server. + * @param {object} [parameters.storageProfile] Storage profile of a server. + * + * @param {number} [parameters.storageProfile.backupRetentionDays] Backup + * retention days for the server. + * + * @param {string} [parameters.storageProfile.geoRedundantBackup] Enable + * Geo-redundant or not for server backup. Possible values include: 'Enabled', + * 'Disabled' + * + * @param {number} [parameters.storageProfile.storageMB] Max storage allowed + * for a server. * * @param {string} [parameters.administratorLoginPassword] The password of the * administrator login. @@ -745,11 +765,11 @@ function _list(options, callback) { * * @param {object} [parameters.sku] The SKU (pricing tier) of the server. * - * @param {string} [parameters.sku.name] The name of the sku, typically, a - * letter + Number code, e.g. P3. + * @param {string} [parameters.sku.name] The name of the sku, typically, tier + + * family + cores, e.g. B_Gen4_1, GP_Gen5_8. * * @param {string} [parameters.sku.tier] The tier of the particular SKU, e.g. - * Basic. Possible values include: 'Basic', 'Standard' + * Basic. Possible values include: 'Basic', 'GeneralPurpose', 'MemoryOptimized' * * @param {number} [parameters.sku.capacity] The scale up/out capacity, * representing server's compute units. @@ -761,9 +781,6 @@ function _list(options, callback) { * * @param {object} parameters.properties Properties of the server. * - * @param {number} [parameters.properties.storageMB] The maximum storage - * allowed for a server. - * * @param {string} [parameters.properties.version] Server version. Possible * values include: '9.5', '9.6' * @@ -771,6 +788,19 @@ function _list(options, callback) { * enforcement or not when connect to server. Possible values include: * 'Enabled', 'Disabled' * + * @param {object} [parameters.properties.storageProfile] Storage profile of a + * server. + * + * @param {number} [parameters.properties.storageProfile.backupRetentionDays] + * Backup retention days for the server. + * + * @param {string} [parameters.properties.storageProfile.geoRedundantBackup] + * Enable Geo-redundant or not for server backup. Possible values include: + * 'Enabled', 'Disabled' + * + * @param {number} [parameters.properties.storageProfile.storageMB] Max storage + * allowed for a server. + * * @param {string} parameters.properties.createMode Polymorphic Discriminator * * @param {string} parameters.location The location the resource resides in. @@ -964,11 +994,11 @@ function _beginCreate(resourceGroupName, serverName, parameters, options, callba * * @param {object} [parameters.sku] The SKU (pricing tier) of the server. * - * @param {string} [parameters.sku.name] The name of the sku, typically, a - * letter + Number code, e.g. P3. + * @param {string} [parameters.sku.name] The name of the sku, typically, tier + + * family + cores, e.g. B_Gen4_1, GP_Gen5_8. * * @param {string} [parameters.sku.tier] The tier of the particular SKU, e.g. - * Basic. Possible values include: 'Basic', 'Standard' + * Basic. Possible values include: 'Basic', 'GeneralPurpose', 'MemoryOptimized' * * @param {number} [parameters.sku.capacity] The scale up/out capacity, * representing server's compute units. @@ -978,7 +1008,17 @@ function _beginCreate(resourceGroupName, serverName, parameters, options, callba * * @param {string} [parameters.sku.family] The family of hardware. * - * @param {number} [parameters.storageMB] The max storage allowed for a server. + * @param {object} [parameters.storageProfile] Storage profile of a server. + * + * @param {number} [parameters.storageProfile.backupRetentionDays] Backup + * retention days for the server. + * + * @param {string} [parameters.storageProfile.geoRedundantBackup] Enable + * Geo-redundant or not for server backup. Possible values include: 'Enabled', + * 'Disabled' + * + * @param {number} [parameters.storageProfile.storageMB] Max storage allowed + * for a server. * * @param {string} [parameters.administratorLoginPassword] The password of the * administrator login. @@ -1309,11 +1349,11 @@ class Servers { * * @param {object} [parameters.sku] The SKU (pricing tier) of the server. * - * @param {string} [parameters.sku.name] The name of the sku, typically, a - * letter + Number code, e.g. P3. + * @param {string} [parameters.sku.name] The name of the sku, typically, tier + + * family + cores, e.g. B_Gen4_1, GP_Gen5_8. * * @param {string} [parameters.sku.tier] The tier of the particular SKU, e.g. - * Basic. Possible values include: 'Basic', 'Standard' + * Basic. Possible values include: 'Basic', 'GeneralPurpose', 'MemoryOptimized' * * @param {number} [parameters.sku.capacity] The scale up/out capacity, * representing server's compute units. @@ -1325,9 +1365,6 @@ class Servers { * * @param {object} parameters.properties Properties of the server. * - * @param {number} [parameters.properties.storageMB] The maximum storage - * allowed for a server. - * * @param {string} [parameters.properties.version] Server version. Possible * values include: '9.5', '9.6' * @@ -1335,6 +1372,19 @@ class Servers { * enforcement or not when connect to server. Possible values include: * 'Enabled', 'Disabled' * + * @param {object} [parameters.properties.storageProfile] Storage profile of a + * server. + * + * @param {number} [parameters.properties.storageProfile.backupRetentionDays] + * Backup retention days for the server. + * + * @param {string} [parameters.properties.storageProfile.geoRedundantBackup] + * Enable Geo-redundant or not for server backup. Possible values include: + * 'Enabled', 'Disabled' + * + * @param {number} [parameters.properties.storageProfile.storageMB] Max storage + * allowed for a server. + * * @param {string} parameters.properties.createMode Polymorphic Discriminator * * @param {string} parameters.location The location the resource resides in. @@ -1381,11 +1431,11 @@ class Servers { * * @param {object} [parameters.sku] The SKU (pricing tier) of the server. * - * @param {string} [parameters.sku.name] The name of the sku, typically, a - * letter + Number code, e.g. P3. + * @param {string} [parameters.sku.name] The name of the sku, typically, tier + + * family + cores, e.g. B_Gen4_1, GP_Gen5_8. * * @param {string} [parameters.sku.tier] The tier of the particular SKU, e.g. - * Basic. Possible values include: 'Basic', 'Standard' + * Basic. Possible values include: 'Basic', 'GeneralPurpose', 'MemoryOptimized' * * @param {number} [parameters.sku.capacity] The scale up/out capacity, * representing server's compute units. @@ -1397,9 +1447,6 @@ class Servers { * * @param {object} parameters.properties Properties of the server. * - * @param {number} [parameters.properties.storageMB] The maximum storage - * allowed for a server. - * * @param {string} [parameters.properties.version] Server version. Possible * values include: '9.5', '9.6' * @@ -1407,6 +1454,19 @@ class Servers { * enforcement or not when connect to server. Possible values include: * 'Enabled', 'Disabled' * + * @param {object} [parameters.properties.storageProfile] Storage profile of a + * server. + * + * @param {number} [parameters.properties.storageProfile.backupRetentionDays] + * Backup retention days for the server. + * + * @param {string} [parameters.properties.storageProfile.geoRedundantBackup] + * Enable Geo-redundant or not for server backup. Possible values include: + * 'Enabled', 'Disabled' + * + * @param {number} [parameters.properties.storageProfile.storageMB] Max storage + * allowed for a server. + * * @param {string} parameters.properties.createMode Polymorphic Discriminator * * @param {string} parameters.location The location the resource resides in. @@ -1475,11 +1535,11 @@ class Servers { * * @param {object} [parameters.sku] The SKU (pricing tier) of the server. * - * @param {string} [parameters.sku.name] The name of the sku, typically, a - * letter + Number code, e.g. P3. + * @param {string} [parameters.sku.name] The name of the sku, typically, tier + + * family + cores, e.g. B_Gen4_1, GP_Gen5_8. * * @param {string} [parameters.sku.tier] The tier of the particular SKU, e.g. - * Basic. Possible values include: 'Basic', 'Standard' + * Basic. Possible values include: 'Basic', 'GeneralPurpose', 'MemoryOptimized' * * @param {number} [parameters.sku.capacity] The scale up/out capacity, * representing server's compute units. @@ -1489,7 +1549,17 @@ class Servers { * * @param {string} [parameters.sku.family] The family of hardware. * - * @param {number} [parameters.storageMB] The max storage allowed for a server. + * @param {object} [parameters.storageProfile] Storage profile of a server. + * + * @param {number} [parameters.storageProfile.backupRetentionDays] Backup + * retention days for the server. + * + * @param {string} [parameters.storageProfile.geoRedundantBackup] Enable + * Geo-redundant or not for server backup. Possible values include: 'Enabled', + * 'Disabled' + * + * @param {number} [parameters.storageProfile.storageMB] Max storage allowed + * for a server. * * @param {string} [parameters.administratorLoginPassword] The password of the * administrator login. @@ -1542,11 +1612,11 @@ class Servers { * * @param {object} [parameters.sku] The SKU (pricing tier) of the server. * - * @param {string} [parameters.sku.name] The name of the sku, typically, a - * letter + Number code, e.g. P3. + * @param {string} [parameters.sku.name] The name of the sku, typically, tier + + * family + cores, e.g. B_Gen4_1, GP_Gen5_8. * * @param {string} [parameters.sku.tier] The tier of the particular SKU, e.g. - * Basic. Possible values include: 'Basic', 'Standard' + * Basic. Possible values include: 'Basic', 'GeneralPurpose', 'MemoryOptimized' * * @param {number} [parameters.sku.capacity] The scale up/out capacity, * representing server's compute units. @@ -1556,7 +1626,17 @@ class Servers { * * @param {string} [parameters.sku.family] The family of hardware. * - * @param {number} [parameters.storageMB] The max storage allowed for a server. + * @param {object} [parameters.storageProfile] Storage profile of a server. + * + * @param {number} [parameters.storageProfile.backupRetentionDays] Backup + * retention days for the server. + * + * @param {string} [parameters.storageProfile.geoRedundantBackup] Enable + * Geo-redundant or not for server backup. Possible values include: 'Enabled', + * 'Disabled' + * + * @param {number} [parameters.storageProfile.storageMB] Max storage allowed + * for a server. * * @param {string} [parameters.administratorLoginPassword] The password of the * administrator login. @@ -1974,11 +2054,11 @@ class Servers { * * @param {object} [parameters.sku] The SKU (pricing tier) of the server. * - * @param {string} [parameters.sku.name] The name of the sku, typically, a - * letter + Number code, e.g. P3. + * @param {string} [parameters.sku.name] The name of the sku, typically, tier + + * family + cores, e.g. B_Gen4_1, GP_Gen5_8. * * @param {string} [parameters.sku.tier] The tier of the particular SKU, e.g. - * Basic. Possible values include: 'Basic', 'Standard' + * Basic. Possible values include: 'Basic', 'GeneralPurpose', 'MemoryOptimized' * * @param {number} [parameters.sku.capacity] The scale up/out capacity, * representing server's compute units. @@ -1990,9 +2070,6 @@ class Servers { * * @param {object} parameters.properties Properties of the server. * - * @param {number} [parameters.properties.storageMB] The maximum storage - * allowed for a server. - * * @param {string} [parameters.properties.version] Server version. Possible * values include: '9.5', '9.6' * @@ -2000,6 +2077,19 @@ class Servers { * enforcement or not when connect to server. Possible values include: * 'Enabled', 'Disabled' * + * @param {object} [parameters.properties.storageProfile] Storage profile of a + * server. + * + * @param {number} [parameters.properties.storageProfile.backupRetentionDays] + * Backup retention days for the server. + * + * @param {string} [parameters.properties.storageProfile.geoRedundantBackup] + * Enable Geo-redundant or not for server backup. Possible values include: + * 'Enabled', 'Disabled' + * + * @param {number} [parameters.properties.storageProfile.storageMB] Max storage + * allowed for a server. + * * @param {string} parameters.properties.createMode Polymorphic Discriminator * * @param {string} parameters.location The location the resource resides in. @@ -2046,11 +2136,11 @@ class Servers { * * @param {object} [parameters.sku] The SKU (pricing tier) of the server. * - * @param {string} [parameters.sku.name] The name of the sku, typically, a - * letter + Number code, e.g. P3. + * @param {string} [parameters.sku.name] The name of the sku, typically, tier + + * family + cores, e.g. B_Gen4_1, GP_Gen5_8. * * @param {string} [parameters.sku.tier] The tier of the particular SKU, e.g. - * Basic. Possible values include: 'Basic', 'Standard' + * Basic. Possible values include: 'Basic', 'GeneralPurpose', 'MemoryOptimized' * * @param {number} [parameters.sku.capacity] The scale up/out capacity, * representing server's compute units. @@ -2062,9 +2152,6 @@ class Servers { * * @param {object} parameters.properties Properties of the server. * - * @param {number} [parameters.properties.storageMB] The maximum storage - * allowed for a server. - * * @param {string} [parameters.properties.version] Server version. Possible * values include: '9.5', '9.6' * @@ -2072,6 +2159,19 @@ class Servers { * enforcement or not when connect to server. Possible values include: * 'Enabled', 'Disabled' * + * @param {object} [parameters.properties.storageProfile] Storage profile of a + * server. + * + * @param {number} [parameters.properties.storageProfile.backupRetentionDays] + * Backup retention days for the server. + * + * @param {string} [parameters.properties.storageProfile.geoRedundantBackup] + * Enable Geo-redundant or not for server backup. Possible values include: + * 'Enabled', 'Disabled' + * + * @param {number} [parameters.properties.storageProfile.storageMB] Max storage + * allowed for a server. + * * @param {string} parameters.properties.createMode Polymorphic Discriminator * * @param {string} parameters.location The location the resource resides in. @@ -2140,11 +2240,11 @@ class Servers { * * @param {object} [parameters.sku] The SKU (pricing tier) of the server. * - * @param {string} [parameters.sku.name] The name of the sku, typically, a - * letter + Number code, e.g. P3. + * @param {string} [parameters.sku.name] The name of the sku, typically, tier + + * family + cores, e.g. B_Gen4_1, GP_Gen5_8. * * @param {string} [parameters.sku.tier] The tier of the particular SKU, e.g. - * Basic. Possible values include: 'Basic', 'Standard' + * Basic. Possible values include: 'Basic', 'GeneralPurpose', 'MemoryOptimized' * * @param {number} [parameters.sku.capacity] The scale up/out capacity, * representing server's compute units. @@ -2154,7 +2254,17 @@ class Servers { * * @param {string} [parameters.sku.family] The family of hardware. * - * @param {number} [parameters.storageMB] The max storage allowed for a server. + * @param {object} [parameters.storageProfile] Storage profile of a server. + * + * @param {number} [parameters.storageProfile.backupRetentionDays] Backup + * retention days for the server. + * + * @param {string} [parameters.storageProfile.geoRedundantBackup] Enable + * Geo-redundant or not for server backup. Possible values include: 'Enabled', + * 'Disabled' + * + * @param {number} [parameters.storageProfile.storageMB] Max storage allowed + * for a server. * * @param {string} [parameters.administratorLoginPassword] The password of the * administrator login. @@ -2207,11 +2317,11 @@ class Servers { * * @param {object} [parameters.sku] The SKU (pricing tier) of the server. * - * @param {string} [parameters.sku.name] The name of the sku, typically, a - * letter + Number code, e.g. P3. + * @param {string} [parameters.sku.name] The name of the sku, typically, tier + + * family + cores, e.g. B_Gen4_1, GP_Gen5_8. * * @param {string} [parameters.sku.tier] The tier of the particular SKU, e.g. - * Basic. Possible values include: 'Basic', 'Standard' + * Basic. Possible values include: 'Basic', 'GeneralPurpose', 'MemoryOptimized' * * @param {number} [parameters.sku.capacity] The scale up/out capacity, * representing server's compute units. @@ -2221,7 +2331,17 @@ class Servers { * * @param {string} [parameters.sku.family] The family of hardware. * - * @param {number} [parameters.storageMB] The max storage allowed for a server. + * @param {object} [parameters.storageProfile] Storage profile of a server. + * + * @param {number} [parameters.storageProfile.backupRetentionDays] Backup + * retention days for the server. + * + * @param {string} [parameters.storageProfile.geoRedundantBackup] Enable + * Geo-redundant or not for server backup. Possible values include: 'Enabled', + * 'Disabled' + * + * @param {number} [parameters.storageProfile.storageMB] Max storage allowed + * for a server. * * @param {string} [parameters.administratorLoginPassword] The password of the * administrator login. diff --git a/lib/services/postgresqlManagement/lib/postgreSQLManagementClient.d.ts b/lib/services/postgresqlManagement/lib/postgreSQLManagementClient.d.ts index b9589b515f..6418680304 100755 --- a/lib/services/postgresqlManagement/lib/postgreSQLManagementClient.d.ts +++ b/lib/services/postgresqlManagement/lib/postgreSQLManagementClient.d.ts @@ -10,9 +10,10 @@ import { ServiceClientCredentials } from 'ms-rest'; import { AzureServiceClient, AzureServiceClientOptions } from 'ms-rest-azure'; +import * as models from "./models"; import * as operations from "./operations"; -declare class PostgreSQLManagementClient extends AzureServiceClient { +export default class PostgreSQLManagementClient extends AzureServiceClient { /** * Initializes a new instance of the PostgreSQLManagementClient class. * @constructor @@ -60,10 +61,9 @@ declare class PostgreSQLManagementClient extends AzureServiceClient { databases: operations.Databases; configurations: operations.Configurations; logFiles: operations.LogFiles; - performanceTiers: operations.PerformanceTiers; locationBasedPerformanceTier: operations.LocationBasedPerformanceTier; checkNameAvailability: operations.CheckNameAvailability; operations: operations.Operations; } -export = PostgreSQLManagementClient; +export { PostgreSQLManagementClient, models as PostgreSQLManagementModels }; diff --git a/lib/services/postgresqlManagement/lib/postgreSQLManagementClient.js b/lib/services/postgresqlManagement/lib/postgreSQLManagementClient.js index e387c97297..b1879c11b3 100755 --- a/lib/services/postgresqlManagement/lib/postgreSQLManagementClient.js +++ b/lib/services/postgresqlManagement/lib/postgreSQLManagementClient.js @@ -50,7 +50,7 @@ class PostgreSQLManagementClient extends ServiceClient { super(credentials, options); - this.apiVersion = '2017-04-30-preview'; + this.apiVersion = '2017-12-01'; this.acceptLanguage = 'en-US'; this.longRunningOperationRetryTimeout = 30; this.generateClientRequestId = true; @@ -77,7 +77,6 @@ class PostgreSQLManagementClient extends ServiceClient { this.databases = new operations.Databases(this); this.configurations = new operations.Configurations(this); this.logFiles = new operations.LogFiles(this); - this.performanceTiers = new operations.PerformanceTiers(this); this.locationBasedPerformanceTier = new operations.LocationBasedPerformanceTier(this); this.checkNameAvailability = new operations.CheckNameAvailability(this); this.operations = new operations.Operations(this); @@ -88,3 +87,6 @@ class PostgreSQLManagementClient extends ServiceClient { } module.exports = PostgreSQLManagementClient; +module.exports['default'] = PostgreSQLManagementClient; +module.exports.PostgreSQLManagementClient = PostgreSQLManagementClient; +module.exports.PostgreSQLManagementModels = models; From efacf08dea6b1707e350f53386643a47f980a10e Mon Sep 17 00:00:00 2001 From: Dan Schulte Date: Wed, 28 Mar 2018 13:54:52 -0700 Subject: [PATCH 2/3] Update posgresql major version and regenerate --- codegen_mappings.json | 4 ++ lib/services/postgresqlManagement/LICENSE.txt | 4 +- .../postgresqlManagement/package.json | 39 +++++-------------- 3 files changed, 16 insertions(+), 31 deletions(-) diff --git a/codegen_mappings.json b/codegen_mappings.json index c558ce03d5..d1c5f21368 100644 --- a/codegen_mappings.json +++ b/codegen_mappings.json @@ -467,6 +467,10 @@ "postgresql": { "resource-manager": { "packageName": "azure-arm-postgresql", + "packageVersion": "3.0.0-preview", + "generateLicenseTxt": true, + "generatePackageJson": true, + "generateReadmeMd": false, "dir": "postgresqlManagement", "source": "postgresql/resource-manager/readme.md" } diff --git a/lib/services/postgresqlManagement/LICENSE.txt b/lib/services/postgresqlManagement/LICENSE.txt index 0313a903d7..a70e8cf660 100644 --- a/lib/services/postgresqlManagement/LICENSE.txt +++ b/lib/services/postgresqlManagement/LICENSE.txt @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2017 Microsoft +Copyright (c) 2018 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 @@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. \ No newline at end of file +SOFTWARE. diff --git a/lib/services/postgresqlManagement/package.json b/lib/services/postgresqlManagement/package.json index 9d100eb2a5..8a3b85d57c 100644 --- a/lib/services/postgresqlManagement/package.json +++ b/lib/services/postgresqlManagement/package.json @@ -1,41 +1,22 @@ { "name": "azure-arm-postgresql", "author": "Microsoft Corporation", - "contributors": [ - "Rancourt, Kent " - ], - "version": "2.0.0-preview", - "description": "Microsoft Azure PostgreSQL Resource Provider Management Client Library for Node", - "tags": [ - "azure", - "sdk", - "rdbms", - "postgres", - "postgresql" - ], - "keywords": [ - "azure", - "sdk", - "rdbms", - "postgres", - "postgresql" - ], - "main": "./lib/postgreSQLManagementClient.js", - "types": "./lib/postgreSQLManagementClient.d.ts", - "license": "MIT", + "description": "PostgreSQLManagementClient Library with typescript type definitions for node", + "version": "3.0.0-preview", "dependencies": { - "ms-rest": "^2.2.2", - "ms-rest-azure": "^2.3.3" + "ms-rest": "^2.3.3", + "ms-rest-azure": "^2.5.5" }, - "homepage": "http://github.com/Azure/azure-sdk-for-node", + "keywords": [ "node", "azure" ], + "license": "MIT", + "main": "./lib/postgreSQLManagementClient.js", + "types": "./lib/postgreSQLManagementClient.d.ts", + "homepage": "http://github.com/azure/azure-sdk-for-node", "repository": { "type": "git", - "url": "git@github.com:Azure/azure-sdk-for-node.git" + "url": "https://github.com/azure/azure-sdk-for-node.git" }, "bugs": { "url": "http://github.com/Azure/azure-sdk-for-node/issues" - }, - "scripts": { - "test": "npm -s run-script jshint" } } From e722efb3f709bb13315b23f9c53481e944ba2feb Mon Sep 17 00:00:00 2001 From: Dan Schulte Date: Wed, 28 Mar 2018 14:10:47 -0700 Subject: [PATCH 3/3] Fix postgreSQL tests --- ...should_create_a_database_correctly.nock.js | 20 ++++---- ...ould_delete_the_specified_database.nock.js | 16 +++---- ..._should_get_the_specified_database.nock.js | 4 +- ...st_all_the_databases_in_the_server.nock.js | 4 +- ...s_should_create_a_server_correctly.nock.js | 48 +++++++++---------- ...should_delete_the_specified_server.nock.js | 20 ++++---- ...rs_should_get_the_specified_server.nock.js | 4 +- ...l_the_servers_in_the_resourcegroup.nock.js | 4 +- ...ll_the_servers_in_the_subscription.nock.js | 4 +- 9 files changed, 62 insertions(+), 62 deletions(-) diff --git a/test/recordings/postgresqlmanagementservice-tests/PostgreSQL_Management_databases_should_create_a_database_correctly.nock.js b/test/recordings/postgresqlmanagementservice-tests/PostgreSQL_Management_databases_should_create_a_database_correctly.nock.js index 0fa4c39dfa..e458326fee 100644 --- a/test/recordings/postgresqlmanagementservice-tests/PostgreSQL_Management_databases_should_create_a_database_correctly.nock.js +++ b/test/recordings/postgresqlmanagementservice-tests/PostgreSQL_Management_databases_should_create_a_database_correctly.nock.js @@ -9,15 +9,15 @@ exports.scopes = [[function (nock) { var result = nock('http://management.azure.com:443') .filteringRequestBody(function (path) { return '*';}) -.put('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/resourceGroups/nodeTestGroup5834/providers/Microsoft.DBforPostgreSQL/servers/testserver3266/databases/testdb4417?api-version=2017-04-30-preview', '*') + .put('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/resourceGroups/nodeTestGroup5834/providers/Microsoft.DBforPostgreSQL/servers/testserver3266/databases/testdb4417?api-version=2017-12-01', '*') .reply(202, "{\"operation\":\"UpsertElasticServerDatabase\",\"startTime\":\"2017-05-25T00:08:00.613Z\"}", { 'cache-control': 'no-cache', pragma: 'no-cache', 'content-length': '82', 'content-type': 'application/json; charset=utf-8', expires: '-1', - location: 'https://management.azure.com/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/providers/Microsoft.DBforPostgreSQL/locations/westus/operationResults/941ffd02-b315-48fc-9461-23f2e2f304f3?api-version=2017-04-30-preview', + location: 'https://management.azure.com/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/providers/Microsoft.DBforPostgreSQL/locations/westus/operationResults/941ffd02-b315-48fc-9461-23f2e2f304f3?api-version=2017-12-01', 'retry-after': '15', - 'azure-asyncoperation': 'https://management.azure.com/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/providers/Microsoft.DBforPostgreSQL/locations/westus/azureAsyncOperation/941ffd02-b315-48fc-9461-23f2e2f304f3?api-version=2017-04-30-preview', + 'azure-asyncoperation': 'https://management.azure.com/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/providers/Microsoft.DBforPostgreSQL/locations/westus/azureAsyncOperation/941ffd02-b315-48fc-9461-23f2e2f304f3?api-version=2017-12-01', 'x-ms-request-id': '941ffd02-b315-48fc-9461-23f2e2f304f3', server: 'Microsoft-HTTPAPI/2.0', 'x-ms-ratelimit-remaining-subscription-writes': '1197', @@ -31,15 +31,15 @@ function (nock) { var result = nock('https://management.azure.com:443') .filteringRequestBody(function (path) { return '*';}) -.put('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/resourceGroups/nodeTestGroup5834/providers/Microsoft.DBforPostgreSQL/servers/testserver3266/databases/testdb4417?api-version=2017-04-30-preview', '*') + .put('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/resourceGroups/nodeTestGroup5834/providers/Microsoft.DBforPostgreSQL/servers/testserver3266/databases/testdb4417?api-version=2017-12-01', '*') .reply(202, "{\"operation\":\"UpsertElasticServerDatabase\",\"startTime\":\"2017-05-25T00:08:00.613Z\"}", { 'cache-control': 'no-cache', pragma: 'no-cache', 'content-length': '82', 'content-type': 'application/json; charset=utf-8', expires: '-1', - location: 'https://management.azure.com/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/providers/Microsoft.DBforPostgreSQL/locations/westus/operationResults/941ffd02-b315-48fc-9461-23f2e2f304f3?api-version=2017-04-30-preview', + location: 'https://management.azure.com/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/providers/Microsoft.DBforPostgreSQL/locations/westus/operationResults/941ffd02-b315-48fc-9461-23f2e2f304f3?api-version=2017-12-01', 'retry-after': '15', - 'azure-asyncoperation': 'https://management.azure.com/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/providers/Microsoft.DBforPostgreSQL/locations/westus/azureAsyncOperation/941ffd02-b315-48fc-9461-23f2e2f304f3?api-version=2017-04-30-preview', + 'azure-asyncoperation': 'https://management.azure.com/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/providers/Microsoft.DBforPostgreSQL/locations/westus/azureAsyncOperation/941ffd02-b315-48fc-9461-23f2e2f304f3?api-version=2017-12-01', 'x-ms-request-id': '941ffd02-b315-48fc-9461-23f2e2f304f3', server: 'Microsoft-HTTPAPI/2.0', 'x-ms-ratelimit-remaining-subscription-writes': '1197', @@ -52,7 +52,7 @@ nock('https://management.azure.com:443') function (nock) { var result = nock('http://management.azure.com:443') - .get('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/providers/Microsoft.DBforPostgreSQL/locations/westus/azureAsyncOperation/941ffd02-b315-48fc-9461-23f2e2f304f3?api-version=2017-04-30-preview') + .get('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/providers/Microsoft.DBforPostgreSQL/locations/westus/azureAsyncOperation/941ffd02-b315-48fc-9461-23f2e2f304f3?api-version=2017-12-01') .reply(200, "{\"name\":\"941ffd02-b315-48fc-9461-23f2e2f304f3\",\"status\":\"Succeeded\",\"startTime\":\"2017-05-25T00:08:00.613Z\"}", { 'cache-control': 'no-cache', pragma: 'no-cache', 'content-length': '107', @@ -70,7 +70,7 @@ nock('http://management.azure.com:443') function (nock) { var result = nock('https://management.azure.com:443') - .get('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/providers/Microsoft.DBforPostgreSQL/locations/westus/azureAsyncOperation/941ffd02-b315-48fc-9461-23f2e2f304f3?api-version=2017-04-30-preview') + .get('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/providers/Microsoft.DBforPostgreSQL/locations/westus/azureAsyncOperation/941ffd02-b315-48fc-9461-23f2e2f304f3?api-version=2017-12-01') .reply(200, "{\"name\":\"941ffd02-b315-48fc-9461-23f2e2f304f3\",\"status\":\"Succeeded\",\"startTime\":\"2017-05-25T00:08:00.613Z\"}", { 'cache-control': 'no-cache', pragma: 'no-cache', 'content-length': '107', @@ -88,7 +88,7 @@ nock('https://management.azure.com:443') function (nock) { var result = nock('http://management.azure.com:443') - .get('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/resourceGroups/nodeTestGroup5834/providers/Microsoft.DBforPostgreSQL/servers/testserver3266/databases/testdb4417?api-version=2017-04-30-preview') + .get('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/resourceGroups/nodeTestGroup5834/providers/Microsoft.DBforPostgreSQL/servers/testserver3266/databases/testdb4417?api-version=2017-12-01') .reply(200, "{\"id\":\"/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/resourceGroups/nodeTestGroup5834/providers/Microsoft.DBforPostgreSQL/servers/testserver3266/databases/testdb4417\",\"name\":\"testdb4417\",\"type\":\"Microsoft.DBforPostgreSQL/servers/databases\",\"properties\":{\"charset\":\"UTF8\",\"collation\":\"English_United States.1252\"}}", { 'cache-control': 'no-cache', pragma: 'no-cache', 'content-length': '319', @@ -106,7 +106,7 @@ nock('http://management.azure.com:443') function (nock) { var result = nock('https://management.azure.com:443') - .get('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/resourceGroups/nodeTestGroup5834/providers/Microsoft.DBforPostgreSQL/servers/testserver3266/databases/testdb4417?api-version=2017-04-30-preview') + .get('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/resourceGroups/nodeTestGroup5834/providers/Microsoft.DBforPostgreSQL/servers/testserver3266/databases/testdb4417?api-version=2017-12-01') .reply(200, "{\"id\":\"/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/resourceGroups/nodeTestGroup5834/providers/Microsoft.DBforPostgreSQL/servers/testserver3266/databases/testdb4417\",\"name\":\"testdb4417\",\"type\":\"Microsoft.DBforPostgreSQL/servers/databases\",\"properties\":{\"charset\":\"UTF8\",\"collation\":\"English_United States.1252\"}}", { 'cache-control': 'no-cache', pragma: 'no-cache', 'content-length': '319', diff --git a/test/recordings/postgresqlmanagementservice-tests/PostgreSQL_Management_databases_should_delete_the_specified_database.nock.js b/test/recordings/postgresqlmanagementservice-tests/PostgreSQL_Management_databases_should_delete_the_specified_database.nock.js index 35b82801ab..9d2f6709ef 100644 --- a/test/recordings/postgresqlmanagementservice-tests/PostgreSQL_Management_databases_should_delete_the_specified_database.nock.js +++ b/test/recordings/postgresqlmanagementservice-tests/PostgreSQL_Management_databases_should_delete_the_specified_database.nock.js @@ -8,15 +8,15 @@ exports.setEnvironment = function() { exports.scopes = [[function (nock) { var result = nock('http://management.azure.com:443') - .delete('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/resourceGroups/nodeTestGroup5834/providers/Microsoft.DBforPostgreSQL/servers/testserver3266/databases/testdb4417?api-version=2017-04-30-preview') + .delete('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/resourceGroups/nodeTestGroup5834/providers/Microsoft.DBforPostgreSQL/servers/testserver3266/databases/testdb4417?api-version=2017-12-01') .reply(202, "{\"operation\":\"DropElasticServerDatabase\",\"startTime\":\"2017-05-25T00:08:32.757Z\"}", { 'cache-control': 'no-cache', pragma: 'no-cache', 'content-length': '80', 'content-type': 'application/json; charset=utf-8', expires: '-1', - location: 'https://management.azure.com/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/providers/Microsoft.DBforPostgreSQL/locations/westus/operationResults/e5344e7b-36ac-474c-8700-6888633006d3?api-version=2017-04-30-preview', + location: 'https://management.azure.com/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/providers/Microsoft.DBforPostgreSQL/locations/westus/operationResults/e5344e7b-36ac-474c-8700-6888633006d3?api-version=2017-12-01', 'retry-after': '15', - 'azure-asyncoperation': 'https://management.azure.com/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/providers/Microsoft.DBforPostgreSQL/locations/westus/azureAsyncOperation/e5344e7b-36ac-474c-8700-6888633006d3?api-version=2017-04-30-preview', + 'azure-asyncoperation': 'https://management.azure.com/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/providers/Microsoft.DBforPostgreSQL/locations/westus/azureAsyncOperation/e5344e7b-36ac-474c-8700-6888633006d3?api-version=2017-12-01', 'x-ms-request-id': 'e5344e7b-36ac-474c-8700-6888633006d3', server: 'Microsoft-HTTPAPI/2.0', 'x-ms-ratelimit-remaining-subscription-writes': '1199', @@ -29,15 +29,15 @@ nock('http://management.azure.com:443') function (nock) { var result = nock('https://management.azure.com:443') - .delete('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/resourceGroups/nodeTestGroup5834/providers/Microsoft.DBforPostgreSQL/servers/testserver3266/databases/testdb4417?api-version=2017-04-30-preview') + .delete('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/resourceGroups/nodeTestGroup5834/providers/Microsoft.DBforPostgreSQL/servers/testserver3266/databases/testdb4417?api-version=2017-12-01') .reply(202, "{\"operation\":\"DropElasticServerDatabase\",\"startTime\":\"2017-05-25T00:08:32.757Z\"}", { 'cache-control': 'no-cache', pragma: 'no-cache', 'content-length': '80', 'content-type': 'application/json; charset=utf-8', expires: '-1', - location: 'https://management.azure.com/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/providers/Microsoft.DBforPostgreSQL/locations/westus/operationResults/e5344e7b-36ac-474c-8700-6888633006d3?api-version=2017-04-30-preview', + location: 'https://management.azure.com/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/providers/Microsoft.DBforPostgreSQL/locations/westus/operationResults/e5344e7b-36ac-474c-8700-6888633006d3?api-version=2017-12-01', 'retry-after': '15', - 'azure-asyncoperation': 'https://management.azure.com/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/providers/Microsoft.DBforPostgreSQL/locations/westus/azureAsyncOperation/e5344e7b-36ac-474c-8700-6888633006d3?api-version=2017-04-30-preview', + 'azure-asyncoperation': 'https://management.azure.com/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/providers/Microsoft.DBforPostgreSQL/locations/westus/azureAsyncOperation/e5344e7b-36ac-474c-8700-6888633006d3?api-version=2017-12-01', 'x-ms-request-id': 'e5344e7b-36ac-474c-8700-6888633006d3', server: 'Microsoft-HTTPAPI/2.0', 'x-ms-ratelimit-remaining-subscription-writes': '1199', @@ -50,7 +50,7 @@ nock('https://management.azure.com:443') function (nock) { var result = nock('http://management.azure.com:443') - .get('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/providers/Microsoft.DBforPostgreSQL/locations/westus/azureAsyncOperation/e5344e7b-36ac-474c-8700-6888633006d3?api-version=2017-04-30-preview') + .get('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/providers/Microsoft.DBforPostgreSQL/locations/westus/azureAsyncOperation/e5344e7b-36ac-474c-8700-6888633006d3?api-version=2017-12-01') .reply(200, "{\"name\":\"e5344e7b-36ac-474c-8700-6888633006d3\",\"status\":\"Succeeded\",\"startTime\":\"2017-05-25T00:08:32.757Z\"}", { 'cache-control': 'no-cache', pragma: 'no-cache', 'content-length': '107', @@ -68,7 +68,7 @@ nock('http://management.azure.com:443') function (nock) { var result = nock('https://management.azure.com:443') - .get('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/providers/Microsoft.DBforPostgreSQL/locations/westus/azureAsyncOperation/e5344e7b-36ac-474c-8700-6888633006d3?api-version=2017-04-30-preview') + .get('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/providers/Microsoft.DBforPostgreSQL/locations/westus/azureAsyncOperation/e5344e7b-36ac-474c-8700-6888633006d3?api-version=2017-12-01') .reply(200, "{\"name\":\"e5344e7b-36ac-474c-8700-6888633006d3\",\"status\":\"Succeeded\",\"startTime\":\"2017-05-25T00:08:32.757Z\"}", { 'cache-control': 'no-cache', pragma: 'no-cache', 'content-length': '107', diff --git a/test/recordings/postgresqlmanagementservice-tests/PostgreSQL_Management_databases_should_get_the_specified_database.nock.js b/test/recordings/postgresqlmanagementservice-tests/PostgreSQL_Management_databases_should_get_the_specified_database.nock.js index 6b5c7a06a4..a9506e22e3 100644 --- a/test/recordings/postgresqlmanagementservice-tests/PostgreSQL_Management_databases_should_get_the_specified_database.nock.js +++ b/test/recordings/postgresqlmanagementservice-tests/PostgreSQL_Management_databases_should_get_the_specified_database.nock.js @@ -8,7 +8,7 @@ exports.setEnvironment = function() { exports.scopes = [[function (nock) { var result = nock('http://management.azure.com:443') - .get('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/resourceGroups/nodeTestGroup5834/providers/Microsoft.DBforPostgreSQL/servers/testserver3266/databases/testdb4417?api-version=2017-04-30-preview') + .get('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/resourceGroups/nodeTestGroup5834/providers/Microsoft.DBforPostgreSQL/servers/testserver3266/databases/testdb4417?api-version=2017-12-01') .reply(200, "{\"id\":\"/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/resourceGroups/nodeTestGroup5834/providers/Microsoft.DBforPostgreSQL/servers/testserver3266/databases/testdb4417\",\"name\":\"testdb4417\",\"type\":\"Microsoft.DBforPostgreSQL/servers/databases\",\"properties\":{\"charset\":\"UTF8\",\"collation\":\"English_United States.1252\"}}", { 'cache-control': 'no-cache', pragma: 'no-cache', 'content-length': '319', @@ -26,7 +26,7 @@ nock('http://management.azure.com:443') function (nock) { var result = nock('https://management.azure.com:443') - .get('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/resourceGroups/nodeTestGroup5834/providers/Microsoft.DBforPostgreSQL/servers/testserver3266/databases/testdb4417?api-version=2017-04-30-preview') + .get('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/resourceGroups/nodeTestGroup5834/providers/Microsoft.DBforPostgreSQL/servers/testserver3266/databases/testdb4417?api-version=2017-12-01') .reply(200, "{\"id\":\"/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/resourceGroups/nodeTestGroup5834/providers/Microsoft.DBforPostgreSQL/servers/testserver3266/databases/testdb4417\",\"name\":\"testdb4417\",\"type\":\"Microsoft.DBforPostgreSQL/servers/databases\",\"properties\":{\"charset\":\"UTF8\",\"collation\":\"English_United States.1252\"}}", { 'cache-control': 'no-cache', pragma: 'no-cache', 'content-length': '319', diff --git a/test/recordings/postgresqlmanagementservice-tests/PostgreSQL_Management_databases_should_list_all_the_databases_in_the_server.nock.js b/test/recordings/postgresqlmanagementservice-tests/PostgreSQL_Management_databases_should_list_all_the_databases_in_the_server.nock.js index 89872b4c16..42997325e2 100644 --- a/test/recordings/postgresqlmanagementservice-tests/PostgreSQL_Management_databases_should_list_all_the_databases_in_the_server.nock.js +++ b/test/recordings/postgresqlmanagementservice-tests/PostgreSQL_Management_databases_should_list_all_the_databases_in_the_server.nock.js @@ -8,7 +8,7 @@ exports.setEnvironment = function() { exports.scopes = [[function (nock) { var result = nock('http://management.azure.com:443') - .get('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/resourceGroups/nodeTestGroup5834/providers/Microsoft.DBforPostgreSQL/servers/testserver3266/databases?api-version=2017-04-30-preview') + .get('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/resourceGroups/nodeTestGroup5834/providers/Microsoft.DBforPostgreSQL/servers/testserver3266/databases?api-version=2017-12-01') .reply(200, "{\"value\":[{\"id\":\"/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/resourceGroups/nodeTestGroup5834/providers/Microsoft.DBforPostgreSQL/servers/testserver3266/databases/postgres\",\"name\":\"postgres\",\"type\":\"Microsoft.DBforPostgreSQL/servers/databases\",\"properties\":{\"charset\":\"UTF8\",\"collation\":\"English_United States.1252\"}},{\"id\":\"/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/resourceGroups/nodeTestGroup5834/providers/Microsoft.DBforPostgreSQL/servers/testserver3266/databases/testdb4417\",\"name\":\"testdb4417\",\"type\":\"Microsoft.DBforPostgreSQL/servers/databases\",\"properties\":{\"charset\":\"UTF8\",\"collation\":\"English_United States.1252\"}}]}", { 'cache-control': 'no-cache', pragma: 'no-cache', 'content-length': '647', @@ -26,7 +26,7 @@ nock('http://management.azure.com:443') function (nock) { var result = nock('https://management.azure.com:443') - .get('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/resourceGroups/nodeTestGroup5834/providers/Microsoft.DBforPostgreSQL/servers/testserver3266/databases?api-version=2017-04-30-preview') + .get('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/resourceGroups/nodeTestGroup5834/providers/Microsoft.DBforPostgreSQL/servers/testserver3266/databases?api-version=2017-12-01') .reply(200, "{\"value\":[{\"id\":\"/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/resourceGroups/nodeTestGroup5834/providers/Microsoft.DBforPostgreSQL/servers/testserver3266/databases/postgres\",\"name\":\"postgres\",\"type\":\"Microsoft.DBforPostgreSQL/servers/databases\",\"properties\":{\"charset\":\"UTF8\",\"collation\":\"English_United States.1252\"}},{\"id\":\"/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/resourceGroups/nodeTestGroup5834/providers/Microsoft.DBforPostgreSQL/servers/testserver3266/databases/testdb4417\",\"name\":\"testdb4417\",\"type\":\"Microsoft.DBforPostgreSQL/servers/databases\",\"properties\":{\"charset\":\"UTF8\",\"collation\":\"English_United States.1252\"}}]}", { 'cache-control': 'no-cache', pragma: 'no-cache', 'content-length': '647', diff --git a/test/recordings/postgresqlmanagementservice-tests/PostgreSQL_Management_servers_should_create_a_server_correctly.nock.js b/test/recordings/postgresqlmanagementservice-tests/PostgreSQL_Management_servers_should_create_a_server_correctly.nock.js index fb533f8806..ad6479f6f6 100644 --- a/test/recordings/postgresqlmanagementservice-tests/PostgreSQL_Management_servers_should_create_a_server_correctly.nock.js +++ b/test/recordings/postgresqlmanagementservice-tests/PostgreSQL_Management_servers_should_create_a_server_correctly.nock.js @@ -9,15 +9,15 @@ exports.scopes = [[function (nock) { var result = nock('http://management.azure.com:443') .filteringRequestBody(function (path) { return '*';}) -.put('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/resourceGroups/nodeTestGroup5834/providers/Microsoft.DBforPostgreSQL/servers/testserver1149?api-version=2017-04-30-preview', '*') + .put('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/resourceGroups/nodeTestGroup5834/providers/Microsoft.DBforPostgreSQL/servers/testserver1149?api-version=2017-12-01', '*') .reply(202, "{\"operation\":\"UpsertElasticServer\",\"startTime\":\"2017-05-25T00:00:41.193Z\"}", { 'cache-control': 'no-cache', pragma: 'no-cache', 'content-length': '74', 'content-type': 'application/json; charset=utf-8', expires: '-1', - location: 'https://management.azure.com/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/providers/Microsoft.DBforPostgreSQL/locations/westus/operationResults/c6fd9226-1065-4812-a375-3ae755f08dbd?api-version=2017-04-30-preview', + location: 'https://management.azure.com/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/providers/Microsoft.DBforPostgreSQL/locations/westus/operationResults/c6fd9226-1065-4812-a375-3ae755f08dbd?api-version=2017-12-01', 'retry-after': '60', - 'azure-asyncoperation': 'https://management.azure.com/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/providers/Microsoft.DBforPostgreSQL/locations/westus/azureAsyncOperation/c6fd9226-1065-4812-a375-3ae755f08dbd?api-version=2017-04-30-preview', + 'azure-asyncoperation': 'https://management.azure.com/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/providers/Microsoft.DBforPostgreSQL/locations/westus/azureAsyncOperation/c6fd9226-1065-4812-a375-3ae755f08dbd?api-version=2017-12-01', 'x-ms-request-id': 'c6fd9226-1065-4812-a375-3ae755f08dbd', server: 'Microsoft-HTTPAPI/2.0', 'x-ms-ratelimit-remaining-subscription-writes': '1199', @@ -31,15 +31,15 @@ function (nock) { var result = nock('https://management.azure.com:443') .filteringRequestBody(function (path) { return '*';}) -.put('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/resourceGroups/nodeTestGroup5834/providers/Microsoft.DBforPostgreSQL/servers/testserver1149?api-version=2017-04-30-preview', '*') +.put('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/resourceGroups/nodeTestGroup5834/providers/Microsoft.DBforPostgreSQL/servers/testserver1149?api-version=2017-12-01', '*') .reply(202, "{\"operation\":\"UpsertElasticServer\",\"startTime\":\"2017-05-25T00:00:41.193Z\"}", { 'cache-control': 'no-cache', pragma: 'no-cache', 'content-length': '74', 'content-type': 'application/json; charset=utf-8', expires: '-1', - location: 'https://management.azure.com/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/providers/Microsoft.DBforPostgreSQL/locations/westus/operationResults/c6fd9226-1065-4812-a375-3ae755f08dbd?api-version=2017-04-30-preview', + location: 'https://management.azure.com/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/providers/Microsoft.DBforPostgreSQL/locations/westus/operationResults/c6fd9226-1065-4812-a375-3ae755f08dbd?api-version=2017-12-01', 'retry-after': '60', - 'azure-asyncoperation': 'https://management.azure.com/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/providers/Microsoft.DBforPostgreSQL/locations/westus/azureAsyncOperation/c6fd9226-1065-4812-a375-3ae755f08dbd?api-version=2017-04-30-preview', + 'azure-asyncoperation': 'https://management.azure.com/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/providers/Microsoft.DBforPostgreSQL/locations/westus/azureAsyncOperation/c6fd9226-1065-4812-a375-3ae755f08dbd?api-version=2017-12-01', 'x-ms-request-id': 'c6fd9226-1065-4812-a375-3ae755f08dbd', server: 'Microsoft-HTTPAPI/2.0', 'x-ms-ratelimit-remaining-subscription-writes': '1199', @@ -52,7 +52,7 @@ nock('https://management.azure.com:443') function (nock) { var result = nock('http://management.azure.com:443') - .get('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/providers/Microsoft.DBforPostgreSQL/locations/westus/azureAsyncOperation/c6fd9226-1065-4812-a375-3ae755f08dbd?api-version=2017-04-30-preview') + .get('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/providers/Microsoft.DBforPostgreSQL/locations/westus/azureAsyncOperation/c6fd9226-1065-4812-a375-3ae755f08dbd?api-version=2017-12-01') .reply(200, "{\"name\":\"c6fd9226-1065-4812-a375-3ae755f08dbd\",\"status\":\"InProgress\",\"startTime\":\"2017-05-25T00:00:41.193Z\"}", { 'cache-control': 'no-cache', pragma: 'no-cache', 'content-length': '108', @@ -70,7 +70,7 @@ nock('http://management.azure.com:443') function (nock) { var result = nock('https://management.azure.com:443') - .get('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/providers/Microsoft.DBforPostgreSQL/locations/westus/azureAsyncOperation/c6fd9226-1065-4812-a375-3ae755f08dbd?api-version=2017-04-30-preview') + .get('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/providers/Microsoft.DBforPostgreSQL/locations/westus/azureAsyncOperation/c6fd9226-1065-4812-a375-3ae755f08dbd?api-version=2017-12-01') .reply(200, "{\"name\":\"c6fd9226-1065-4812-a375-3ae755f08dbd\",\"status\":\"InProgress\",\"startTime\":\"2017-05-25T00:00:41.193Z\"}", { 'cache-control': 'no-cache', pragma: 'no-cache', 'content-length': '108', @@ -88,7 +88,7 @@ nock('https://management.azure.com:443') function (nock) { var result = nock('http://management.azure.com:443') - .get('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/providers/Microsoft.DBforPostgreSQL/locations/westus/azureAsyncOperation/c6fd9226-1065-4812-a375-3ae755f08dbd?api-version=2017-04-30-preview') + .get('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/providers/Microsoft.DBforPostgreSQL/locations/westus/azureAsyncOperation/c6fd9226-1065-4812-a375-3ae755f08dbd?api-version=2017-12-01') .reply(200, "{\"name\":\"c6fd9226-1065-4812-a375-3ae755f08dbd\",\"status\":\"InProgress\",\"startTime\":\"2017-05-25T00:00:41.193Z\"}", { 'cache-control': 'no-cache', pragma: 'no-cache', 'content-length': '108', @@ -106,7 +106,7 @@ nock('http://management.azure.com:443') function (nock) { var result = nock('https://management.azure.com:443') - .get('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/providers/Microsoft.DBforPostgreSQL/locations/westus/azureAsyncOperation/c6fd9226-1065-4812-a375-3ae755f08dbd?api-version=2017-04-30-preview') + .get('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/providers/Microsoft.DBforPostgreSQL/locations/westus/azureAsyncOperation/c6fd9226-1065-4812-a375-3ae755f08dbd?api-version=2017-12-01') .reply(200, "{\"name\":\"c6fd9226-1065-4812-a375-3ae755f08dbd\",\"status\":\"InProgress\",\"startTime\":\"2017-05-25T00:00:41.193Z\"}", { 'cache-control': 'no-cache', pragma: 'no-cache', 'content-length': '108', @@ -124,7 +124,7 @@ nock('https://management.azure.com:443') function (nock) { var result = nock('http://management.azure.com:443') - .get('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/providers/Microsoft.DBforPostgreSQL/locations/westus/azureAsyncOperation/c6fd9226-1065-4812-a375-3ae755f08dbd?api-version=2017-04-30-preview') + .get('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/providers/Microsoft.DBforPostgreSQL/locations/westus/azureAsyncOperation/c6fd9226-1065-4812-a375-3ae755f08dbd?api-version=2017-12-01') .reply(200, "{\"name\":\"c6fd9226-1065-4812-a375-3ae755f08dbd\",\"status\":\"InProgress\",\"startTime\":\"2017-05-25T00:00:41.193Z\"}", { 'cache-control': 'no-cache', pragma: 'no-cache', 'content-length': '108', @@ -142,7 +142,7 @@ nock('http://management.azure.com:443') function (nock) { var result = nock('https://management.azure.com:443') - .get('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/providers/Microsoft.DBforPostgreSQL/locations/westus/azureAsyncOperation/c6fd9226-1065-4812-a375-3ae755f08dbd?api-version=2017-04-30-preview') + .get('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/providers/Microsoft.DBforPostgreSQL/locations/westus/azureAsyncOperation/c6fd9226-1065-4812-a375-3ae755f08dbd?api-version=2017-12-01') .reply(200, "{\"name\":\"c6fd9226-1065-4812-a375-3ae755f08dbd\",\"status\":\"InProgress\",\"startTime\":\"2017-05-25T00:00:41.193Z\"}", { 'cache-control': 'no-cache', pragma: 'no-cache', 'content-length': '108', @@ -160,7 +160,7 @@ nock('https://management.azure.com:443') function (nock) { var result = nock('http://management.azure.com:443') - .get('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/providers/Microsoft.DBforPostgreSQL/locations/westus/azureAsyncOperation/c6fd9226-1065-4812-a375-3ae755f08dbd?api-version=2017-04-30-preview') + .get('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/providers/Microsoft.DBforPostgreSQL/locations/westus/azureAsyncOperation/c6fd9226-1065-4812-a375-3ae755f08dbd?api-version=2017-12-01') .reply(200, "{\"name\":\"c6fd9226-1065-4812-a375-3ae755f08dbd\",\"status\":\"InProgress\",\"startTime\":\"2017-05-25T00:00:41.193Z\"}", { 'cache-control': 'no-cache', pragma: 'no-cache', 'content-length': '108', @@ -178,7 +178,7 @@ nock('http://management.azure.com:443') function (nock) { var result = nock('https://management.azure.com:443') - .get('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/providers/Microsoft.DBforPostgreSQL/locations/westus/azureAsyncOperation/c6fd9226-1065-4812-a375-3ae755f08dbd?api-version=2017-04-30-preview') + .get('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/providers/Microsoft.DBforPostgreSQL/locations/westus/azureAsyncOperation/c6fd9226-1065-4812-a375-3ae755f08dbd?api-version=2017-12-01') .reply(200, "{\"name\":\"c6fd9226-1065-4812-a375-3ae755f08dbd\",\"status\":\"InProgress\",\"startTime\":\"2017-05-25T00:00:41.193Z\"}", { 'cache-control': 'no-cache', pragma: 'no-cache', 'content-length': '108', @@ -196,7 +196,7 @@ nock('https://management.azure.com:443') function (nock) { var result = nock('http://management.azure.com:443') - .get('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/providers/Microsoft.DBforPostgreSQL/locations/westus/azureAsyncOperation/c6fd9226-1065-4812-a375-3ae755f08dbd?api-version=2017-04-30-preview') + .get('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/providers/Microsoft.DBforPostgreSQL/locations/westus/azureAsyncOperation/c6fd9226-1065-4812-a375-3ae755f08dbd?api-version=2017-12-01') .reply(200, "{\"name\":\"c6fd9226-1065-4812-a375-3ae755f08dbd\",\"status\":\"InProgress\",\"startTime\":\"2017-05-25T00:00:41.193Z\"}", { 'cache-control': 'no-cache', pragma: 'no-cache', 'content-length': '108', @@ -214,7 +214,7 @@ nock('http://management.azure.com:443') function (nock) { var result = nock('https://management.azure.com:443') - .get('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/providers/Microsoft.DBforPostgreSQL/locations/westus/azureAsyncOperation/c6fd9226-1065-4812-a375-3ae755f08dbd?api-version=2017-04-30-preview') + .get('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/providers/Microsoft.DBforPostgreSQL/locations/westus/azureAsyncOperation/c6fd9226-1065-4812-a375-3ae755f08dbd?api-version=2017-12-01') .reply(200, "{\"name\":\"c6fd9226-1065-4812-a375-3ae755f08dbd\",\"status\":\"InProgress\",\"startTime\":\"2017-05-25T00:00:41.193Z\"}", { 'cache-control': 'no-cache', pragma: 'no-cache', 'content-length': '108', @@ -232,7 +232,7 @@ nock('https://management.azure.com:443') function (nock) { var result = nock('http://management.azure.com:443') - .get('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/providers/Microsoft.DBforPostgreSQL/locations/westus/azureAsyncOperation/c6fd9226-1065-4812-a375-3ae755f08dbd?api-version=2017-04-30-preview') + .get('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/providers/Microsoft.DBforPostgreSQL/locations/westus/azureAsyncOperation/c6fd9226-1065-4812-a375-3ae755f08dbd?api-version=2017-12-01') .reply(200, "{\"name\":\"c6fd9226-1065-4812-a375-3ae755f08dbd\",\"status\":\"InProgress\",\"startTime\":\"2017-05-25T00:00:41.193Z\"}", { 'cache-control': 'no-cache', pragma: 'no-cache', 'content-length': '108', @@ -250,7 +250,7 @@ nock('http://management.azure.com:443') function (nock) { var result = nock('https://management.azure.com:443') - .get('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/providers/Microsoft.DBforPostgreSQL/locations/westus/azureAsyncOperation/c6fd9226-1065-4812-a375-3ae755f08dbd?api-version=2017-04-30-preview') + .get('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/providers/Microsoft.DBforPostgreSQL/locations/westus/azureAsyncOperation/c6fd9226-1065-4812-a375-3ae755f08dbd?api-version=2017-12-01') .reply(200, "{\"name\":\"c6fd9226-1065-4812-a375-3ae755f08dbd\",\"status\":\"InProgress\",\"startTime\":\"2017-05-25T00:00:41.193Z\"}", { 'cache-control': 'no-cache', pragma: 'no-cache', 'content-length': '108', @@ -268,7 +268,7 @@ nock('https://management.azure.com:443') function (nock) { var result = nock('http://management.azure.com:443') - .get('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/providers/Microsoft.DBforPostgreSQL/locations/westus/azureAsyncOperation/c6fd9226-1065-4812-a375-3ae755f08dbd?api-version=2017-04-30-preview') + .get('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/providers/Microsoft.DBforPostgreSQL/locations/westus/azureAsyncOperation/c6fd9226-1065-4812-a375-3ae755f08dbd?api-version=2017-12-01') .reply(200, "{\"name\":\"c6fd9226-1065-4812-a375-3ae755f08dbd\",\"status\":\"InProgress\",\"startTime\":\"2017-05-25T00:00:41.193Z\"}", { 'cache-control': 'no-cache', pragma: 'no-cache', 'content-length': '108', @@ -286,7 +286,7 @@ nock('http://management.azure.com:443') function (nock) { var result = nock('https://management.azure.com:443') - .get('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/providers/Microsoft.DBforPostgreSQL/locations/westus/azureAsyncOperation/c6fd9226-1065-4812-a375-3ae755f08dbd?api-version=2017-04-30-preview') + .get('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/providers/Microsoft.DBforPostgreSQL/locations/westus/azureAsyncOperation/c6fd9226-1065-4812-a375-3ae755f08dbd?api-version=2017-12-01') .reply(200, "{\"name\":\"c6fd9226-1065-4812-a375-3ae755f08dbd\",\"status\":\"InProgress\",\"startTime\":\"2017-05-25T00:00:41.193Z\"}", { 'cache-control': 'no-cache', pragma: 'no-cache', 'content-length': '108', @@ -304,7 +304,7 @@ nock('https://management.azure.com:443') function (nock) { var result = nock('http://management.azure.com:443') - .get('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/providers/Microsoft.DBforPostgreSQL/locations/westus/azureAsyncOperation/c6fd9226-1065-4812-a375-3ae755f08dbd?api-version=2017-04-30-preview') + .get('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/providers/Microsoft.DBforPostgreSQL/locations/westus/azureAsyncOperation/c6fd9226-1065-4812-a375-3ae755f08dbd?api-version=2017-12-01') .reply(200, "{\"name\":\"c6fd9226-1065-4812-a375-3ae755f08dbd\",\"status\":\"Succeeded\",\"startTime\":\"2017-05-25T00:00:41.193Z\"}", { 'cache-control': 'no-cache', pragma: 'no-cache', 'content-length': '107', @@ -322,7 +322,7 @@ nock('http://management.azure.com:443') function (nock) { var result = nock('https://management.azure.com:443') - .get('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/providers/Microsoft.DBforPostgreSQL/locations/westus/azureAsyncOperation/c6fd9226-1065-4812-a375-3ae755f08dbd?api-version=2017-04-30-preview') + .get('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/providers/Microsoft.DBforPostgreSQL/locations/westus/azureAsyncOperation/c6fd9226-1065-4812-a375-3ae755f08dbd?api-version=2017-12-01') .reply(200, "{\"name\":\"c6fd9226-1065-4812-a375-3ae755f08dbd\",\"status\":\"Succeeded\",\"startTime\":\"2017-05-25T00:00:41.193Z\"}", { 'cache-control': 'no-cache', pragma: 'no-cache', 'content-length': '107', @@ -340,7 +340,7 @@ nock('https://management.azure.com:443') function (nock) { var result = nock('http://management.azure.com:443') - .get('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/resourceGroups/nodeTestGroup5834/providers/Microsoft.DBforPostgreSQL/servers/testserver1149?api-version=2017-04-30-preview') + .get('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/resourceGroups/nodeTestGroup5834/providers/Microsoft.DBforPostgreSQL/servers/testserver1149?api-version=2017-12-01') .reply(200, "{\"id\":\"/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/resourceGroups/nodeTestGroup5834/providers/Microsoft.DBforPostgreSQL/servers/testserver1149\",\"name\":\"testserver1149\",\"type\":\"Microsoft.DBforPostgreSQL/servers\",\"location\":\"westus\",\"sku\":{\"name\":\"PGSQLB100\",\"tier\":\"Basic\",\"capacity\":100},\"properties\":{\"administratorLogin\":\"postgres\",\"storageMB\":51200,\"version\":\"9.5\",\"sslEnforcement\":\"Enabled\",\"userVisibleState\":\"Ready\",\"fullyQualifiedDomainName\":\"testserver1149.postgres.database.azure.com\"}}", { 'cache-control': 'no-cache', pragma: 'no-cache', 'content-length': '503', @@ -358,7 +358,7 @@ nock('http://management.azure.com:443') function (nock) { var result = nock('https://management.azure.com:443') - .get('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/resourceGroups/nodeTestGroup5834/providers/Microsoft.DBforPostgreSQL/servers/testserver1149?api-version=2017-04-30-preview') + .get('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/resourceGroups/nodeTestGroup5834/providers/Microsoft.DBforPostgreSQL/servers/testserver1149?api-version=2017-12-01') .reply(200, "{\"id\":\"/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/resourceGroups/nodeTestGroup5834/providers/Microsoft.DBforPostgreSQL/servers/testserver1149\",\"name\":\"testserver1149\",\"type\":\"Microsoft.DBforPostgreSQL/servers\",\"location\":\"westus\",\"sku\":{\"name\":\"PGSQLB100\",\"tier\":\"Basic\",\"capacity\":100},\"properties\":{\"administratorLogin\":\"postgres\",\"storageMB\":51200,\"version\":\"9.5\",\"sslEnforcement\":\"Enabled\",\"userVisibleState\":\"Ready\",\"fullyQualifiedDomainName\":\"testserver1149.postgres.database.azure.com\"}}", { 'cache-control': 'no-cache', pragma: 'no-cache', 'content-length': '503', diff --git a/test/recordings/postgresqlmanagementservice-tests/PostgreSQL_Management_servers_should_delete_the_specified_server.nock.js b/test/recordings/postgresqlmanagementservice-tests/PostgreSQL_Management_servers_should_delete_the_specified_server.nock.js index 093739f260..9cc3c9c01e 100644 --- a/test/recordings/postgresqlmanagementservice-tests/PostgreSQL_Management_servers_should_delete_the_specified_server.nock.js +++ b/test/recordings/postgresqlmanagementservice-tests/PostgreSQL_Management_servers_should_delete_the_specified_server.nock.js @@ -8,15 +8,15 @@ exports.setEnvironment = function() { exports.scopes = [[function (nock) { var result = nock('http://management.azure.com:443') - .delete('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/resourceGroups/nodeTestGroup5834/providers/Microsoft.DBforPostgreSQL/servers/testserver1149?api-version=2017-04-30-preview') + .delete('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/resourceGroups/nodeTestGroup5834/providers/Microsoft.DBforPostgreSQL/servers/testserver1149?api-version=2017-12-01') .reply(202, "{\"operation\":\"DropElasticServer\",\"startTime\":\"2017-05-25T00:04:51.687Z\"}", { 'cache-control': 'no-cache', pragma: 'no-cache', 'content-length': '72', 'content-type': 'application/json; charset=utf-8', expires: '-1', - location: 'https://management.azure.com/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/providers/Microsoft.DBforPostgreSQL/locations/westus/operationResults/4adb4f9d-7682-4521-87eb-68dfcd504b15?api-version=2017-04-30-preview', + location: 'https://management.azure.com/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/providers/Microsoft.DBforPostgreSQL/locations/westus/operationResults/4adb4f9d-7682-4521-87eb-68dfcd504b15?api-version=2017-12-01', 'retry-after': '60', - 'azure-asyncoperation': 'https://management.azure.com/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/providers/Microsoft.DBforPostgreSQL/locations/westus/azureAsyncOperation/4adb4f9d-7682-4521-87eb-68dfcd504b15?api-version=2017-04-30-preview', + 'azure-asyncoperation': 'https://management.azure.com/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/providers/Microsoft.DBforPostgreSQL/locations/westus/azureAsyncOperation/4adb4f9d-7682-4521-87eb-68dfcd504b15?api-version=2017-12-01', 'x-ms-request-id': '4adb4f9d-7682-4521-87eb-68dfcd504b15', server: 'Microsoft-HTTPAPI/2.0', 'x-ms-ratelimit-remaining-subscription-writes': '1198', @@ -29,15 +29,15 @@ nock('http://management.azure.com:443') function (nock) { var result = nock('https://management.azure.com:443') - .delete('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/resourceGroups/nodeTestGroup5834/providers/Microsoft.DBforPostgreSQL/servers/testserver1149?api-version=2017-04-30-preview') + .delete('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/resourceGroups/nodeTestGroup5834/providers/Microsoft.DBforPostgreSQL/servers/testserver1149?api-version=2017-12-01') .reply(202, "{\"operation\":\"DropElasticServer\",\"startTime\":\"2017-05-25T00:04:51.687Z\"}", { 'cache-control': 'no-cache', pragma: 'no-cache', 'content-length': '72', 'content-type': 'application/json; charset=utf-8', expires: '-1', - location: 'https://management.azure.com/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/providers/Microsoft.DBforPostgreSQL/locations/westus/operationResults/4adb4f9d-7682-4521-87eb-68dfcd504b15?api-version=2017-04-30-preview', + location: 'https://management.azure.com/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/providers/Microsoft.DBforPostgreSQL/locations/westus/operationResults/4adb4f9d-7682-4521-87eb-68dfcd504b15?api-version=2017-12-01', 'retry-after': '60', - 'azure-asyncoperation': 'https://management.azure.com/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/providers/Microsoft.DBforPostgreSQL/locations/westus/azureAsyncOperation/4adb4f9d-7682-4521-87eb-68dfcd504b15?api-version=2017-04-30-preview', + 'azure-asyncoperation': 'https://management.azure.com/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/providers/Microsoft.DBforPostgreSQL/locations/westus/azureAsyncOperation/4adb4f9d-7682-4521-87eb-68dfcd504b15?api-version=2017-12-01', 'x-ms-request-id': '4adb4f9d-7682-4521-87eb-68dfcd504b15', server: 'Microsoft-HTTPAPI/2.0', 'x-ms-ratelimit-remaining-subscription-writes': '1198', @@ -50,7 +50,7 @@ nock('https://management.azure.com:443') function (nock) { var result = nock('http://management.azure.com:443') - .get('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/providers/Microsoft.DBforPostgreSQL/locations/westus/azureAsyncOperation/4adb4f9d-7682-4521-87eb-68dfcd504b15?api-version=2017-04-30-preview') + .get('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/providers/Microsoft.DBforPostgreSQL/locations/westus/azureAsyncOperation/4adb4f9d-7682-4521-87eb-68dfcd504b15?api-version=2017-12-01') .reply(200, "{\"name\":\"4adb4f9d-7682-4521-87eb-68dfcd504b15\",\"status\":\"Succeeded\",\"startTime\":\"2017-05-25T00:04:51.687Z\"}", { 'cache-control': 'no-cache', pragma: 'no-cache', 'content-length': '107', @@ -68,7 +68,7 @@ nock('http://management.azure.com:443') function (nock) { var result = nock('https://management.azure.com:443') - .get('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/providers/Microsoft.DBforPostgreSQL/locations/westus/azureAsyncOperation/4adb4f9d-7682-4521-87eb-68dfcd504b15?api-version=2017-04-30-preview') + .get('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/providers/Microsoft.DBforPostgreSQL/locations/westus/azureAsyncOperation/4adb4f9d-7682-4521-87eb-68dfcd504b15?api-version=2017-12-01') .reply(200, "{\"name\":\"4adb4f9d-7682-4521-87eb-68dfcd504b15\",\"status\":\"Succeeded\",\"startTime\":\"2017-05-25T00:04:51.687Z\"}", { 'cache-control': 'no-cache', pragma: 'no-cache', 'content-length': '107', @@ -86,7 +86,7 @@ nock('https://management.azure.com:443') function (nock) { var result = nock('http://management.azure.com:443') - .get('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/resourceGroups/nodeTestGroup5834/providers/Microsoft.DBforPostgreSQL/servers/testserver1149?api-version=2017-04-30-preview') + .get('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/resourceGroups/nodeTestGroup5834/providers/Microsoft.DBforPostgreSQL/servers/testserver1149?api-version=2017-12-01') .reply(404, "{\"error\":{\"code\":\"ResourceNotFound\",\"message\":\"The requested resource of type 'PostgreSQL.Server.PAL' with name 'testserver1149' was not found.\"}}", { 'cache-control': 'no-cache', pragma: 'no-cache', 'content-length': '146', @@ -104,7 +104,7 @@ nock('http://management.azure.com:443') function (nock) { var result = nock('https://management.azure.com:443') - .get('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/resourceGroups/nodeTestGroup5834/providers/Microsoft.DBforPostgreSQL/servers/testserver1149?api-version=2017-04-30-preview') + .get('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/resourceGroups/nodeTestGroup5834/providers/Microsoft.DBforPostgreSQL/servers/testserver1149?api-version=2017-12-01') .reply(404, "{\"error\":{\"code\":\"ResourceNotFound\",\"message\":\"The requested resource of type 'PostgreSQL.Server.PAL' with name 'testserver1149' was not found.\"}}", { 'cache-control': 'no-cache', pragma: 'no-cache', 'content-length': '146', diff --git a/test/recordings/postgresqlmanagementservice-tests/PostgreSQL_Management_servers_should_get_the_specified_server.nock.js b/test/recordings/postgresqlmanagementservice-tests/PostgreSQL_Management_servers_should_get_the_specified_server.nock.js index 462afc4093..759e0a996c 100644 --- a/test/recordings/postgresqlmanagementservice-tests/PostgreSQL_Management_servers_should_get_the_specified_server.nock.js +++ b/test/recordings/postgresqlmanagementservice-tests/PostgreSQL_Management_servers_should_get_the_specified_server.nock.js @@ -8,7 +8,7 @@ exports.setEnvironment = function() { exports.scopes = [[function (nock) { var result = nock('http://management.azure.com:443') - .get('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/resourceGroups/nodeTestGroup5834/providers/Microsoft.DBforPostgreSQL/servers/testserver1149?api-version=2017-04-30-preview') + .get('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/resourceGroups/nodeTestGroup5834/providers/Microsoft.DBforPostgreSQL/servers/testserver1149?api-version=2017-12-01') .reply(200, "{\"id\":\"/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/resourceGroups/nodeTestGroup5834/providers/Microsoft.DBforPostgreSQL/servers/testserver1149\",\"name\":\"testserver1149\",\"type\":\"Microsoft.DBforPostgreSQL/servers\",\"location\":\"westus\",\"sku\":{\"name\":\"PGSQLB100\",\"tier\":\"Basic\",\"capacity\":100},\"properties\":{\"administratorLogin\":\"postgres\",\"storageMB\":51200,\"version\":\"9.5\",\"sslEnforcement\":\"Enabled\",\"userVisibleState\":\"Ready\",\"fullyQualifiedDomainName\":\"testserver1149.postgres.database.azure.com\"}}", { 'cache-control': 'no-cache', pragma: 'no-cache', 'content-length': '503', @@ -26,7 +26,7 @@ nock('http://management.azure.com:443') function (nock) { var result = nock('https://management.azure.com:443') - .get('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/resourceGroups/nodeTestGroup5834/providers/Microsoft.DBforPostgreSQL/servers/testserver1149?api-version=2017-04-30-preview') + .get('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/resourceGroups/nodeTestGroup5834/providers/Microsoft.DBforPostgreSQL/servers/testserver1149?api-version=2017-12-01') .reply(200, "{\"id\":\"/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/resourceGroups/nodeTestGroup5834/providers/Microsoft.DBforPostgreSQL/servers/testserver1149\",\"name\":\"testserver1149\",\"type\":\"Microsoft.DBforPostgreSQL/servers\",\"location\":\"westus\",\"sku\":{\"name\":\"PGSQLB100\",\"tier\":\"Basic\",\"capacity\":100},\"properties\":{\"administratorLogin\":\"postgres\",\"storageMB\":51200,\"version\":\"9.5\",\"sslEnforcement\":\"Enabled\",\"userVisibleState\":\"Ready\",\"fullyQualifiedDomainName\":\"testserver1149.postgres.database.azure.com\"}}", { 'cache-control': 'no-cache', pragma: 'no-cache', 'content-length': '503', diff --git a/test/recordings/postgresqlmanagementservice-tests/PostgreSQL_Management_servers_should_list_all_the_servers_in_the_resourcegroup.nock.js b/test/recordings/postgresqlmanagementservice-tests/PostgreSQL_Management_servers_should_list_all_the_servers_in_the_resourcegroup.nock.js index 010cb02bac..76cf558843 100644 --- a/test/recordings/postgresqlmanagementservice-tests/PostgreSQL_Management_servers_should_list_all_the_servers_in_the_resourcegroup.nock.js +++ b/test/recordings/postgresqlmanagementservice-tests/PostgreSQL_Management_servers_should_list_all_the_servers_in_the_resourcegroup.nock.js @@ -8,7 +8,7 @@ exports.setEnvironment = function() { exports.scopes = [[function (nock) { var result = nock('http://management.azure.com:443') - .get('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/resourceGroups/nodeTestGroup5834/providers/Microsoft.DBforPostgreSQL/servers?api-version=2017-04-30-preview') + .get('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/resourceGroups/nodeTestGroup5834/providers/Microsoft.DBforPostgreSQL/servers?api-version=2017-12-01') .reply(200, "{\"value\":[{\"id\":\"/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/resourceGroups/nodeTestGroup5834/providers/Microsoft.DBforPostgreSQL/servers/testserver1149\",\"name\":\"testserver1149\",\"type\":\"Microsoft.DBforPostgreSQL/servers\",\"location\":\"westus\",\"sku\":{\"name\":\"PGSQLB100\",\"tier\":\"Basic\",\"capacity\":100},\"properties\":{\"administratorLogin\":\"postgres\",\"storageMB\":51200,\"version\":\"9.5\",\"sslEnforcement\":\"Enabled\",\"userVisibleState\":\"Ready\",\"fullyQualifiedDomainName\":\"testserver1149.postgres.database.azure.com\"}}]}", { 'cache-control': 'no-cache', pragma: 'no-cache', 'content-length': '515', @@ -26,7 +26,7 @@ nock('http://management.azure.com:443') function (nock) { var result = nock('https://management.azure.com:443') - .get('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/resourceGroups/nodeTestGroup5834/providers/Microsoft.DBforPostgreSQL/servers?api-version=2017-04-30-preview') + .get('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/resourceGroups/nodeTestGroup5834/providers/Microsoft.DBforPostgreSQL/servers?api-version=2017-12-01') .reply(200, "{\"value\":[{\"id\":\"/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/resourceGroups/nodeTestGroup5834/providers/Microsoft.DBforPostgreSQL/servers/testserver1149\",\"name\":\"testserver1149\",\"type\":\"Microsoft.DBforPostgreSQL/servers\",\"location\":\"westus\",\"sku\":{\"name\":\"PGSQLB100\",\"tier\":\"Basic\",\"capacity\":100},\"properties\":{\"administratorLogin\":\"postgres\",\"storageMB\":51200,\"version\":\"9.5\",\"sslEnforcement\":\"Enabled\",\"userVisibleState\":\"Ready\",\"fullyQualifiedDomainName\":\"testserver1149.postgres.database.azure.com\"}}]}", { 'cache-control': 'no-cache', pragma: 'no-cache', 'content-length': '515', diff --git a/test/recordings/postgresqlmanagementservice-tests/PostgreSQL_Management_servers_should_list_all_the_servers_in_the_subscription.nock.js b/test/recordings/postgresqlmanagementservice-tests/PostgreSQL_Management_servers_should_list_all_the_servers_in_the_subscription.nock.js index 1f1cd58806..64fb86024b 100644 --- a/test/recordings/postgresqlmanagementservice-tests/PostgreSQL_Management_servers_should_list_all_the_servers_in_the_subscription.nock.js +++ b/test/recordings/postgresqlmanagementservice-tests/PostgreSQL_Management_servers_should_list_all_the_servers_in_the_subscription.nock.js @@ -8,7 +8,7 @@ exports.setEnvironment = function() { exports.scopes = [[function (nock) { var result = nock('http://management.azure.com:443') - .get('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/providers/Microsoft.DBforPostgreSQL/servers?api-version=2017-04-30-preview') + .get('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/providers/Microsoft.DBforPostgreSQL/servers?api-version=2017-12-01') .reply(200, "{\"value\":[{\"id\":\"/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/resourceGroups/nodeTestGroup5834/providers/Microsoft.DBforPostgreSQL/servers/testserver1149\",\"name\":\"testserver1149\",\"type\":\"Microsoft.DBforPostgreSQL/servers\",\"location\":\"westus\",\"sku\":{\"name\":\"PGSQLB100\",\"tier\":\"Basic\",\"capacity\":100},\"properties\":{\"administratorLogin\":\"postgres\",\"storageMB\":51200,\"version\":\"9.5\",\"sslEnforcement\":\"Enabled\",\"userVisibleState\":\"Ready\",\"fullyQualifiedDomainName\":\"testserver1149.postgres.database.azure.com\"}}]}", { 'cache-control': 'no-cache', pragma: 'no-cache', 'content-length': '515', @@ -26,7 +26,7 @@ nock('http://management.azure.com:443') function (nock) { var result = nock('https://management.azure.com:443') - .get('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/providers/Microsoft.DBforPostgreSQL/servers?api-version=2017-04-30-preview') + .get('/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/providers/Microsoft.DBforPostgreSQL/servers?api-version=2017-12-01') .reply(200, "{\"value\":[{\"id\":\"/subscriptions/d466671a-79ad-4ca5-878f-599df8bcd17e/resourceGroups/nodeTestGroup5834/providers/Microsoft.DBforPostgreSQL/servers/testserver1149\",\"name\":\"testserver1149\",\"type\":\"Microsoft.DBforPostgreSQL/servers\",\"location\":\"westus\",\"sku\":{\"name\":\"PGSQLB100\",\"tier\":\"Basic\",\"capacity\":100},\"properties\":{\"administratorLogin\":\"postgres\",\"storageMB\":51200,\"version\":\"9.5\",\"sslEnforcement\":\"Enabled\",\"userVisibleState\":\"Ready\",\"fullyQualifiedDomainName\":\"testserver1149.postgres.database.azure.com\"}}]}", { 'cache-control': 'no-cache', pragma: 'no-cache', 'content-length': '515',