From 5269a33bc4e48e336b7eacdba01c999953f42013 Mon Sep 17 00:00:00 2001 From: binilk Date: Mon, 10 Dec 2018 21:11:26 -0800 Subject: [PATCH 1/5] Fixes for: Issue #1 : https://github.com/Azure/azure-rest-api-specs/issues/4576#issuecomment-445427819 Typo in the DeltaOperationType Enum. Issue #2 : https://github.com/Azure/azure-rest-api-specs/issues/4844#event-2014233693 GlobalAdmins list is marked as an object, while it's an array. --- .../stable/2014-01-01/ADHybridHealthService.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/adhybridhealthservice/resource-manager/Microsoft.ADHybridHealthService/stable/2014-01-01/ADHybridHealthService.json b/specification/adhybridhealthservice/resource-manager/Microsoft.ADHybridHealthService/stable/2014-01-01/ADHybridHealthService.json index a0d27ff3854d..39fbef95b18c 100644 --- a/specification/adhybridhealthservice/resource-manager/Microsoft.ADHybridHealthService/stable/2014-01-01/ADHybridHealthService.json +++ b/specification/adhybridhealthservice/resource-manager/Microsoft.ADHybridHealthService/stable/2014-01-01/ADHybridHealthService.json @@ -3964,7 +3964,7 @@ "Update", "Delete", "Obsolete", - "DeletAdd" + "DeleteAdd" ], "x-ms-enum": { "name": "DeltaOperationType", @@ -6245,7 +6245,7 @@ "description": "The reason due to which the tenant was disabled in Azure Active Directory Connect Health." }, "globalAdminsEmail": { - "type": "object", + "type": "array", "items": { "type": "string" }, From b251b90d29dc68c1adea3e71b649604f04bf5402 Mon Sep 17 00:00:00 2001 From: binilk Date: Tue, 15 Jan 2019 15:38:49 -0800 Subject: [PATCH 2/5] Updated the Specification as example for Risky IP Download report. --- .../2014-01-01/ADHybridHealthService.json | 64 +++++++++++++++++++ .../2014-01-01/examples/RiskyIpDownload.json | 22 +++++++ 2 files changed, 86 insertions(+) create mode 100644 specification/adhybridhealthservice/resource-manager/Microsoft.ADHybridHealthService/stable/2014-01-01/examples/RiskyIpDownload.json diff --git a/specification/adhybridhealthservice/resource-manager/Microsoft.ADHybridHealthService/stable/2014-01-01/ADHybridHealthService.json b/specification/adhybridhealthservice/resource-manager/Microsoft.ADHybridHealthService/stable/2014-01-01/ADHybridHealthService.json index 56af5a164574..c5c0f60dc9d1 100644 --- a/specification/adhybridhealthservice/resource-manager/Microsoft.ADHybridHealthService/stable/2014-01-01/ADHybridHealthService.json +++ b/specification/adhybridhealthservice/resource-manager/Microsoft.ADHybridHealthService/stable/2014-01-01/ADHybridHealthService.json @@ -3258,6 +3258,70 @@ } } } + }, + "/providers/Microsoft.ADHybridHealthService/services/{serviceName}/reports/riskyIp/GetAllBlobUri": { + "get": { + "tags": [ "Reports" ], + "description": "Gets all the blob uri for the risky ip download report requested for a given service for last 7 days.", + "x-ms-examples": { + "services_listAllRiskyIpDownloadReport": { + "$ref": "./examples/RiskyIpDownload.json" + } + }, + "operationId": "services_listAllRiskyIpDownloadReport", + "parameters": [ + { + "name": "serviceName", + "in": "path", + "description": "The name of the service.", + "required": true, + "type": "string" + }, + { + "$ref": "#/parameters/apiVersionParameter" + } + ], + "responses": { + "200": { + "description": "The list of blob uri for the risky ip download report requested for a given service for last 7 days.", + } + }, + "x-ms-pageable": { + "nextLinkName": null + } + } + }, + "/providers/Microsoft.ADHybridHealthService/services/{serviceName}/reports/riskyIp/GetBlobUri": { + "get": { + "tags": [ "Reports" ], + "description": "Gets only the current requested risky ip download report for a given service.", + "x-ms-examples": { + "services_listCurrentRiskyIpDownloadReport": { + "$ref": "./examples/RiskyIpDownload.json" + } + }, + "operationId": "services_listCurrentRiskyIpDownloadReport", + "parameters": [ + { + "name": "serviceName", + "in": "path", + "description": "The name of the service.", + "required": true, + "type": "string" + }, + { + "$ref": "#/parameters/apiVersionParameter" + } + ], + "responses": { + "200": { + "description": "The blob URI for the currently requested risky ip download report for a given service.", + } + }, + "x-ms-pageable": { + "nextLinkName": null + } + } } }, "definitions": { diff --git a/specification/adhybridhealthservice/resource-manager/Microsoft.ADHybridHealthService/stable/2014-01-01/examples/RiskyIpDownload.json b/specification/adhybridhealthservice/resource-manager/Microsoft.ADHybridHealthService/stable/2014-01-01/examples/RiskyIpDownload.json new file mode 100644 index 000000000000..9f4a11b12d58 --- /dev/null +++ b/specification/adhybridhealthservice/resource-manager/Microsoft.ADHybridHealthService/stable/2014-01-01/examples/RiskyIpDownload.json @@ -0,0 +1,22 @@ +{ + "parameters": { + "serviceName": "sampleServiceName", + "api-version": "2014-01-01" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "tenantId": "TenantId of the tenant.", + "serviceId": "ServiceId of the tenant.", + "resultSasUri": "SAS Uri of the blob.", + "blobCreateDateTime": "2019-01-07T20:32:02+00:00", + "jobCompletionTime": "2019-01-07T20:32:05+00:00", + "status": "status of the task." + } + ] + } + } + } +} \ No newline at end of file From 515dcb5236d7641d40250a6757cc398c86eef763 Mon Sep 17 00:00:00 2001 From: binilk Date: Tue, 15 Jan 2019 20:28:07 -0800 Subject: [PATCH 3/5] Added the Result details --- .../2014-01-01/ADHybridHealthService.json | 59 +++++++++++++++++-- 1 file changed, 55 insertions(+), 4 deletions(-) diff --git a/specification/adhybridhealthservice/resource-manager/Microsoft.ADHybridHealthService/stable/2014-01-01/ADHybridHealthService.json b/specification/adhybridhealthservice/resource-manager/Microsoft.ADHybridHealthService/stable/2014-01-01/ADHybridHealthService.json index c5c0f60dc9d1..1c50edc6ea7e 100644 --- a/specification/adhybridhealthservice/resource-manager/Microsoft.ADHybridHealthService/stable/2014-01-01/ADHybridHealthService.json +++ b/specification/adhybridhealthservice/resource-manager/Microsoft.ADHybridHealthService/stable/2014-01-01/ADHybridHealthService.json @@ -3262,7 +3262,7 @@ "/providers/Microsoft.ADHybridHealthService/services/{serviceName}/reports/riskyIp/GetAllBlobUri": { "get": { "tags": [ "Reports" ], - "description": "Gets all the blob uri for the risky ip download report requested for a given service for last 7 days.", + "description": "Gets all the blob uris for the Risky IP reports requested for a given service in the last 7 days.", "x-ms-examples": { "services_listAllRiskyIpDownloadReport": { "$ref": "./examples/RiskyIpDownload.json" @@ -3283,7 +3283,10 @@ ], "responses": { "200": { - "description": "The list of blob uri for the risky ip download report requested for a given service for last 7 days.", + "description": "The list of blob uris for the Risky IP download report requested for a given service for last 7 days.", + "schema": { + "$ref": "#/definitions/RiskyIPBlobUris" + } } }, "x-ms-pageable": { @@ -3294,7 +3297,7 @@ "/providers/Microsoft.ADHybridHealthService/services/{serviceName}/reports/riskyIp/GetBlobUri": { "get": { "tags": [ "Reports" ], - "description": "Gets only the current requested risky ip download report for a given service.", + "description": "Initiate the generation of a new Risky IP report. Returns the URI for the new one, along with all the blob uris for the Risky IP reports requested in the last 7 days.", "x-ms-examples": { "services_listCurrentRiskyIpDownloadReport": { "$ref": "./examples/RiskyIpDownload.json" @@ -3315,7 +3318,10 @@ ], "responses": { "200": { - "description": "The blob URI for the currently requested risky ip download report for a given service.", + "description": "The list containing the uri to the newly requested Risky IP report, along with the blob uris for the Risky IP reports requested in the last 7 days.", + "schema": { + "$ref": "#/definitions/RiskyIPBlobUris" + } } }, "x-ms-pageable": { @@ -5785,6 +5791,51 @@ } } }, + "RiskyIPBlobUri": { + "description": "The blob uri pointing to Risky IP Report.", + "type": "object", + "properties": { + "tenantId": { + "description": "The tenant id for whom the report belongs to.", + "type": "string" + }, + "serviceId": { + "description": "The service id for whom the report belongs to.", + "type": "string" + }, + "resultSasUri": { + "description": "The blob uri for the report.", + "type": "string" + }, + "blobCreateDateTime": { + "description": "Time at which the the new Risky IP report was requested.", + "type": "string", + "format": "date-time" + }, + "jobCompletionTime": { + "description": "Time at which the blob creation job for the new Risky IP report was completed.", + "type": "string", + "format": "date-time" + }, + "status": { + "description": "Status of the Risky IP report generation.", + "type": "string" + } + } + }, + "RiskyIPBlobUris": { + "description": "The list containing blob uris.", + "type": "object", + "properties": { + "value": { + "description": "The list of blob uris.", + "type": "array", + "items": { + "$ref": "#/definitions/RiskyIPBlobUri" + } + } + } + }, "RuleErrorInfo": { "description": "The error details in legacy rule processing.", "type": "object", From 00a8482da03ba9b8f6d485582c59eaf3ec7fd98e Mon Sep 17 00:00:00 2001 From: binilk Date: Tue, 5 Feb 2019 15:31:06 -0800 Subject: [PATCH 4/5] Fixed review comments, changed the URI scheme as well as changed get/post methods --- .../stable/2014-01-01/ADHybridHealthService.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/specification/adhybridhealthservice/resource-manager/Microsoft.ADHybridHealthService/stable/2014-01-01/ADHybridHealthService.json b/specification/adhybridhealthservice/resource-manager/Microsoft.ADHybridHealthService/stable/2014-01-01/ADHybridHealthService.json index 1c50edc6ea7e..13c19c47fdc3 100644 --- a/specification/adhybridhealthservice/resource-manager/Microsoft.ADHybridHealthService/stable/2014-01-01/ADHybridHealthService.json +++ b/specification/adhybridhealthservice/resource-manager/Microsoft.ADHybridHealthService/stable/2014-01-01/ADHybridHealthService.json @@ -3259,10 +3259,10 @@ } } }, - "/providers/Microsoft.ADHybridHealthService/services/{serviceName}/reports/riskyIp/GetAllBlobUri": { + "/providers/Microsoft.ADHybridHealthService/services/{serviceName}/reports/riskyIp/blobUris": { "get": { "tags": [ "Reports" ], - "description": "Gets all the blob uris for the Risky IP reports requested for a given service in the last 7 days.", + "description": "Gets all Risky IP report URIs for the last 7 days.", "x-ms-examples": { "services_listAllRiskyIpDownloadReport": { "$ref": "./examples/RiskyIpDownload.json" @@ -3283,7 +3283,7 @@ ], "responses": { "200": { - "description": "The list of blob uris for the Risky IP download report requested for a given service for last 7 days.", + "description": "Risky IP report URIs for the last 7 days.", "schema": { "$ref": "#/definitions/RiskyIPBlobUris" } @@ -3294,10 +3294,10 @@ } } }, - "/providers/Microsoft.ADHybridHealthService/services/{serviceName}/reports/riskyIp/GetBlobUri": { - "get": { + "/providers/Microsoft.ADHybridHealthService/services/{serviceName}/reports/riskyIp/blobUri": { + "post": { "tags": [ "Reports" ], - "description": "Initiate the generation of a new Risky IP report. Returns the URI for the new one, along with all the blob uris for the Risky IP reports requested in the last 7 days.", + "description": "Initiate the generation of a new Risky IP report. Returns the URI for the new one.", "x-ms-examples": { "services_listCurrentRiskyIpDownloadReport": { "$ref": "./examples/RiskyIpDownload.json" @@ -3318,7 +3318,7 @@ ], "responses": { "200": { - "description": "The list containing the uri to the newly requested Risky IP report, along with the blob uris for the Risky IP reports requested in the last 7 days.", + "description": "The URI of the Risky IP report that was requested.", "schema": { "$ref": "#/definitions/RiskyIPBlobUris" } From 74422c4469e2235d395a497c7883378c16b9fe5c Mon Sep 17 00:00:00 2001 From: binilk Date: Thu, 21 Feb 2019 17:34:09 -0800 Subject: [PATCH 5/5] Addressing Review Feedback, changing POST call of blobUri -> generateBlobUri --- .../stable/2014-01-01/ADHybridHealthService.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/adhybridhealthservice/resource-manager/Microsoft.ADHybridHealthService/stable/2014-01-01/ADHybridHealthService.json b/specification/adhybridhealthservice/resource-manager/Microsoft.ADHybridHealthService/stable/2014-01-01/ADHybridHealthService.json index 13c19c47fdc3..41527760bf48 100644 --- a/specification/adhybridhealthservice/resource-manager/Microsoft.ADHybridHealthService/stable/2014-01-01/ADHybridHealthService.json +++ b/specification/adhybridhealthservice/resource-manager/Microsoft.ADHybridHealthService/stable/2014-01-01/ADHybridHealthService.json @@ -3294,7 +3294,7 @@ } } }, - "/providers/Microsoft.ADHybridHealthService/services/{serviceName}/reports/riskyIp/blobUri": { + "/providers/Microsoft.ADHybridHealthService/services/{serviceName}/reports/riskyIp/generateBlobUri": { "post": { "tags": [ "Reports" ], "description": "Initiate the generation of a new Risky IP report. Returns the URI for the new one.",