Skip to content

Commit

Permalink
[ACR] SystemData and new readonly KeyVaultProperties (Azure#11601)
Browse files Browse the repository at this point in the history
  • Loading branch information
Adithya Upadhya authored and giromm2ms committed Dec 20, 2020
1 parent 832ff3e commit fefc3a7
Show file tree
Hide file tree
Showing 3 changed files with 234 additions and 34 deletions.
85 changes: 72 additions & 13 deletions ...er/Microsoft.ContainerRegistry/preview/2019-05-01-preview/containerregistry_scopemap.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -532,6 +532,33 @@
}
}
},
"ProxyResource": {
"description": "The resource model definition for a ARM proxy resource. It will have everything other than required location and tags.",
"properties": {
"id": {
"description": "The resource ID.",
"type": "string",
"readOnly": true
},
"name": {
"description": "The name of the resource.",
"type": "string",
"readOnly": true
},
"type": {
"description": "The type of the resource.",
"type": "string",
"readOnly": true
},
"systemData": {
"$ref": "#/definitions/SystemData",
"description": "Metadata pertaining to creation and last modification of the resource.",
"type": "object",
"readOnly": true
}
},
"x-ms-azure-resource": true
},
"ScopeMapProperties": {
"description": "The properties of a scope map.",
"required": [
Expand Down Expand Up @@ -886,26 +913,58 @@
}
}
},
"ProxyResource": {
"description": "The resource model definition for a ARM proxy resource. It will have everything other than required location and tags.",
"SystemData": {
"description": "Metadata pertaining to creation and last modification of the resource.",
"type": "object",
"properties": {
"id": {
"description": "The resource ID.",
"type": "string",
"readOnly": true
"createdBy": {
"description": "The identity that created the resource.",
"type": "string"
},
"name": {
"description": "The name of the resource.",
"createdByType": {
"description": "The type of identity that created the resource.",
"enum": [
"User",
"Application",
"ManagedIdentity",
"Key"
],
"type": "string",
"readOnly": true
"x-ms-enum": {
"name": "createdByType",
"modelAsString": true
}
},
"type": {
"description": "The type of the resource.",
"createdAt": {
"format": "date-time",
"description": "The timestamp of resource creation (UTC).",
"type": "string"
},
"lastModifiedBy": {
"description": "The identity that last modified the resource.",
"type": "string"
},
"lastModifiedByType": {
"description": "The type of identity that last modified the resource.",
"enum": [
"User",
"Application",
"ManagedIdentity",
"Key"
],
"type": "string",
"readOnly": true
"x-ms-enum": {
"name": "lastModifiedByType",
"modelAsString": true
}
},
"lastModifiedAt": {
"format": "date-time",
"description": "The timestamp of resource modification (UTC).",
"type": "string"
}
},
"x-ms-azure-resource": true
"readOnly": true
}
},
"parameters": {
Expand Down
65 changes: 65 additions & 0 deletions ...nager/Microsoft.ContainerRegistry/preview/2019-06-01-preview/containerregistry_build.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2974,6 +2974,12 @@
"additionalProperties": {
"type": "string"
}
},
"systemData": {
"$ref": "#/definitions/SystemData",
"description": "Metadata pertaining to creation and last modification of the resource.",
"type": "object",
"readOnly": true
}
},
"x-ms-azure-resource": true
Expand All @@ -2995,10 +3001,69 @@
"description": "The type of the resource.",
"type": "string",
"readOnly": true
},
"systemData": {
"$ref": "#/definitions/SystemData",
"description": "Metadata pertaining to creation and last modification of the resource.",
"type": "object",
"readOnly": true
}
},
"x-ms-azure-resource": true
},
"SystemData": {
"description": "Metadata pertaining to creation and last modification of the resource.",
"type": "object",
"properties": {
"createdBy": {
"description": "The identity that created the resource.",
"type": "string"
},
"createdByType": {
"description": "The type of identity that created the resource.",
"enum": [
"User",
"Application",
"ManagedIdentity",
"Key"
],
"type": "string",
"x-ms-enum": {
"name": "createdByType",
"modelAsString": true
}
},
"createdAt": {
"format": "date-time",
"description": "The timestamp of resource creation (UTC).",
"type": "string"
},
"lastModifiedBy": {
"description": "The identity that last modified the resource.",
"type": "string"
},
"lastModifiedByType": {
"description": "The type of identity that last modified the resource.",
"enum": [
"User",
"Application",
"ManagedIdentity",
"Key"
],
"type": "string",
"x-ms-enum": {
"name": "lastModifiedByType",
"modelAsString": true
}
},
"lastModifiedAt": {
"format": "date-time",
"description": "The timestamp of resource modification (UTC).",
"type": "string"
}
},
"readOnly": true
},
"ErrorResponseBody": {
"description": "An error response from the Azure Container Registry service.",
"required": [
Expand Down
118 changes: 97 additions & 21 deletions ...rce-manager/Microsoft.ContainerRegistry/preview/2019-12-01-preview/containerregistry.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1855,6 +1855,33 @@
}
}
},
"ProxyResource": {
"description": "The resource model definition for a ARM proxy resource. It will have everything other than required location and tags.",
"properties": {
"id": {
"description": "The resource ID.",
"type": "string",
"readOnly": true
},
"name": {
"description": "The name of the resource.",
"type": "string",
"readOnly": true
},
"type": {
"description": "The type of the resource.",
"type": "string",
"readOnly": true
},
"systemData": {
"$ref": "#/definitions/SystemData",
"description": "Metadata pertaining to creation and last modification of the resource.",
"type": "object",
"readOnly": true
}
},
"x-ms-azure-resource": true
},
"ExportPipelineProperties": {
"description": "The properties of an export pipeline.",
"required": [
Expand Down Expand Up @@ -3089,6 +3116,17 @@
"identity": {
"description": "The client id of the identity which will be used to access key vault.",
"type": "string"
},
"keyRotationEnabled": {
"description": "Auto key rotation status for a CMK enabled registry.",
"type": "boolean",
"readOnly": true
},
"lastKeyRotationTimestamp": {
"format": "date-time",
"description": "Timestamp of the last successful key rotation.",
"type": "string",
"readOnly": true
}
}
},
Expand Down Expand Up @@ -3931,27 +3969,6 @@
}
}
},
"ProxyResource": {
"description": "The resource model definition for a ARM proxy resource. It will have everything other than required location and tags.",
"properties": {
"id": {
"description": "The resource ID.",
"type": "string",
"readOnly": true
},
"name": {
"description": "The name of the resource.",
"type": "string",
"readOnly": true
},
"type": {
"description": "The type of the resource.",
"type": "string",
"readOnly": true
}
},
"x-ms-azure-resource": true
},
"Resource": {
"description": "An Azure resource.",
"required": [
Expand Down Expand Up @@ -3987,9 +4004,68 @@
"additionalProperties": {
"type": "string"
}
},
"systemData": {
"$ref": "#/definitions/SystemData",
"description": "Metadata pertaining to creation and last modification of the resource.",
"type": "object",
"readOnly": true
}
},
"x-ms-azure-resource": true
},
"SystemData": {
"description": "Metadata pertaining to creation and last modification of the resource.",
"type": "object",
"properties": {
"createdBy": {
"description": "The identity that created the resource.",
"type": "string"
},
"createdByType": {
"description": "The type of identity that created the resource.",
"enum": [
"User",
"Application",
"ManagedIdentity",
"Key"
],
"type": "string",
"x-ms-enum": {
"name": "createdByType",
"modelAsString": true
}
},
"createdAt": {
"format": "date-time",
"description": "The timestamp of resource creation (UTC).",
"type": "string"
},
"lastModifiedBy": {
"description": "The identity that last modified the resource.",
"type": "string"
},
"lastModifiedByType": {
"description": "The type of identity that last modified the resource.",
"enum": [
"User",
"Application",
"ManagedIdentity",
"Key"
],
"type": "string",
"x-ms-enum": {
"name": "lastModifiedByType",
"modelAsString": true
}
},
"lastModifiedAt": {
"format": "date-time",
"description": "The timestamp of resource modification (UTC).",
"type": "string"
}
},
"readOnly": true
}
},
"parameters": {
Expand Down

0 comments on commit fefc3a7

Please sign in to comment.