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

[AutoPR sql/resource-manager] Adding new value to VA baseline name #2914

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ const WebResource = msRest.WebResource;
*
* @param {string} ruleId The vulnerability assessment rule ID.
*
* @param {string} baselineName The name of the vulnerability assessment rule
* baseline (default implies a baseline on a database level rule and master for
* server level rule). Possible values include: 'master', 'default'
*
* @param {object} [options] Optional Parameters.
*
* @param {object} [options.customHeaders] Headers that will be added to the
Expand All @@ -47,7 +51,7 @@ const WebResource = msRest.WebResource;
*
* {stream} [response] - The HTTP Response stream if an error did not occur.
*/
function _get(resourceGroupName, serverName, databaseName, ruleId, options, callback) {
function _get(resourceGroupName, serverName, databaseName, ruleId, baselineName, options, callback) {
/* jshint validthis: true */
let client = this.client;
if(!callback && typeof options === 'function') {
Expand All @@ -58,7 +62,6 @@ function _get(resourceGroupName, serverName, databaseName, ruleId, options, call
throw new Error('callback cannot be null.');
}
let vulnerabilityAssessmentName = 'default';
let baselineName = 'default';
let apiVersion = '2017-03-01-preview';
// Validate
try {
Expand All @@ -74,6 +77,14 @@ function _get(resourceGroupName, serverName, databaseName, ruleId, options, call
if (ruleId === null || ruleId === undefined || typeof ruleId.valueOf() !== 'string') {
throw new Error('ruleId cannot be null or undefined and it must be of type string.');
}
if (baselineName) {
let allowedValues = [ 'master', 'default' ];
if (!allowedValues.some( function(item) { return item === baselineName; })) {
throw new Error(baselineName + ' is not a valid value. The valid values are: ' + allowedValues);
}
} else {
throw new Error('baselineName cannot be null or undefined.');
}
if (this.client.subscriptionId === null || this.client.subscriptionId === undefined || typeof this.client.subscriptionId.valueOf() !== 'string') {
throw new Error('this.client.subscriptionId cannot be null or undefined and it must be of type string.');
}
Expand Down Expand Up @@ -191,6 +202,10 @@ function _get(resourceGroupName, serverName, databaseName, ruleId, options, call
*
* @param {string} ruleId The vulnerability assessment rule ID.
*
* @param {string} baselineName The name of the vulnerability assessment rule
* baseline (default implies a baseline on a database level rule and master for
* server level rule). Possible values include: 'master', 'default'
*
* @param {object} parameters The requested rule baseline resource.
*
* @param {array} parameters.baselineResults The rule baseline result
Expand All @@ -214,7 +229,7 @@ function _get(resourceGroupName, serverName, databaseName, ruleId, options, call
*
* {stream} [response] - The HTTP Response stream if an error did not occur.
*/
function _createOrUpdate(resourceGroupName, serverName, databaseName, ruleId, parameters, options, callback) {
function _createOrUpdate(resourceGroupName, serverName, databaseName, ruleId, baselineName, parameters, options, callback) {
/* jshint validthis: true */
let client = this.client;
if(!callback && typeof options === 'function') {
Expand All @@ -225,7 +240,6 @@ function _createOrUpdate(resourceGroupName, serverName, databaseName, ruleId, pa
throw new Error('callback cannot be null.');
}
let vulnerabilityAssessmentName = 'default';
let baselineName = 'default';
let apiVersion = '2017-03-01-preview';
// Validate
try {
Expand All @@ -241,6 +255,14 @@ function _createOrUpdate(resourceGroupName, serverName, databaseName, ruleId, pa
if (ruleId === null || ruleId === undefined || typeof ruleId.valueOf() !== 'string') {
throw new Error('ruleId cannot be null or undefined and it must be of type string.');
}
if (baselineName) {
let allowedValues = [ 'master', 'default' ];
if (!allowedValues.some( function(item) { return item === baselineName; })) {
throw new Error(baselineName + ' is not a valid value. The valid values are: ' + allowedValues);
}
} else {
throw new Error('baselineName cannot be null or undefined.');
}
if (parameters === null || parameters === undefined) {
throw new Error('parameters cannot be null or undefined.');
}
Expand Down Expand Up @@ -375,6 +397,10 @@ function _createOrUpdate(resourceGroupName, serverName, databaseName, ruleId, pa
*
* @param {string} ruleId The vulnerability assessment rule ID.
*
* @param {string} baselineName The name of the vulnerability assessment rule
* baseline (default implies a baseline on a database level rule and master for
* server level rule). Possible values include: 'master', 'default'
*
* @param {object} [options] Optional Parameters.
*
* @param {object} [options.customHeaders] Headers that will be added to the
Expand All @@ -392,7 +418,7 @@ function _createOrUpdate(resourceGroupName, serverName, databaseName, ruleId, pa
*
* {stream} [response] - The HTTP Response stream if an error did not occur.
*/
function _deleteMethod(resourceGroupName, serverName, databaseName, ruleId, options, callback) {
function _deleteMethod(resourceGroupName, serverName, databaseName, ruleId, baselineName, options, callback) {
/* jshint validthis: true */
let client = this.client;
if(!callback && typeof options === 'function') {
Expand All @@ -403,7 +429,6 @@ function _deleteMethod(resourceGroupName, serverName, databaseName, ruleId, opti
throw new Error('callback cannot be null.');
}
let vulnerabilityAssessmentName = 'default';
let baselineName = 'default';
let apiVersion = '2017-03-01-preview';
// Validate
try {
Expand All @@ -419,6 +444,14 @@ function _deleteMethod(resourceGroupName, serverName, databaseName, ruleId, opti
if (ruleId === null || ruleId === undefined || typeof ruleId.valueOf() !== 'string') {
throw new Error('ruleId cannot be null or undefined and it must be of type string.');
}
if (baselineName) {
let allowedValues = [ 'master', 'default' ];
if (!allowedValues.some( function(item) { return item === baselineName; })) {
throw new Error(baselineName + ' is not a valid value. The valid values are: ' + allowedValues);
}
} else {
throw new Error('baselineName cannot be null or undefined.');
}
if (this.client.subscriptionId === null || this.client.subscriptionId === undefined || typeof this.client.subscriptionId.valueOf() !== 'string') {
throw new Error('this.client.subscriptionId cannot be null or undefined and it must be of type string.');
}
Expand Down Expand Up @@ -532,6 +565,10 @@ class DatabaseVulnerabilityAssessmentRuleBaselines {
*
* @param {string} ruleId The vulnerability assessment rule ID.
*
* @param {string} baselineName The name of the vulnerability assessment rule
* baseline (default implies a baseline on a database level rule and master for
* server level rule). Possible values include: 'master', 'default'
*
* @param {object} [options] Optional Parameters.
*
* @param {object} [options.customHeaders] Headers that will be added to the
Expand All @@ -543,11 +580,11 @@ class DatabaseVulnerabilityAssessmentRuleBaselines {
*
* @reject {Error} - The error object.
*/
getWithHttpOperationResponse(resourceGroupName, serverName, databaseName, ruleId, options) {
getWithHttpOperationResponse(resourceGroupName, serverName, databaseName, ruleId, baselineName, options) {
let client = this.client;
let self = this;
return new Promise((resolve, reject) => {
self._get(resourceGroupName, serverName, databaseName, ruleId, options, (err, result, request, response) => {
self._get(resourceGroupName, serverName, databaseName, ruleId, baselineName, options, (err, result, request, response) => {
let httpOperationResponse = new msRest.HttpOperationResponse(request, response);
httpOperationResponse.body = result;
if (err) { reject(err); }
Expand All @@ -571,6 +608,10 @@ class DatabaseVulnerabilityAssessmentRuleBaselines {
*
* @param {string} ruleId The vulnerability assessment rule ID.
*
* @param {string} baselineName The name of the vulnerability assessment rule
* baseline (default implies a baseline on a database level rule and master for
* server level rule). Possible values include: 'master', 'default'
*
* @param {object} [options] Optional Parameters.
*
* @param {object} [options.customHeaders] Headers that will be added to the
Expand Down Expand Up @@ -599,7 +640,7 @@ class DatabaseVulnerabilityAssessmentRuleBaselines {
*
* {stream} [response] - The HTTP Response stream if an error did not occur.
*/
get(resourceGroupName, serverName, databaseName, ruleId, options, optionalCallback) {
get(resourceGroupName, serverName, databaseName, ruleId, baselineName, options, optionalCallback) {
let client = this.client;
let self = this;
if (!optionalCallback && typeof options === 'function') {
Expand All @@ -608,14 +649,14 @@ class DatabaseVulnerabilityAssessmentRuleBaselines {
}
if (!optionalCallback) {
return new Promise((resolve, reject) => {
self._get(resourceGroupName, serverName, databaseName, ruleId, options, (err, result, request, response) => {
self._get(resourceGroupName, serverName, databaseName, ruleId, baselineName, options, (err, result, request, response) => {
if (err) { reject(err); }
else { resolve(result); }
return;
});
});
} else {
return self._get(resourceGroupName, serverName, databaseName, ruleId, options, optionalCallback);
return self._get(resourceGroupName, serverName, databaseName, ruleId, baselineName, options, optionalCallback);
}
}

Expand All @@ -633,6 +674,10 @@ class DatabaseVulnerabilityAssessmentRuleBaselines {
*
* @param {string} ruleId The vulnerability assessment rule ID.
*
* @param {string} baselineName The name of the vulnerability assessment rule
* baseline (default implies a baseline on a database level rule and master for
* server level rule). Possible values include: 'master', 'default'
*
* @param {object} parameters The requested rule baseline resource.
*
* @param {array} parameters.baselineResults The rule baseline result
Expand All @@ -648,11 +693,11 @@ class DatabaseVulnerabilityAssessmentRuleBaselines {
*
* @reject {Error} - The error object.
*/
createOrUpdateWithHttpOperationResponse(resourceGroupName, serverName, databaseName, ruleId, parameters, options) {
createOrUpdateWithHttpOperationResponse(resourceGroupName, serverName, databaseName, ruleId, baselineName, parameters, options) {
let client = this.client;
let self = this;
return new Promise((resolve, reject) => {
self._createOrUpdate(resourceGroupName, serverName, databaseName, ruleId, parameters, options, (err, result, request, response) => {
self._createOrUpdate(resourceGroupName, serverName, databaseName, ruleId, baselineName, parameters, options, (err, result, request, response) => {
let httpOperationResponse = new msRest.HttpOperationResponse(request, response);
httpOperationResponse.body = result;
if (err) { reject(err); }
Expand All @@ -676,6 +721,10 @@ class DatabaseVulnerabilityAssessmentRuleBaselines {
*
* @param {string} ruleId The vulnerability assessment rule ID.
*
* @param {string} baselineName The name of the vulnerability assessment rule
* baseline (default implies a baseline on a database level rule and master for
* server level rule). Possible values include: 'master', 'default'
*
* @param {object} parameters The requested rule baseline resource.
*
* @param {array} parameters.baselineResults The rule baseline result
Expand Down Expand Up @@ -708,7 +757,7 @@ class DatabaseVulnerabilityAssessmentRuleBaselines {
*
* {stream} [response] - The HTTP Response stream if an error did not occur.
*/
createOrUpdate(resourceGroupName, serverName, databaseName, ruleId, parameters, options, optionalCallback) {
createOrUpdate(resourceGroupName, serverName, databaseName, ruleId, baselineName, parameters, options, optionalCallback) {
let client = this.client;
let self = this;
if (!optionalCallback && typeof options === 'function') {
Expand All @@ -717,14 +766,14 @@ class DatabaseVulnerabilityAssessmentRuleBaselines {
}
if (!optionalCallback) {
return new Promise((resolve, reject) => {
self._createOrUpdate(resourceGroupName, serverName, databaseName, ruleId, parameters, options, (err, result, request, response) => {
self._createOrUpdate(resourceGroupName, serverName, databaseName, ruleId, baselineName, parameters, options, (err, result, request, response) => {
if (err) { reject(err); }
else { resolve(result); }
return;
});
});
} else {
return self._createOrUpdate(resourceGroupName, serverName, databaseName, ruleId, parameters, options, optionalCallback);
return self._createOrUpdate(resourceGroupName, serverName, databaseName, ruleId, baselineName, parameters, options, optionalCallback);
}
}

Expand All @@ -742,6 +791,10 @@ class DatabaseVulnerabilityAssessmentRuleBaselines {
*
* @param {string} ruleId The vulnerability assessment rule ID.
*
* @param {string} baselineName The name of the vulnerability assessment rule
* baseline (default implies a baseline on a database level rule and master for
* server level rule). Possible values include: 'master', 'default'
*
* @param {object} [options] Optional Parameters.
*
* @param {object} [options.customHeaders] Headers that will be added to the
Expand All @@ -753,11 +806,11 @@ class DatabaseVulnerabilityAssessmentRuleBaselines {
*
* @reject {Error} - The error object.
*/
deleteMethodWithHttpOperationResponse(resourceGroupName, serverName, databaseName, ruleId, options) {
deleteMethodWithHttpOperationResponse(resourceGroupName, serverName, databaseName, ruleId, baselineName, options) {
let client = this.client;
let self = this;
return new Promise((resolve, reject) => {
self._deleteMethod(resourceGroupName, serverName, databaseName, ruleId, options, (err, result, request, response) => {
self._deleteMethod(resourceGroupName, serverName, databaseName, ruleId, baselineName, options, (err, result, request, response) => {
let httpOperationResponse = new msRest.HttpOperationResponse(request, response);
httpOperationResponse.body = result;
if (err) { reject(err); }
Expand All @@ -781,6 +834,10 @@ class DatabaseVulnerabilityAssessmentRuleBaselines {
*
* @param {string} ruleId The vulnerability assessment rule ID.
*
* @param {string} baselineName The name of the vulnerability assessment rule
* baseline (default implies a baseline on a database level rule and master for
* server level rule). Possible values include: 'master', 'default'
*
* @param {object} [options] Optional Parameters.
*
* @param {object} [options.customHeaders] Headers that will be added to the
Expand All @@ -807,7 +864,7 @@ class DatabaseVulnerabilityAssessmentRuleBaselines {
*
* {stream} [response] - The HTTP Response stream if an error did not occur.
*/
deleteMethod(resourceGroupName, serverName, databaseName, ruleId, options, optionalCallback) {
deleteMethod(resourceGroupName, serverName, databaseName, ruleId, baselineName, options, optionalCallback) {
let client = this.client;
let self = this;
if (!optionalCallback && typeof options === 'function') {
Expand All @@ -816,14 +873,14 @@ class DatabaseVulnerabilityAssessmentRuleBaselines {
}
if (!optionalCallback) {
return new Promise((resolve, reject) => {
self._deleteMethod(resourceGroupName, serverName, databaseName, ruleId, options, (err, result, request, response) => {
self._deleteMethod(resourceGroupName, serverName, databaseName, ruleId, baselineName, options, (err, result, request, response) => {
if (err) { reject(err); }
else { resolve(result); }
return;
});
});
} else {
return self._deleteMethod(resourceGroupName, serverName, databaseName, ruleId, options, optionalCallback);
return self._deleteMethod(resourceGroupName, serverName, databaseName, ruleId, baselineName, options, optionalCallback);
}
}

Expand Down
Loading