Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Try to use the common type for SystemData #13723

Merged
merged 4 commits into from
Mar 31, 2021
Merged

Try to use the common type for SystemData #13723

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
026cb50
Add SystemData
jiacheng-L Mar 26, 2021
c178e6b
Try to use the common type for SystemData
jiacheng-L Mar 30, 2021
635fa2d
Revert "Try to use the common type for SystemData"
jiacheng-L Mar 30, 2021
0abee98
Move systemData to common json file
jiacheng-L Mar 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 46 additions & 0 deletions ...ation/keyvault/resource-manager/Microsoft.KeyVault/preview/2021-04-01-preview/common.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,52 @@
}
},
"x-ms-external": true
},
"SystemData": {
"description": "Metadata pertaining to creation and last modification of the key vault resource.",
"readOnly": true,
"properties": {
"createdBy": {
"type": "string",
"description": "The identity that created the key vault resource."
},
"createdByType": {
"description": "The type of identity that created the key vault resource.",
"$ref": "#/definitions/IdentityType"
},
"createdAt": {
"type": "string",
"format": "date-time",
"description": "The timestamp of the key vault resource creation (UTC)."
},
"lastModifiedBy": {
"type": "string",
"description": "The identity that last modified the key vault resource."
},
"lastModifiedByType": {
"description": "The type of identity that last modified the key vault resource.",
"$ref": "#/definitions/IdentityType"
},
"lastModifiedAt": {
"type": "string",
"format": "date-time",
"description": "The timestamp of the 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
}
}
}
}
16 changes: 16 additions & 0 deletions .../resource-manager/Microsoft.KeyVault/preview/2021-04-01-preview/examples/createVault.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -151,6 +159,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",
Expand Down
16 changes: 16 additions & 0 deletions ...er/Microsoft.KeyVault/preview/2021-04-01-preview/examples/createVaultWithNetworkAcls.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
8 changes: 8 additions & 0 deletions ...ult/resource-manager/Microsoft.KeyVault/preview/2021-04-01-preview/examples/getVault.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
8 changes: 8 additions & 0 deletions ...ager/Microsoft.KeyVault/preview/2021-04-01-preview/examples/listVaultByResourceGroup.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
8 changes: 8 additions & 0 deletions ...nager/Microsoft.KeyVault/preview/2021-04-01-preview/examples/listVaultBySubscription.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
16 changes: 16 additions & 0 deletions .../resource-manager/Microsoft.KeyVault/preview/2021-04-01-preview/examples/updateVault.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-01T12:00:00.0000000Z"
},
"properties": {
"sku": {
"family": "A",
Expand Down Expand Up @@ -150,6 +158,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",
Expand Down
4 changes: 4 additions & 0 deletions ...ion/keyvault/resource-manager/Microsoft.KeyVault/preview/2021-04-01-preview/keyvault.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1532,6 +1532,10 @@
},
"description": "Tags assigned to the key vault resource."
},
"systemData": {
"description": "System metadata for the key vault.",
"$ref": "common.json#/definitions/SystemData"
},
"properties": {
"$ref": "#/definitions/VaultProperties",
"description": "Properties of the vault"
Expand Down
2 changes: 1 addition & 1 deletion ...n/keyvault/resource-manager/Microsoft.KeyVault/preview/2021-04-01-preview/managedHsm.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -962,7 +962,7 @@
"description": "Resource tags"
},
"systemData": {
"$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData"
"$ref": "common.json#/definitions/SystemData"
}
},
"description": "Managed HSM resource",
Expand Down