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.

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

move common type definition to pick up from latest official typing file #28870

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,10 @@
"description": "Model that represents a Capability resource.",
"allOf": [
{
"$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/Resource"
"$ref": "../../../../../../common-types/resource-management/v5/types.json#/definitions/Resource"
}
],
"properties": {
"systemData": {
"description": "The standard system metadata of a resource type.",
"$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/systemData",
"readOnly": true
},
"properties": {
"x-ms-client-flatten": true,
"description": "The properties of a capability resource.",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,10 @@
"description": "Model that represents a Capability Type resource.",
"allOf": [
{
"$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/Resource"
"$ref": "../../../../../../common-types/resource-management/v5/types.json#/definitions/ProxyResource"
}
],
"properties": {
"systemData": {
"description": "The system metadata properties of the capability type resource.",
"$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/systemData",
"readOnly": true
},
"location": {
"type": "string",
"description": "Location of the Capability Type resource."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,45 +6,6 @@
},
"paths": {},
"definitions": {
"resourceIdentity": {
"type": "object",
"description": "The identity of a resource.",
"properties": {
"type": {
"type": "string",
"description": "String of the resource identity type.",
"enum": [
"None",
"SystemAssigned",
"UserAssigned"
],
"x-ms-enum": {
"name": "ResourceIdentityType",
"modelAsString": false
}
},
"userAssignedIdentities": {
"$ref": "../../../../../../common-types/resource-management/v3/managedidentity.json#/definitions/UserAssignedIdentities",
"description": "The list of user identities associated with the Experiment. The user identity dictionary key references will be ARM resource ids in the form: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}'."
},
"principalId": {
"type": "string",
"description": "GUID that represents the principal ID of this resource identity.",
"pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$",
"readOnly": true
},
"tenantId": {
"type": "string",
"description": "GUID that represents the tenant ID of this resource identity.",
"pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$",
"readOnly": true
}
},
"required": [
"type"
],
"additionalProperties": false
},
"tags": {
"type": "object",
"additionalProperties": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,23 +44,44 @@
}
},
"definitions": {
"experimentIdentity": {
"type": "object",
"description": "The identity of the experiment resource.",
"allOf": [
{
"$ref": "../../../../../../common-types/resource-management/v5/managedidentity.json#/definitions/ManagedServiceIdentity"
}
],
"properties": {
"type": {
"description": "overwrite default enum for type to reflect experiment's support of only one identity",
"enum": [
"None",
"SystemAssigned",
"UserAssigned"
],
"type": "string",
"x-ms-enum": {
"name": "ManagedServiceIdentityType",
"modelAsString": true
}
}
},
"required": [
"type"
]
},
"experiment": {
"type": "object",
"description": "Model that represents a Experiment resource.",
"allOf": [
{
"$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/TrackedResource"
"$ref": "../../../../../../common-types/resource-management/v5/types.json#/definitions/TrackedResource"
}
],
"properties": {
"systemData": {
"description": "The system metadata of the experiment resource.",
"$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/systemData",
"readOnly": true
},
"identity": {
"description": "The identity of the experiment resource.",
"$ref": "./common.json#/definitions/resourceIdentity"
"$ref": "#/definitions/experimentIdentity"
},
"properties": {
"description": "The properties of the experiment resource.",
Expand All @@ -77,8 +98,7 @@
"description": "Describes an experiment update.",
"properties": {
"identity": {
"description": "The identity of the experiment resource.",
"$ref": "./common.json#/definitions/resourceIdentity"
"$ref": "#/definitions/experimentIdentity"
},
"tags": {
"description": "The tags of the experiment resource.",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"type": "array",
"readOnly": true,
"items": {
"$ref": "../../../../../../common-types/resource-management/v5/privatelinks.json#/definitions/PrivateEndpointConnection"
"$ref": "../../../../../../common-types/resource-management/v6/privatelinks.json#/definitions/PrivateEndpointConnection"
},
"description": "A readonly collection of private endpoint connection. Currently only one endpoint connection is supported."
},
Expand Down Expand Up @@ -86,12 +86,13 @@
}
},
"PrivateLinkResourceListResult": {
"type": "object",
"properties": {
"value": {
"type": "array",
"description": "Array of private link resources",
"items": {
"$ref": "../../../../../../common-types/resource-management/v5/privatelinks.json#/definitions/PrivateLinkResource"
"$ref": "../../../../../../common-types/resource-management/v6/privatelinks.json#/definitions/PrivateLinkResource"
}
},
"nextLink": {
Expand All @@ -103,12 +104,13 @@
"description": "A list of private link resources"
},
"PrivateEndpointConnectionListResult": {
"type": "object",
"properties": {
"value": {
"type": "array",
"description": "Array of private endpoint connections",
"items": {
"$ref": "../../../../../../common-types/resource-management/v5/privatelinks.json#/definitions/PrivateEndpointConnection"
"$ref": "../../../../../../common-types/resource-management/v6/privatelinks.json#/definitions/PrivateEndpointConnection"
}
},
"nextLink": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,10 @@
"description": "Model that represents a Target Type resource.",
"allOf": [
{
"$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/Resource"
"$ref": "../../../../../../common-types/resource-management/v5/types.json#/definitions/ProxyResource"
}
],
"properties": {
"systemData": {
"description": "The system metadata properties of the target type resource.",
"$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/systemData",
"readOnly": true
},
"location": {
"type": "string",
"description": "Location of the Target Type resource."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,10 @@
"description": "Model that represents a Target resource.",
"allOf": [
{
"$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/Resource"
"$ref": "../../../../../../common-types/resource-management/v5/types.json#/definitions/Resource"
}
],
"properties": {
"systemData": {
"description": "The system metadata of the target resource.",
"$ref": "../../../../../../common-types/resource-management/v2/types.json#/definitions/systemData",
"readOnly": true
},
"location": {
"type": "string",
"description": "Location of the target resource."
Expand Down