Skip to content

Commit 1c9e2ce

Browse files
a7mad-3bbasAhmad Abas
a7mad-3bbas
and
Ahmad Abas
authored
update sql vulnerability assessment swagger according to SQL controller requirements. (#19240)
Co-authored-by: Ahmad Abas <ahabas@microsoft.com>
1 parent ca2e197 commit 1c9e2ce

10 files changed

+365
-399
lines changed

‎specification/sql/resource-manager/Microsoft.Sql/preview/2022-02-01-preview/DatabaseSqlVulnerabilityAssessmentBaselines.json‎

Lines changed: 48 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
"200": {
5959
"description": "Successfully got the sql vulnerability assessment rule baseline list.",
6060
"schema": {
61-
"$ref": "#/definitions/DatabaseSqlVulnerabilityAssessmentRuleBaselineListResult"
61+
"$ref": "#/definitions/DatabaseSqlVulnerabilityAssessmentBaselineSetListResult"
6262
}
6363
},
6464
"default": {
@@ -130,16 +130,13 @@
130130
"200": {
131131
"description": "Successfully got the sql vulnerability assessment rule baseline list.",
132132
"schema": {
133-
"$ref": "#/definitions/DatabaseSqlVulnerabilityAssessmentRuleBaselineListResult"
133+
"$ref": "#/definitions/DatabaseSqlVulnerabilityAssessmentBaselineSet"
134134
}
135135
},
136136
"default": {
137137
"description": "*** Error Responses: ***\n\n * 400 SqlVulnerabilityAssessmentIsDisabled - SQL vulnerability assessment feature is disabled. please enable the feature before executing other SQL vulnerability assessment operations.\n\n * 400 SqlVulnerabilityAssessmentScanResultsAreNotAvailableYet - SQL vulnerability assessment results are not available yet, please try again later.\n\n * 400 SqlVulnerabilityAssessmentInvalidRuleId - The SQL vulnerability assessment rule id is invalid.\n\n * 400 SqlVulnerabilityAssessmentScanDoesNotExist - SQL vulnerability assessment scan does not exist.\n\n * 400 SqlVulnerabilityAssessmentNoBaseline - No baseline have been found for the latest scan in the resource\n\n * 400 SqlVulnerabilityAssessmentNoRuleBaseline - No SQL vulnerability assessment baseline was found\n\n * 400 SqlVulnerabilityAssessmentBaselineNoScanResults - No scan results have been found for rule Id. To set a baseline there must be results for this rule in the latest scan available\n\n * 400 SqlVulnerabilityAssessmentBadBinaryRuleFormat - Input for binary rule is not a boolean representation\n\n * 400 SqlVulnerabilityAssessmentBadRuleFormat - The provided results do not comply with the actual layout of the scan results\n\n * 400 SqlVulnerabilityAssessmentBadRuleWithoutRuleIdFormat - The provided results do not comply with the actual layout of the scan results\n\n * 400 SqlVulnerabilityAssessmentBadBinaryRuleWithoutRuleIdFormat - Input for binary rule is not a boolean representation\n\n * 400 SqlVulnerabilityAssessmentBaselineNoScanResultsWithoutRuleId - No scan results have been found for one of the rules. To set a baseline there must be results for this rule in the latest scan available\n\n * 404 SubscriptionDoesNotHaveServer - The requested server was not found\n\n * 404 SourceDatabaseNotFound - The source database does not exist.\n\n * 404 DatabaseDoesNotExist - User has specified a database name that does not exist on this server instance.\n\n * 409 DatabaseVulnerabilityAssessmentScanIsAlreadyInProgress - SQL Vulnerability Assessment scan is already in progress\n\n * 500 DatabaseIsUnavailable - Loading failed. Please try again later."
138138
}
139139
},
140-
"x-ms-pageable": {
141-
"nextLinkName": "nextLink"
142-
},
143140
"x-ms-examples": {
144141
"Gets a list of database's sql vulnerability assessment rule baselines.": {
145142
"$ref": "./examples/DatabaseSqlVulnerabilityAssessmentBaselineGet.json"
@@ -209,16 +206,13 @@
209206
"200": {
210207
"description": "Successfully add the vulnerability assessment rule baseline list.",
211208
"schema": {
212-
"$ref": "#/definitions/DatabaseSqlVulnerabilityAssessmentRuleBaselineListResult"
209+
"$ref": "#/definitions/DatabaseSqlVulnerabilityAssessmentBaselineSet"
213210
}
214211
},
215212
"default": {
216213
"description": "*** Error Responses: ***\n\n * 400 SqlVulnerabilityAssessmentIsDisabled - SQL vulnerability assessment feature is disabled. please enable the feature before executing other SQL vulnerability assessment operations.\n\n * 400 InvalidVulnerabilityAssessmentOperationRequest - The vulnerability assessment operation request does not exist or has no properties object.\n\n * 400 SqlVulnerabilityAssessmentInvalidUserSuppliedParameter - An invalid parameter value was provided by the client.\n\n * 400 SqlVulnerabilityAssessmentScanResultsAreNotAvailableYet - SQL vulnerability assessment results are not available yet, please try again later.\n\n * 400 SqlVulnerabilityAssessmentInvalidRuleId - The SQL vulnerability assessment rule id is invalid.\n\n * 400 SqlVulnerabilityAssessmentScanDoesNotExist - SQL vulnerability assessment scan does not exist.\n\n * 400 SqlVulnerabilityAssessmentNoBaseline - No baseline have been found for the latest scan in the resource\n\n * 400 SqlVulnerabilityAssessmentNoRuleBaseline - No SQL vulnerability assessment baseline was found\n\n * 400 SqlVulnerabilityAssessmentBaselineNoScanResults - No scan results have been found for rule Id. To set a baseline there must be results for this rule in the latest scan available\n\n * 400 SqlVulnerabilityAssessmentBadBinaryRuleFormat - Input for binary rule is not a boolean representation\n\n * 400 SqlVulnerabilityAssessmentBadRuleFormat - The provided results do not comply with the actual layout of the scan results\n\n * 400 SqlVulnerabilityAssessmentBadRuleWithoutRuleIdFormat - The provided results do not comply with the actual layout of the scan results\n\n * 400 SqlVulnerabilityAssessmentBadBinaryRuleWithoutRuleIdFormat - Input for binary rule is not a boolean representation\n\n * 400 SqlVulnerabilityAssessmentBaselineNoScanResultsWithoutRuleId - No scan results have been found for one of the rules. To set a baseline there must be results for this rule in the latest scan available\n\n * 404 SubscriptionDoesNotHaveServer - The requested server was not found\n\n * 404 SourceDatabaseNotFound - The source database does not exist.\n\n * 404 DatabaseDoesNotExist - User has specified a database name that does not exist on this server instance.\n\n * 409 DatabaseVulnerabilityAssessmentScanIsAlreadyInProgress - SQL Vulnerability Assessment scan is already in progress\n\n * 500 DatabaseIsUnavailable - Loading failed. Please try again later."
217214
}
218215
},
219-
"x-ms-pageable": {
220-
"nextLinkName": "nextLink"
221-
},
222216
"x-ms-examples": {
223217
"Add a database's vulnerability assessment rule baseline list.": {
224218
"$ref": "./examples/DatabaseSqlVulnerabilityAssessmentBaselineAdd.json"
@@ -231,8 +225,8 @@
231225
}
232226
},
233227
"definitions": {
234-
"DatabaseSqlVulnerabilityAssessmentRuleBaseline": {
235-
"description": "A database sql vulnerability assessment rule baseline.",
228+
"DatabaseSqlVulnerabilityAssessmentBaselineSet": {
229+
"description": "A database sql vulnerability assessment baseline set.",
236230
"type": "object",
237231
"allOf": [
238232
{
@@ -242,16 +236,57 @@
242236
"properties": {
243237
"systemData": {
244238
"$ref": "../../../common/v1/types.json#/definitions/systemData",
245-
"description": "SystemData of DatabaseSqlVulnerabilityAssessmentRuleBaselineResource.",
239+
"description": "SystemData of DatabaseSqlVulnerabilityAssessmentBaselineSetResource.",
246240
"readOnly": true
247241
},
248242
"properties": {
249-
"$ref": "#/definitions/DatabaseSqlVulnerabilityAssessmentRuleBaselineProperties",
243+
"$ref": "#/definitions/DatabaseSqlVulnerabilityAssessmentBaselineSetProperties",
250244
"description": "Resource properties.",
251245
"x-ms-client-flatten": true
252246
}
253247
}
254248
},
249+
"DatabaseSqlVulnerabilityAssessmentBaselineSetListResult": {
250+
"description": "A list of SQL Vulnerability Assessments baseline set.",
251+
"type": "object",
252+
"properties": {
253+
"value": {
254+
"description": "Array of results.",
255+
"type": "array",
256+
"items": {
257+
"$ref": "#/definitions/DatabaseSqlVulnerabilityAssessmentBaselineSet"
258+
},
259+
"readOnly": true
260+
},
261+
"nextLink": {
262+
"description": "Link to retrieve next page of results.",
263+
"type": "string",
264+
"readOnly": true
265+
}
266+
}
267+
},
268+
"DatabaseSqlVulnerabilityAssessmentBaselineSetProperties": {
269+
"description": "Properties of a database Sql Vulnerability Assessment baseline set.",
270+
"required": [
271+
"results"
272+
],
273+
"type": "object",
274+
"properties": {
275+
"results": {
276+
"description": "The baseline set result",
277+
"type": "object",
278+
"additionalProperties": {
279+
"type": "array",
280+
"items": {
281+
"type": "array",
282+
"items": {
283+
"type": "string"
284+
}
285+
}
286+
}
287+
}
288+
}
289+
},
255290
"DatabaseSqlVulnerabilityAssessmentRuleBaselineListInput": {
256291
"description": "A database sql vulnerability assessment rule baseline list input.",
257292
"type": "object",
@@ -299,44 +334,6 @@
299334
}
300335
}
301336
}
302-
},
303-
"DatabaseSqlVulnerabilityAssessmentRuleBaselineListResult": {
304-
"description": "A list of SQL Vulnerability Assessments rule baseline.",
305-
"type": "object",
306-
"properties": {
307-
"value": {
308-
"description": "Array of results.",
309-
"type": "array",
310-
"items": {
311-
"$ref": "#/definitions/DatabaseSqlVulnerabilityAssessmentRuleBaseline"
312-
},
313-
"readOnly": true
314-
},
315-
"nextLink": {
316-
"description": "Link to retrieve next page of results.",
317-
"type": "string",
318-
"readOnly": true
319-
}
320-
}
321-
},
322-
"DatabaseSqlVulnerabilityAssessmentRuleBaselineProperties": {
323-
"description": "Properties of a database Sql Vulnerability Assessment rule baseline.",
324-
"required": [
325-
"results"
326-
],
327-
"type": "object",
328-
"properties": {
329-
"results": {
330-
"description": "The rule baseline result",
331-
"type": "array",
332-
"items": {
333-
"type": "array",
334-
"items": {
335-
"type": "string"
336-
}
337-
}
338-
}
339-
}
340337
}
341338
},
342339
"parameters": {

‎specification/sql/resource-manager/Microsoft.Sql/preview/2022-02-01-preview/SqlVulnerabilityAssessmentBaseline.json‎

Lines changed: 48 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
"200": {
7070
"description": "Successfully got the sql vulnerability assessment rule baseline list.",
7171
"schema": {
72-
"$ref": "#/definitions/DatabaseSqlVulnerabilityAssessmentRuleBaselineListResult"
72+
"$ref": "#/definitions/DatabaseSqlVulnerabilityAssessmentBaselineSetListResult"
7373
}
7474
},
7575
"default": {
@@ -152,16 +152,13 @@
152152
"200": {
153153
"description": "Successfully got the sql vulnerability assessment rule baseline list.",
154154
"schema": {
155-
"$ref": "#/definitions/DatabaseSqlVulnerabilityAssessmentRuleBaselineListResult"
155+
"$ref": "#/definitions/DatabaseSqlVulnerabilityAssessmentBaselineSet"
156156
}
157157
},
158158
"default": {
159159
"description": "*** Error Responses: ***\n\n * 400 SqlVulnerabilityAssessmentIsDisabled - SQL vulnerability assessment feature is disabled. please enable the feature before executing other SQL vulnerability assessment operations.\n\n * 400 SqlVulnerabilityAssessmentScanResultsAreNotAvailableYet - SQL vulnerability assessment results are not available yet, please try again later.\n\n * 400 SqlVulnerabilityAssessmentInvalidRuleId - The SQL vulnerability assessment rule id is invalid.\n\n * 400 SqlVulnerabilityAssessmentScanDoesNotExist - SQL vulnerability assessment scan does not exist.\n\n * 400 SqlVulnerabilityAssessmentNoBaseline - No baseline have been found for the latest scan in the resource\n\n * 400 SqlVulnerabilityAssessmentNoRuleBaseline - No SQL vulnerability assessment baseline was found\n\n * 400 SqlVulnerabilityAssessmentBaselineNoScanResults - No scan results have been found for rule Id. To set a baseline there must be results for this rule in the latest scan available\n\n * 400 SqlVulnerabilityAssessmentBadBinaryRuleFormat - Input for binary rule is not a boolean representation\n\n * 400 SqlVulnerabilityAssessmentBadRuleFormat - The provided results do not comply with the actual layout of the scan results\n\n * 400 SqlVulnerabilityAssessmentBadRuleWithoutRuleIdFormat - The provided results do not comply with the actual layout of the scan results\n\n * 400 SqlVulnerabilityAssessmentBadBinaryRuleWithoutRuleIdFormat - Input for binary rule is not a boolean representation\n\n * 400 SqlVulnerabilityAssessmentBaselineNoScanResultsWithoutRuleId - No scan results have been found for one of the rules. To set a baseline there must be results for this rule in the latest scan available\n\n * 404 SubscriptionDoesNotHaveServer - The requested server was not found\n\n * 404 SourceDatabaseNotFound - The source database does not exist.\n\n * 404 DatabaseDoesNotExist - User has specified a database name that does not exist on this server instance.\n\n * 409 DatabaseVulnerabilityAssessmentScanIsAlreadyInProgress - SQL Vulnerability Assessment scan is already in progress\n\n * 500 DatabaseIsUnavailable - Loading failed. Please try again later."
160160
}
161161
},
162-
"x-ms-pageable": {
163-
"nextLinkName": "nextLink"
164-
},
165162
"x-ms-examples": {
166163
"Gets a list of database's sql vulnerability assessment rule baselines.": {
167164
"$ref": "./examples/SqlVulnerabilityAssessmentBaselineGet.json"
@@ -242,16 +239,13 @@
242239
"200": {
243240
"description": "Successfully add the vulnerability assessment rule baseline list.",
244241
"schema": {
245-
"$ref": "#/definitions/DatabaseSqlVulnerabilityAssessmentRuleBaselineListResult"
242+
"$ref": "#/definitions/DatabaseSqlVulnerabilityAssessmentBaselineSet"
246243
}
247244
},
248245
"default": {
249246
"description": "*** Error Responses: ***\n\n * 400 SqlVulnerabilityAssessmentIsDisabled - SQL vulnerability assessment feature is disabled. please enable the feature before executing other SQL vulnerability assessment operations.\n\n * 400 InvalidVulnerabilityAssessmentOperationRequest - The vulnerability assessment operation request does not exist or has no properties object.\n\n * 400 SqlVulnerabilityAssessmentInvalidUserSuppliedParameter - An invalid parameter value was provided by the client.\n\n * 400 SqlVulnerabilityAssessmentScanResultsAreNotAvailableYet - SQL vulnerability assessment results are not available yet, please try again later.\n\n * 400 SqlVulnerabilityAssessmentInvalidRuleId - The SQL vulnerability assessment rule id is invalid.\n\n * 400 SqlVulnerabilityAssessmentScanDoesNotExist - SQL vulnerability assessment scan does not exist.\n\n * 400 SqlVulnerabilityAssessmentNoBaseline - No baseline have been found for the latest scan in the resource\n\n * 400 SqlVulnerabilityAssessmentNoRuleBaseline - No SQL vulnerability assessment baseline was found\n\n * 400 SqlVulnerabilityAssessmentBaselineNoScanResults - No scan results have been found for rule Id. To set a baseline there must be results for this rule in the latest scan available\n\n * 400 SqlVulnerabilityAssessmentBadBinaryRuleFormat - Input for binary rule is not a boolean representation\n\n * 400 SqlVulnerabilityAssessmentBadRuleFormat - The provided results do not comply with the actual layout of the scan results\n\n * 400 SqlVulnerabilityAssessmentBadRuleWithoutRuleIdFormat - The provided results do not comply with the actual layout of the scan results\n\n * 400 SqlVulnerabilityAssessmentBadBinaryRuleWithoutRuleIdFormat - Input for binary rule is not a boolean representation\n\n * 400 SqlVulnerabilityAssessmentBaselineNoScanResultsWithoutRuleId - No scan results have been found for one of the rules. To set a baseline there must be results for this rule in the latest scan available\n\n * 404 SubscriptionDoesNotHaveServer - The requested server was not found\n\n * 404 SourceDatabaseNotFound - The source database does not exist.\n\n * 404 DatabaseDoesNotExist - User has specified a database name that does not exist on this server instance.\n\n * 409 DatabaseVulnerabilityAssessmentScanIsAlreadyInProgress - SQL Vulnerability Assessment scan is already in progress\n\n * 500 DatabaseIsUnavailable - Loading failed. Please try again later."
250247
}
251248
},
252-
"x-ms-pageable": {
253-
"nextLinkName": "nextLink"
254-
},
255249
"x-ms-examples": {
256250
"Add a database's vulnerability assessment rule baseline list.": {
257251
"$ref": "./examples/SqlVulnerabilityAssessmentBaselineAdd.json"
@@ -264,8 +258,8 @@
264258
}
265259
},
266260
"definitions": {
267-
"DatabaseSqlVulnerabilityAssessmentRuleBaseline": {
268-
"description": "A database sql vulnerability assessment rule baseline.",
261+
"DatabaseSqlVulnerabilityAssessmentBaselineSet": {
262+
"description": "A database sql vulnerability assessment baseline set.",
269263
"type": "object",
270264
"allOf": [
271265
{
@@ -275,16 +269,57 @@
275269
"properties": {
276270
"systemData": {
277271
"$ref": "../../../common/v1/types.json#/definitions/systemData",
278-
"description": "SystemData of DatabaseSqlVulnerabilityAssessmentRuleBaselineResource.",
272+
"description": "SystemData of DatabaseSqlVulnerabilityAssessmentBaselineSetResource.",
279273
"readOnly": true
280274
},
281275
"properties": {
282-
"$ref": "#/definitions/DatabaseSqlVulnerabilityAssessmentRuleBaselineProperties",
276+
"$ref": "#/definitions/DatabaseSqlVulnerabilityAssessmentBaselineSetProperties",
283277
"description": "Resource properties.",
284278
"x-ms-client-flatten": true
285279
}
286280
}
287281
},
282+
"DatabaseSqlVulnerabilityAssessmentBaselineSetListResult": {
283+
"description": "A list of SQL Vulnerability Assessments baseline set.",
284+
"type": "object",
285+
"properties": {
286+
"value": {
287+
"description": "Array of results.",
288+
"type": "array",
289+
"items": {
290+
"$ref": "#/definitions/DatabaseSqlVulnerabilityAssessmentBaselineSet"
291+
},
292+
"readOnly": true
293+
},
294+
"nextLink": {
295+
"description": "Link to retrieve next page of results.",
296+
"type": "string",
297+
"readOnly": true
298+
}
299+
}
300+
},
301+
"DatabaseSqlVulnerabilityAssessmentBaselineSetProperties": {
302+
"description": "Properties of a database Sql Vulnerability Assessment baseline set.",
303+
"required": [
304+
"results"
305+
],
306+
"type": "object",
307+
"properties": {
308+
"results": {
309+
"description": "The baseline set result",
310+
"type": "object",
311+
"additionalProperties": {
312+
"type": "array",
313+
"items": {
314+
"type": "array",
315+
"items": {
316+
"type": "string"
317+
}
318+
}
319+
}
320+
}
321+
}
322+
},
288323
"DatabaseSqlVulnerabilityAssessmentRuleBaselineListInput": {
289324
"description": "A database sql vulnerability assessment rule baseline list input.",
290325
"type": "object",
@@ -332,44 +367,6 @@
332367
}
333368
}
334369
}
335-
},
336-
"DatabaseSqlVulnerabilityAssessmentRuleBaselineListResult": {
337-
"description": "A list of SQL Vulnerability Assessments rule baseline.",
338-
"type": "object",
339-
"properties": {
340-
"value": {
341-
"description": "Array of results.",
342-
"type": "array",
343-
"items": {
344-
"$ref": "#/definitions/DatabaseSqlVulnerabilityAssessmentRuleBaseline"
345-
},
346-
"readOnly": true
347-
},
348-
"nextLink": {
349-
"description": "Link to retrieve next page of results.",
350-
"type": "string",
351-
"readOnly": true
352-
}
353-
}
354-
},
355-
"DatabaseSqlVulnerabilityAssessmentRuleBaselineProperties": {
356-
"description": "Properties of a database Sql Vulnerability Assessment rule baseline.",
357-
"required": [
358-
"results"
359-
],
360-
"type": "object",
361-
"properties": {
362-
"results": {
363-
"description": "The rule baseline result",
364-
"type": "array",
365-
"items": {
366-
"type": "array",
367-
"items": {
368-
"type": "string"
369-
}
370-
}
371-
}
372-
}
373370
}
374371
},
375372
"parameters": {

0 commit comments

Comments
 (0)