From c2bd7116718bd1c0d38c19d0d6a8e92beb178d24 Mon Sep 17 00:00:00 2001
From: gdlxm <40441617+gdlxm@users.noreply.github.com>
Date: Thu, 20 Feb 2020 17:39:52 -0800
Subject: [PATCH] Added SoftDeleteRetentionInDays, CustomizedRecoverable and
 recoverableDays

---
 CODEOWNERS                                       |  2 +-
 .../2018-02-14-preview/examples/deleteVault.json |  6 ++++--
 .../examples/purgeDeletedVault.json              |  8 ++------
 .../preview/2018-02-14-preview/keyvault.json     |  3 +++
 .../stable/2019-09-01/keyvault.json              | 16 ++++++++++++++--
 5 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/CODEOWNERS b/CODEOWNERS
index 206fdc893088..b88af5dc9848 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -34,7 +34,7 @@
 /specification/insights/ @gucalder
 /specification/intune/ @vrmurthy01
 /specification/iothub/ @rkmanda
-/specification/keyvault/ @schaabs
+/specification/keyvault/ @schaabs @heaths
 /specification/logic/ @pankajsn @tonytang-microsoft-com
 /specification/machinelearning/ @nonstatic2014
 /specification/machinelearningcompute/ @shutchings
diff --git a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2018-02-14-preview/examples/deleteVault.json b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2018-02-14-preview/examples/deleteVault.json
index c2c9c0dfded1..e4b57537049d 100644
--- a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2018-02-14-preview/examples/deleteVault.json
+++ b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2018-02-14-preview/examples/deleteVault.json
@@ -7,8 +7,10 @@
   },
   "responses": {
     "200": {
-      "headers": {},
-      "body": ""
+      "headers": {}
+    },
+    "204": {
+      "headers": {}
     }
   }
 }
diff --git a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2018-02-14-preview/examples/purgeDeletedVault.json b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2018-02-14-preview/examples/purgeDeletedVault.json
index a215ef70f74f..781ece7c2d33 100644
--- a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2018-02-14-preview/examples/purgeDeletedVault.json
+++ b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2018-02-14-preview/examples/purgeDeletedVault.json
@@ -6,11 +6,7 @@
     "api-version": "2018-02-14-preview"
   },
   "responses": {
-    "200": {
-      "body": ""
-    },
-    "202": {
-      "body": ""
-    }
+    "200": {},
+    "202": {}
   }
 }
diff --git a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2018-02-14-preview/keyvault.json b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2018-02-14-preview/keyvault.json
index ede2c4ba6953..8145b18b578a 100644
--- a/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2018-02-14-preview/keyvault.json
+++ b/specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2018-02-14-preview/keyvault.json
@@ -174,6 +174,9 @@
         "responses": {
           "200": {
             "description": "OK Response."
+          },
+          "204": {
+            "description": "No Content."
           }
         },
         "x-ms-examples": {
diff --git a/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2019-09-01/keyvault.json b/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2019-09-01/keyvault.json
index 07ebc970138f..6d1b457281ab 100644
--- a/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2019-09-01/keyvault.json
+++ b/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2019-09-01/keyvault.json
@@ -1122,7 +1122,13 @@
         },
         "enableSoftDelete": {
           "type": "boolean",
-          "description": "Property to specify whether the 'soft delete' functionality is enabled for this key vault. If omitted, assume true as default value. Once set to true, cannot be reverted to false."
+          "default": true,
+          "description": "Property to specify whether the 'soft delete' functionality is enabled for this key vault. If it's not set to any value(true or false) when creating new key vault, it will be set to true by default. Once it's been set to true value, it can NOT be reverted to false."
+        },
+        "softDeleteRetentionInDays": {
+          "type": "integer",
+          "format": "int32",
+          "description": "softDelete data retention days. It accepts >=7 and <=90."
         },
         "createMode": {
           "type": "string",
@@ -1191,7 +1197,13 @@
         },
         "enableSoftDelete": {
           "type": "boolean",
-          "description": "Property to specify whether the 'soft delete' functionality is enabled for this key vault. If omitted, assume true as default value. Once set to true, cannot be reverted to false."
+          "default": false,
+          "description": "Property to specify whether the 'soft delete' functionality is enabled for this key vault. If omitted, assume false as default value when patching an existing vault. Once set to true, cannot be reverted to false."
+        },
+        "softDeleteRetentionInDays": {
+          "type": "integer",
+          "format": "int32",
+          "description": "softDelete data retention days. It accepts >=7 and <=90."
         },
         "createMode": {
           "type": "string",