New for swagger update (#3125)

* Adding Vulnerability Assessment APIs on managed instance Adding Vulnerability Assessment APIs on managed instance * fixed scan operation id * character mismatch fix * Added needed changes to Swagger and exampels Added needed changes to Swagger Azure/azure-sdk-for-net#4327 (review) * Delete managedDatabaseVulnerabilityAssessmentBaselines.json * Delete managedDatabaseVulnerabilityAssessmentScans.json * Delete managedDatabaseVulnerabilityAssessments.json * Delete ManagedDatabaseVulnerabilityAssessmentCreateMax.json * Delete ManagedDatabaseVulnerabilityAssessmentCreateMin.json * Delete ManagedDatabaseVulnerabilityAssessmentDelete.json * Delete ManagedDatabaseVulnerabilityAssessmentGet.json * Delete ManagedDatabaseVulnerabilityAssessmentRuleBaselineCreate.json * Delete ManagedDatabaseVulnerabilityAssessmentRuleBaselineDelete.json * Delete ManagedDatabaseVulnerabilityAssessmentRuleBaselineGet.json * Delete ManagedDatabaseVulnerabilityAssessmentScanExport.json * Delete ManagedDatabaseVulnerabilityAssessmentScanRecordsGet.json * Delete ManagedDatabaseVulnerabilityAssessmentScanRecordsListByDatabase.json * Delete ManagedDatabaseVulnerabilityAssessmentScansExecute.json * Update readme.md
Azure · May 23, 2018 · 3ea886e · 3ea886e
1 parent 0d97bd1
commit 3ea886e
Show file tree

Hide file tree

Showing 6 changed files with 82 additions and 91 deletions.
diff --git a/...ce-manager/Microsoft.Sql/preview/2017-03-01-preview/databaseVulnerabilityAssessments.json b/...ce-manager/Microsoft.Sql/preview/2017-03-01-preview/databaseVulnerabilityAssessments.json
@@ -143,11 +143,11 @@
           }
         },
         "x-ms-examples": {
-          "Create a database's vulnerability assessment with minimal parameters": {
-            "$ref": "./examples/DatabaseVulnerabilityAssessmentCreateMin.json"
-          },
           "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"
           }
         }
       },
