diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2022-02-01-preview/DatabaseSqlVulnerabilityAssessmentBaselines.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2022-02-01-preview/DatabaseSqlVulnerabilityAssessmentBaselines.json index 05e5726f25a1..6e9ce86255ee 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2022-02-01-preview/DatabaseSqlVulnerabilityAssessmentBaselines.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2022-02-01-preview/DatabaseSqlVulnerabilityAssessmentBaselines.json @@ -58,7 +58,7 @@ "200": { "description": "Successfully got the sql vulnerability assessment rule baseline list.", "schema": { - "$ref": "#/definitions/DatabaseSqlVulnerabilityAssessmentRuleBaselineListResult" + "$ref": "#/definitions/DatabaseSqlVulnerabilityAssessmentBaselineSetListResult" } }, "default": { @@ -130,16 +130,13 @@ "200": { "description": "Successfully got the sql vulnerability assessment rule baseline list.", "schema": { - "$ref": "#/definitions/DatabaseSqlVulnerabilityAssessmentRuleBaselineListResult" + "$ref": "#/definitions/DatabaseSqlVulnerabilityAssessmentBaselineSet" } }, "default": { "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." } }, - "x-ms-pageable": { - "nextLinkName": "nextLink" - }, "x-ms-examples": { "Gets a list of database's sql vulnerability assessment rule baselines.": { "$ref": "./examples/DatabaseSqlVulnerabilityAssessmentBaselineGet.json" @@ -209,16 +206,13 @@ "200": { "description": "Successfully add the vulnerability assessment rule baseline list.", "schema": { - "$ref": "#/definitions/DatabaseSqlVulnerabilityAssessmentRuleBaselineListResult" + "$ref": "#/definitions/DatabaseSqlVulnerabilityAssessmentBaselineSet" } }, "default": { "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." } }, - "x-ms-pageable": { - "nextLinkName": "nextLink" - }, "x-ms-examples": { "Add a database's vulnerability assessment rule baseline list.": { "$ref": "./examples/DatabaseSqlVulnerabilityAssessmentBaselineAdd.json" @@ -231,8 +225,8 @@ } }, "definitions": { - "DatabaseSqlVulnerabilityAssessmentRuleBaseline": { - "description": "A database sql vulnerability assessment rule baseline.", + "DatabaseSqlVulnerabilityAssessmentBaselineSet": { + "description": "A database sql vulnerability assessment baseline set.", "type": "object", "allOf": [ { @@ -242,16 +236,57 @@ "properties": { "systemData": { "$ref": "../../../common/v1/types.json#/definitions/systemData", - "description": "SystemData of DatabaseSqlVulnerabilityAssessmentRuleBaselineResource.", + "description": "SystemData of DatabaseSqlVulnerabilityAssessmentBaselineSetResource.", "readOnly": true }, "properties": { - "$ref": "#/definitions/DatabaseSqlVulnerabilityAssessmentRuleBaselineProperties", + "$ref": "#/definitions/DatabaseSqlVulnerabilityAssessmentBaselineSetProperties", "description": "Resource properties.", "x-ms-client-flatten": true } } }, + "DatabaseSqlVulnerabilityAssessmentBaselineSetListResult": { + "description": "A list of SQL Vulnerability Assessments baseline set.", + "type": "object", + "properties": { + "value": { + "description": "Array of results.", + "type": "array", + "items": { + "$ref": "#/definitions/DatabaseSqlVulnerabilityAssessmentBaselineSet" + }, + "readOnly": true + }, + "nextLink": { + "description": "Link to retrieve next page of results.", + "type": "string", + "readOnly": true + } + } + }, + "DatabaseSqlVulnerabilityAssessmentBaselineSetProperties": { + "description": "Properties of a database Sql Vulnerability Assessment baseline set.", + "required": [ + "results" + ], + "type": "object", + "properties": { + "results": { + "description": "The baseline set result", + "type": "object", + "additionalProperties": { + "type": "array", + "items": { + "type": "array", + "items": { + "type": "string" + } + } + } + } + } + }, "DatabaseSqlVulnerabilityAssessmentRuleBaselineListInput": { "description": "A database sql vulnerability assessment rule baseline list input.", "type": "object", @@ -299,44 +334,6 @@ } } } - }, - "DatabaseSqlVulnerabilityAssessmentRuleBaselineListResult": { - "description": "A list of SQL Vulnerability Assessments rule baseline.", - "type": "object", - "properties": { - "value": { - "description": "Array of results.", - "type": "array", - "items": { - "$ref": "#/definitions/DatabaseSqlVulnerabilityAssessmentRuleBaseline" - }, - "readOnly": true - }, - "nextLink": { - "description": "Link to retrieve next page of results.", - "type": "string", - "readOnly": true - } - } - }, - "DatabaseSqlVulnerabilityAssessmentRuleBaselineProperties": { - "description": "Properties of a database Sql Vulnerability Assessment rule baseline.", - "required": [ - "results" - ], - "type": "object", - "properties": { - "results": { - "description": "The rule baseline result", - "type": "array", - "items": { - "type": "array", - "items": { - "type": "string" - } - } - } - } } }, "parameters": { diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2022-02-01-preview/SqlVulnerabilityAssessmentBaseline.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2022-02-01-preview/SqlVulnerabilityAssessmentBaseline.json index bc43cd540293..11c7bb476a5a 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2022-02-01-preview/SqlVulnerabilityAssessmentBaseline.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2022-02-01-preview/SqlVulnerabilityAssessmentBaseline.json @@ -69,7 +69,7 @@ "200": { "description": "Successfully got the sql vulnerability assessment rule baseline list.", "schema": { - "$ref": "#/definitions/DatabaseSqlVulnerabilityAssessmentRuleBaselineListResult" + "$ref": "#/definitions/DatabaseSqlVulnerabilityAssessmentBaselineSetListResult" } }, "default": { @@ -152,16 +152,13 @@ "200": { "description": "Successfully got the sql vulnerability assessment rule baseline list.", "schema": { - "$ref": "#/definitions/DatabaseSqlVulnerabilityAssessmentRuleBaselineListResult" + "$ref": "#/definitions/DatabaseSqlVulnerabilityAssessmentBaselineSet" } }, "default": { "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." } }, - "x-ms-pageable": { - "nextLinkName": "nextLink" - }, "x-ms-examples": { "Gets a list of database's sql vulnerability assessment rule baselines.": { "$ref": "./examples/SqlVulnerabilityAssessmentBaselineGet.json" @@ -242,16 +239,13 @@ "200": { "description": "Successfully add the vulnerability assessment rule baseline list.", "schema": { - "$ref": "#/definitions/DatabaseSqlVulnerabilityAssessmentRuleBaselineListResult" + "$ref": "#/definitions/DatabaseSqlVulnerabilityAssessmentBaselineSet" } }, "default": { "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." } }, - "x-ms-pageable": { - "nextLinkName": "nextLink" - }, "x-ms-examples": { "Add a database's vulnerability assessment rule baseline list.": { "$ref": "./examples/SqlVulnerabilityAssessmentBaselineAdd.json" @@ -264,8 +258,8 @@ } }, "definitions": { - "DatabaseSqlVulnerabilityAssessmentRuleBaseline": { - "description": "A database sql vulnerability assessment rule baseline.", + "DatabaseSqlVulnerabilityAssessmentBaselineSet": { + "description": "A database sql vulnerability assessment baseline set.", "type": "object", "allOf": [ { @@ -275,16 +269,57 @@ "properties": { "systemData": { "$ref": "../../../common/v1/types.json#/definitions/systemData", - "description": "SystemData of DatabaseSqlVulnerabilityAssessmentRuleBaselineResource.", + "description": "SystemData of DatabaseSqlVulnerabilityAssessmentBaselineSetResource.", "readOnly": true }, "properties": { - "$ref": "#/definitions/DatabaseSqlVulnerabilityAssessmentRuleBaselineProperties", + "$ref": "#/definitions/DatabaseSqlVulnerabilityAssessmentBaselineSetProperties", "description": "Resource properties.", "x-ms-client-flatten": true } } }, + "DatabaseSqlVulnerabilityAssessmentBaselineSetListResult": { + "description": "A list of SQL Vulnerability Assessments baseline set.", + "type": "object", + "properties": { + "value": { + "description": "Array of results.", + "type": "array", + "items": { + "$ref": "#/definitions/DatabaseSqlVulnerabilityAssessmentBaselineSet" + }, + "readOnly": true + }, + "nextLink": { + "description": "Link to retrieve next page of results.", + "type": "string", + "readOnly": true + } + } + }, + "DatabaseSqlVulnerabilityAssessmentBaselineSetProperties": { + "description": "Properties of a database Sql Vulnerability Assessment baseline set.", + "required": [ + "results" + ], + "type": "object", + "properties": { + "results": { + "description": "The baseline set result", + "type": "object", + "additionalProperties": { + "type": "array", + "items": { + "type": "array", + "items": { + "type": "string" + } + } + } + } + } + }, "DatabaseSqlVulnerabilityAssessmentRuleBaselineListInput": { "description": "A database sql vulnerability assessment rule baseline list input.", "type": "object", @@ -332,44 +367,6 @@ } } } - }, - "DatabaseSqlVulnerabilityAssessmentRuleBaselineListResult": { - "description": "A list of SQL Vulnerability Assessments rule baseline.", - "type": "object", - "properties": { - "value": { - "description": "Array of results.", - "type": "array", - "items": { - "$ref": "#/definitions/DatabaseSqlVulnerabilityAssessmentRuleBaseline" - }, - "readOnly": true - }, - "nextLink": { - "description": "Link to retrieve next page of results.", - "type": "string", - "readOnly": true - } - } - }, - "DatabaseSqlVulnerabilityAssessmentRuleBaselineProperties": { - "description": "Properties of a database Sql Vulnerability Assessment rule baseline.", - "required": [ - "results" - ], - "type": "object", - "properties": { - "results": { - "description": "The rule baseline result", - "type": "array", - "items": { - "type": "array", - "items": { - "type": "string" - } - } - } - } } }, "parameters": { diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2022-02-01-preview/examples/DatabaseSqlVulnerabilityAssessmentBaselineAdd.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2022-02-01-preview/examples/DatabaseSqlVulnerabilityAssessmentBaselineAdd.json index 813d10c5148a..50443393c574 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2022-02-01-preview/examples/DatabaseSqlVulnerabilityAssessmentBaselineAdd.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2022-02-01-preview/examples/DatabaseSqlVulnerabilityAssessmentBaselineAdd.json @@ -11,21 +11,18 @@ "properties": { "latestScan": false, "results": { - "VA1234": [ + "VA2063": [ [ - "userA", - "SELECT" - ], - [ - "userB", - "SELECT" + "AllowAll", + "0.0.0.0", + "255.255.255.255" ] ], - "VA5678": [ + "VA2065": [ [ - "Test", + "AllowAll", "0.0.0.0", - "125.125.125.125" + "255.255.255.255" ] ] } @@ -35,39 +32,27 @@ "responses": { "200": { "body": { - "value": [ - { - "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/vulnerabilityaseessmenttest-4799/providers/Microsoft.Sql/servers/vulnerabilityaseessmenttest-6440/databases/testdb/sqlVulnerabilityAssessments/default/baselines/default/rules/VA1234", - "name": "VA1234", - "type": "Microsoft.Sql/servers/databases/sqlVulnerabilityAssessments/baselines", - "properties": { - "results": [ - [ - "userA", - "SELECT" - ], - [ - "userB", - "SELECT" - ] + "properties": { + "results": { + "VA2063": [ + [ + "AllowAll", + "0.0.0.0", + "255.255.255.255" ] - } - }, - { - "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/vulnerabilityaseessmenttest-4799/providers/Microsoft.Sql/servers/vulnerabilityaseessmenttest-6440/databases/testdb/sqlVulnerabilityAssessments/default/baselines/default/rules/VA5678", - "name": "VA5678", - "type": "Microsoft.Sql/servers/databases/sqlVulnerabilityAssessments/baselines", - "properties": { - "results": [ - [ - "Test", - "0.0.0.0", - "125.125.125.125" - ] + ], + "VA2065": [ + [ + "AllowAll", + "0.0.0.0", + "255.255.255.255" ] - } + ] } - ] + }, + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/vulnerabilityaseessmenttest-4799/providers/Microsoft.Sql/servers/vulnerabilityaseessmenttest-6440/databases/testdb/sqlVulnerabilityAssessments/Default/baselines/Default", + "name": "Default", + "type": "Microsoft.Sql/servers/sqlVulnerabilityAssessments/baselines" } } } diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2022-02-01-preview/examples/DatabaseSqlVulnerabilityAssessmentBaselineAddLatest.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2022-02-01-preview/examples/DatabaseSqlVulnerabilityAssessmentBaselineAddLatest.json index 51c2917eb466..b378c91720ac 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2022-02-01-preview/examples/DatabaseSqlVulnerabilityAssessmentBaselineAddLatest.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2022-02-01-preview/examples/DatabaseSqlVulnerabilityAssessmentBaselineAddLatest.json @@ -17,39 +17,45 @@ "responses": { "200": { "body": { - "value": [ - { - "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/vulnerabilityaseessmenttest-4799/providers/Microsoft.Sql/servers/vulnerabilityaseessmenttest-6440/databases/testdb/sqlVulnerabilityAssessments/default/baselines/default/rules/VA1234", - "name": "VA1234", - "type": "Microsoft.Sql/servers/databases/sqlVulnerabilityAssessments/baselines", - "properties": { - "results": [ - [ - "userA", - "SELECT" - ], - [ - "userB", - "SELECT" - ] + "properties": { + "results": { + "VA1020": [], + "VA1054": [], + "VA1095": [], + "VA1096": [], + "VA1097": [], + "VA1099": [], + "VA1143": [ + [ + "True" ] - } - }, - { - "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/vulnerabilityaseessmenttest-4799/providers/Microsoft.Sql/servers/vulnerabilityaseessmenttest-6440/databases/testdb/sqlVulnerabilityAssessments/default/baselines/default/rules/VA5678", - "name": "VA5678", - "type": "Microsoft.Sql/servers/databases/sqlVulnerabilityAssessments/baselines", - "properties": { - "results": [ - [ - "Test", - "0.0.0.0", - "125.125.125.125" - ] + ], + "VA1219": [ + [ + "False" ] - } + ], + "VA1221": [], + "VA1223": [], + "VA1224": [], + "VA1246": [], + "VA1248": [], + "VA1258": [], + "VA1281": [], + "VA1282": [], + "VA2020": [], + "VA2033": [], + "VA2062": [], + "VA2064": [], + "VA2108": [], + "VA2109": [], + "VA2129": [], + "VA2130": [] } - ] + }, + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/vulnerabilityaseessmenttest-4799/providers/Microsoft.Sql/servers/vulnerabilityaseessmenttest-6440/databases/testdb/sqlVulnerabilityAssessments/Default/baselines/Default", + "name": "Default", + "type": "Microsoft.Sql/servers/databases/sqlVulnerabilityAssessments/baselines" } } } diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2022-02-01-preview/examples/DatabaseSqlVulnerabilityAssessmentBaselineGet.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2022-02-01-preview/examples/DatabaseSqlVulnerabilityAssessmentBaselineGet.json index 5e8404442e85..f0efb31e282e 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2022-02-01-preview/examples/DatabaseSqlVulnerabilityAssessmentBaselineGet.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2022-02-01-preview/examples/DatabaseSqlVulnerabilityAssessmentBaselineGet.json @@ -11,50 +11,45 @@ "responses": { "200": { "body": { - "value": [ - { - "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/vulnerabilityaseessmenttest-4799/providers/Microsoft.Sql/servers/vulnerabilityaseessmenttest-6440/databases/testdb/sqlVulnerabilityAssessments/default/baselines/default/rules/VA1001", - "name": "default", - "type": "Microsoft.Sql/servers/databases/sqlVulnerabilityAssessments/baselines", - "properties": { - "results": [ - [ - "userA", - "SELECT" - ], - [ - "userB", - "SELECT" - ], - [ - "userC", - "SELECT" - ] + "properties": { + "results": { + "VA1020": [], + "VA1054": [], + "VA1095": [], + "VA1096": [], + "VA1097": [], + "VA1099": [], + "VA1143": [ + [ + "True" ] - } - }, - { - "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/vulnerabilityaseessmenttest-4799/providers/Microsoft.Sql/servers/vulnerabilityaseessmenttest-6440/databases/testdb/sqlVulnerabilityAssessments/default/baselines/default/rules/VA1002", - "name": "default", - "type": "Microsoft.Sql/servers/databases/sqlVulnerabilityAssessments/baselines", - "properties": { - "results": [ - [ - "userA", - "SELECT" - ], - [ - "userB", - "SELECT" - ], - [ - "userC", - "SELECT" - ] + ], + "VA1219": [ + [ + "False" ] - } + ], + "VA1221": [], + "VA1223": [], + "VA1224": [], + "VA1246": [], + "VA1248": [], + "VA1258": [], + "VA1281": [], + "VA1282": [], + "VA2020": [], + "VA2033": [], + "VA2062": [], + "VA2064": [], + "VA2108": [], + "VA2109": [], + "VA2129": [], + "VA2130": [] } - ] + }, + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/vulnerabilityaseessmenttest-4799/providers/Microsoft.Sql/servers/vulnerabilityaseessmenttest-6440/databases/testdb/sqlVulnerabilityAssessments/Default/baselines/Default", + "name": "Default", + "type": "Microsoft.Sql/servers/databases/sqlVulnerabilityAssessments/baselines" } } } diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2022-02-01-preview/examples/DatabaseSqlVulnerabilityAssessmentBaselineListBySqlVulnerabilityAssessment.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2022-02-01-preview/examples/DatabaseSqlVulnerabilityAssessmentBaselineListBySqlVulnerabilityAssessment.json index f0f9934ff72b..5e5c34133ce0 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2022-02-01-preview/examples/DatabaseSqlVulnerabilityAssessmentBaselineListBySqlVulnerabilityAssessment.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2022-02-01-preview/examples/DatabaseSqlVulnerabilityAssessmentBaselineListBySqlVulnerabilityAssessment.json @@ -12,46 +12,45 @@ "body": { "value": [ { - "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/vulnerabilityaseessmenttest-4799/providers/Microsoft.Sql/servers/vulnerabilityaseessmenttest-6440/databases/testdb/sqlVulnerabilityAssessments/default/baselines/default/rules/VA1001", - "name": "default", - "type": "Microsoft.Sql/servers/databases/sqlVulnerabilityAssessments/baselines", "properties": { - "results": [ - [ - "userA", - "SELECT" + "results": { + "VA1020": [], + "VA1054": [], + "VA1095": [], + "VA1096": [], + "VA1097": [], + "VA1099": [], + "VA1143": [ + [ + "True" + ] ], - [ - "userB", - "SELECT" + "VA1219": [ + [ + "False" + ] ], - [ - "userC", - "SELECT" - ] - ] - } - }, - { - "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/vulnerabilityaseessmenttest-4799/providers/Microsoft.Sql/servers/vulnerabilityaseessmenttest-6440/databases/testdb/sqlVulnerabilityAssessments/default/baselines/default/rules/VA1002", - "name": "default", - "type": "Microsoft.Sql/servers/databases/sqlVulnerabilityAssessments/baselines", - "properties": { - "results": [ - [ - "userA", - "SELECT" - ], - [ - "userB", - "SELECT" - ], - [ - "userC", - "SELECT" - ] - ] - } + "VA1221": [], + "VA1223": [], + "VA1224": [], + "VA1246": [], + "VA1248": [], + "VA1258": [], + "VA1281": [], + "VA1282": [], + "VA2020": [], + "VA2033": [], + "VA2062": [], + "VA2064": [], + "VA2108": [], + "VA2109": [], + "VA2129": [], + "VA2130": [] + } + }, + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/vulnerabilityaseessmenttest-4799/providers/Microsoft.Sql/servers/vulnerabilityaseessmenttest-6440/databases/testdb/sqlVulnerabilityAssessments/Default/baselines/Default", + "name": "Default", + "type": "Microsoft.Sql/servers/databases/sqlVulnerabilityAssessments/baselines" } ] } diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2022-02-01-preview/examples/SqlVulnerabilityAssessmentBaselineAdd.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2022-02-01-preview/examples/SqlVulnerabilityAssessmentBaselineAdd.json index 953fd01e0ff2..d87abf4ca6fa 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2022-02-01-preview/examples/SqlVulnerabilityAssessmentBaselineAdd.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2022-02-01-preview/examples/SqlVulnerabilityAssessmentBaselineAdd.json @@ -11,21 +11,18 @@ "properties": { "latestScan": false, "results": { - "VA1234": [ + "VA2063": [ [ - "userA", - "SELECT" - ], - [ - "userB", - "SELECT" + "AllowAll", + "0.0.0.0", + "255.255.255.255" ] ], - "VA5678": [ + "VA2065": [ [ - "Test", + "AllowAll", "0.0.0.0", - "125.125.125.125" + "255.255.255.255" ] ] } @@ -35,43 +32,27 @@ "responses": { "200": { "body": { - "value": [ - { - "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/vulnerabilityaseessmenttest-4711/providers/Microsoft.Sql/servers/vulnerabilityaseessmenttest-6411/sqlVulnerabilityAssessments/default/baselines/default/rules/VA1234", - "name": "VA1234", - "type": "Microsoft.Sql/servers/sqlVulnerabilityAssessments/baselines", - "properties": { - "results": [ - [ - "userA", - "SELECT" - ], - [ - "userB", - "SELECT" - ], - [ - "userC", - "SELECT" - ] + "properties": { + "results": { + "VA2063": [ + [ + "AllowAll", + "0.0.0.0", + "255.255.255.255" ] - } - }, - { - "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/vulnerabilityaseessmenttest-4711/providers/Microsoft.Sql/servers/vulnerabilityaseessmenttest-6411/sqlVulnerabilityAssessments/default/baselines/default/rules/VA5678", - "name": "VA5678", - "type": "Microsoft.Sql/servers/sqlVulnerabilityAssessments/baselines", - "properties": { - "results": [ - [ - "Test", - "0.0.0.0", - "125.125.125.125" - ] + ], + "VA2065": [ + [ + "AllowAll", + "0.0.0.0", + "255.255.255.255" ] - } + ] } - ] + }, + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/vulnerabilityaseessmenttest-4799/providers/Microsoft.Sql/servers/vulnerabilityaseessmenttest-6440/sqlVulnerabilityAssessments/Default/baselines/Default", + "name": "Default", + "type": "Microsoft.Sql/servers/sqlVulnerabilityAssessments/baselines" } } } diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2022-02-01-preview/examples/SqlVulnerabilityAssessmentBaselineAddLatest.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2022-02-01-preview/examples/SqlVulnerabilityAssessmentBaselineAddLatest.json index 1a599b3af404..7ece07f41967 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2022-02-01-preview/examples/SqlVulnerabilityAssessmentBaselineAddLatest.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2022-02-01-preview/examples/SqlVulnerabilityAssessmentBaselineAddLatest.json @@ -17,39 +17,47 @@ "responses": { "200": { "body": { - "value": [ - { - "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/vulnerabilityaseessmenttest-4799/providers/Microsoft.Sql/servers/vulnerabilityaseessmenttest-6440/sqlVulnerabilityAssessments/default/baselines/default/rules/VA1234", - "name": "VA1234", - "type": "Microsoft.Sql/servers/sqlVulnerabilityAssessments/baselines", - "properties": { - "results": [ - [ - "userA", - "SELECT" - ], - [ - "userB", - "SELECT" - ] + "properties": { + "results": { + "VA1223": [], + "VA2060": [ + [ + "False" ] - } - }, - { - "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/vulnerabilityaseessmenttest-4799/providers/Microsoft.Sql/servers/vulnerabilityaseessmenttest-6440/sqlVulnerabilityAssessments/default/baselines/default/rules/VA5678", - "name": "VA5678", - "type": "Microsoft.Sql/servers/sqlVulnerabilityAssessments/baselines", - "properties": { - "results": [ - [ - "Test", - "0.0.0.0", - "125.125.125.125" - ] + ], + "VA2061": [ + [ + "True" ] - } + ], + "VA2062": [], + "VA2063": [ + [ + "AllowAll", + "0.0.0.0", + "255.255.255.255" + ] + ], + "VA2064": [], + "VA2065": [ + [ + "AllowAll", + "0.0.0.0", + "255.255.255.255" + ] + ], + "VA2107": [], + "VA2130": [ + [ + "Value1", + "Value2" + ] + ] } - ] + }, + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/vulnerabilityaseessmenttest-4799/providers/Microsoft.Sql/servers/vulnerabilityaseessmenttest-6440/sqlVulnerabilityAssessments/Default/baselines/Default", + "name": "Default", + "type": "Microsoft.Sql/servers/sqlVulnerabilityAssessments/baselines" } } } diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2022-02-01-preview/examples/SqlVulnerabilityAssessmentBaselineGet.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2022-02-01-preview/examples/SqlVulnerabilityAssessmentBaselineGet.json index d261b65501b4..4988b0aaa9b8 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2022-02-01-preview/examples/SqlVulnerabilityAssessmentBaselineGet.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2022-02-01-preview/examples/SqlVulnerabilityAssessmentBaselineGet.json @@ -11,50 +11,47 @@ "responses": { "200": { "body": { - "value": [ - { - "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/vulnerabilityaseessmenttest-4799/providers/Microsoft.Sql/servers/vulnerabilityaseessmenttest-6440/sqlVulnerabilityAssessments/default/baselines/default/rules/VA1001", - "name": "default", - "type": "Microsoft.Sql/servers/databases/sqlVulnerabilityAssessments/baselines", - "properties": { - "results": [ - [ - "userA", - "SELECT" - ], - [ - "userB", - "SELECT" - ], - [ - "userC", - "SELECT" - ] + "properties": { + "results": { + "VA1223": [], + "VA2060": [ + [ + "False" ] - } - }, - { - "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/vulnerabilityaseessmenttest-4799/providers/Microsoft.Sql/servers/vulnerabilityaseessmenttest-6440/sqlVulnerabilityAssessments/default/baselines/default/rules/VA1002", - "name": "default", - "type": "Microsoft.Sql/servers/databases/sqlVulnerabilityAssessments/baselines", - "properties": { - "results": [ - [ - "userA", - "SELECT" - ], - [ - "userB", - "SELECT" - ], - [ - "userC", - "SELECT" - ] + ], + "VA2061": [ + [ + "True" ] - } + ], + "VA2062": [], + "VA2063": [ + [ + "AllowAll", + "0.0.0.0", + "255.255.255.255" + ] + ], + "VA2064": [], + "VA2065": [ + [ + "AllowAll", + "0.0.0.0", + "255.255.255.255" + ] + ], + "VA2107": [], + "VA2130": [ + [ + "Value1", + "Value2" + ] + ] } - ] + }, + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/vulnerabilityaseessmenttest-4799/providers/Microsoft.Sql/servers/vulnerabilityaseessmenttest-6440/sqlVulnerabilityAssessments/Default/baselines/Default", + "name": "Default", + "type": "Microsoft.Sql/servers/databases/sqlVulnerabilityAssessments/baselines" } } } diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2022-02-01-preview/examples/SqlVulnerabilityAssessmentBaselineListBySqlVulnerabilityAssessment.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2022-02-01-preview/examples/SqlVulnerabilityAssessmentBaselineListBySqlVulnerabilityAssessment.json index 1f44f4a6a30c..f116c61b7b86 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2022-02-01-preview/examples/SqlVulnerabilityAssessmentBaselineListBySqlVulnerabilityAssessment.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2022-02-01-preview/examples/SqlVulnerabilityAssessmentBaselineListBySqlVulnerabilityAssessment.json @@ -12,46 +12,47 @@ "body": { "value": [ { - "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/vulnerabilityaseessmenttest-4799/providers/Microsoft.Sql/servers/vulnerabilityaseessmenttest-6440/sqlVulnerabilityAssessments/default/baselines/default/rules/VA1001", - "name": "default", - "type": "Microsoft.Sql/servers/databases/sqlVulnerabilityAssessments/baselines", "properties": { - "results": [ - [ - "userA", - "SELECT" + "results": { + "VA1223": [], + "VA2060": [ + [ + "False" + ] ], - [ - "userB", - "SELECT" + "VA2061": [ + [ + "True" + ] ], - [ - "userC", - "SELECT" - ] - ] - } - }, - { - "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/vulnerabilityaseessmenttest-4799/providers/Microsoft.Sql/servers/vulnerabilityaseessmenttest-6440/sqlVulnerabilityAssessments/default/baselines/default/rules/VA1002", - "name": "default", - "type": "Microsoft.Sql/servers/databases/sqlVulnerabilityAssessments/baselines", - "properties": { - "results": [ - [ - "userA", - "SELECT" + "VA2062": [], + "VA2063": [ + [ + "AllowAll", + "0.0.0.0", + "255.255.255.255" + ] ], - [ - "userB", - "SELECT" + "VA2064": [], + "VA2065": [ + [ + "AllowAll", + "0.0.0.0", + "255.255.255.255" + ] ], - [ - "userC", - "SELECT" + "VA2107": [], + "VA2130": [ + [ + "Value1", + "Value2" + ] ] - ] - } + } + }, + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/vulnerabilityaseessmenttest-4799/providers/Microsoft.Sql/servers/vulnerabilityaseessmenttest-6440/sqlVulnerabilityAssessments/Default/baselines/Default", + "name": "Default", + "type": "Microsoft.Sql/servers/sqlVulnerabilityAssessments/baselines" } ] }