From c7763459d74c6a407643a8a56c3b7fb9056ef7c5 Mon Sep 17 00:00:00 2001
From: Jack Lichwa <52512203+jlichwa@users.noreply.github.com>
Date: Thu, 15 Aug 2019 16:07:38 -0700
Subject: [PATCH 1/9] Create KeyVault.json

Event definitions for Key Vault Certificates, Keys and Secrets - NewVersion, Near Expiry and Expired
---
 .../stable/2018-01-01/KeyVault.json           | 611 ++++++++++++++++++
 1 file changed, 611 insertions(+)
 create mode 100644 specification/eventgrid/data-plane/Microsoft.KeyVault/stable/2018-01-01/KeyVault.json

diff --git a/specification/eventgrid/data-plane/Microsoft.KeyVault/stable/2018-01-01/KeyVault.json b/specification/eventgrid/data-plane/Microsoft.KeyVault/stable/2018-01-01/KeyVault.json
new file mode 100644
index 000000000000..8d9173c4e8e8
--- /dev/null
+++ b/specification/eventgrid/data-plane/Microsoft.KeyVault/stable/2018-01-01/KeyVault.json
@@ -0,0 +1,611 @@
+{
+
+  "swagger": "2.0",
+
+  "info": {
+
+    "version": "2018-01-01",
+
+    "title": "Schema of Azure Vault events published to Azure Event Grid",
+
+    "description": "Describes the schema of the Azure Key Vault events published to Azure Event Grid. This corresponds to the Data property of an EventGridEvent."
+
+  },
+
+  "paths": {},
+
+  "definitions": {
+
+    "CertificateNewVersionCreated": {
+
+      "description": "Schema of the Data property of an EventGridEvent for an CertificateNewVersionCreated event.",
+
+      "type": "object",
+
+      "properties": {
+
+        "id": {
+
+          "description": "The id of the object that triggered this event.",
+
+          "type": "string"
+
+        },
+
+        "topic": {
+
+          "description": "The topic of triggered event.",
+
+          "type": "string"
+
+        },
+
+        "objectType": {
+
+          "description": "The type of the object that triggered this event",
+
+          "type": "string"
+
+        },
+
+        "objectName": {
+
+          "description": "The name of the object that triggered this event",
+
+          "type": "string"
+
+        },
+
+        "version": {
+
+          "description": "The version of the object that triggered this event",
+
+          "type": "string"
+
+        },
+
+        "nbf": {
+
+          "description": "Not before date of the object that triggered this event",
+
+          "type": "number"
+        },
+
+        "exp": {
+
+          "description": "The expiration date of the object that triggered this event",
+
+          "type": "number"
+        }
+      }
+
+    },
+    "CertificateNearExpiry": {
+
+        "description": "Schema of the Data property of an EventGridEvent for an CertificateNearExpiry event.",
+  
+        "type": "object",
+  
+        "properties": {
+  
+          "id": {
+  
+            "description": "The id of the object that triggered this event.",
+  
+            "type": "string"
+  
+          },
+  
+          "topic": {
+  
+            "description": "The topic of triggered event.",
+  
+            "type": "string"
+  
+          },
+  
+          "objectType": {
+  
+            "description": "The type of the object that triggered this event",
+  
+            "type": "string"
+  
+          },
+  
+          "objectName": {
+  
+            "description": "The name of the object that triggered this event",
+  
+            "type": "string"
+  
+          },
+  
+          "version": {
+  
+            "description": "The version of the object that triggered this event",
+  
+            "type": "string"
+  
+          },
+  
+          "nbf": {
+  
+            "description": "Not before date of the object that triggered this event",
+  
+            "type": "number"
+          },
+  
+          "exp": {
+  
+            "description": "The expiration date of the object that triggered this event",
+  
+            "type": "number"
+          }
+        }
+  
+      },
+      "CertificateExpired": {
+
+        "description": "Schema of the Data property of an EventGridEvent for an CertificateExpired event.",
+  
+        "type": "object",
+  
+        "properties": {
+  
+          "id": {
+  
+            "description": "The id of the object that triggered this event.",
+  
+            "type": "string"
+  
+          },
+  
+          "topic": {
+  
+            "description": "The topic of triggered event.",
+  
+            "type": "string"
+  
+          },
+  
+          "objectType": {
+  
+            "description": "The type of the object that triggered this event",
+  
+            "type": "string"
+  
+          },
+  
+          "objectName": {
+  
+            "description": "The name of the object that triggered this event",
+  
+            "type": "string"
+  
+          },
+  
+          "version": {
+  
+            "description": "The version of the object that triggered this event",
+  
+            "type": "string"
+  
+          },
+  
+          "nbf": {
+  
+            "description": "Not before date of the object that triggered this event",
+  
+            "type": "number"
+
+          },
+  
+          "exp": {
+  
+            "description": "The expiration date of the object that triggered this event",
+  
+            "type": "number"
+
+          }
+        }
+  
+      },
+      "KeyNewVersionCreated": {
+
+        "description": "Schema of the Data property of an EventGridEvent for an KeyNewVersionCreated event.",
+  
+        "type": "object",
+  
+        "properties": {
+  
+          "id": {
+  
+            "description": "The id of the object that triggered this event.",
+  
+            "type": "string"
+  
+          },
+  
+          "topic": {
+  
+            "description": "The topic of triggered event.",
+  
+            "type": "string"
+  
+          },
+  
+          "objectType": {
+  
+            "description": "The type of the object that triggered this event",
+  
+            "type": "string"
+  
+          },
+  
+          "objectName": {
+  
+            "description": "The name of the object that triggered this event",
+  
+            "type": "string"
+  
+          },
+  
+          "version": {
+  
+            "description": "The version of the object that triggered this event",
+  
+            "type": "string"
+  
+          },
+  
+          "nbf": {
+  
+            "description": "Not before date of the object that triggered this event",
+  
+            "type": "number"
+
+          },
+  
+          "exp": {
+  
+            "description": "The expiration date of the object that triggered this event",
+  
+            "type": "number"
+
+          }
+        }
+  
+      },
+      "KeyNearExpiry": {
+
+        "description": "Schema of the Data property of an EventGridEvent for an KeyNearExpiry event.",
+  
+        "type": "object",
+  
+        "properties": {
+  
+          "id": {
+  
+            "description": "The id of the object that triggered this event.",
+  
+            "type": "string"
+  
+          },
+  
+          "topic": {
+  
+            "description": "The topic of triggered event.",
+  
+            "type": "string"
+  
+          },
+  
+          "objectType": {
+  
+            "description": "The type of the object that triggered this event",
+  
+            "type": "string"
+  
+          },
+  
+          "objectName": {
+  
+            "description": "The name of the object that triggered this event",
+  
+            "type": "string"
+  
+          },
+  
+          "version": {
+  
+            "description": "The version of the object that triggered this event",
+  
+            "type": "string"
+  
+          },
+  
+          "nbf": {
+  
+            "description": "Not before date of the object that triggered this event",
+  
+            "type": "number"
+  
+          },
+  
+          "exp": {
+  
+            "description": "The expiration date of the object that triggered this event",
+  
+            "type": "number"
+  
+          }
+        }
+  
+      },
+      "KeyExpired": {
+
+        "description": "Schema of the Data property of an EventGridEvent for an KeyExpired event.",
+  
+        "type": "object",
+  
+        "properties": {
+  
+          "id": {
+  
+            "description": "The id of the object that triggered this event.",
+  
+            "type": "string"
+  
+          },
+  
+          "topic": {
+  
+            "description": "The topic of triggered event.",
+  
+            "type": "string"
+  
+          },
+  
+          "objectType": {
+  
+            "description": "The type of the object that triggered this event",
+  
+            "type": "string"
+  
+          },
+  
+          "objectName": {
+  
+            "description": "The name of the object that triggered this event",
+  
+            "type": "string"
+  
+          },
+  
+          "version": {
+  
+            "description": "The version of the object that triggered this event",
+  
+            "type": "string"
+  
+          },
+  
+          "nbf": {
+  
+            "description": "Not before date of the object that triggered this event",
+  
+            "type": "number"
+
+          },
+  
+          "exp": {
+  
+            "description": "The expiration date of the object that triggered this event",
+  
+            "type": "number"
+
+          }
+        }
+  
+      },
+      "SecretNewVersionCreated": {
+
+        "description": "Schema of the Data property of an EventGridEvent for an SecretNewVersionCreated event.",
+  
+        "type": "object",
+  
+        "properties": {
+  
+          "id": {
+  
+            "description": "The id of the object that triggered this event.",
+  
+            "type": "string"
+  
+          },
+  
+          "topic": {
+  
+            "description": "The topic of triggered event.",
+  
+            "type": "string"
+  
+          },
+  
+          "objectType": {
+  
+            "description": "The type of the object that triggered this event",
+  
+            "type": "string"
+  
+          },
+  
+          "objectName": {
+  
+            "description": "The name of the object that triggered this event",
+  
+            "type": "string"
+  
+          },
+  
+          "version": {
+  
+            "description": "The version of the object that triggered this event",
+  
+            "type": "string"
+  
+          },
+  
+          "nbf": {
+  
+            "description": "Not before date of the object that triggered this event",
+  
+            "type": "number"
+
+          },
+  
+          "exp": {
+  
+            "description": "The expiration date of the object that triggered this event",
+  
+            "type": "number"
+
+          }
+        }
+  
+      },
+      "SecretNearExpiry": {
+
+        "description": "Schema of the Data property of an EventGridEvent for an SecretNearExpiry event.",
+  
+        "type": "object",
+  
+        "properties": {
+  
+          "id": {
+  
+            "description": "The id of the object that triggered this event.",
+  
+            "type": "string"
+  
+          },
+  
+          "topic": {
+  
+            "description": "The topic of triggered event.",
+  
+            "type": "string"
+  
+          },
+  
+          "objectType": {
+  
+            "description": "The type of the object that triggered this event",
+  
+            "type": "string"
+  
+          },
+  
+          "objectName": {
+  
+            "description": "The name of the object that triggered this event",
+  
+            "type": "string"
+  
+          },
+  
+          "version": {
+  
+            "description": "The version of the object that triggered this event",
+  
+            "type": "string"
+  
+          },
+  
+          "nbf": {
+  
+            "description": "Not before date of the object that triggered this event",
+  
+            "type": "number"
+
+          },
+  
+          "exp": {
+  
+            "description": "The expiration date of the object that triggered this event",
+  
+            "type": "number"
+
+          }
+        }
+  
+      },
+      "SecretExpired": {
+
+        "description": "Schema of the Data property of an EventGridEvent for an SecretExpired event.",
+  
+        "type": "object",
+  
+        "properties": {
+  
+          "id": {
+  
+            "description": "The id of the object that triggered this event.",
+  
+            "type": "string"
+  
+          },
+  
+          "topic": {
+  
+            "description": "The topic of triggered event.",
+  
+            "type": "string"
+  
+          },
+  
+          "objectType": {
+  
+            "description": "The type of the object that triggered this event",
+  
+            "type": "string"
+  
+          },
+  
+          "objectName": {
+  
+            "description": "The name of the object that triggered this event",
+  
+            "type": "string"
+  
+          },
+  
+          "version": {
+  
+            "description": "The version of the object that triggered this event",
+  
+            "type": "string"
+  
+          },
+  
+          "nbf": {
+  
+            "description": "Not before date of the object that triggered this event",
+  
+            "type": "number"
+     
+          },
+  
+          "exp": {
+  
+            "description": "The expiration date of the object that triggered this event",
+  
+            "type": "number"
+
+          }
+        }
+  
+      }
+    }
+}
+

