From bc9e989af286662e46da50296c0e1fe22762e989 Mon Sep 17 00:00:00 2001 From: JoshLove-msft <54595583+JoshLove-msft@users.noreply.github.com> Date: Tue, 7 Dec 2021 12:21:07 -0800 Subject: [PATCH 1/2] Update Resources.json --- .../stable/2018-01-01/Resources.json | 102 +++++++++++++----- 1 file changed, 76 insertions(+), 26 deletions(-) diff --git a/specification/eventgrid/data-plane/Microsoft.Resources/stable/2018-01-01/Resources.json b/specification/eventgrid/data-plane/Microsoft.Resources/stable/2018-01-01/Resources.json index 8606b4fe0349..8d0de39ee748 100644 --- a/specification/eventgrid/data-plane/Microsoft.Resources/stable/2018-01-01/Resources.json +++ b/specification/eventgrid/data-plane/Microsoft.Resources/stable/2018-01-01/Resources.json @@ -41,11 +41,12 @@ }, "authorization": { "description": "The requested authorization for the operation.", - "type": "string" + "$ref": "#/definitions/ResourceAuthorization" }, "claims": { "description": "The properties of the claims.", - "type": "string" + "type": "object", + "additionalProperties": true }, "correlationId": { "description": "An operation ID used for troubleshooting.", @@ -53,7 +54,7 @@ }, "httpRequest": { "description": "The details of the operation.", - "type": "string" + "$ref": "#/definitions/ResourceHttpRequest" } } }, @@ -91,11 +92,12 @@ }, "authorization": { "description": "The requested authorization for the operation.", - "type": "string" + "$ref": "#/definitions/ResourceAuthorization" }, "claims": { "description": "The properties of the claims.", - "type": "string" + "type": "object", + "additionalProperties": true }, "correlationId": { "description": "An operation ID used for troubleshooting.", @@ -103,7 +105,7 @@ }, "httpRequest": { "description": "The details of the operation.", - "type": "string" + "$ref": "#/definitions/ResourceHttpRequest" } } }, @@ -141,11 +143,12 @@ }, "authorization": { "description": "The requested authorization for the operation.", - "type": "string" + "$ref": "#/definitions/ResourceAuthorization" }, "claims": { "description": "The properties of the claims.", - "type": "string" + "type": "object", + "additionalProperties": true }, "correlationId": { "description": "An operation ID used for troubleshooting.", @@ -153,7 +156,7 @@ }, "httpRequest": { "description": "The details of the operation.", - "type": "string" + "$ref": "#/definitions/ResourceHttpRequest" } } }, @@ -191,11 +194,12 @@ }, "authorization": { "description": "The requested authorization for the operation.", - "type": "string" + "$ref": "#/definitions/ResourceAuthorization" }, "claims": { "description": "The properties of the claims.", - "type": "string" + "type": "object", + "additionalProperties": true }, "correlationId": { "description": "An operation ID used for troubleshooting.", @@ -203,7 +207,7 @@ }, "httpRequest": { "description": "The details of the operation.", - "type": "string" + "$ref": "#/definitions/ResourceHttpRequest" } } }, @@ -241,11 +245,12 @@ }, "authorization": { "description": "The requested authorization for the operation.", - "type": "string" + "$ref": "#/definitions/ResourceAuthorization" }, "claims": { "description": "The properties of the claims.", - "type": "string" + "type": "object", + "additionalProperties": true }, "correlationId": { "description": "An operation ID used for troubleshooting.", @@ -253,7 +258,7 @@ }, "httpRequest": { "description": "The details of the operation.", - "type": "string" + "$ref": "#/definitions/ResourceHttpRequest" } } }, @@ -291,11 +296,12 @@ }, "authorization": { "description": "The requested authorization for the operation.", - "type": "string" + "$ref": "#/definitions/ResourceAuthorization" }, "claims": { "description": "The properties of the claims.", - "type": "string" + "type": "object", + "additionalProperties": true }, "correlationId": { "description": "An operation ID used for troubleshooting.", @@ -303,7 +309,7 @@ }, "httpRequest": { "description": "The details of the operation.", - "type": "string" + "$ref": "#/definitions/ResourceHttpRequest" } } }, @@ -341,11 +347,12 @@ }, "authorization": { "description": "The requested authorization for the operation.", - "type": "string" + "$ref": "#/definitions/ResourceAuthorization" }, "claims": { "description": "The properties of the claims.", - "type": "string" + "type": "object", + "additionalProperties": true }, "correlationId": { "description": "An operation ID used for troubleshooting.", @@ -353,7 +360,7 @@ }, "httpRequest": { "description": "The details of the operation.", - "type": "string" + "$ref": "#/definitions/ResourceHttpRequest" } } }, @@ -391,11 +398,12 @@ }, "authorization": { "description": "The requested authorization for the operation.", - "type": "string" + "$ref": "#/definitions/ResourceAuthorization" }, "claims": { "description": "The properties of the claims.", - "type": "string" + "type": "object", + "additionalProperties": true }, "correlationId": { "description": "An operation ID used for troubleshooting.", @@ -403,7 +411,7 @@ }, "httpRequest": { "description": "The details of the operation.", - "type": "string" + "$ref": "#/definitions/ResourceHttpRequest" } } }, @@ -441,11 +449,12 @@ }, "authorization": { "description": "The requested authorization for the operation.", - "type": "string" + "$ref": "#/definitions/ResourceAuthorization" }, "claims": { "description": "The properties of the claims.", - "type": "string" + "type": "object", + "additionalProperties": true }, "correlationId": { "description": "An operation ID used for troubleshooting.", @@ -453,7 +462,48 @@ }, "httpRequest": { "description": "The details of the operation.", + "$ref": "#/definitions/ResourceHttpRequest" + } + } + }, + "ResourceHttpRequest": { + "description": "The details of the HTTP request.", + "type": "object", + "properties": { + "clientRequestId": { + "description": "The client request ID.", + "type": "string" + }, + "clientIpAddress": { + "description": "The client IP address.", + "type": "string" + }, + "method": { + "description": "The request method.", "type": "string" + }, + "url": { + "description": "The url used in the request.", + "type": "string" + } + } + }, + "ResourceAuthorization": { + "description": "The details of the authorization for the resource.", + "type": "object", + "properties": { + "scope": { + "description": "The scope of the authorization.", + "type": "string" + }, + "action": { + "description": "The action being requested.", + "type": "string" + }, + "evidence": { + "description": "The evidence for the authorization.", + "type": "object", + "additionalProperties": true } } } From a103762e8e586695199873512d65818edc19bfd9 Mon Sep 17 00:00:00 2001 From: JoshLove-msft <54595583+JoshLove-msft@users.noreply.github.com> Date: Sun, 12 Dec 2021 11:02:57 -0800 Subject: [PATCH 2/2] Specify additionalProperties type --- .../stable/2018-01-01/Resources.json | 40 ++++++++++++++----- 1 file changed, 30 insertions(+), 10 deletions(-) diff --git a/specification/eventgrid/data-plane/Microsoft.Resources/stable/2018-01-01/Resources.json b/specification/eventgrid/data-plane/Microsoft.Resources/stable/2018-01-01/Resources.json index 8d0de39ee748..0d12a93e32e5 100644 --- a/specification/eventgrid/data-plane/Microsoft.Resources/stable/2018-01-01/Resources.json +++ b/specification/eventgrid/data-plane/Microsoft.Resources/stable/2018-01-01/Resources.json @@ -46,7 +46,9 @@ "claims": { "description": "The properties of the claims.", "type": "object", - "additionalProperties": true + "additionalProperties": { + "type": "string" + } }, "correlationId": { "description": "An operation ID used for troubleshooting.", @@ -97,7 +99,9 @@ "claims": { "description": "The properties of the claims.", "type": "object", - "additionalProperties": true + "additionalProperties": { + "type": "string" + } }, "correlationId": { "description": "An operation ID used for troubleshooting.", @@ -148,7 +152,9 @@ "claims": { "description": "The properties of the claims.", "type": "object", - "additionalProperties": true + "additionalProperties": { + "type": "string" + } }, "correlationId": { "description": "An operation ID used for troubleshooting.", @@ -199,7 +205,9 @@ "claims": { "description": "The properties of the claims.", "type": "object", - "additionalProperties": true + "additionalProperties": { + "type": "string" + } }, "correlationId": { "description": "An operation ID used for troubleshooting.", @@ -250,7 +258,9 @@ "claims": { "description": "The properties of the claims.", "type": "object", - "additionalProperties": true + "additionalProperties": { + "type": "string" + } }, "correlationId": { "description": "An operation ID used for troubleshooting.", @@ -301,7 +311,9 @@ "claims": { "description": "The properties of the claims.", "type": "object", - "additionalProperties": true + "additionalProperties": { + "type": "string" + } }, "correlationId": { "description": "An operation ID used for troubleshooting.", @@ -352,7 +364,9 @@ "claims": { "description": "The properties of the claims.", "type": "object", - "additionalProperties": true + "additionalProperties": { + "type": "string" + } }, "correlationId": { "description": "An operation ID used for troubleshooting.", @@ -403,7 +417,9 @@ "claims": { "description": "The properties of the claims.", "type": "object", - "additionalProperties": true + "additionalProperties": { + "type": "string" + } }, "correlationId": { "description": "An operation ID used for troubleshooting.", @@ -454,7 +470,9 @@ "claims": { "description": "The properties of the claims.", "type": "object", - "additionalProperties": true + "additionalProperties": { + "type": "string" + } }, "correlationId": { "description": "An operation ID used for troubleshooting.", @@ -503,7 +521,9 @@ "evidence": { "description": "The evidence for the authorization.", "type": "object", - "additionalProperties": true + "additionalProperties": { + "type": "string" + } } } }