Skip to content
This repository was archived by the owner on May 5, 2023. It is now read-only.

[AutoPR automation/resource-manager] Fixing the spec for DSCConfigurations. #3446

Merged
AutorestCI merged 1 commit into from
Aug 28, 2018
Merged

[AutoPR automation/resource-manager] Fixing the spec for DSCConfigurations. #3446

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 14 additions & 37 deletions lib/services/automationManagement/lib/operations/dscConfigurationOperations.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -802,7 +802,7 @@ function _update(resourceGroupName, automationAccountName, configurationName, op
*
* {Error} err - The Error object if an error occurred, null otherwise.
*
* {string} [result] - The deserialized result object if an error did not occur.
* {object} [result] - The deserialized result object if an error did not occur.
*
* {object} [request] - The HTTP Request object if an error did not occur.
*
Expand Down Expand Up @@ -889,28 +889,29 @@ function _getContent(resourceGroupName, automationAccountName, configurationName
}
httpRequest.body = null;
// Send Request
httpRequest.streamedResponse = true;
return client.pipeline(httpRequest, (err, response, responseBody) => {
if (err) {
return callback(err);
}

let statusCode = response.statusCode;
if (statusCode !== 200) {
let error = new Error(responseBody);
let error = new Error(`Unexpected status code: ${statusCode}`);
error.statusCode = response.statusCode;
error.request = msRest.stripRequest(httpRequest);
error.response = msRest.stripResponse(response);
if (responseBody === '') responseBody = null;
let parsedErrorResponse;
try {
parsedErrorResponse = JSON.parse(responseBody);
if (responseBody !== undefined) 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) {
Expand All @@ -920,33 +921,9 @@ function _getContent(resourceGroupName, automationAccountName, configurationName
}
return callback(error);
}
// Create Result
let result = null;
if (responseBody === '') responseBody = null;
// Deserialize Response
if (statusCode === 200) {
let parsedResponse = null;
try {
parsedResponse = JSON.parse(responseBody);
result = JSON.parse(responseBody);
if (parsedResponse !== null && parsedResponse !== undefined) {
let resultMapper = {
required: false,
serializedName: 'parsedResponse',
type: {
name: 'String'
}
};
result = client.deserialize(resultMapper, parsedResponse, 'result');
}
} catch (error) {
let deserializationError = new Error(`Error ${error} occurred in deserializing the responseBody - ${responseBody}`);
deserializationError.request = msRest.stripRequest(httpRequest);
deserializationError.response = msRest.stripResponse(response);
return callback(deserializationError);
}
}

// Create Result
let result = response;
return callback(null, result, httpRequest, response);
});
}
Expand Down Expand Up @@ -1829,7 +1806,7 @@ class DscConfigurationOperations {
*
* @returns {Promise} A promise is returned
*
* @resolve {HttpOperationResponse<String>} - The deserialized result object.
* @resolve {HttpOperationResponse<Object>} - The deserialized result object.
*
* @reject {Error} - The error object.
*/
Expand Down Expand Up @@ -1868,15 +1845,15 @@ class DscConfigurationOperations {
*
* {Promise} A promise is returned
*
* @resolve {String} - The deserialized result object.
* @resolve {Object} - The deserialized result object.
*
* @reject {Error} - The error object.
*
* {function} optionalCallback(err, result, request, response)
*
* {Error} err - The Error object if an error occurred, null otherwise.
*
* {string} [result] - The deserialized result object if an error did not occur.
* {object} [result] - The deserialized result object if an error did not occur.
*
* {object} [request] - The HTTP Request object if an error did not occur.
*
Expand Down
14 changes: 7 additions & 7 deletions lib/services/automationManagement/lib/operations/index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2919,11 +2919,11 @@ export interface DscConfigurationOperations {
*
* @returns {Promise} A promise is returned
*
* @resolve {HttpOperationResponse<String>} - The deserialized result object.
* @resolve {HttpOperationResponse<Object>} - The deserialized result object.
*
* @reject {Error|ServiceError} - The error object.
*/
getContentWithHttpOperationResponse(resourceGroupName: string, automationAccountName: string, configurationName: string, options?: { customHeaders? : { [headerName: string]: string; } }): Promise<HttpOperationResponse<string>>;
getContentWithHttpOperationResponse(resourceGroupName: string, automationAccountName: string, configurationName: string, options?: { customHeaders? : { [headerName: string]: string; } }): Promise<HttpOperationResponse<stream.Readable>>;

/**
* Retrieve the configuration script identified by configuration name.
Expand All @@ -2946,23 +2946,23 @@ export interface DscConfigurationOperations {
*
* {Promise} A promise is returned.
*
* @resolve {String} - The deserialized result object.
* @resolve {Object} - 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.
*
* {String} [result] - The deserialized result object if an error did not occur.
* {Object} [result] - The deserialized result object if an error did not occur.
*
* {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.
*/
getContent(resourceGroupName: string, automationAccountName: string, configurationName: string, options?: { customHeaders? : { [headerName: string]: string; } }): Promise<string>;
getContent(resourceGroupName: string, automationAccountName: string, configurationName: string, callback: ServiceCallback<string>): void;
getContent(resourceGroupName: string, automationAccountName: string, configurationName: string, options: { customHeaders? : { [headerName: string]: string; } }, callback: ServiceCallback<string>): void;
getContent(resourceGroupName: string, automationAccountName: string, configurationName: string, options?: { customHeaders? : { [headerName: string]: string; } }): Promise<stream.Readable>;
getContent(resourceGroupName: string, automationAccountName: string, configurationName: string, callback: ServiceCallback<stream.Readable>): void;
getContent(resourceGroupName: string, automationAccountName: string, configurationName: string, options: { customHeaders? : { [headerName: string]: string; } }, callback: ServiceCallback<stream.Readable>): void;


/**
Expand Down