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..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": "3.0.0", + "version": "4.0.0", "dependencies": { "ms-rest": "^2.3.3", "ms-rest-azure": "^2.5.5"