Skip to content

Commit

Permalink
[DO NOT MERGE] VA List Api version edit (#4257)
Browse files Browse the repository at this point in the history 
* VA List Api version edit

* Updated missing tests

* Update DatabaseVulnerabilityAssessmentListByDatabase.json

* Update DatabaseVulnerabilityAssessmentListByDatabase.json

* Update DatabaseVulnerabilityAssessmentListByDatabase.json
  • Loading branch information
@t-robalt @jianghaolu
t-robalt authored and jianghaolu committed Oct 31, 2018
1 parent 86f0601 commit 4769596
Show file tree
Hide file tree
Showing 17 changed files with 157 additions and 876 deletions.
91 changes: 78 additions & 13 deletions ...ce-manager/Microsoft.Sql/preview/2017-03-01-preview/databaseVulnerabilityAssessments.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
}
},
"default": {
"description": "*** Error Responses: ***\n\n * 400 InvalidStorageAccountName - The provided storage account is not valid or does not exist.\n\n * 400 InvalidStorageAccountCredentials - The provided storage account shared access signature is not valid.\n\n * 404 SubscriptionDoesNotHaveServer - The requested server was not found\n\n * 404 DatabaseDoesNotExist - User has specified a database name that does not exist on this server instance.\n\n * 404 SourceDatabaseNotFound - The source database does not exist.\n\n * 500 DatabaseIsUnavailable - Loading failed. Please try again later."
"description": "*** Error Responses: ***\n\n * 400 InvalidStorageAccountName - The provided storage account is not valid or does not exist.\n\n * 400 InvalidStorageAccountCredentials - The provided storage account shared access signature or account storage key is not valid.\n\n * 400 DatabaseVulnerabilityAssessmentMissingStorageContainerPath - Storage container path must be provided if it isn't set in server level policy\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 * 500 DatabaseIsUnavailable - Loading failed. Please try again later."
}
},
"x-ms-examples": {
Expand Down Expand Up @@ -133,7 +133,7 @@
}
},
"default": {
"description": "*** Error Responses: ***\n\n * 400 InvalidStorageAccountName - The provided storage account is not valid or does not exist.\n\n * 400 InvalidStorageAccountCredentials - The provided storage account shared access signature is not valid.\n\n * 400 InvalidDatabaseVulnerabilityAssessmentOperationRequest - The vulnerability assessment operation request does not exist or has no properties object.\n\n * 400 DataSecurityInvalidUserSuppliedParameter - An invalid parameter value was provided by the client.\n\n * 404 SubscriptionDoesNotHaveServer - The requested server was not found\n\n * 404 DatabaseDoesNotExist - User has specified a database name that does not exist on this server instance.\n\n * 404 SourceDatabaseNotFound - The source database does not exist.\n\n * 500 DatabaseIsUnavailable - Loading failed. Please try again later."
"description": "*** Error Responses: ***\n\n * 400 InvalidStorageAccountName - The provided storage account is not valid or does not exist.\n\n * 400 InvalidStorageAccountCredentials - The provided storage account shared access signature or account storage key is not valid.\n\n * 400 DatabaseVulnerabilityAssessmentMissingStorageContainerPath - Storage container path must be provided if it isn't set in server level policy\n\n * 400 InvalidVulnerabilityAssessmentOperationRequest - The vulnerability assessment operation request does not exist or has no properties object.\n\n * 400 DataSecurityInvalidUserSuppliedParameter - An invalid parameter value was provided by the client.\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 * 500 DatabaseIsUnavailable - Loading failed. Please try again later."
},
"201": {
"description": "Successfully created the vulnerability assessment.",
Expand All @@ -143,14 +143,14 @@
}
},
"x-ms-examples": {
"Create a database's vulnerability assessment with all parameters": {
"$ref": "./examples/DatabaseVulnerabilityAssessmentCreateMax.json"
},
"Create a database's vulnerability assessment with minimal parameters, when storageContainerSasKey is specified": {
"$ref": "./examples/DatabaseVulnerabilityAssessmentCreateSasKeyMin.json"
"$ref": "./examples/DatabaseVulnerabilityAssessmentCreateContainerSasKeyMin.json"
},
"Create a database's vulnerability assessment with minimal parameters, when storageAccountAccessKey is specified": {
"$ref": "./examples/DatabaseVulnerabilityAssessmentCreateStorageKeyMin.json"
"$ref": "./examples/DatabaseVulnerabilityAssessmentCreateStorageAccessKeyMin.json"
},
"Create a database's vulnerability assessment with all parameters": {
"$ref": "./examples/DatabaseVulnerabilityAssessmentCreateMax.json"
}
}
},
Expand Down Expand Up @@ -200,7 +200,7 @@
"description": "Successfully removed the database vulnerability assessment."
},
"default": {
"description": "*** Error Responses: ***\n\n * 400 InvalidStorageAccountName - The provided storage account is not valid or does not exist.\n\n * 400 InvalidStorageAccountCredentials - The provided storage account shared access signature is not valid.\n\n * 404 SubscriptionDoesNotHaveServer - The requested server was not found\n\n * 404 DatabaseDoesNotExist - User has specified a database name that does not exist on this server instance.\n\n * 404 SourceDatabaseNotFound - The source database does not exist.\n\n * 500 DatabaseIsUnavailable - Loading failed. Please try again later."
"description": "*** Error Responses: ***\n\n * 400 InvalidStorageAccountName - The provided storage account is not valid or does not exist.\n\n * 400 InvalidStorageAccountCredentials - The provided storage account shared access signature or account storage key is not valid.\n\n * 400 DatabaseVulnerabilityAssessmentMissingStorageContainerPath - Storage container path must be provided if it isn't set in server level policy\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 * 500 DatabaseIsUnavailable - Loading failed. Please try again later."
}
},
"x-ms-examples": {
Expand All @@ -209,18 +209,64 @@
}
}
}
},
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/servers/{serverName}/databases/{databaseName}/vulnerabilityAssessments": {
"get": {
"tags": [
"DatabaseVulnerabilityAssessments"
],
"description": "Lists the vulnerability assessment policies associated with a database.",
"operationId": "DatabaseVulnerabilityAssessments_ListByDatabase",
"parameters": [
{
"$ref": "#/parameters/ResourceGroupParameter"
},
{
"$ref": "#/parameters/ServerNameParameter"
},
{
"name": "databaseName",
"in": "path",
"description": "The name of the database for which the vulnerability assessment policies are defined.",
"required": true,
"type": "string"
},
{
"$ref": "#/parameters/SubscriptionIdParameter"
},
{
"$ref": "#/parameters/ApiVersionParameter"
}
],
"responses": {
"200": {
"description": "Successfully retrieved the database vulnerability assessment policies.",
"schema": {
"$ref": "#/definitions/DatabaseVulnerabilityAssessmentListResult"
}
},
"default": {
"description": "*** Error Responses: ***\n\n * 400 InvalidStorageAccountName - The provided storage account is not valid or does not exist.\n\n * 400 InvalidStorageAccountCredentials - The provided storage account shared access signature or account storage key is not valid.\n\n * 400 VulnerabilityAssessmentInvalidPolicy - Vulnerability Assessment settings don't exist or invalid storage specified in settings. \n\n * 400 DatabaseVulnerabilityAssessmentMissingStorageContainerPath - Storage container path must be provided if it isn't set in server level policy\n\n * 400 VulnerabilityAssessmentDatawarehouseDatabaseIsDeactivated - Could not execute Vulnerability Assessment operation because the database is paused. Please resume it.\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 - 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": {
"Get the database's vulnerability assessment policies": {
"$ref": "./examples/DatabaseVulnerabilityAssessmentListByDatabase.json"
}
}
}
}
},
"definitions": {
"DatabaseVulnerabilityAssessmentProperties": {
"description": "Properties of a database Vulnerability Assessment.",
"required": [
"storageContainerPath"
],
"type": "object",
"properties": {
"storageContainerPath": {
"description": "A blob storage container path to hold the scan results (e.g. https://myStorage.blob.core.windows.net/VaScans/).",
"description": "A blob storage container path to hold the scan results (e.g. https://myStorage.blob.core.windows.net/VaScans/). It is required if server level vulnerability assessment policy doesn't set",
"type": "string",
"x-ms-mutability": [
"create",
Expand All @@ -236,7 +282,7 @@
]
},
"storageAccountAccessKey": {
"description": "Specifies the identifier key of the vulnerability assessment storage account. If 'StorageContainerSasKey' isn't specified, storageAccountAccessKey is required.",
"description": "Specifies the identifier key of the storage account for vulnerability assessment scan results. If 'StorageContainerSasKey' isn't specified, storageAccountAccessKey is required.",
"type": "string",
"x-ms-mutability": [
"create",
Expand Down Expand Up @@ -286,6 +332,25 @@
"x-ms-client-flatten": true
}
}
},
"DatabaseVulnerabilityAssessmentListResult": {
"description": "A list of the database's vulnerability assessments.",
"type": "object",
"properties": {
"value": {
"description": "Array of results.",
"type": "array",
"items": {
"$ref": "#/definitions/DatabaseVulnerabilityAssessment"
},
"readOnly": true
},
"nextLink": {
"description": "Link to retrieve next page of results.",
"type": "string",
"readOnly": true
}
}
}
},
"parameters": {
Expand Down
0 ...tyAssessmentCreateContainerSasKeyMin.json → ...tyAssessmentCreateContainerSasKeyMin.json
View file
File renamed without changes.
48 changes: 0 additions & 48 deletions ...l/preview/2017-03-01-preview/examples/DatabaseVulnerabilityAssessmentCreateSasKeyMin.json
View file

This file was deleted.

0 ...yAssessmentCreateStorageAccessKeyMin.json → ...yAssessmentCreateStorageAccessKeyMin.json
View file
File renamed without changes.
48 changes: 0 additions & 48 deletions ...eview/2017-03-01-preview/examples/DatabaseVulnerabilityAssessmentCreateStorageKeyMin.json
View file

This file was deleted.

4 changes: 2 additions & 2 deletions ...ulnerabilityAssessmentListByDatabase.json → ...ulnerabilityAssessmentListByDatabase.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"subscriptionId": "00000000-1111-2222-3333-444444444444",
"resourceGroupName": "vulnerabilityaseessmenttest-4799",
"serverName": "vulnerabilityaseessmenttest-6440",
"databaseName": "testdb",
"databaseName": "testdb",
"vulnerabilityAssessmentName": "default",
"api-version": "2018-06-01-preview"
},
Expand All @@ -28,4 +28,4 @@
}
}
}
}
}
0 ...ulnerabilityAssessmentListByDatabase.json → ...ulnerabilityAssessmentListByDatabase.json
View file
File renamed without changes.
Loading

0 comments on commit 4769596

Please sign in to comment.