From 03645a856ba34f572618832814b410d8e2410ba2 Mon Sep 17 00:00:00 2001 From: yaakoviyun Date: Sun, 27 May 2018 09:38:39 +0300 Subject: [PATCH 1/4] Adding new value to VA baseline name Adding new value to VA baseline name --- ...abaseVulnerabilityAssessmentBaselines.json | 49 ++++++++++++++++--- ...ulnerabilityAssessmentRuleBaselineGet.json | 2 +- 2 files changed, 43 insertions(+), 8 deletions(-) diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/databaseVulnerabilityAssessmentBaselines.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/databaseVulnerabilityAssessmentBaselines.json index d1a60d1507aa..1f5709b485e5 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/databaseVulnerabilityAssessmentBaselines.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/databaseVulnerabilityAssessmentBaselines.json @@ -61,11 +61,12 @@ { "name": "baselineName", "in": "path", - "description": "The name of the vulnerability assessment rule baseline.", + "description": "The name of the vulnerability assessment rule baseline (default implies a baseline on a database level rule and master for server level rule.", "required": true, "type": "string", "enum": [ - "default" + "default", + "master" ], "x-ms-enum": { "name": "VulnerabilityAssessmentPolicyBaselineName", @@ -140,11 +141,12 @@ { "name": "baselineName", "in": "path", - "description": "The name of the vulnerability assessment rule baseline.", + "description": "The name of the vulnerability assessment rule baseline (default implies a baseline on a database level rule and master for server level rule.", "required": true, "type": "string", "enum": [ - "default" + "default", + "master" ], "x-ms-enum": { "name": "VulnerabilityAssessmentPolicyBaselineName", @@ -228,11 +230,12 @@ { "name": "baselineName", "in": "path", - "description": "The name of the vulnerability assessment rule baseline.", + "description": "The name of the vulnerability assessment rule baseline (default implies a baseline on a database level rule and master for server level rule.", "required": true, "type": "string", "enum": [ - "default" + "default", + "master" ], "x-ms-enum": { "name": "VulnerabilityAssessmentPolicyBaselineName", @@ -295,12 +298,44 @@ } } }, + "Resource": { + "description": "ARM resource.", + "type": "object", + "properties": { + "id": { + "description": "Resource ID.", + "type": "string", + "readOnly": true + }, + "name": { + "description": "Resource name.", + "type": "string", + "readOnly": true + }, + "type": { + "description": "Resource type.", + "type": "string", + "readOnly": true + } + }, + "x-ms-azure-resource": true + }, + "ProxyResource": { + "description": "ARM proxy resource.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/Resource" + } + ], + "properties": {} + }, "DatabaseVulnerabilityAssessmentRuleBaseline": { "description": "A database vulnerability assessment rule baseline.", "type": "object", "allOf": [ { - "$ref": "../../../common/v1/types.json#/definitions/ProxyResource" + "$ref": "#/definitions/ProxyResource" } ], "properties": { diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/examples/DatabaseVulnerabilityAssessmentRuleBaselineGet.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/examples/DatabaseVulnerabilityAssessmentRuleBaselineGet.json index 0b3527a8ab43..1602407dad65 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/examples/DatabaseVulnerabilityAssessmentRuleBaselineGet.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/examples/DatabaseVulnerabilityAssessmentRuleBaselineGet.json @@ -6,7 +6,7 @@ "databaseName": "testdb", "vulnerabilityAssessmentName": "default", "ruleId": "VA1001", - "baselineName": "default", + "baselineName": "master", "api-version": "2017-03-01-preview" }, "responses": { From c9946efbfaf9f6a9f7765878a337784756ce951c Mon Sep 17 00:00:00 2001 From: yaakoviyun Date: Sun, 27 May 2018 09:57:19 +0300 Subject: [PATCH 2/4] Fix typo Fix typo --- .../databaseVulnerabilityAssessmentBaselines.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/databaseVulnerabilityAssessmentBaselines.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/databaseVulnerabilityAssessmentBaselines.json index 1f5709b485e5..9b000c9a63f3 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/databaseVulnerabilityAssessmentBaselines.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/databaseVulnerabilityAssessmentBaselines.json @@ -61,7 +61,7 @@ { "name": "baselineName", "in": "path", - "description": "The name of the vulnerability assessment rule baseline (default implies a baseline on a database level rule and master for server level rule.", + "description": "The name of the vulnerability assessment rule baseline (default implies a baseline on a database level rule and master for server level rule).", "required": true, "type": "string", "enum": [ @@ -141,7 +141,7 @@ { "name": "baselineName", "in": "path", - "description": "The name of the vulnerability assessment rule baseline (default implies a baseline on a database level rule and master for server level rule.", + "description": "The name of the vulnerability assessment rule baseline (default implies a baseline on a database level rule and master for server level rule).", "required": true, "type": "string", "enum": [ @@ -230,7 +230,7 @@ { "name": "baselineName", "in": "path", - "description": "The name of the vulnerability assessment rule baseline (default implies a baseline on a database level rule and master for server level rule.", + "description": "The name of the vulnerability assessment rule baseline (default implies a baseline on a database level rule and master for server level rule).", "required": true, "type": "string", "enum": [ From c3621b01ece4897d91763a7e4ba8d1e29d4d6832 Mon Sep 17 00:00:00 2001 From: yaakoviyun Date: Wed, 30 May 2018 09:52:14 +0300 Subject: [PATCH 3/4] Updating VulnerabilityAssessmentPolicyBaselineName --- ...tabaseVulnerabilityAssessmentBaselines.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/databaseVulnerabilityAssessmentBaselines.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/databaseVulnerabilityAssessmentBaselines.json index 9b000c9a63f3..25d940c1b7b8 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/databaseVulnerabilityAssessmentBaselines.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/databaseVulnerabilityAssessmentBaselines.json @@ -65,12 +65,12 @@ "required": true, "type": "string", "enum": [ - "default", - "master" + "Master", + "Default" ], "x-ms-enum": { "name": "VulnerabilityAssessmentPolicyBaselineName", - "modelAsString": true + "modelAsString": false } }, { @@ -145,12 +145,12 @@ "required": true, "type": "string", "enum": [ - "default", - "master" + "Master", + "Default" ], "x-ms-enum": { "name": "VulnerabilityAssessmentPolicyBaselineName", - "modelAsString": true + "modelAsString": false } }, { @@ -234,12 +234,12 @@ "required": true, "type": "string", "enum": [ - "default", - "master" + "Master", + "Default" ], "x-ms-enum": { "name": "VulnerabilityAssessmentPolicyBaselineName", - "modelAsString": true + "modelAsString": false } }, { From 5c8646bff054ea42bb05bef708e3c66c7d005c2e Mon Sep 17 00:00:00 2001 From: yaakoviyun Date: Thu, 31 May 2018 09:25:42 +0300 Subject: [PATCH 4/4] Fixed all comments --- ...abaseVulnerabilityAssessmentBaselines.json | 46 +++---------------- 1 file changed, 7 insertions(+), 39 deletions(-) diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/databaseVulnerabilityAssessmentBaselines.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/databaseVulnerabilityAssessmentBaselines.json index 25d940c1b7b8..994880c297fc 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/databaseVulnerabilityAssessmentBaselines.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/databaseVulnerabilityAssessmentBaselines.json @@ -65,8 +65,8 @@ "required": true, "type": "string", "enum": [ - "Master", - "Default" + "master", + "default" ], "x-ms-enum": { "name": "VulnerabilityAssessmentPolicyBaselineName", @@ -145,8 +145,8 @@ "required": true, "type": "string", "enum": [ - "Master", - "Default" + "master", + "default" ], "x-ms-enum": { "name": "VulnerabilityAssessmentPolicyBaselineName", @@ -234,8 +234,8 @@ "required": true, "type": "string", "enum": [ - "Master", - "Default" + "master", + "default" ], "x-ms-enum": { "name": "VulnerabilityAssessmentPolicyBaselineName", @@ -298,44 +298,12 @@ } } }, - "Resource": { - "description": "ARM resource.", - "type": "object", - "properties": { - "id": { - "description": "Resource ID.", - "type": "string", - "readOnly": true - }, - "name": { - "description": "Resource name.", - "type": "string", - "readOnly": true - }, - "type": { - "description": "Resource type.", - "type": "string", - "readOnly": true - } - }, - "x-ms-azure-resource": true - }, - "ProxyResource": { - "description": "ARM proxy resource.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/Resource" - } - ], - "properties": {} - }, "DatabaseVulnerabilityAssessmentRuleBaseline": { "description": "A database vulnerability assessment rule baseline.", "type": "object", "allOf": [ { - "$ref": "#/definitions/ProxyResource" + "$ref": "../../../common/v1/types.json#/definitions/ProxyResource" } ], "properties": {