@@ -211,6 +211,10 @@
   "definitions": {
     "DatabaseVulnerabilityAssessmentProperties": {
       "description": "Properties of a database Vulnerability Assessment.",
+      "required": [
+        "storageContainerPath",
+        "storageContainerSasKey"
+      ],
       "type": "object",
       "properties": {
         "storageContainerPath": {

diff --git a/...anager/Microsoft.Sql/preview/2017-10-01-preview/databaseVulnerabilityAssessmentScans.json b/...anager/Microsoft.Sql/preview/2017-10-01-preview/databaseVulnerabilityAssessmentScans.json
@@ -85,7 +85,7 @@
           "DatabaseVulnerabilityAssessmentScans"
         ],
         "description": "Executes a Vulnerability Assessment database scan.",
-        "operationId": "DatabaseVulnerabilityAssessmentScans_Execute",
+        "operationId": "DatabaseVulnerabilityAssessmentScans_InitiateScan",
         "parameters": [
           {
             "$ref": "#/parameters/ResourceGroupParameter"
@@ -522,7 +522,7 @@
       }
     },
     "DatabaseVulnerabilityAssessmentScanExportProperties": {
-      "description": "Properties of the export operation’s result.",
+      "description": "Properties of the export operation's result.",
       "type": "object",
       "properties": {
         "exportedReportLocation": {

diff --git a/...ft.Sql/preview/2017-10-01-preview/examples/DatabaseVulnerabilityAssessmentScanExport.json b/...ft.Sql/preview/2017-10-01-preview/examples/DatabaseVulnerabilityAssessmentScanExport.json
@@ -1,34 +1,34 @@
 {
-    "parameters": {
-        "subscriptionId": "00000000-1111-2222-3333-444444444444",
-        "resourceGroupName": "vulnerabilityassessmenttest-4799",
+  "parameters": {
+    "subscriptionId": "00000000-1111-2222-3333-444444444444",
+    "resourceGroupName": "vulnerabilityassessmenttest-4799",
         "serverName": "vulnerabilityassessmenttest-6440",
-        "databaseName": "testdb",
-        "vulnerabilityAssessmentName": "default",
-        "vaScanId": "scan001",
-        "api-version": "2017-10-01-preview",
-        "parameters": { }
+    "databaseName": "testdb",
+    "vulnerabilityAssessmentName": "default",
+    "scanId": "scan001",
+    "api-version": "2017-10-01-preview",
+    "parameters": {}
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/vulnerabilityassessmenttest-4799/providers/Microsoft.Sql/servers/vulnerabilityassessmenttest-6440/databases/testdb/vulnerabilityAssessments/default/scans/scan001/export",
+        "name": "scan001",
+        "type": "Microsoft.Sql/servers/databases/vulnerabilityAssessments/scans/export",
+        "properties": {
+          "exportedReportLocation": "https://myaccount.blob.core.windows.net/vulnerabilityAssessment/vulnerabilityassessmenttest-6440/testdb/scan001.xlsx"
+        }
+      }
     },
-    "responses": {
-        "200": {
-            "body": {
-                "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/vulnerabilityassessmenttest-4799/providers/Microsoft.Sql/servers/vulnerabilityassessmenttest-6440/databases/testdb/vulnerabilityAssessments/default/scans/scan001/export",
-                "name": "scan001",
-                "type": "Microsoft.Sql/servers/databases/vulnerabilityAssessments/scans/export",
-                "properties": {
-                    "exportedReportLocation": "https://myaccount.blob.core.windows.net/vulnerabilityAssessment/vulnerabilityassessmenttest-6440/testdb/scan001.xlsx"
-                }
-            }
-        },
-        "201": {
-            "body": {
-                "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/vulnerabilityassessmenttest-4799/providers/Microsoft.Sql/servers/vulnerabilityassessmenttest-6440/databases/testdb/vulnerabilityAssessments/default/scans/scan001/export",
-                "name": "scan001",
-                "type": "Microsoft.Sql/servers/databases/vulnerabilityAssessments/scans/export",
-                "properties": {
-                    "exportedReportLocation": "https://myaccount.blob.core.windows.net/vulnerabilityAssessment/vulnerabilityassessmenttest-6440/testdb/scan001.xlsx"
-                }
-            }
+    "201": {
+      "body": {
+        "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/vulnerabilityassessmenttest-4799/providers/Microsoft.Sql/servers/vulnerabilityassessmenttest-6440/databases/testdb/vulnerabilityAssessments/default/scans/scan001/export",
+        "name": "scan001",
+        "type": "Microsoft.Sql/servers/databases/vulnerabilityAssessments/scans/export",
+        "properties": {
+          "exportedReportLocation": "https://myaccount.blob.core.windows.net/vulnerabilityAssessment/vulnerabilityassessmenttest-6440/testdb/scan001.xlsx"
         }
+      }
     }
+  }
 }
diff --git a/...ql/preview/2017-10-01-preview/examples/DatabaseVulnerabilityAssessmentScanRecordsGet.json b/...ql/preview/2017-10-01-preview/examples/DatabaseVulnerabilityAssessmentScanRecordsGet.json
@@ -1,30 +1,30 @@
 {
-    "parameters": {
-        "subscriptionId": "00000000-1111-2222-3333-444444444444",
-        "resourceGroupName": "vulnerabilityassessmenttest-4711",
+  "parameters": {
+    "subscriptionId": "00000000-1111-2222-3333-444444444444",
+    "resourceGroupName": "vulnerabilityassessmenttest-4711",
         "serverName": "vulnerabilityassessmenttest-6411",
-        "databaseName": "testdb",
-        "vulnerabilityAssessmentName": "default",
-        "scanId": "scan001",
-        "api-version": "2017-10-01-preview"
-    },
-    "responses": {
-        "200": {
-            "body": {
-                "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/vulnerabilityassessmenttest-4799/providers/Microsoft.Sql/servers/vulnerabilityassessmenttest-6440/databases/testdb/vulnerabilityAssessments/default/scans/scan001",
-                "name": "scan001",
-                "type": "Microsoft.Sql/servers/databases/vulnerabilityAssessments/scans",
-                "properties": {
-                    "id": "scan001",
-                    "triggerType": "OnDemand",
-                    "state": "Passed",
-                    "startTime": "2017-12-12T17:45:06Z",
-                    "endTime": "2017-12-12T17:47:06Z",
-                    "errors": [ ],
-                    "storageContainerPath": "https://myaccount.blob.core.windows.net/vulnerability-assessment",
-                    "numberOfFailedSecurityChecks": 9
-                }
-            }
+    "databaseName": "testdb",
+    "vulnerabilityAssessmentName": "default",
+    "scanId": "scan001",
+    "api-version": "2017-10-01-preview"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/vulnerabilityassessmenttest-4799/providers/Microsoft.Sql/servers/vulnerabilityassessmenttest-6440/databases/testdb/vulnerabilityAssessments/default/scans/scan001",
+        "name": "scan001",
+        "type": "Microsoft.Sql/servers/databases/vulnerabilityAssessments/scans",
+        "properties": {
+          "scanId": "scan001",
+          "triggerType": "OnDemand",
+          "state": "Passed",
+          "startTime": "2017-12-12T17:45:06Z",
+          "endTime": "2017-12-12T17:47:06Z",
+          "errors": [],
+          "storageContainerPath": "https://myaccount.blob.core.windows.net/vulnerability-assessment",
+          "numberOfFailedSecurityChecks": 9
         }
+      }
     }
+  }
 }
diff --git a/...2017-10-01-preview/examples/DatabaseVulnerabilityAssessmentScanRecordsListByDatabase.json b/...2017-10-01-preview/examples/DatabaseVulnerabilityAssessmentScanRecordsListByDatabase.json
@@ -16,7 +16,7 @@
                         "name": "scan001",
                         "type": "Microsoft.Sql/servers/databases/vulnerabilityAssessments/scans",
                         "properties": {
-                            "id": "scan001",
+                            "scanId": "scan001",
                             "triggerType": "OnDemand",
                             "state": "Passed",
                             "startTime": "2017-12-12T17:45:06Z",
@@ -31,7 +31,7 @@
                         "name": "scan002",
                         "type": "Microsoft.Sql/servers/databases/vulnerabilityAssessments/scans",
                         "properties": {
-                            "id": "scan002",
+                            "scanId": "scan002",
                             "triggerType": "Recurring",
                             "state": "Failed",
                             "startTime": "2017-12-12T17:45:06Z",
@@ -46,13 +46,16 @@
                         "name": "scan003",
                         "type": "Microsoft.Sql/servers/databases/vulnerabilityAssessments/scans",
                         "properties": {
-                            "id": "scan003",
+                            "scanId": "scan003",
                             "triggerType": "Recurring",
                             "state": "FailedToRun",
                             "startTime": "2017-12-12T17:45:06Z",
                             "endTime": "2017-12-12T17:47:06Z",
                             "errors": [
-                                { "code": "StorageNotFound", "message": "Storage not found" }
+                                {
+                                    "code": "StorageNotFound",
+                                    "message": "Storage not found"
+                                }
                             ],
                             "storageContainerPath": "https://myaccount.blob.core.windows.net/vulnerability-assessment",
                             "numberOfFailedSecurityChecks": 0

diff --git a/....Sql/preview/2017-10-01-preview/examples/DatabaseVulnerabilityAssessmentScansExecute.json b/....Sql/preview/2017-10-01-preview/examples/DatabaseVulnerabilityAssessmentScansExecute.json
@@ -1,31 +1,15 @@
 {
-    "parameters": {
-        "subscriptionId": "00000000-1111-2222-3333-444444444444",
-        "resourceGroupName": "vulnerabilityassessmenttest-4711",
-        "serverName": "vulnerabilityassessmenttest-6411",
-        "databaseName": "testdb",
-        "vulnerabilityAssessmentName": "default",
-        "scanId": "scan01",
-        "api-version": "2017-10-01-preview"
-    },
-    "responses": {
-        "200": {
-            "body": {
-                "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/vulnerabilityassessmenttest-4799/providers/Microsoft.Sql/servers/vulnerabilityassessmenttest-6440/databases/testdb/vulnerabilityAssessments/default/scans/scan001",
-                "name": "scan001",
-                "type": "Microsoft.Sql/servers/databases/vulnerabilityAssessments/scans",
-                "properties": {
-                    "id": "scan001",
-                    "triggerType": "OnDemand",
-                    "state": "Passed",
-                    "startTime": "2017-12-12T17:45:06Z",
-                    "endTime": "2017-12-12T17:47:06Z",
-                    "errors": [ ],
-                    "storageContainerPath": "https://myaccount.blob.core.windows.net/vulnerability-assessment",
-                    "numberOfFailedSecurityChecks": 9
-                }
-            }
-        },
-        "202": {}
-    }
+  "parameters": {
+    "subscriptionId": "00000000-1111-2222-3333-444444444444",
+    "resourceGroupName": "vulnerabilityassessmenttest-4711",
+    "managedInstanceName": "vulnerabilityassessmenttest-6411",
+    "databaseName": "testdb",
+    "vulnerabilityAssessmentName": "default",
+    "scanId": "scan01",
+    "api-version": "2017-10-01-preview"
+  },
+  "responses": {
+    "200": {},
+    "202": {}
+  }
 }