Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding new value to VA baseline name #3143

Merged
merged 4 commits into from
May 31, 2018
Merged

Adding new value to VA baseline name #3143

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
03645a8
Adding new value to VA baseline name
yaakoviyun May 27, 2018
c9946ef
Fix typo
yaakoviyun May 27, 2018
c3621b0
Updating VulnerabilityAssessmentPolicyBaselineName
yaakoviyun May 30, 2018
5c8646b
Fixed all comments
yaakoviyun May 31, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 45 additions & 10 deletions ...er/Microsoft.Sql/preview/2017-03-01-preview/databaseVulnerabilityAssessmentBaselines.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,15 +61,16 @@
{
"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"
"Master",
"Default"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this should be 'master' , 'default'. The C# code generator should capitalize the first letter for the enum name when it generated code.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure

],
"x-ms-enum": {
"name": "VulnerabilityAssessmentPolicyBaselineName",
"modelAsString": true
"modelAsString": false
}
},
{
Expand Down Expand Up @@ -140,15 +141,16 @@
{
"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).",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does the server level rule apply to all databases in the server, or just this one? If it applies to all databases, then the api should be on the server.

Copy link
Member Author

@yaakoviyun yaakoviyun May 30, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

currently we don't support a "server level" configuration. In the meantime, the user can set a server rule baseline only in the context of a single database

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, so if I set the master baseline for one database, that doesn't affect the master baseline for another database, is that right? When I look at my VA scan results, how do I know whether I need to update the current or master baseline?

"required": true,
"type": "string",
"enum": [
"default"
"Master",
"Default"
],
"x-ms-enum": {
"name": "VulnerabilityAssessmentPolicyBaselineName",
"modelAsString": true
"modelAsString": false
}
},
{
Expand Down Expand Up @@ -228,15 +230,16 @@
{
"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"
"Master",
"Default"
],
"x-ms-enum": {
"name": "VulnerabilityAssessmentPolicyBaselineName",
"modelAsString": true
"modelAsString": false
}
},
{
Expand Down Expand Up @@ -295,12 +298,44 @@
}
}
},
"Resource": {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please remove Resource & ProxyResource definitions

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

will do.
note that this swagger was automatically generated from the RP code.

"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"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please undo this, the common/v1 definition should be used

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

will do.
note that this swagger was automatically generated from the RP code.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Understood, I haven't yet updated generator :)

}
],
"properties": {
Expand Down
2 changes: 1 addition & 1 deletion ...l/preview/2017-03-01-preview/examples/DatabaseVulnerabilityAssessmentRuleBaselineGet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"databaseName": "testdb",
"vulnerabilityAssessmentName": "default",
"ruleId": "VA1001",
"baselineName": "default",
"baselineName": "master",
"api-version": "2017-03-01-preview"
},
"responses": {
Expand Down