[Hub Generated] Review request for Microsoft.KeyVault to add version …

…preview/2020-04-01-preview (Azure#13389) * Add systemData to keyVault Vault property * Update to our own systemData definition * Fix copy/paste error and refactor out the identity type
mkarmark · Jul 20, 2021 · 9cbf31f · 9cbf31f
1 parent 2981406
commit 9cbf31f
Show file tree

Hide file tree

Showing 7 changed files with 123 additions and 0 deletions.
diff --git a/.../resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/createVault.json b/.../resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/createVault.json
@@ -78,6 +78,14 @@
         "type": "Microsoft.KeyVault/vaults",
         "location": "westus",
         "tags": {},
+        "systemData": {
+          "createdBy": "keyVaultUser1",
+          "createdByType": "User",
+          "createdAt": "2020-01-01T12:00:00.0000000Z",
+          "lastModifiedBy": "keyVaultUser2",
+          "lastModifiedByType": "User",
+          "lastModifiedAt": "2020-01-01T12:00:00.0000000Z"
+        },
         "properties": {
           "sku": {
             "family": "A",
@@ -181,6 +189,14 @@
         "type": "Microsoft.KeyVault/vaults",
         "location": "westus",
         "tags": {},
+        "systemData": {
+          "createdBy": "keyVaultUser1",
+          "createdByType": "User",
+          "createdAt": "2020-01-01T12:00:00.0000000Z",
+          "lastModifiedBy": "keyVaultUser2",
+          "lastModifiedByType": "User",
+          "lastModifiedAt": "2020-01-01T12:00:00.0000000Z"
+        },
         "properties": {
           "sku": {
             "family": "A",

diff --git a/...er/Microsoft.KeyVault/preview/2020-04-01-preview/examples/createVaultWithNetworkAcls.json b/...er/Microsoft.KeyVault/preview/2020-04-01-preview/examples/createVaultWithNetworkAcls.json
@@ -43,6 +43,14 @@
         "type": "Microsoft.KeyVault/vaults",
         "location": "westus",
         "tags": {},
+        "systemData": {
+          "createdBy": "keyVaultUser1",
+          "createdByType": "User",
+          "createdAt": "2020-01-01T12:00:00.0000000Z",
+          "lastModifiedBy": "keyVaultUser2",
+          "lastModifiedByType": "User",
+          "lastModifiedAt": "2020-01-01T12:00:00.0000000Z"
+        },
         "properties": {
           "sku": {
             "family": "A",
@@ -80,6 +88,14 @@
         "type": "Microsoft.KeyVault/vaults",
         "location": "westus",
         "tags": {},
+        "systemData": {
+          "createdBy": "keyVaultUser1",
+          "createdByType": "User",
+          "createdAt": "2020-01-01T12:00:00.0000000Z",
+          "lastModifiedBy": "keyVaultUser2",
+          "lastModifiedByType": "User",
+          "lastModifiedAt": "2020-01-01T12:00:00.0000000Z"
+        },
         "properties": {
           "sku": {
             "family": "A",

diff --git a/...ult/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/getVault.json b/...ult/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/getVault.json
@@ -13,6 +13,14 @@
         "type": "Microsoft.KeyVault/vaults",
         "location": "westus",
         "tags": {},
+        "systemData": {
+          "createdBy": "keyVaultUser1",
+          "createdByType": "User",
+          "createdAt": "2020-01-01T12:00:00.0000000Z",
+          "lastModifiedBy": "keyVaultUser2",
+          "lastModifiedByType": "User",
+          "lastModifiedAt": "2020-01-01T12:00:00.0000000Z"
+        },
         "properties": {
           "sku": {
             "family": "A",

diff --git a/...ager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/listVaultByResourceGroup.json b/...ager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/listVaultByResourceGroup.json
@@ -15,6 +15,14 @@
             "type": "Microsoft.KeyVault/vaults",
             "location": "westus",
             "tags": {},
+            "systemData": {
+              "createdBy": "keyVaultUser1",
+              "createdByType": "User",
+              "createdAt": "2020-01-01T12:00:00.0000000Z",
+              "lastModifiedBy": "keyVaultUser2",
+              "lastModifiedByType": "User",
+              "lastModifiedAt": "2020-01-01T12:00:00.0000000Z"
+            },
             "properties": {
               "sku": {
                 "family": "A",

diff --git a/...nager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/listVaultBySubscription.json b/...nager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/listVaultBySubscription.json
@@ -14,6 +14,14 @@
             "type": "Microsoft.KeyVault/vaults",
             "location": "westus",
             "tags": {},
+            "systemData": {
+              "createdBy": "keyVaultUser1",
+              "createdByType": "User",
+              "createdAt": "2020-01-01T12:00:00.0000000Z",
+              "lastModifiedBy": "keyVaultUser2",
+              "lastModifiedByType": "User",
+              "lastModifiedAt": "2020-01-01T12:00:00.0000000Z"
+            },
             "properties": {
               "sku": {
                 "family": "A",

diff --git a/.../resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/updateVault.json b/.../resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/examples/updateVault.json
@@ -77,6 +77,14 @@
         "type": "Microsoft.KeyVault/vaults",
         "location": "westus",
         "tags": {},
+        "systemData": {
+          "createdBy": "keyVaultUser1",
+          "createdByType": "User",
+          "createdAt": "2020-01-01T12:00:00.0000000Z",
+          "lastModifiedBy": "keyVaultUser2",
+          "lastModifiedByType": "User",
+          "lastModifiedAt": "2020-01-01T13:00:00.0000000Z"
+        },
         "properties": {
           "sku": {
             "family": "A",
@@ -180,6 +188,14 @@
         "type": "Microsoft.KeyVault/vaults",
         "location": "westus",
         "tags": {},
+        "systemData": {
+          "createdBy": "keyVaultUser1",
+          "createdByType": "User",
+          "createdAt": "2020-01-01T12:00:00.0000000Z",
+          "lastModifiedBy": "keyVaultUser2",
+          "lastModifiedByType": "User",
+          "lastModifiedAt": "2020-01-01T13:00:00.0000000Z"
+        },
         "properties": {
           "sku": {
             "family": "A",

diff --git a/...ion/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/keyvault.json b/...ion/keyvault/resource-manager/Microsoft.KeyVault/preview/2020-04-01-preview/keyvault.json
@@ -1532,6 +1532,10 @@
           },
           "description": "Tags assigned to the key vault resource."
         },
+        "systemData": {
+          "description": "System metadata for the key vault.",
+          "$ref": "#/definitions/SystemData"
+        },
         "properties": {
           "$ref": "#/definitions/VaultProperties",
           "description": "Properties of the vault"
@@ -1939,6 +1943,53 @@
         }
       },
       "description": "Properties of a private link resource."
+    },
+    "SystemData": {
+      "description": "Metadata pertaining to creation and last modification of key vault resource.",
+      "type": "object",
+      "readOnly": true,
+      "properties": {
+        "createdBy": {
+          "type": "string",
+          "description": "The identity that created key vault resource."
+        },
+        "createdByType": {
+          "description": "The type of identity that created key vault resource.",
+          "$ref": "#/definitions/IdentityType"
+        },
+        "createdAt": {
+          "type": "string",
+          "format": "date-time",
+          "description": "The timestamp of key vault resource creation (UTC)."
+        },
+        "lastModifiedBy": {
+          "type": "string",
+          "description": "The identity that last modified key vault resource."
+        },
+        "lastModifiedByType": {
+          "description": "The type of identity that last modified key vault resource.",
+          "$ref": "#/definitions/IdentityType"
+        },
+        "lastModifiedAt": {
+          "type": "string",
+          "format": "date-time",
+          "description": "The timestamp of key vault resource last modification (UTC)."
+        }
+      }
+    },
+    "IdentityType": {
+      "type": "string",
+      "description": "The type of identity.",
+      "enum": [
+        "User",
+        "Application",
+        "ManagedIdentity",
+        "Key"
+      ],
+      "x-ms-enum": {
+        "name": "identityType",
+        "modelAsString": true
+      }
     }
   },
   "parameters": {