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

[Refactor only] Try to use common type as much as possible and remove not used field #16648

Merged
merged 14 commits into from
Nov 4, 2021
Merged

[Refactor only] Try to use common type as much as possible and remove not used field #16648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
a861859
IoT Central Public API 1.1-preview Oct Release (#16514)
yang-hai-feng Oct 27, 2021
d0c7b5a
Merge branch 'main' of github.com:Azure/azure-rest-api-specs
sureleo Nov 3, 2021
d4048d3
Try to use common types for operation list
sureleo Nov 3, 2021
ef6bb1d
Fix semnatic
sureleo Nov 3, 2021
8be7f11
try to use provided tracked resrouce
sureleo Nov 3, 2021
74dae83
Remove dup
sureleo Nov 3, 2021
4e500fb
Fix tracked resource
sureleo Nov 3, 2021
00b85af
blah
sureleo Nov 3, 2021
25bf9f1
remove not used stuff
sureleo Nov 3, 2021
8862920
Remove types aren't used
sureleo Nov 3, 2021
0b72a4c
use parameters from common
sureleo Nov 3, 2021
83a11a8
fix correct path
sureleo Nov 3, 2021
d2078ec
Adding back
sureleo Nov 3, 2021
cf6515b
Adding coming sku back
sureleo Nov 3, 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
219 changes: 0 additions & 219 deletions ...arcdata/resource-manager/Microsoft.AzureArcData/stable/2021-11-01/definitions/common.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,200 +38,6 @@
"name"
]
},
"IdentityType": {
"description": "The type of identity that creates/modifies resources",
"type": "string",
"enum": [
"User",
"Application",
"ManagedIdentity",
"Key"
],
"x-ms-enum": {
"name": "IdentityType",
"modelAsString": true
}
},
"Identity": {
"description": "Identity for the resource.",
"type": "object",
"properties": {
"principalId": {
"readOnly": true,
"type": "string",
"description": "The principal ID of resource identity."
},
"tenantId": {
"readOnly": true,
"type": "string",
"description": "The tenant ID of resource."
},
"type": {
"type": "string",
"description": "The identity type.",
"enum": [
"SystemAssigned"
],
"x-ms-enum": {
"name": "ResourceIdentityType",
"modelAsString": false
}
}
}
},
"Plan": {
"type": "object",
"properties": {
"name": {
"type": "string",
"description": "A user defined name of the 3rd Party Artifact that is being procured."
},
"publisher": {
"type": "string",
"description": "The publisher of the 3rd Party Artifact that is being bought. E.g. NewRelic"
},
"product": {
"type": "string",
"description": "The 3rd Party artifact that is being procured. E.g. NewRelic. Product maps to the OfferID specified for the artifact at the time of Data Market onboarding. "
},
"promotionCode": {
"type": "string",
"description": "A publisher provided promotion code as provisioned in Data Market for the said product/artifact."
},
"version": {
"type": "string",
"description": "The version of the desired product/artifact."
}
},
"description": "Plan for the resource.",
"required": [
"name",
"publisher",
"product"
]
},
"Resource": {
"type": "object",
"properties": {
"id": {
"readOnly": true,
"type": "string",
"description": "Fully qualified resource Id for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}"
},
"name": {
"readOnly": true,
"type": "string",
"description": "The name of the resource"
},
"type": {
"readOnly": true,
"type": "string",
"description": "The type of the resource. Ex- Microsoft.Compute/virtualMachines or Microsoft.Storage/storageAccounts."
}
},
"x-ms-azure-resource": true
},
"TrackedResource": {
"type": "object",
"description": "The resource model definition for a ARM tracked top level resource",
"properties": {
"tags": {
"type": "object",
"additionalProperties": {
"type": "string"
},
"x-ms-mutability": [
"read",
"create",
"update"
],
"description": "Resource tags."
},
"location": {
"type": "string",
"x-ms-mutability": [
"read",
"create"
],
"description": "The geo-location where the resource lives"
},
"systemData": {
"$ref": "#/definitions/SystemData",
"readOnly": true
}
},
"required": [
"location"
],
"allOf": [
{
"$ref": "#/definitions/Resource"
}
]
},
"ProxyResource": {
"type": "object",
"description": "The resource model definition for a ARM proxy resource. It will have everything other than required location and tags",
"allOf": [
{
"$ref": "#/definitions/Resource"
}
]
},
"SystemData": {
"description": "Read only system data",
"type": "object",
"readOnly": true,
"properties": {
"createdBy": {
"type": "string",
"description": "An identifier for the identity that created the resource"
},
"createdByType": {
"$ref": "#/definitions/IdentityType",
"description": "The type of identity that created the resource"
},
"createdAt": {
"type": "string",
"format": "date-time",
"description": "The timestamp of resource creation (UTC)"
},
"lastModifiedBy": {
"type": "string",
"description": "An identifier for the identity that last modified the resource"
},
"lastModifiedByType": {
"$ref": "#/definitions/IdentityType",
"description": "The type of identity that last modified the resource"
},
"lastModifiedAt": {
"type": "string",
"format": "date-time",
"description": "The timestamp of resource last modification (UTC)"
}
}
},
"ResourceSku": {
"type": "object",
"properties": {
"capacity": {
"type": "integer",
"format": "int32"
},
"family": {
"type": "string"
},
"name": {
"type": "string"
},
"size": {
"type": "string"
},
"tier": {
"type": "string"
}
}
},
"ErrorResponse": {
"type": "object",
"properties": {
Expand Down Expand Up @@ -267,31 +73,6 @@
},
"description": "An error response from the Batch service."
},
"ODataError": {
"properties": {
"code": {
"type": "string",
"description": "A language-independent error name."
},
"message": {
"type": "string",
"description": "The error message."
},
"target": {
"type": "string",
"description": "The target of the error (for example, the name of the property in error)."
},
"details": {
"type": "array",
"items": {
"$ref": "#/definitions/ODataError"
},
"description": "The error details."
}
},
"type": "object",
"description": "Information about an error."
},
"ExtendedLocation": {
"type": "object",
"description": "The complex type of the extended location.",
Expand Down
2 changes: 1 addition & 1 deletion ...esource-manager/Microsoft.AzureArcData/stable/2021-11-01/definitions/dataControllers.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"type": "object",
"allOf": [
{
"$ref": "./common.json#/definitions/TrackedResource"
"$ref": "../../../../../../common-types/resource-management/v3/types.json#/definitions/TrackedResource"
}
],
"properties": {
Expand Down
2 changes: 1 addition & 1 deletion ...rce-manager/Microsoft.AzureArcData/stable/2021-11-01/definitions/sqlManagedInstances.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"type": "object",
"allOf": [
{
"$ref": "./common.json#/definitions/TrackedResource"
"$ref": "../../../../../../common-types/resource-management/v3/types.json#/definitions/TrackedResource"
}
],
"properties": {
Expand Down
2 changes: 1 addition & 1 deletion ...urce-manager/Microsoft.AzureArcData/stable/2021-11-01/definitions/sqlServerInstances.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"type": "object",
"allOf": [
{
"$ref": "./common.json#/definitions/TrackedResource"
"$ref": "../../../../../../common-types/resource-management/v3/types.json#/definitions/TrackedResource"
}
],
"properties": {
Expand Down