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

Jump to bottom

Add DatabaseVulnerabilityAssessments swagger #3275

Merged
merged 9 commits into from
Jul 27, 2018
Merged

Add DatabaseVulnerabilityAssessments swagger #3275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9f34855
Add DatabaseVulnerabilityAssessments swagger
ggildin Jun 20, 2018
660b2f7
Add two missing example files
ggildin Jun 21, 2018
7f90a83
update databaseVulnerabilityAssessments for version 2017-03
ggildin Jun 24, 2018
8e9301f
Revert "update databaseVulnerabilityAssessments for version 2017-03"
ggildin Jun 24, 2018
63de515
Revert "Add DatabaseVulnerabilityAssessments swagger"
ggildin Jun 24, 2018
ed33cd7
Revert "Add two missing example files"
ggildin Jun 24, 2018
05785ec
Update databaseVulnerabilityAssessments 2017-03-01 swagger
ggildin Jun 24, 2018
6444d20
Clean non required params in version 10-2017
ggildin Jun 28, 2018
135edfb
fix error in execute scan example
ggildin Jul 25, 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
20 changes: 15 additions & 5 deletions ...ce-manager/Microsoft.Sql/preview/2017-03-01-preview/databaseVulnerabilityAssessments.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,11 @@
"Create a database's vulnerability assessment with all parameters": {
"$ref": "./examples/DatabaseVulnerabilityAssessmentCreateMax.json"
},
"Create a database's vulnerability assessment with minimal parameters": {
"$ref": "./examples/DatabaseVulnerabilityAssessmentCreateMin.json"
"Create a database's vulnerability assessment with minimal parameters, when storageContainerSasKey is specified": {
"$ref": "./examples/DatabaseVulnerabilityAssessmentCreateSasKeyMin.json"
},
"Create a database's vulnerability assessment with minimal parameters, when storageAccountAccessKey is specified": {
"$ref": "./examples/DatabaseVulnerabilityAssessmentCreateStorageKeyMin.json"
}
}
},
Expand Down Expand Up @@ -212,8 +215,7 @@
"DatabaseVulnerabilityAssessmentProperties": {
"description": "Properties of a database Vulnerability Assessment.",
"required": [
"storageContainerPath",
"storageContainerSasKey"
"storageContainerPath"
],
"type": "object",
"properties": {
Expand All @@ -226,7 +228,15 @@
]
},
"storageContainerSasKey": {
"description": "A shared access signature (SAS Key) that has write access to the blob container specified in 'storageContainerPath' parameter.",
"description": "A shared access signature (SAS Key) that has write access to the blob container specified in 'storageContainerPath' parameter. If 'storageAccountAccessKey' isn't specified, StorageContainerSasKey is required.",
"type": "string",
"x-ms-mutability": [
"create",
"update"
]
},
"storageAccountAccessKey": {
"description": "Specifies the identifier key of the auditing storage account. If 'StorageContainerSasKey' isn't specified, storageAccountAccessKey is required.",
"type": "string",
"x-ms-mutability": [
"create",
Copy link
Member

Choose a reason for hiding this comment

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

  •        "create",

  •        "update"?

Expand Down
1 change: 1 addition & 0 deletions ...oft.Sql/preview/2017-03-01-preview/examples/DatabaseVulnerabilityAssessmentCreateMax.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"properties": {
"storageContainerPath": "https://myStorage.blob.core.windows.net/vulnerability-assessment/",
"storageContainerSasKey": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"storageAccountAccessKey": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"recurringScans": {
"isEnabled": true,
"emailSubscriptionAdmins": true,
Expand Down
0 ...baseVulnerabilityAssessmentCreateMin.json → ...lnerabilityAssessmentCreateSasKeyMin.json
View file
Open in desktop
File renamed without changes.
48 changes: 48 additions & 0 deletions ...eview/2017-03-01-preview/examples/DatabaseVulnerabilityAssessmentCreateStorageKeyMin.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
{
"parameters": {
"subscriptionId": "00000000-1111-2222-3333-444444444444",
"resourceGroupName": "vulnerabilityaseessmenttest-4799",
"serverName": "vulnerabilityaseessmenttest-6440",
"databaseName": "testdb",
"vulnerabilityAssessmentName": "default",
"api-version": "2017-03-01-preview",
"parameters": {
"properties": {
"storageContainerPath": "https://myStorage.blob.core.windows.net/vulnerability-assessment/",
"storageAccountAccessKey": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
}
}
},
"responses": {
"200": {
"body": {
"id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/vulnerabilityaseessmenttest-4799/providers/Microsoft.Sql/servers/vulnerabilityaseessmenttest-6440/databases/testdb/vulnerabilityAssessments/default",
"name": "default",
"type": "Microsoft.Sql/servers/databases/vulnerabilityAssessments",
"properties": {
"storageContainerPath": "https://myStorage.blob.core.windows.net/vulnerability-assessment/",
"recurringScans": {
"isEnabled": true,
"emailSubscriptionAdmins": false,
"emails": []
}
}
}
},
"201": {
"body": {
"id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/vulnerabilityaseessmenttest-4799/providers/Microsoft.Sql/servers/vulnerabilityaseessmenttest-6440/databases/testdb/vulnerabilityAssessments/default",
"name": "default",
"type": "Microsoft.Sql/servers/databases/vulnerabilityAssessments",
"properties": {
"storageContainerPath": "https://myStorage.blob.core.windows.net/vulnerability-assessment/",
"recurringScans": {
"isEnabled": true,
"emailSubscriptionAdmins": false,
"emails": []
}
}
}
}
}
}
46 changes: 0 additions & 46 deletions ...anager/Microsoft.Sql/preview/2017-10-01-preview/databaseVulnerabilityAssessmentScans.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,36 +277,6 @@
}
},
"definitions": {
"DatabaseVulnerabilityAssessmentProperties": {
"description": "Properties of a database Vulnerability Assessment.",
"required": [
"storageContainerPath",
"storageContainerSasKey"
],
"type": "object",
"properties": {
"storageContainerPath": {
"description": "A blob storage container path to hold the scan results (e.g. https://myStorage.blob.core.windows.net/VaScans/).",
"type": "string",
"x-ms-mutability": [
"create",
"update"
]
},
"storageContainerSasKey": {
"description": "A shared access signature (SAS Key) that has write access to the blob container specified in 'storageContainerPath' parameter.",
"type": "string",
"x-ms-mutability": [
"create",
"update"
]
},
"recurringScans": {
"$ref": "#/definitions/VulnerabilityAssessmentRecurringScansProperties",
"description": "The recurring scans settings"
}
}
},
"VulnerabilityAssessmentRecurringScansProperties": {
"description": "Properties of a Vulnerability Assessment recurring scans.",
"type": "object",
Expand All @@ -329,22 +299,6 @@
}
}
},
"DatabaseVulnerabilityAssessment": {
"description": "A database vulnerability assessment.",
"type": "object",
"allOf": [
{
"$ref": "../../../common/v1/types.json#/definitions/ProxyResource"
}
],
"properties": {
"properties": {
"$ref": "#/definitions/DatabaseVulnerabilityAssessmentProperties",
"description": "Resource properties.",
"x-ms-client-flatten": true
}
}
},
"VulnerabilityAssessmentScanRecordProperties": {
"description": "Properties of a vulnerability assessment scan record.",
"type": "object",
Expand Down
2 changes: 1 addition & 1 deletion ....Sql/preview/2017-10-01-preview/examples/DatabaseVulnerabilityAssessmentScansExecute.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"parameters": {
"subscriptionId": "00000000-1111-2222-3333-444444444444",
"resourceGroupName": "vulnerabilityassessmenttest-4711",
"managedInstanceName": "vulnerabilityassessmenttest-6411",
"serverName": "vulnerabilityassessmenttest-6440",
"databaseName": "testdb",
"vulnerabilityAssessmentName": "default",
"scanId": "scan01",
Expand Down