Skip to content

[Cdn] Use common-types/resource-management/v6 for some definitions #34949

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

Merged
ChenglongLiu merged 3 commits into from
Jun 5, 2025
Merged

[Cdn] Use common-types/resource-management/v6 for some definitions #34949

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3800db3
Use common-types v6 for some definitions
ChenglongLiu May 27, 2025
35a0d08
Use common-types v6 for some definitions
ChenglongLiu May 27, 2025
e78a656
Fix id
ChenglongLiu May 27, 2025
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
Next Next commit
Use common-types v6 for some definitions
  • Loading branch information
@ChenglongLiu
ChenglongLiu committed May 27, 2025
commit 3800db35b29a89ef80a28498901e4decb1ace27e
18 changes: 9 additions & 9 deletions specification/cdn/resource-manager/Microsoft.Cdn/stable/2025-04-15/afdx.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4205,7 +4205,7 @@
"type": "object",
"allOf": [
{
"$ref": "./cdn.json#/definitions/ProxyResource"
"$ref": "../../../../../common-types/resource-management/v6/types.json#/definitions/ProxyResource"
}
],
"properties": {
Expand Down Expand Up @@ -4385,7 +4385,7 @@
"type": "object",
"allOf": [
{
"$ref": "./cdn.json#/definitions/ProxyResource"
"$ref": "../../../../../common-types/resource-management/v6/types.json#/definitions/ProxyResource"
}
],
"properties": {
Expand Down Expand Up @@ -4578,7 +4578,7 @@
"type": "object",
"allOf": [
{
"$ref": "./cdn.json#/definitions/TrackedResource"
"$ref": "../../../../../common-types/resource-management/v6/types.json#/definitions/TrackedResource"
}
],
"properties": {
Expand Down Expand Up @@ -4722,7 +4722,7 @@
"type": "object",
"allOf": [
{
"$ref": "./cdn.json#/definitions/ProxyResource"
"$ref": "../../../../../common-types/resource-management/v6/types.json#/definitions/ProxyResource"
}
],
"properties": {
Expand Down Expand Up @@ -4956,7 +4956,7 @@
"type": "object",
"allOf": [
{
"$ref": "./cdn.json#/definitions/ProxyResource"
"$ref": "../../../../../common-types/resource-management/v6/types.json#/definitions/ProxyResource"
}
],
"properties": {
Expand Down Expand Up @@ -4987,7 +4987,7 @@
"type": "object",
"allOf": [
{
"$ref": "./cdn.json#/definitions/ProxyResource"
"$ref": "../../../../../common-types/resource-management/v6/types.json#/definitions/ProxyResource"
}
],
"properties": {
Expand Down Expand Up @@ -5163,7 +5163,7 @@
"type": "object",
"allOf": [
{
"$ref": "./cdn.json#/definitions/ProxyResource"
"$ref": "../../../../../common-types/resource-management/v6/types.json#/definitions/ProxyResource"
}
],
"properties": {
Expand Down Expand Up @@ -5297,7 +5297,7 @@
"type": "object",
"allOf": [
{
"$ref": "./cdn.json#/definitions/ProxyResource"
"$ref": "../../../../../common-types/resource-management/v6/types.json#/definitions/ProxyResource"
}
],
"properties": {
Expand Down Expand Up @@ -5493,7 +5493,7 @@
"type": "object",
"allOf": [
{
"$ref": "./cdn.json#/definitions/ProxyResource"
"$ref": "../../../../../common-types/resource-management/v6/types.json#/definitions/ProxyResource"
}
],
"properties": {
Expand Down
151 changes: 19 additions & 132 deletions specification/cdn/resource-manager/Microsoft.Cdn/stable/2025-04-15/cdn.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"default": {
"description": "CDN error response describing why the operation failed.",
"schema": {
"$ref": "#/definitions/ErrorResponse"
"$ref": "../../../../../common-types/resource-management/v6/types.json#/definitions/ErrorResponse"
}
}
},
Expand Down Expand Up @@ -106,7 +106,7 @@
"default": {
"description": "CDN error response describing why the operation failed.",
"schema": {
"$ref": "#/definitions/ErrorResponse"
"$ref": "../../../../../common-types/resource-management/v6/types.json#/definitions/ErrorResponse"
}
}
},
Expand Down Expand Up @@ -155,7 +155,7 @@
"default": {
"description": "CDN error response describing why the operation failed.",
"schema": {
"$ref": "#/definitions/ErrorResponse"
"$ref": "../../../../../common-types/resource-management/v6/types.json#/definitions/ErrorResponse"
}
}
}
Expand Down Expand Up @@ -225,7 +225,7 @@
"default": {
"description": "CDN error response describing why the operation failed.",
"schema": {
"$ref": "#/definitions/ErrorResponse"
"$ref": "../../../../../common-types/resource-management/v6/types.json#/definitions/ErrorResponse"
}
}
},
Expand Down Expand Up @@ -290,7 +290,7 @@
"default": {
"description": "CDN error response describing why the operation failed.",
"schema": {
"$ref": "#/definitions/ErrorResponse"
"$ref": "../../../../../common-types/resource-management/v6/types.json#/definitions/ErrorResponse"
}
}
},
Expand Down Expand Up @@ -343,7 +343,7 @@
"default": {
"description": "CDN error response describing why the operation failed.",
"schema": {
"$ref": "#/definitions/ErrorResponse"
"$ref": "../../../../../common-types/resource-management/v6/types.json#/definitions/ErrorResponse"
}
}
},
Expand Down Expand Up @@ -400,7 +400,7 @@
"default": {
"description": "CDN error response describing why the operation failed.",
"schema": {
"$ref": "#/definitions/ErrorResponse"
"$ref": "../../../../../common-types/resource-management/v6/types.json#/definitions/ErrorResponse"
}
}
},
Expand Down Expand Up @@ -463,7 +463,7 @@
"default": {
"description": "CDN error response describing why the operation failed.",
"schema": {
"$ref": "#/definitions/ErrorResponse"
"$ref": "../../../../../common-types/resource-management/v6/types.json#/definitions/ErrorResponse"
}
}
},
Expand Down Expand Up @@ -518,7 +518,7 @@
"default": {
"description": "CDN error response describing why the operation failed.",
"schema": {
"$ref": "#/definitions/ErrorResponse"
"$ref": "../../../../../common-types/resource-management/v6/types.json#/definitions/ErrorResponse"
}
}
},
Expand Down Expand Up @@ -568,7 +568,7 @@
"default": {
"description": "CDN error response describing why the operation failed.",
"schema": {
"$ref": "#/definitions/ErrorResponse"
"$ref": "../../../../../common-types/resource-management/v6/types.json#/definitions/ErrorResponse"
}
}
}
Expand Down Expand Up @@ -614,7 +614,7 @@
"default": {
"description": "CDN error response describing why the operation failed.",
"schema": {
"$ref": "#/definitions/ErrorResponse"
"$ref": "../../../../../common-types/resource-management/v6/types.json#/definitions/ErrorResponse"
}
}
}
Expand Down Expand Up @@ -660,7 +660,7 @@
"default": {
"description": "CDN error response describing why the operation failed.",
"schema": {
"$ref": "#/definitions/ErrorResponse"
"$ref": "../../../../../common-types/resource-management/v6/types.json#/definitions/ErrorResponse"
}
}
},
Expand Down Expand Up @@ -2901,7 +2901,7 @@
"type": "object",
"allOf": [
{
"$ref": "#/definitions/TrackedResource"
"$ref": "../../../../../common-types/resource-management/v6/types.json#/definitions/TrackedResource"
}
],
"properties": {
Expand Down Expand Up @@ -3416,7 +3416,7 @@
"type": "object",
"allOf": [
{
"$ref": "#/definitions/TrackedResource"
"$ref": "../../../../../common-types/resource-management/v6/types.json#/definitions/TrackedResource"
}
],
"properties": {
Expand Down Expand Up @@ -5993,7 +5993,7 @@
"type": "object",
"allOf": [
{
"$ref": "#/definitions/ProxyResource"
"$ref": "../../../../../common-types/resource-management/v6/types.json#/definitions/ProxyResource"
}
],
"properties": {
Expand Down Expand Up @@ -6153,7 +6153,7 @@
"type": "object",
"allOf": [
{
"$ref": "#/definitions/ProxyResource"
"$ref": "../../../../../common-types/resource-management/v6/types.json#/definitions/ProxyResource"
}
],
"properties": {
Expand Down Expand Up @@ -6403,7 +6403,7 @@
"type": "object",
"allOf": [
{
"$ref": "#/definitions/ProxyResource"
"$ref": "../../../../../common-types/resource-management/v6/types.json#/definitions/ProxyResource"
}
],
"properties": {
Expand Down Expand Up @@ -7138,7 +7138,7 @@
"type": "object",
"allOf": [
{
"$ref": "#/definitions/ProxyResource"
"$ref": "../../../../../common-types/resource-management/v6/types.json#/definitions/ProxyResource"
}
],
"properties": {
Expand Down Expand Up @@ -7212,119 +7212,6 @@
}
}
},
"Resource": {
"description": "The core properties of ARM resources",
"type": "object",
"properties": {
"id": {
"description": "Resource ID.",
"readOnly": true,
"type": "string"
},
"name": {
"description": "Resource name.",
"readOnly": true,
"type": "string"
},
"type": {
"description": "Resource type.",
"readOnly": true,
"type": "string"
},
"systemData": {
"$ref": "#/definitions/SystemData",
"readOnly": true
}
},
"x-ms-azure-resource": true
},
"SystemData": {
"description": "Read only system data",
"readOnly": true,
"type": "object",
"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)"
}
}
},
"IdentityType": {
"description": "The type of identity that creates/modifies resources",
"type": "string",
"enum": [
"user",
"application",
"managedIdentity",
"key"
],
"x-ms-enum": {
"name": "IdentityType",
"modelAsString": true
}
},
"TrackedResource": {
"description": "The resource model definition for a ARM tracked top level resource.",
"type": "object",
"allOf": [
{
"$ref": "#/definitions/Resource"
}
],
"properties": {
"location": {
"type": "string",
"description": "Resource location."
},
"tags": {
"type": "object",
"additionalProperties": {
"type": "string"
},
"x-ms-mutability": [
"read",
"create",
"update"
],
"description": "Resource tags."
}
},
"required": [
"location"
]
},
"ProxyResource": {
"description": "The resource model definition for a ARM proxy resource. It will have everything other than required location and tags",
"type": "object",
"allOf": [
{
"$ref": "#/definitions/Resource"
}
],
"properties": {}
},
"QueryStringCachingBehavior": {
"description": "Defines how CDN caches requests that include query strings. You can ignore any query strings when caching, bypass caching to prevent requests that contain query strings from being cached, or cache every request with a unique URL.",
"enum": [
Expand Down Expand Up @@ -7404,7 +7291,7 @@
"type": "object",
"properties": {
"error": {
"$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/ErrorDetail"
"$ref": "../../../../../common-types/resource-management/v6/types.json#/definitions/ErrorDetail"
}
}
},
Expand Down