From dbc6d94896d07f59ca7669fa5e21a5f39c84359f Mon Sep 17 00:00:00 2001
From: Jack Lichwa <52512203+jlichwa@users.noreply.github.com>
Date: Thu, 15 Aug 2019 16:45:50 -0700
Subject: [PATCH 2/9] Update KeyVault.json

---
 .../Microsoft.KeyVault/stable/2018-01-01/KeyVault.json        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/specification/eventgrid/data-plane/Microsoft.KeyVault/stable/2018-01-01/KeyVault.json b/specification/eventgrid/data-plane/Microsoft.KeyVault/stable/2018-01-01/KeyVault.json
index 8d9173c4e8e8..74645c92ea21 100644
--- a/specification/eventgrid/data-plane/Microsoft.KeyVault/stable/2018-01-01/KeyVault.json
+++ b/specification/eventgrid/data-plane/Microsoft.KeyVault/stable/2018-01-01/KeyVault.json
@@ -32,9 +32,9 @@
 
         },
 
-        "topic": {
+        "vaultName": {
 
-          "description": "The topic of triggered event.",
+          "description": "Key vault name of the object that triggered this event.",
 
           "type": "string"
 

From ffebdaf19c0af6f3008111aa89fd434f655ab133 Mon Sep 17 00:00:00 2001
From: Jack Lichwa <52512203+jlichwa@users.noreply.github.com>
Date: Thu, 15 Aug 2019 16:49:24 -0700
Subject: [PATCH 3/9] Update KeyVault.json

Change topic to vaultname
---
 .../stable/2018-01-01/KeyVault.json           | 48 +++++++++----------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/specification/eventgrid/data-plane/Microsoft.KeyVault/stable/2018-01-01/KeyVault.json b/specification/eventgrid/data-plane/Microsoft.KeyVault/stable/2018-01-01/KeyVault.json
index 74645c92ea21..9570f34c4442 100644
--- a/specification/eventgrid/data-plane/Microsoft.KeyVault/stable/2018-01-01/KeyVault.json
+++ b/specification/eventgrid/data-plane/Microsoft.KeyVault/stable/2018-01-01/KeyVault.json
@@ -96,9 +96,9 @@
   
           },
   
-          "topic": {
-  
-            "description": "The topic of triggered event.",
+         "vaultName": {
+
+            "description": "Key vault name of the object that triggered this event.",
   
             "type": "string"
   
@@ -160,9 +160,9 @@
   
           },
   
-          "topic": {
-  
-            "description": "The topic of triggered event.",
+          "vaultName": {
+
+            "description": "Key vault name of the object that triggered this event.",
   
             "type": "string"
   
@@ -226,9 +226,9 @@
   
           },
   
-          "topic": {
-  
-            "description": "The topic of triggered event.",
+         "vaultName": {
+
+            "description": "Key vault name of the object that triggered this event.",
   
             "type": "string"
   
@@ -292,9 +292,9 @@
   
           },
   
-          "topic": {
-  
-            "description": "The topic of triggered event.",
+         "vaultName": {
+
+            "description": "Key vault name of the object that triggered this event.",
   
             "type": "string"
   
@@ -358,9 +358,9 @@
   
           },
   
-          "topic": {
-  
-            "description": "The topic of triggered event.",
+         "vaultName": {
+
+            "description": "Key vault name of the object that triggered this event.",
   
             "type": "string"
   
@@ -424,9 +424,9 @@
   
           },
   
-          "topic": {
-  
-            "description": "The topic of triggered event.",
+         "vaultName": {
+
+            "description": "Key vault name of the object that triggered this event.",
   
             "type": "string"
   
@@ -490,9 +490,9 @@
   
           },
   
-          "topic": {
-  
-            "description": "The topic of triggered event.",
+         "vaultName": {
+
+            "description": "Key vault name of the object that triggered this event.",
   
             "type": "string"
   
@@ -556,9 +556,9 @@
   
           },
   
-          "topic": {
-  
-            "description": "The topic of triggered event.",
+         "vaultName": {
+
+            "description": "Key vault name of the object that triggered this event.",
   
             "type": "string"
   

From 66c76158ca650e8f4bf0ff082bc5428e2544c457 Mon Sep 17 00:00:00 2001
From: Jack Lichwa <52512203+jlichwa@users.noreply.github.com>
Date: Fri, 16 Aug 2019 10:38:50 -0700
Subject: [PATCH 4/9] Update readme with KeyVault.json

---
 specification/eventgrid/data-plane/readme.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/specification/eventgrid/data-plane/readme.md b/specification/eventgrid/data-plane/readme.md
index 7eab6e07b842..b530b170746f 100644
--- a/specification/eventgrid/data-plane/readme.md
+++ b/specification/eventgrid/data-plane/readme.md
@@ -55,6 +55,7 @@ input-file:
 - Microsoft.Maps/stable/2018-01-01/Maps.json
 - Microsoft.AppConfiguration/stable/2018-01-01/AppConfiguration.json
 - Microsoft.SignalRService/stable/2018-01-01/SignalRService.json
+- Microsoft.KeyVault/stable/2018-01-01/KeyVault.json
 ```
 
 ---
@@ -133,6 +134,7 @@ input-file:
   - $(this-folder)/Microsoft.Maps/stable/2018-01-01/Maps.json
   - $(this-folder)/Microsoft.AppConfiguration/stable/2018-01-01/AppConfiguration.json
   - $(this-folder)/Microsoft.SignalRService/stable/2018-01-01/SignalRService.json
+  - $(this-folder)/Microsoft.KeyVault/stable/2018-01-01/KeyVault.json
 
 ```
 

From 49e8d1d165cd280e0afd95f6ef6a18f88b546ed0 Mon Sep 17 00:00:00 2001
From: Jack Lichwa <52512203+jlichwa@users.noreply.github.com>
Date: Mon, 19 Aug 2019 09:51:48 -0700
Subject: [PATCH 5/9] Update KeyVault.json

---
 .../Microsoft.KeyVault/stable/2018-01-01/KeyVault.json          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/specification/eventgrid/data-plane/Microsoft.KeyVault/stable/2018-01-01/KeyVault.json b/specification/eventgrid/data-plane/Microsoft.KeyVault/stable/2018-01-01/KeyVault.json
index 9570f34c4442..6eba02eeca0d 100644
--- a/specification/eventgrid/data-plane/Microsoft.KeyVault/stable/2018-01-01/KeyVault.json
+++ b/specification/eventgrid/data-plane/Microsoft.KeyVault/stable/2018-01-01/KeyVault.json
@@ -6,7 +6,7 @@
 
     "version": "2018-01-01",
 
-    "title": "Schema of Azure Vault events published to Azure Event Grid",
+    "title": "Schema of Azure Key Vault events published to Azure Event Grid",
 
     "description": "Describes the schema of the Azure Key Vault events published to Azure Event Grid. This corresponds to the Data property of an EventGridEvent."
 

From 1370afed33c0b25cfee2b8462c8240f96c67d482 Mon Sep 17 00:00:00 2001
From: Jack Lichwa <52512203+jlichwa@users.noreply.github.com>
Date: Wed, 21 Aug 2019 12:21:09 -0700
Subject: [PATCH 6/9] Update KeyVault.json

Remove empty lines
---
 .../stable/2018-01-01/KeyVault.json           | 294 ------------------
 1 file changed, 294 deletions(-)

diff --git a/specification/eventgrid/data-plane/Microsoft.KeyVault/stable/2018-01-01/KeyVault.json b/specification/eventgrid/data-plane/Microsoft.KeyVault/stable/2018-01-01/KeyVault.json
index 6eba02eeca0d..3a279b291475 100644
--- a/specification/eventgrid/data-plane/Microsoft.KeyVault/stable/2018-01-01/KeyVault.json
+++ b/specification/eventgrid/data-plane/Microsoft.KeyVault/stable/2018-01-01/KeyVault.json
@@ -1,611 +1,317 @@
 {
-
   "swagger": "2.0",
-
   "info": {
-
     "version": "2018-01-01",
-
     "title": "Schema of Azure Key Vault events published to Azure Event Grid",
-
     "description": "Describes the schema of the Azure Key Vault events published to Azure Event Grid. This corresponds to the Data property of an EventGridEvent."
-
   },
-
   "paths": {},
-
   "definitions": {
-
     "CertificateNewVersionCreated": {
-
       "description": "Schema of the Data property of an EventGridEvent for an CertificateNewVersionCreated event.",
-
       "type": "object",
-
       "properties": {
-
         "id": {
-
           "description": "The id of the object that triggered this event.",
-
           "type": "string"
-
         },
-
         "vaultName": {
-
           "description": "Key vault name of the object that triggered this event.",
-
           "type": "string"
-
         },
-
         "objectType": {
-
           "description": "The type of the object that triggered this event",
-
           "type": "string"
-
         },
-
         "objectName": {
-
           "description": "The name of the object that triggered this event",
-
           "type": "string"
-
         },
-
         "version": {
-
           "description": "The version of the object that triggered this event",
-
           "type": "string"
-
         },
-
         "nbf": {
-
           "description": "Not before date of the object that triggered this event",
-
           "type": "number"
         },
-
         "exp": {
-
           "description": "The expiration date of the object that triggered this event",
-
           "type": "number"
         }
       }
-
     },
     "CertificateNearExpiry": {
-
         "description": "Schema of the Data property of an EventGridEvent for an CertificateNearExpiry event.",
-  
         "type": "object",
-  
         "properties": {
-  
           "id": {
-  
             "description": "The id of the object that triggered this event.",
-  
             "type": "string"
-  
           },
-  
          "vaultName": {
-
             "description": "Key vault name of the object that triggered this event.",
-  
             "type": "string"
-  
           },
-  
           "objectType": {
-  
             "description": "The type of the object that triggered this event",
-  
             "type": "string"
-  
           },
-  
           "objectName": {
-  
             "description": "The name of the object that triggered this event",
-  
             "type": "string"
-  
           },
-  
           "version": {
-  
             "description": "The version of the object that triggered this event",
-  
             "type": "string"
-  
           },
-  
           "nbf": {
-  
             "description": "Not before date of the object that triggered this event",
-  
             "type": "number"
           },
-  
           "exp": {
-  
             "description": "The expiration date of the object that triggered this event",
-  
             "type": "number"
           }
         }
-  
       },
       "CertificateExpired": {
-
         "description": "Schema of the Data property of an EventGridEvent for an CertificateExpired event.",
-  
         "type": "object",
-  
         "properties": {
-  
           "id": {
-  
             "description": "The id of the object that triggered this event.",
-  
             "type": "string"
-  
           },
-  
           "vaultName": {
-
             "description": "Key vault name of the object that triggered this event.",
-  
             "type": "string"
-  
           },
-  
           "objectType": {
-  
             "description": "The type of the object that triggered this event",
-  
             "type": "string"
-  
           },
-  
           "objectName": {
-  
             "description": "The name of the object that triggered this event",
-  
             "type": "string"
-  
           },
-  
           "version": {
-  
             "description": "The version of the object that triggered this event",
-  
             "type": "string"
-  
           },
-  
           "nbf": {
-  
             "description": "Not before date of the object that triggered this event",
-  
             "type": "number"
-
           },
-  
           "exp": {
-  
             "description": "The expiration date of the object that triggered this event",
-  
             "type": "number"
-
           }
         }
-  
       },
       "KeyNewVersionCreated": {
-
         "description": "Schema of the Data property of an EventGridEvent for an KeyNewVersionCreated event.",
-  
         "type": "object",
-  
         "properties": {
-  
           "id": {
-  
             "description": "The id of the object that triggered this event.",
-  
             "type": "string"
-  
           },
-  
          "vaultName": {
-
             "description": "Key vault name of the object that triggered this event.",
-  
             "type": "string"
-  
           },
-  
           "objectType": {
-  
             "description": "The type of the object that triggered this event",
-  
             "type": "string"
-  
           },
-  
           "objectName": {
-  
             "description": "The name of the object that triggered this event",
-  
             "type": "string"
-  
           },
-  
           "version": {
-  
             "description": "The version of the object that triggered this event",
-  
             "type": "string"
-  
           },
-  
           "nbf": {
-  
             "description": "Not before date of the object that triggered this event",
-  
             "type": "number"
-
           },
-  
           "exp": {
-  
             "description": "The expiration date of the object that triggered this event",
-  
             "type": "number"
-
           }
         }
-  
       },
       "KeyNearExpiry": {
-
         "description": "Schema of the Data property of an EventGridEvent for an KeyNearExpiry event.",
-  
         "type": "object",
-  
         "properties": {
-  
           "id": {
-  
             "description": "The id of the object that triggered this event.",
-  
             "type": "string"
-  
           },
-  
          "vaultName": {
-
             "description": "Key vault name of the object that triggered this event.",
-  
             "type": "string"
-  
           },
-  
           "objectType": {
-  
             "description": "The type of the object that triggered this event",
-  
             "type": "string"
-  
           },
-  
           "objectName": {
-  
             "description": "The name of the object that triggered this event",
-  
             "type": "string"
-  
           },
-  
           "version": {
-  
             "description": "The version of the object that triggered this event",
-  
             "type": "string"
-  
           },
-  
           "nbf": {
-  
             "description": "Not before date of the object that triggered this event",
-  
             "type": "number"
-  
           },
-  
           "exp": {
-  
             "description": "The expiration date of the object that triggered this event",
-  
             "type": "number"
-  
           }
         }
-  
       },
       "KeyExpired": {
-
         "description": "Schema of the Data property of an EventGridEvent for an KeyExpired event.",
-  
         "type": "object",
-  
         "properties": {
-  
           "id": {
-  
             "description": "The id of the object that triggered this event.",
-  
             "type": "string"
-  
           },
-  
          "vaultName": {
-
             "description": "Key vault name of the object that triggered this event.",
-  
             "type": "string"
-  
           },
-  
           "objectType": {
-  
             "description": "The type of the object that triggered this event",
-  
             "type": "string"
-  
           },
-  
           "objectName": {
-  
             "description": "The name of the object that triggered this event",
-  
             "type": "string"
-  
           },
-  
           "version": {
-  
             "description": "The version of the object that triggered this event",
-  
             "type": "string"
-  
           },
-  
           "nbf": {
-  
             "description": "Not before date of the object that triggered this event",
-  
             "type": "number"
-
           },
-  
           "exp": {
-  
             "description": "The expiration date of the object that triggered this event",
-  
             "type": "number"
-
           }
         }
-  
       },
       "SecretNewVersionCreated": {
-
         "description": "Schema of the Data property of an EventGridEvent for an SecretNewVersionCreated event.",
-  
         "type": "object",
-  
         "properties": {
-  
           "id": {
-  
             "description": "The id of the object that triggered this event.",
-  
             "type": "string"
-  
           },
-  
          "vaultName": {
-
             "description": "Key vault name of the object that triggered this event.",
-  
             "type": "string"
-  
           },
-  
           "objectType": {
-  
             "description": "The type of the object that triggered this event",
-  
             "type": "string"
-  
           },
-  
           "objectName": {
-  
             "description": "The name of the object that triggered this event",
-  
             "type": "string"
-  
           },
-  
           "version": {
-  
             "description": "The version of the object that triggered this event",
-  
             "type": "string"
-  
           },
-  
           "nbf": {
-  
             "description": "Not before date of the object that triggered this event",
-  
             "type": "number"
-
           },
-  
           "exp": {
-  
             "description": "The expiration date of the object that triggered this event",
-  
             "type": "number"
-
           }
         }
-  
       },
       "SecretNearExpiry": {
-
         "description": "Schema of the Data property of an EventGridEvent for an SecretNearExpiry event.",
-  
         "type": "object",
-  
         "properties": {
-  
           "id": {
-  
             "description": "The id of the object that triggered this event.",
-  
             "type": "string"
-  
           },
-  
          "vaultName": {
-
             "description": "Key vault name of the object that triggered this event.",
-  
             "type": "string"
-  
           },
-  
           "objectType": {
-  
             "description": "The type of the object that triggered this event",
-  
             "type": "string"
-  
           },
-  
           "objectName": {
-  
             "description": "The name of the object that triggered this event",
-  
             "type": "string"
-  
           },
-  
           "version": {
-  
             "description": "The version of the object that triggered this event",
-  
             "type": "string"
-  
           },
-  
           "nbf": {
-  
             "description": "Not before date of the object that triggered this event",
-  
             "type": "number"
-
           },
-  
           "exp": {
-  
             "description": "The expiration date of the object that triggered this event",
-  
             "type": "number"
-
           }
         }
-  
       },
       "SecretExpired": {
-
         "description": "Schema of the Data property of an EventGridEvent for an SecretExpired event.",
-  
         "type": "object",
-  
         "properties": {
-  
           "id": {
-  
             "description": "The id of the object that triggered this event.",
-  
             "type": "string"
-  
           },
-  
          "vaultName": {
-
             "description": "Key vault name of the object that triggered this event.",
-  
             "type": "string"
-  
           },
-  
           "objectType": {
-  
             "description": "The type of the object that triggered this event",
-  
             "type": "string"
-  
           },
-  
           "objectName": {
-  
             "description": "The name of the object that triggered this event",
-  
             "type": "string"
-  
           },
-  
           "version": {
-  
             "description": "The version of the object that triggered this event",
-  
             "type": "string"
-  
           },
-  
           "nbf": {
-  
             "description": "Not before date of the object that triggered this event",
-  
             "type": "number"
-     
           },
-  
           "exp": {
-  
             "description": "The expiration date of the object that triggered this event",
-  
             "type": "number"
-
           }
         }
-  
       }
     }
 }
-

From 7d4a2513c50a216bfe9cbf6a6f769d460d7211f4 Mon Sep 17 00:00:00 2001
From: Jack Lichwa <jalichwa@microsoft.com>
Date: Thu, 22 Aug 2019 11:15:55 -0700
Subject: [PATCH 7/9] Revert "Update readme with KeyVault.json"

This reverts commit 66c76158ca650e8f4bf0ff082bc5428e2544c457.
---
 specification/eventgrid/data-plane/readme.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/specification/eventgrid/data-plane/readme.md b/specification/eventgrid/data-plane/readme.md
index b530b170746f..7eab6e07b842 100644
--- a/specification/eventgrid/data-plane/readme.md
+++ b/specification/eventgrid/data-plane/readme.md
@@ -55,7 +55,6 @@ input-file:
 - Microsoft.Maps/stable/2018-01-01/Maps.json
 - Microsoft.AppConfiguration/stable/2018-01-01/AppConfiguration.json
 - Microsoft.SignalRService/stable/2018-01-01/SignalRService.json
-- Microsoft.KeyVault/stable/2018-01-01/KeyVault.json
 ```
 
 ---
@@ -134,7 +133,6 @@ input-file:
   - $(this-folder)/Microsoft.Maps/stable/2018-01-01/Maps.json
   - $(this-folder)/Microsoft.AppConfiguration/stable/2018-01-01/AppConfiguration.json
   - $(this-folder)/Microsoft.SignalRService/stable/2018-01-01/SignalRService.json
-  - $(this-folder)/Microsoft.KeyVault/stable/2018-01-01/KeyVault.json
 
 ```
 

From dbd054998916183ae4d325d26bb61fd213feb352 Mon Sep 17 00:00:00 2001
From: Jack Lichwa <jalichwa@microsoft.com>
Date: Thu, 22 Aug 2019 11:20:55 -0700
Subject: [PATCH 8/9] Add prefix and suffix to definitions

---
 .../stable/2018-01-01/KeyVault.json           | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/specification/eventgrid/data-plane/Microsoft.KeyVault/stable/2018-01-01/KeyVault.json b/specification/eventgrid/data-plane/Microsoft.KeyVault/stable/2018-01-01/KeyVault.json
index 3a279b291475..b28d21486e57 100644
--- a/specification/eventgrid/data-plane/Microsoft.KeyVault/stable/2018-01-01/KeyVault.json
+++ b/specification/eventgrid/data-plane/Microsoft.KeyVault/stable/2018-01-01/KeyVault.json
@@ -7,7 +7,7 @@
   },
   "paths": {},
   "definitions": {
-    "CertificateNewVersionCreated": {
+    "KeyVaultCertificateNewVersionCreatedEventData": {
       "description": "Schema of the Data property of an EventGridEvent for an CertificateNewVersionCreated event.",
       "type": "object",
       "properties": {
@@ -41,7 +41,7 @@
         }
       }
     },
-    "CertificateNearExpiry": {
+    "KeyVaultCertificateNearExpiryEventData": {
         "description": "Schema of the Data property of an EventGridEvent for an CertificateNearExpiry event.",
         "type": "object",
         "properties": {
@@ -75,7 +75,7 @@
           }
         }
       },
-      "CertificateExpired": {
+      "KeyVaultCertificateExpiredEventData": {
         "description": "Schema of the Data property of an EventGridEvent for an CertificateExpired event.",
         "type": "object",
         "properties": {
@@ -109,7 +109,7 @@
           }
         }
       },
-      "KeyNewVersionCreated": {
+      "KeyVaultKeyNewVersionCreatedEventData": {
         "description": "Schema of the Data property of an EventGridEvent for an KeyNewVersionCreated event.",
         "type": "object",
         "properties": {
@@ -143,7 +143,7 @@
           }
         }
       },
-      "KeyNearExpiry": {
+      "KeyVaultKeyNearExpiryEventData": {
         "description": "Schema of the Data property of an EventGridEvent for an KeyNearExpiry event.",
         "type": "object",
         "properties": {
@@ -177,7 +177,7 @@
           }
         }
       },
-      "KeyExpired": {
+      "KeyVaultKeyExpiredEventData": {
         "description": "Schema of the Data property of an EventGridEvent for an KeyExpired event.",
         "type": "object",
         "properties": {
@@ -211,7 +211,7 @@
           }
         }
       },
-      "SecretNewVersionCreated": {
+      "KeyVaultSecretNewVersionCreatedEventData": {
         "description": "Schema of the Data property of an EventGridEvent for an SecretNewVersionCreated event.",
         "type": "object",
         "properties": {
@@ -245,7 +245,7 @@
           }
         }
       },
-      "SecretNearExpiry": {
+      "KeyVaultSecretNearExpiryEventData": {
         "description": "Schema of the Data property of an EventGridEvent for an SecretNearExpiry event.",
         "type": "object",
         "properties": {
@@ -279,7 +279,7 @@
           }
         }
       },
-      "SecretExpired": {
+      "KeyVaultSecretExpiredEventData": {
         "description": "Schema of the Data property of an EventGridEvent for an SecretExpired event.",
         "type": "object",
         "properties": {
@@ -314,4 +314,4 @@
         }
       }
     }
-}
+}
\ No newline at end of file

From 44674ab5aabc591e8dd6b10d326071e8fa3ccd49 Mon Sep 17 00:00:00 2001
From: Jack Lichwa <52512203+jlichwa@users.noreply.github.com>
Date: Wed, 4 Sep 2019 09:24:19 -0700
Subject: [PATCH 9/9] Update readme.md

---
 specification/eventgrid/data-plane/readme.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/specification/eventgrid/data-plane/readme.md b/specification/eventgrid/data-plane/readme.md
index 7eab6e07b842..80aa086e0b01 100644
--- a/specification/eventgrid/data-plane/readme.md
+++ b/specification/eventgrid/data-plane/readme.md
@@ -55,6 +55,7 @@ input-file:
 - Microsoft.Maps/stable/2018-01-01/Maps.json
 - Microsoft.AppConfiguration/stable/2018-01-01/AppConfiguration.json
 - Microsoft.SignalRService/stable/2018-01-01/SignalRService.json
+- Microsoft.KeyVault/stable/2018-01-01/KeyVault.json
 ```
 
 ---
@@ -133,7 +134,7 @@ input-file:
   - $(this-folder)/Microsoft.Maps/stable/2018-01-01/Maps.json
   - $(this-folder)/Microsoft.AppConfiguration/stable/2018-01-01/AppConfiguration.json
   - $(this-folder)/Microsoft.SignalRService/stable/2018-01-01/SignalRService.json
-
+  - $(this-folder)/Microsoft.KeyVault/stable/2018-01-01/KeyVault.json
 ```
 
 If there are files that should not be in the `all-api-versions` set,