From 33d74f4124b46725860fbcb9d2eef694e3099037 Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Mon, 10 Sep 2018 11:59:43 -0700 Subject: [PATCH 1/4] [AutoPR logic/resource-manager] Change some string Microsoft.Logic modeled enums back into enums (#3470) * Generated from 2b946c42fe05c892efee90f150c5b2b7897d9e8d Change some string modelled enums back into enums * Generated from c016726b2b4438bf45bdbebe25f68a67330478b0 Change EDIFACT back to be an enum, not a string --- .../lib/models/edifactDelimiterOverride.js | 6 ++++-- .../lib/models/edifactFramingSettings.js | 6 ++++-- lib/services/logicManagement/lib/models/index.d.ts | 11 ----------- lib/services/logicManagement/lib/models/index.js | 1 - .../lib/models/integrationAccountAgreement.js | 3 ++- .../lib/models/integrationAccountAgreementFilter.js | 3 ++- .../logicManagement/lib/models/recurrenceSchedule.js | 3 ++- .../lib/models/recurrenceScheduleOccurrence.js | 3 ++- .../logicManagement/lib/models/trackingEvent.js | 3 ++- .../lib/models/x12DelimiterOverrides.js | 3 ++- .../logicManagement/lib/models/x12FramingSettings.js | 3 ++- .../lib/operations/integrationAccountSessions.js | 9 ++++----- lib/services/logicManagement/package.json | 4 ++-- 13 files changed, 28 insertions(+), 30 deletions(-) diff --git a/lib/services/logicManagement/lib/models/edifactDelimiterOverride.js b/lib/services/logicManagement/lib/models/edifactDelimiterOverride.js index 392a9afb88..964455ae94 100644 --- a/lib/services/logicManagement/lib/models/edifactDelimiterOverride.js +++ b/lib/services/logicManagement/lib/models/edifactDelimiterOverride.js @@ -104,14 +104,16 @@ class EdifactDelimiterOverride { required: true, serializedName: 'segmentTerminatorSuffix', type: { - name: 'String' + name: 'Enum', + allowedValues: [ 'NotSpecified', 'None', 'CR', 'LF', 'CRLF' ] } }, decimalPointIndicator: { required: true, serializedName: 'decimalPointIndicator', type: { - name: 'String' + name: 'Enum', + allowedValues: [ 'NotSpecified', 'Comma', 'Decimal' ] } }, releaseIndicator: { diff --git a/lib/services/logicManagement/lib/models/edifactFramingSettings.js b/lib/services/logicManagement/lib/models/edifactFramingSettings.js index 6467082a1e..57f9d9b279 100644 --- a/lib/services/logicManagement/lib/models/edifactFramingSettings.js +++ b/lib/services/logicManagement/lib/models/edifactFramingSettings.js @@ -120,14 +120,16 @@ class EdifactFramingSettings { required: true, serializedName: 'decimalPointIndicator', type: { - name: 'String' + name: 'Enum', + allowedValues: [ 'NotSpecified', 'Comma', 'Decimal' ] } }, segmentTerminatorSuffix: { required: true, serializedName: 'segmentTerminatorSuffix', type: { - name: 'String' + name: 'Enum', + allowedValues: [ 'NotSpecified', 'None', 'CR', 'LF', 'CRLF' ] } } } diff --git a/lib/services/logicManagement/lib/models/index.d.ts b/lib/services/logicManagement/lib/models/index.d.ts index 404e82af6d..111214b220 100644 --- a/lib/services/logicManagement/lib/models/index.d.ts +++ b/lib/services/logicManagement/lib/models/index.d.ts @@ -7983,17 +7983,6 @@ export interface TrackingEventsDefinition { events: TrackingEvent[]; } -/** - * @class - * Initializes a new instance of the AccessKeyRegenerateActionDefinition class. - * @constructor - * @member {string} keyType Possible values include: 'NotSpecified', 'Primary', - * 'Secondary' - */ -export interface AccessKeyRegenerateActionDefinition { - keyType: string; -} - /** * @class * Initializes a new instance of the SetTriggerStateActionDefinition class. diff --git a/lib/services/logicManagement/lib/models/index.js b/lib/services/logicManagement/lib/models/index.js index 3f8db40b00..10b110b832 100644 --- a/lib/services/logicManagement/lib/models/index.js +++ b/lib/services/logicManagement/lib/models/index.js @@ -119,7 +119,6 @@ exports.KeyVaultKey = require('./keyVaultKey'); exports.TrackingEventErrorInfo = require('./trackingEventErrorInfo'); exports.TrackingEvent = require('./trackingEvent'); exports.TrackingEventsDefinition = require('./trackingEventsDefinition'); -exports.AccessKeyRegenerateActionDefinition = require('./accessKeyRegenerateActionDefinition'); exports.SetTriggerStateActionDefinition = require('./setTriggerStateActionDefinition'); exports.Expression = require('./expression'); exports.ExpressionRoot = require('./expressionRoot'); diff --git a/lib/services/logicManagement/lib/models/integrationAccountAgreement.js b/lib/services/logicManagement/lib/models/integrationAccountAgreement.js index 8d6fbf2571..9d4151172d 100644 --- a/lib/services/logicManagement/lib/models/integrationAccountAgreement.js +++ b/lib/services/logicManagement/lib/models/integrationAccountAgreement.js @@ -1640,7 +1640,8 @@ class IntegrationAccountAgreement extends models['Resource'] { required: true, serializedName: 'properties.agreementType', type: { - name: 'String' + name: 'Enum', + allowedValues: [ 'NotSpecified', 'AS2', 'X12', 'Edifact' ] } }, hostPartner: { diff --git a/lib/services/logicManagement/lib/models/integrationAccountAgreementFilter.js b/lib/services/logicManagement/lib/models/integrationAccountAgreementFilter.js index d2e7dc6d10..b1cebe500f 100644 --- a/lib/services/logicManagement/lib/models/integrationAccountAgreementFilter.js +++ b/lib/services/logicManagement/lib/models/integrationAccountAgreementFilter.js @@ -42,7 +42,8 @@ class IntegrationAccountAgreementFilter { required: true, serializedName: 'agreementType', type: { - name: 'String' + name: 'Enum', + allowedValues: [ 'NotSpecified', 'AS2', 'X12', 'Edifact' ] } } } diff --git a/lib/services/logicManagement/lib/models/recurrenceSchedule.js b/lib/services/logicManagement/lib/models/recurrenceSchedule.js index 1da312ae06..230c1d64e5 100644 --- a/lib/services/logicManagement/lib/models/recurrenceSchedule.js +++ b/lib/services/logicManagement/lib/models/recurrenceSchedule.js @@ -77,7 +77,8 @@ class RecurrenceSchedule { required: false, serializedName: 'DaysOfWeekElementType', type: { - name: 'String' + name: 'Enum', + allowedValues: [ 'Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday' ] } } } diff --git a/lib/services/logicManagement/lib/models/recurrenceScheduleOccurrence.js b/lib/services/logicManagement/lib/models/recurrenceScheduleOccurrence.js index a7fc26e83c..7f5c6c4d67 100644 --- a/lib/services/logicManagement/lib/models/recurrenceScheduleOccurrence.js +++ b/lib/services/logicManagement/lib/models/recurrenceScheduleOccurrence.js @@ -43,7 +43,8 @@ class RecurrenceScheduleOccurrence { required: false, serializedName: 'day', type: { - name: 'String' + name: 'Enum', + allowedValues: [ 'Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday' ] } }, occurrence: { diff --git a/lib/services/logicManagement/lib/models/trackingEvent.js b/lib/services/logicManagement/lib/models/trackingEvent.js index 8f867db570..3fd248e362 100644 --- a/lib/services/logicManagement/lib/models/trackingEvent.js +++ b/lib/services/logicManagement/lib/models/trackingEvent.js @@ -52,7 +52,8 @@ class TrackingEvent { required: true, serializedName: 'eventLevel', type: { - name: 'String' + name: 'Enum', + allowedValues: [ 'LogAlways', 'Critical', 'Error', 'Warning', 'Informational', 'Verbose' ] } }, eventTime: { diff --git a/lib/services/logicManagement/lib/models/x12DelimiterOverrides.js b/lib/services/logicManagement/lib/models/x12DelimiterOverrides.js index 8419e25d08..4543ec7a7d 100644 --- a/lib/services/logicManagement/lib/models/x12DelimiterOverrides.js +++ b/lib/services/logicManagement/lib/models/x12DelimiterOverrides.js @@ -86,7 +86,8 @@ class X12DelimiterOverrides { required: true, serializedName: 'segmentTerminatorSuffix', type: { - name: 'String' + name: 'Enum', + allowedValues: [ 'NotSpecified', 'None', 'CR', 'LF', 'CRLF' ] } }, replaceCharacter: { diff --git a/lib/services/logicManagement/lib/models/x12FramingSettings.js b/lib/services/logicManagement/lib/models/x12FramingSettings.js index a55112394a..ad1e7689ae 100644 --- a/lib/services/logicManagement/lib/models/x12FramingSettings.js +++ b/lib/services/logicManagement/lib/models/x12FramingSettings.js @@ -91,7 +91,8 @@ class X12FramingSettings { required: true, serializedName: 'segmentTerminatorSuffix', type: { - name: 'String' + name: 'Enum', + allowedValues: [ 'NotSpecified', 'None', 'CR', 'LF', 'CRLF' ] } } } diff --git a/lib/services/logicManagement/lib/operations/integrationAccountSessions.js b/lib/services/logicManagement/lib/operations/integrationAccountSessions.js index c0d438517e..5d0e05b9d0 100644 --- a/lib/services/logicManagement/lib/operations/integrationAccountSessions.js +++ b/lib/services/logicManagement/lib/operations/integrationAccountSessions.js @@ -639,13 +639,12 @@ function _deleteMethod(resourceGroupName, integrationAccountName, sessionName, o try { parsedErrorResponse = JSON.parse(responseBody); if (parsedErrorResponse) { - let internalError = null; - if (parsedErrorResponse.error) internalError = parsedErrorResponse.error; - error.code = internalError ? internalError.code : parsedErrorResponse.code; - error.message = internalError ? internalError.message : parsedErrorResponse.message; + if (parsedErrorResponse.error) parsedErrorResponse = parsedErrorResponse.error; + if (parsedErrorResponse.code) error.code = parsedErrorResponse.code; + if (parsedErrorResponse.message) error.message = parsedErrorResponse.message; } if (parsedErrorResponse !== null && parsedErrorResponse !== undefined) { - let resultMapper = new client.models['ErrorResponse']().mapper(); + let resultMapper = new client.models['CloudError']().mapper(); error.body = client.deserialize(resultMapper, parsedErrorResponse, 'error.body'); } } catch (defaultError) { diff --git a/lib/services/logicManagement/package.json b/lib/services/logicManagement/package.json index 55cc9935e6..465009742a 100644 --- a/lib/services/logicManagement/package.json +++ b/lib/services/logicManagement/package.json @@ -2,7 +2,7 @@ "name": "azure-arm-logic", "author": "Microsoft Corporation", "description": "LogicManagementClient Library with typescript type definitions for node", - "version": "3.0.0", + "version": "2.0.0", "dependencies": { "ms-rest": "^2.3.3", "ms-rest-azure": "^2.5.5" @@ -14,7 +14,7 @@ "license": "MIT", "main": "./lib/logicManagementClient.js", "types": "./lib/logicManagementClient.d.ts", - "homepage": "https://github.com/azure/azure-sdk-for-node/tree/master/lib/services/logicManagement", + "homepage": "https://github.com/azure/azure-sdk-for-node", "repository": { "type": "git", "url": "https://github.com/azure/azure-sdk-for-node.git" From 8b9dd7e74c07c7570c2a15e9bb841329fb7103d4 Mon Sep 17 00:00:00 2001 From: Dan Schulte Date: Mon, 10 Sep 2018 12:35:08 -0700 Subject: [PATCH 2/4] Regenerate azure-arm-logic --- .../lib/models/edifactDelimiterOverride.js | 6 ++---- .../lib/models/edifactFramingSettings.js | 6 ++---- lib/services/logicManagement/lib/models/index.d.ts | 11 +++++++++++ lib/services/logicManagement/lib/models/index.js | 1 + .../lib/models/integrationAccountAgreement.js | 3 +-- .../lib/models/integrationAccountAgreementFilter.js | 3 +-- .../logicManagement/lib/models/recurrenceSchedule.js | 3 +-- .../lib/models/recurrenceScheduleOccurrence.js | 3 +-- .../logicManagement/lib/models/trackingEvent.js | 3 +-- .../lib/models/x12DelimiterOverrides.js | 3 +-- .../logicManagement/lib/models/x12FramingSettings.js | 3 +-- .../lib/operations/integrationAccountSessions.js | 9 +++++---- lib/services/logicManagement/package.json | 2 +- 13 files changed, 29 insertions(+), 27 deletions(-) diff --git a/lib/services/logicManagement/lib/models/edifactDelimiterOverride.js b/lib/services/logicManagement/lib/models/edifactDelimiterOverride.js index 964455ae94..392a9afb88 100644 --- a/lib/services/logicManagement/lib/models/edifactDelimiterOverride.js +++ b/lib/services/logicManagement/lib/models/edifactDelimiterOverride.js @@ -104,16 +104,14 @@ class EdifactDelimiterOverride { required: true, serializedName: 'segmentTerminatorSuffix', type: { - name: 'Enum', - allowedValues: [ 'NotSpecified', 'None', 'CR', 'LF', 'CRLF' ] + name: 'String' } }, decimalPointIndicator: { required: true, serializedName: 'decimalPointIndicator', type: { - name: 'Enum', - allowedValues: [ 'NotSpecified', 'Comma', 'Decimal' ] + name: 'String' } }, releaseIndicator: { diff --git a/lib/services/logicManagement/lib/models/edifactFramingSettings.js b/lib/services/logicManagement/lib/models/edifactFramingSettings.js index 57f9d9b279..6467082a1e 100644 --- a/lib/services/logicManagement/lib/models/edifactFramingSettings.js +++ b/lib/services/logicManagement/lib/models/edifactFramingSettings.js @@ -120,16 +120,14 @@ class EdifactFramingSettings { required: true, serializedName: 'decimalPointIndicator', type: { - name: 'Enum', - allowedValues: [ 'NotSpecified', 'Comma', 'Decimal' ] + name: 'String' } }, segmentTerminatorSuffix: { required: true, serializedName: 'segmentTerminatorSuffix', type: { - name: 'Enum', - allowedValues: [ 'NotSpecified', 'None', 'CR', 'LF', 'CRLF' ] + name: 'String' } } } diff --git a/lib/services/logicManagement/lib/models/index.d.ts b/lib/services/logicManagement/lib/models/index.d.ts index 111214b220..404e82af6d 100644 --- a/lib/services/logicManagement/lib/models/index.d.ts +++ b/lib/services/logicManagement/lib/models/index.d.ts @@ -7983,6 +7983,17 @@ export interface TrackingEventsDefinition { events: TrackingEvent[]; } +/** + * @class + * Initializes a new instance of the AccessKeyRegenerateActionDefinition class. + * @constructor + * @member {string} keyType Possible values include: 'NotSpecified', 'Primary', + * 'Secondary' + */ +export interface AccessKeyRegenerateActionDefinition { + keyType: string; +} + /** * @class * Initializes a new instance of the SetTriggerStateActionDefinition class. diff --git a/lib/services/logicManagement/lib/models/index.js b/lib/services/logicManagement/lib/models/index.js index 10b110b832..3f8db40b00 100644 --- a/lib/services/logicManagement/lib/models/index.js +++ b/lib/services/logicManagement/lib/models/index.js @@ -119,6 +119,7 @@ exports.KeyVaultKey = require('./keyVaultKey'); exports.TrackingEventErrorInfo = require('./trackingEventErrorInfo'); exports.TrackingEvent = require('./trackingEvent'); exports.TrackingEventsDefinition = require('./trackingEventsDefinition'); +exports.AccessKeyRegenerateActionDefinition = require('./accessKeyRegenerateActionDefinition'); exports.SetTriggerStateActionDefinition = require('./setTriggerStateActionDefinition'); exports.Expression = require('./expression'); exports.ExpressionRoot = require('./expressionRoot'); diff --git a/lib/services/logicManagement/lib/models/integrationAccountAgreement.js b/lib/services/logicManagement/lib/models/integrationAccountAgreement.js index 9d4151172d..8d6fbf2571 100644 --- a/lib/services/logicManagement/lib/models/integrationAccountAgreement.js +++ b/lib/services/logicManagement/lib/models/integrationAccountAgreement.js @@ -1640,8 +1640,7 @@ class IntegrationAccountAgreement extends models['Resource'] { required: true, serializedName: 'properties.agreementType', type: { - name: 'Enum', - allowedValues: [ 'NotSpecified', 'AS2', 'X12', 'Edifact' ] + name: 'String' } }, hostPartner: { diff --git a/lib/services/logicManagement/lib/models/integrationAccountAgreementFilter.js b/lib/services/logicManagement/lib/models/integrationAccountAgreementFilter.js index b1cebe500f..d2e7dc6d10 100644 --- a/lib/services/logicManagement/lib/models/integrationAccountAgreementFilter.js +++ b/lib/services/logicManagement/lib/models/integrationAccountAgreementFilter.js @@ -42,8 +42,7 @@ class IntegrationAccountAgreementFilter { required: true, serializedName: 'agreementType', type: { - name: 'Enum', - allowedValues: [ 'NotSpecified', 'AS2', 'X12', 'Edifact' ] + name: 'String' } } } diff --git a/lib/services/logicManagement/lib/models/recurrenceSchedule.js b/lib/services/logicManagement/lib/models/recurrenceSchedule.js index 230c1d64e5..1da312ae06 100644 --- a/lib/services/logicManagement/lib/models/recurrenceSchedule.js +++ b/lib/services/logicManagement/lib/models/recurrenceSchedule.js @@ -77,8 +77,7 @@ class RecurrenceSchedule { required: false, serializedName: 'DaysOfWeekElementType', type: { - name: 'Enum', - allowedValues: [ 'Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday' ] + name: 'String' } } } diff --git a/lib/services/logicManagement/lib/models/recurrenceScheduleOccurrence.js b/lib/services/logicManagement/lib/models/recurrenceScheduleOccurrence.js index 7f5c6c4d67..a7fc26e83c 100644 --- a/lib/services/logicManagement/lib/models/recurrenceScheduleOccurrence.js +++ b/lib/services/logicManagement/lib/models/recurrenceScheduleOccurrence.js @@ -43,8 +43,7 @@ class RecurrenceScheduleOccurrence { required: false, serializedName: 'day', type: { - name: 'Enum', - allowedValues: [ 'Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday' ] + name: 'String' } }, occurrence: { diff --git a/lib/services/logicManagement/lib/models/trackingEvent.js b/lib/services/logicManagement/lib/models/trackingEvent.js index 3fd248e362..8f867db570 100644 --- a/lib/services/logicManagement/lib/models/trackingEvent.js +++ b/lib/services/logicManagement/lib/models/trackingEvent.js @@ -52,8 +52,7 @@ class TrackingEvent { required: true, serializedName: 'eventLevel', type: { - name: 'Enum', - allowedValues: [ 'LogAlways', 'Critical', 'Error', 'Warning', 'Informational', 'Verbose' ] + name: 'String' } }, eventTime: { diff --git a/lib/services/logicManagement/lib/models/x12DelimiterOverrides.js b/lib/services/logicManagement/lib/models/x12DelimiterOverrides.js index 4543ec7a7d..8419e25d08 100644 --- a/lib/services/logicManagement/lib/models/x12DelimiterOverrides.js +++ b/lib/services/logicManagement/lib/models/x12DelimiterOverrides.js @@ -86,8 +86,7 @@ class X12DelimiterOverrides { required: true, serializedName: 'segmentTerminatorSuffix', type: { - name: 'Enum', - allowedValues: [ 'NotSpecified', 'None', 'CR', 'LF', 'CRLF' ] + name: 'String' } }, replaceCharacter: { diff --git a/lib/services/logicManagement/lib/models/x12FramingSettings.js b/lib/services/logicManagement/lib/models/x12FramingSettings.js index ad1e7689ae..a55112394a 100644 --- a/lib/services/logicManagement/lib/models/x12FramingSettings.js +++ b/lib/services/logicManagement/lib/models/x12FramingSettings.js @@ -91,8 +91,7 @@ class X12FramingSettings { required: true, serializedName: 'segmentTerminatorSuffix', type: { - name: 'Enum', - allowedValues: [ 'NotSpecified', 'None', 'CR', 'LF', 'CRLF' ] + name: 'String' } } } diff --git a/lib/services/logicManagement/lib/operations/integrationAccountSessions.js b/lib/services/logicManagement/lib/operations/integrationAccountSessions.js index 5d0e05b9d0..c0d438517e 100644 --- a/lib/services/logicManagement/lib/operations/integrationAccountSessions.js +++ b/lib/services/logicManagement/lib/operations/integrationAccountSessions.js @@ -639,12 +639,13 @@ function _deleteMethod(resourceGroupName, integrationAccountName, sessionName, o try { parsedErrorResponse = JSON.parse(responseBody); if (parsedErrorResponse) { - if (parsedErrorResponse.error) parsedErrorResponse = parsedErrorResponse.error; - if (parsedErrorResponse.code) error.code = parsedErrorResponse.code; - if (parsedErrorResponse.message) error.message = parsedErrorResponse.message; + let internalError = null; + if (parsedErrorResponse.error) internalError = parsedErrorResponse.error; + error.code = internalError ? internalError.code : parsedErrorResponse.code; + error.message = internalError ? internalError.message : parsedErrorResponse.message; } if (parsedErrorResponse !== null && parsedErrorResponse !== undefined) { - let resultMapper = new client.models['CloudError']().mapper(); + let resultMapper = new client.models['ErrorResponse']().mapper(); error.body = client.deserialize(resultMapper, parsedErrorResponse, 'error.body'); } } catch (defaultError) { diff --git a/lib/services/logicManagement/package.json b/lib/services/logicManagement/package.json index 465009742a..a6ff42351a 100644 --- a/lib/services/logicManagement/package.json +++ b/lib/services/logicManagement/package.json @@ -14,7 +14,7 @@ "license": "MIT", "main": "./lib/logicManagementClient.js", "types": "./lib/logicManagementClient.d.ts", - "homepage": "https://github.com/azure/azure-sdk-for-node", + "homepage": "https://github.com/azure/azure-sdk-for-node/tree/master/lib/services/logicManagement", "repository": { "type": "git", "url": "https://github.com/azure/azure-sdk-for-node.git" From 0445e7c95ddd6e946172579b2b32a330ebcaadfa Mon Sep 17 00:00:00 2001 From: Dan Schulte Date: Mon, 10 Sep 2018 12:35:30 -0700 Subject: [PATCH 3/4] Update azure-arm-logic to 4.0.0 --- lib/services/logicManagement/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/services/logicManagement/package.json b/lib/services/logicManagement/package.json index a6ff42351a..a65f3ef675 100644 --- a/lib/services/logicManagement/package.json +++ b/lib/services/logicManagement/package.json @@ -2,7 +2,7 @@ "name": "azure-arm-logic", "author": "Microsoft Corporation", "description": "LogicManagementClient Library with typescript type definitions for node", - "version": "2.0.0", + "version": "4.0.0", "dependencies": { "ms-rest": "^2.3.3", "ms-rest-azure": "^2.5.5" From 2ca1cfec6fbab3be72e98c13f4c44a3406a8a267 Mon Sep 17 00:00:00 2001 From: Dan Schulte Date: Mon, 10 Sep 2018 12:40:07 -0700 Subject: [PATCH 4/4] Regenerate azure-arm-logic --- .../lib/models/edifactDelimiterOverride.js | 6 ++++-- .../lib/models/edifactFramingSettings.js | 6 ++++-- lib/services/logicManagement/lib/models/index.d.ts | 11 ----------- lib/services/logicManagement/lib/models/index.js | 1 - .../lib/models/integrationAccountAgreement.js | 3 ++- .../lib/models/integrationAccountAgreementFilter.js | 3 ++- .../logicManagement/lib/models/recurrenceSchedule.js | 3 ++- .../lib/models/recurrenceScheduleOccurrence.js | 3 ++- .../logicManagement/lib/models/trackingEvent.js | 3 ++- .../lib/models/x12DelimiterOverrides.js | 3 ++- .../logicManagement/lib/models/x12FramingSettings.js | 3 ++- .../lib/operations/integrationAccountSessions.js | 9 ++++----- 12 files changed, 26 insertions(+), 28 deletions(-) diff --git a/lib/services/logicManagement/lib/models/edifactDelimiterOverride.js b/lib/services/logicManagement/lib/models/edifactDelimiterOverride.js index 392a9afb88..964455ae94 100644 --- a/lib/services/logicManagement/lib/models/edifactDelimiterOverride.js +++ b/lib/services/logicManagement/lib/models/edifactDelimiterOverride.js @@ -104,14 +104,16 @@ class EdifactDelimiterOverride { required: true, serializedName: 'segmentTerminatorSuffix', type: { - name: 'String' + name: 'Enum', + allowedValues: [ 'NotSpecified', 'None', 'CR', 'LF', 'CRLF' ] } }, decimalPointIndicator: { required: true, serializedName: 'decimalPointIndicator', type: { - name: 'String' + name: 'Enum', + allowedValues: [ 'NotSpecified', 'Comma', 'Decimal' ] } }, releaseIndicator: { diff --git a/lib/services/logicManagement/lib/models/edifactFramingSettings.js b/lib/services/logicManagement/lib/models/edifactFramingSettings.js index 6467082a1e..57f9d9b279 100644 --- a/lib/services/logicManagement/lib/models/edifactFramingSettings.js +++ b/lib/services/logicManagement/lib/models/edifactFramingSettings.js @@ -120,14 +120,16 @@ class EdifactFramingSettings { required: true, serializedName: 'decimalPointIndicator', type: { - name: 'String' + name: 'Enum', + allowedValues: [ 'NotSpecified', 'Comma', 'Decimal' ] } }, segmentTerminatorSuffix: { required: true, serializedName: 'segmentTerminatorSuffix', type: { - name: 'String' + name: 'Enum', + allowedValues: [ 'NotSpecified', 'None', 'CR', 'LF', 'CRLF' ] } } } diff --git a/lib/services/logicManagement/lib/models/index.d.ts b/lib/services/logicManagement/lib/models/index.d.ts index 404e82af6d..111214b220 100644 --- a/lib/services/logicManagement/lib/models/index.d.ts +++ b/lib/services/logicManagement/lib/models/index.d.ts @@ -7983,17 +7983,6 @@ export interface TrackingEventsDefinition { events: TrackingEvent[]; } -/** - * @class - * Initializes a new instance of the AccessKeyRegenerateActionDefinition class. - * @constructor - * @member {string} keyType Possible values include: 'NotSpecified', 'Primary', - * 'Secondary' - */ -export interface AccessKeyRegenerateActionDefinition { - keyType: string; -} - /** * @class * Initializes a new instance of the SetTriggerStateActionDefinition class. diff --git a/lib/services/logicManagement/lib/models/index.js b/lib/services/logicManagement/lib/models/index.js index 3f8db40b00..10b110b832 100644 --- a/lib/services/logicManagement/lib/models/index.js +++ b/lib/services/logicManagement/lib/models/index.js @@ -119,7 +119,6 @@ exports.KeyVaultKey = require('./keyVaultKey'); exports.TrackingEventErrorInfo = require('./trackingEventErrorInfo'); exports.TrackingEvent = require('./trackingEvent'); exports.TrackingEventsDefinition = require('./trackingEventsDefinition'); -exports.AccessKeyRegenerateActionDefinition = require('./accessKeyRegenerateActionDefinition'); exports.SetTriggerStateActionDefinition = require('./setTriggerStateActionDefinition'); exports.Expression = require('./expression'); exports.ExpressionRoot = require('./expressionRoot'); diff --git a/lib/services/logicManagement/lib/models/integrationAccountAgreement.js b/lib/services/logicManagement/lib/models/integrationAccountAgreement.js index 8d6fbf2571..9d4151172d 100644 --- a/lib/services/logicManagement/lib/models/integrationAccountAgreement.js +++ b/lib/services/logicManagement/lib/models/integrationAccountAgreement.js @@ -1640,7 +1640,8 @@ class IntegrationAccountAgreement extends models['Resource'] { required: true, serializedName: 'properties.agreementType', type: { - name: 'String' + name: 'Enum', + allowedValues: [ 'NotSpecified', 'AS2', 'X12', 'Edifact' ] } }, hostPartner: { diff --git a/lib/services/logicManagement/lib/models/integrationAccountAgreementFilter.js b/lib/services/logicManagement/lib/models/integrationAccountAgreementFilter.js index d2e7dc6d10..b1cebe500f 100644 --- a/lib/services/logicManagement/lib/models/integrationAccountAgreementFilter.js +++ b/lib/services/logicManagement/lib/models/integrationAccountAgreementFilter.js @@ -42,7 +42,8 @@ class IntegrationAccountAgreementFilter { required: true, serializedName: 'agreementType', type: { - name: 'String' + name: 'Enum', + allowedValues: [ 'NotSpecified', 'AS2', 'X12', 'Edifact' ] } } } diff --git a/lib/services/logicManagement/lib/models/recurrenceSchedule.js b/lib/services/logicManagement/lib/models/recurrenceSchedule.js index 1da312ae06..230c1d64e5 100644 --- a/lib/services/logicManagement/lib/models/recurrenceSchedule.js +++ b/lib/services/logicManagement/lib/models/recurrenceSchedule.js @@ -77,7 +77,8 @@ class RecurrenceSchedule { required: false, serializedName: 'DaysOfWeekElementType', type: { - name: 'String' + name: 'Enum', + allowedValues: [ 'Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday' ] } } } diff --git a/lib/services/logicManagement/lib/models/recurrenceScheduleOccurrence.js b/lib/services/logicManagement/lib/models/recurrenceScheduleOccurrence.js index a7fc26e83c..7f5c6c4d67 100644 --- a/lib/services/logicManagement/lib/models/recurrenceScheduleOccurrence.js +++ b/lib/services/logicManagement/lib/models/recurrenceScheduleOccurrence.js @@ -43,7 +43,8 @@ class RecurrenceScheduleOccurrence { required: false, serializedName: 'day', type: { - name: 'String' + name: 'Enum', + allowedValues: [ 'Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday' ] } }, occurrence: { diff --git a/lib/services/logicManagement/lib/models/trackingEvent.js b/lib/services/logicManagement/lib/models/trackingEvent.js index 8f867db570..3fd248e362 100644 --- a/lib/services/logicManagement/lib/models/trackingEvent.js +++ b/lib/services/logicManagement/lib/models/trackingEvent.js @@ -52,7 +52,8 @@ class TrackingEvent { required: true, serializedName: 'eventLevel', type: { - name: 'String' + name: 'Enum', + allowedValues: [ 'LogAlways', 'Critical', 'Error', 'Warning', 'Informational', 'Verbose' ] } }, eventTime: { diff --git a/lib/services/logicManagement/lib/models/x12DelimiterOverrides.js b/lib/services/logicManagement/lib/models/x12DelimiterOverrides.js index 8419e25d08..4543ec7a7d 100644 --- a/lib/services/logicManagement/lib/models/x12DelimiterOverrides.js +++ b/lib/services/logicManagement/lib/models/x12DelimiterOverrides.js @@ -86,7 +86,8 @@ class X12DelimiterOverrides { required: true, serializedName: 'segmentTerminatorSuffix', type: { - name: 'String' + name: 'Enum', + allowedValues: [ 'NotSpecified', 'None', 'CR', 'LF', 'CRLF' ] } }, replaceCharacter: { diff --git a/lib/services/logicManagement/lib/models/x12FramingSettings.js b/lib/services/logicManagement/lib/models/x12FramingSettings.js index a55112394a..ad1e7689ae 100644 --- a/lib/services/logicManagement/lib/models/x12FramingSettings.js +++ b/lib/services/logicManagement/lib/models/x12FramingSettings.js @@ -91,7 +91,8 @@ class X12FramingSettings { required: true, serializedName: 'segmentTerminatorSuffix', type: { - name: 'String' + name: 'Enum', + allowedValues: [ 'NotSpecified', 'None', 'CR', 'LF', 'CRLF' ] } } } diff --git a/lib/services/logicManagement/lib/operations/integrationAccountSessions.js b/lib/services/logicManagement/lib/operations/integrationAccountSessions.js index c0d438517e..5d0e05b9d0 100644 --- a/lib/services/logicManagement/lib/operations/integrationAccountSessions.js +++ b/lib/services/logicManagement/lib/operations/integrationAccountSessions.js @@ -639,13 +639,12 @@ function _deleteMethod(resourceGroupName, integrationAccountName, sessionName, o try { parsedErrorResponse = JSON.parse(responseBody); if (parsedErrorResponse) { - let internalError = null; - if (parsedErrorResponse.error) internalError = parsedErrorResponse.error; - error.code = internalError ? internalError.code : parsedErrorResponse.code; - error.message = internalError ? internalError.message : parsedErrorResponse.message; + if (parsedErrorResponse.error) parsedErrorResponse = parsedErrorResponse.error; + if (parsedErrorResponse.code) error.code = parsedErrorResponse.code; + if (parsedErrorResponse.message) error.message = parsedErrorResponse.message; } if (parsedErrorResponse !== null && parsedErrorResponse !== undefined) { - let resultMapper = new client.models['ErrorResponse']().mapper(); + let resultMapper = new client.models['CloudError']().mapper(); error.body = client.deserialize(resultMapper, parsedErrorResponse, 'error.body'); } } catch (defaultError) {