diff --git a/lib/services/sqlManagement2/lib/operations/databaseVulnerabilityAssessmentRuleBaselines.js b/lib/services/sqlManagement2/lib/operations/databaseVulnerabilityAssessmentRuleBaselines.js index 7a53ad9ef5..e896a697f7 100644 --- a/lib/services/sqlManagement2/lib/operations/databaseVulnerabilityAssessmentRuleBaselines.js +++ b/lib/services/sqlManagement2/lib/operations/databaseVulnerabilityAssessmentRuleBaselines.js @@ -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 @@ -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') { @@ -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 { @@ -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.'); } @@ -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 @@ -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') { @@ -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 { @@ -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.'); } @@ -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 @@ -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') { @@ -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 { @@ -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.'); } @@ -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 @@ -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); } @@ -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 @@ -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') { @@ -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); } } @@ -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 @@ -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); } @@ -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 @@ -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') { @@ -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); } } @@ -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 @@ -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); } @@ -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 @@ -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') { @@ -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); } } diff --git a/lib/services/sqlManagement2/lib/operations/index.d.ts b/lib/services/sqlManagement2/lib/operations/index.d.ts index a2e56574ad..f120954a02 100644 --- a/lib/services/sqlManagement2/lib/operations/index.d.ts +++ b/lib/services/sqlManagement2/lib/operations/index.d.ts @@ -16616,6 +16616,10 @@ export interface 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 @@ -16627,7 +16631,7 @@ export interface DatabaseVulnerabilityAssessmentRuleBaselines { * * @reject {Error|ServiceError} - The error object. */ - getWithHttpOperationResponse(resourceGroupName: string, serverName: string, databaseName: string, ruleId: string, options?: { customHeaders? : { [headerName: string]: string; } }): Promise>; + getWithHttpOperationResponse(resourceGroupName: string, serverName: string, databaseName: string, ruleId: string, baselineName: string, options?: { customHeaders? : { [headerName: string]: string; } }): Promise>; /** * Gets a database's vulnerability assessment rule baseline. @@ -16643,6 +16647,10 @@ export interface 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 @@ -16671,9 +16679,9 @@ export interface DatabaseVulnerabilityAssessmentRuleBaselines { * * {http.IncomingMessage} [response] - The HTTP Response stream if an error did not occur. */ - get(resourceGroupName: string, serverName: string, databaseName: string, ruleId: string, options?: { customHeaders? : { [headerName: string]: string; } }): Promise; - get(resourceGroupName: string, serverName: string, databaseName: string, ruleId: string, callback: ServiceCallback): void; - get(resourceGroupName: string, serverName: string, databaseName: string, ruleId: string, options: { customHeaders? : { [headerName: string]: string; } }, callback: ServiceCallback): void; + get(resourceGroupName: string, serverName: string, databaseName: string, ruleId: string, baselineName: string, options?: { customHeaders? : { [headerName: string]: string; } }): Promise; + get(resourceGroupName: string, serverName: string, databaseName: string, ruleId: string, baselineName: string, callback: ServiceCallback): void; + get(resourceGroupName: string, serverName: string, databaseName: string, ruleId: string, baselineName: string, options: { customHeaders? : { [headerName: string]: string; } }, callback: ServiceCallback): void; /** @@ -16690,6 +16698,10 @@ export interface 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 @@ -16705,7 +16717,7 @@ export interface DatabaseVulnerabilityAssessmentRuleBaselines { * * @reject {Error|ServiceError} - The error object. */ - createOrUpdateWithHttpOperationResponse(resourceGroupName: string, serverName: string, databaseName: string, ruleId: string, parameters: models.DatabaseVulnerabilityAssessmentRuleBaseline, options?: { customHeaders? : { [headerName: string]: string; } }): Promise>; + createOrUpdateWithHttpOperationResponse(resourceGroupName: string, serverName: string, databaseName: string, ruleId: string, baselineName: string, parameters: models.DatabaseVulnerabilityAssessmentRuleBaseline, options?: { customHeaders? : { [headerName: string]: string; } }): Promise>; /** * Creates or updates a database's vulnerability assessment rule baseline. @@ -16721,6 +16733,10 @@ export interface 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 @@ -16753,9 +16769,9 @@ export interface DatabaseVulnerabilityAssessmentRuleBaselines { * * {http.IncomingMessage} [response] - The HTTP Response stream if an error did not occur. */ - createOrUpdate(resourceGroupName: string, serverName: string, databaseName: string, ruleId: string, parameters: models.DatabaseVulnerabilityAssessmentRuleBaseline, options?: { customHeaders? : { [headerName: string]: string; } }): Promise; - createOrUpdate(resourceGroupName: string, serverName: string, databaseName: string, ruleId: string, parameters: models.DatabaseVulnerabilityAssessmentRuleBaseline, callback: ServiceCallback): void; - createOrUpdate(resourceGroupName: string, serverName: string, databaseName: string, ruleId: string, parameters: models.DatabaseVulnerabilityAssessmentRuleBaseline, options: { customHeaders? : { [headerName: string]: string; } }, callback: ServiceCallback): void; + createOrUpdate(resourceGroupName: string, serverName: string, databaseName: string, ruleId: string, baselineName: string, parameters: models.DatabaseVulnerabilityAssessmentRuleBaseline, options?: { customHeaders? : { [headerName: string]: string; } }): Promise; + createOrUpdate(resourceGroupName: string, serverName: string, databaseName: string, ruleId: string, baselineName: string, parameters: models.DatabaseVulnerabilityAssessmentRuleBaseline, callback: ServiceCallback): void; + createOrUpdate(resourceGroupName: string, serverName: string, databaseName: string, ruleId: string, baselineName: string, parameters: models.DatabaseVulnerabilityAssessmentRuleBaseline, options: { customHeaders? : { [headerName: string]: string; } }, callback: ServiceCallback): void; /** @@ -16772,6 +16788,10 @@ export interface 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 @@ -16783,7 +16803,7 @@ export interface DatabaseVulnerabilityAssessmentRuleBaselines { * * @reject {Error|ServiceError} - The error object. */ - deleteMethodWithHttpOperationResponse(resourceGroupName: string, serverName: string, databaseName: string, ruleId: string, options?: { customHeaders? : { [headerName: string]: string; } }): Promise>; + deleteMethodWithHttpOperationResponse(resourceGroupName: string, serverName: string, databaseName: string, ruleId: string, baselineName: string, options?: { customHeaders? : { [headerName: string]: string; } }): Promise>; /** * Removes the database's vulnerability assessment rule baseline. @@ -16799,6 +16819,10 @@ export interface 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 @@ -16825,9 +16849,9 @@ export interface DatabaseVulnerabilityAssessmentRuleBaselines { * * {http.IncomingMessage} [response] - The HTTP Response stream if an error did not occur. */ - deleteMethod(resourceGroupName: string, serverName: string, databaseName: string, ruleId: string, options?: { customHeaders? : { [headerName: string]: string; } }): Promise; - deleteMethod(resourceGroupName: string, serverName: string, databaseName: string, ruleId: string, callback: ServiceCallback): void; - deleteMethod(resourceGroupName: string, serverName: string, databaseName: string, ruleId: string, options: { customHeaders? : { [headerName: string]: string; } }, callback: ServiceCallback): void; + deleteMethod(resourceGroupName: string, serverName: string, databaseName: string, ruleId: string, baselineName: string, options?: { customHeaders? : { [headerName: string]: string; } }): Promise; + deleteMethod(resourceGroupName: string, serverName: string, databaseName: string, ruleId: string, baselineName: string, callback: ServiceCallback): void; + deleteMethod(resourceGroupName: string, serverName: string, databaseName: string, ruleId: string, baselineName: string, options: { customHeaders? : { [headerName: string]: string; } }, callback: ServiceCallback): void; } /**