diff --git a/specification/appcomplianceautomation/resource-manager/Microsoft.AppComplianceAutomation/preview/2022-11-16-preview/appcomplianceautomation.json b/specification/appcomplianceautomation/resource-manager/Microsoft.AppComplianceAutomation/preview/2022-11-16-preview/appcomplianceautomation.json index cae8a962a144..976c8af4d3ef 100644 --- a/specification/appcomplianceautomation/resource-manager/Microsoft.AppComplianceAutomation/preview/2022-11-16-preview/appcomplianceautomation.json +++ b/specification/appcomplianceautomation/resource-manager/Microsoft.AppComplianceAutomation/preview/2022-11-16-preview/appcomplianceautomation.json @@ -34,52 +34,6 @@ } }, "paths": { - "/providers/Microsoft.AppComplianceAutomation/operationResults/{operationId}": { - "get": { - "tags": [ - "AppComplianceAutomation" - ], - "description": "Query the ongoing operation status.", - "operationId": "OperationResults_Get", - "produces": [ - "application/json" - ], - "parameters": [ - { - "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter" - }, - { - "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/OperationIdParameter" - } - ], - "responses": { - "200": { - "description": "OK. The request has succeeded." - }, - "202": { - "description": "Accepted. The request is still running." - }, - "204": { - "description": "No Content. For Delete operation results." - }, - "default": { - "description": "Error response.", - "schema": { - "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/ErrorResponse" - } - } - }, - "x-ms-long-running-operation": true, - "x-ms-long-running-operation-options": { - "final-state-via": "azure-async-operation" - }, - "x-ms-examples": { - "OperationResults_Get": { - "$ref": "./examples/OperationResults_Get.json" - } - } - } - }, "/providers/Microsoft.AppComplianceAutomation/operations": { "get": { "tags": [ @@ -124,7 +78,7 @@ "tags": [ "AppComplianceAutomation" ], - "description": "Get the AppComplianceAutomation report list.", + "description": "Get the AppComplianceAutomation report list for the tenant.", "operationId": "Reports_List", "parameters": [ { @@ -288,11 +242,8 @@ "$ref": "#/definitions/ReportResource" } }, - "201": { - "description": "Long running operation support.", - "schema": { - "$ref": "#/definitions/ReportResource" - } + "202": { + "description": "Long running operation support." }, "default": { "description": "Error response.", @@ -327,7 +278,7 @@ ], "responses": { "200": { - "description": "Success. The response indicates the resource is already deleted." + "description": "Success. The response indicates the resource has been deleted." }, "202": { "description": "Accepted. The response indicates the delete operation is performed in the background." @@ -464,13 +415,13 @@ "$ref": "#/parameters/SnapshotNameParameter" }, { - "$ref": "#/parameters/ReportCreatorTenantIdParameter" - }, - { - "$ref": "#/parameters/DownloadTypeParameter" - }, - { - "$ref": "#/parameters/OfferGuidParameter" + "name": "parameters", + "in": "body", + "description": "Parameters for the query operation", + "required": true, + "schema": { + "$ref": "#/definitions/SnapshotDownloadRequest" + } } ], "responses": { @@ -516,17 +467,17 @@ "description": "The overview of the compliance result for one report.", "type": "object", "properties": { - "passed": { + "passedCount": { "format": "int32", "type": "integer", "description": "The count of all passed full automation control." }, - "failed": { + "failedCount": { "format": "int32", "type": "integer", "description": "The count of all failed full automation control." }, - "manual": { + "manualCount": { "format": "int32", "type": "integer", "description": "The count of all manual control." @@ -835,9 +786,17 @@ "readOnly": true }, "isPass": { - "type": "boolean", + "type": "string", + "enum": [ + "True", + "False" + ], "readOnly": true, - "description": "Indicates whether all the resource(s) are compliant." + "description": "Indicates whether all the resource(s) are compliant.", + "x-ms-enum": { + "name": "IsPass", + "modelAsString": true + } }, "policyId": { "description": "The policy id mapping to this assessment.", @@ -1026,6 +985,50 @@ } } }, + "SnapshotDownloadRequest": { + "type": "object", + "description": "Snapshot's download request.", + "properties": { + "properties": { + "description": "Snapshot's download properties", + "$ref": "#/definitions/SnapshotDownloadProperties" + } + } + }, + "SnapshotDownloadProperties": { + "type": "object", + "description": "Snapshot's download query properties.", + "required": [ + "downloadType" + ], + "properties": { + "reportCreatorTenantId": { + "description": "Tenant id.", + "type": "string" + }, + "downloadType": { + "description": "Indicates the download type.", + "x-ms-parameter-location": "method", + "enum": [ + "ComplianceReport", + "CompliancePdfReport", + "ComplianceDetailedPdfReport", + "ResourceList" + ], + "type": "string", + "x-ms-enum": { + "name": "DownloadType", + "modelAsString": true + } + }, + "offerGuid": { + "type": "string", + "description": "The offerGuid which mapping to the reports.", + "x-ms-parameter-location": "method", + "minLength": 1 + } + } + }, "SnapshotProperties": { "type": "object", "description": "Snapshot's properties.", @@ -1180,7 +1183,8 @@ "sasUri": { "description": "uri of compliance pdf report", "type": "string", - "readOnly": true + "readOnly": true, + "x-ms-secret": false } } }, diff --git a/specification/appcomplianceautomation/resource-manager/Microsoft.AppComplianceAutomation/preview/2022-11-16-preview/examples/OperationResults_Get.json b/specification/appcomplianceautomation/resource-manager/Microsoft.AppComplianceAutomation/preview/2022-11-16-preview/examples/OperationResults_Get.json deleted file mode 100644 index f4ec8b479531..000000000000 --- a/specification/appcomplianceautomation/resource-manager/Microsoft.AppComplianceAutomation/preview/2022-11-16-preview/examples/OperationResults_Get.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "parameters": { - "api-version": "2022-11-16-preview", - "operationId": "00000" - }, - "responses": { - "200": {}, - "204": {}, - "202": { - "headers": { - "Location": "https://management.azure.com/subscriptions/subid/providers/Microsoft.AppComplianceAutomation/...pathToOperationResult...", - "Azure-AsyncOperation": "https://management.azure.com/subscriptions/subid/providers/Microsoft.AppComplianceAutomation/...pathToOperationStatus..." - } - } - } -} diff --git a/specification/appcomplianceautomation/resource-manager/Microsoft.AppComplianceAutomation/preview/2022-11-16-preview/examples/Report_CreateOrUpdate.json b/specification/appcomplianceautomation/resource-manager/Microsoft.AppComplianceAutomation/preview/2022-11-16-preview/examples/Report_CreateOrUpdate.json index 13da0055efe6..4f95f3d65af6 100644 --- a/specification/appcomplianceautomation/resource-manager/Microsoft.AppComplianceAutomation/preview/2022-11-16-preview/examples/Report_CreateOrUpdate.json +++ b/specification/appcomplianceautomation/resource-manager/Microsoft.AppComplianceAutomation/preview/2022-11-16-preview/examples/Report_CreateOrUpdate.json @@ -48,9 +48,9 @@ "provisioningState": "Succeeded", "complianceStatus": { "m365": { - "passed": 0, - "failed": 0, - "manual": 0 + "passedCount": 0, + "failedCount": 0, + "manualCount": 0 } } }, @@ -92,9 +92,9 @@ ], "complianceStatus": { "m365": { - "passed": 0, - "failed": 0, - "manual": 0 + "passedCount": 0, + "failedCount": 0, + "manualCount": 0 } }, "provisioningState": "Succeeded" diff --git a/specification/appcomplianceautomation/resource-manager/Microsoft.AppComplianceAutomation/preview/2022-11-16-preview/examples/Report_Get.json b/specification/appcomplianceautomation/resource-manager/Microsoft.AppComplianceAutomation/preview/2022-11-16-preview/examples/Report_Get.json index 674a414b57c4..43797f1aa605 100644 --- a/specification/appcomplianceautomation/resource-manager/Microsoft.AppComplianceAutomation/preview/2022-11-16-preview/examples/Report_Get.json +++ b/specification/appcomplianceautomation/resource-manager/Microsoft.AppComplianceAutomation/preview/2022-11-16-preview/examples/Report_Get.json @@ -32,9 +32,9 @@ ], "complianceStatus": { "m365": { - "passed": 0, - "failed": 0, - "manual": 0 + "passedCount": 0, + "failedCount": 0, + "manualCount": 0 } }, "provisioningState": "Succeeded" diff --git a/specification/appcomplianceautomation/resource-manager/Microsoft.AppComplianceAutomation/preview/2022-11-16-preview/examples/Report_Update.json b/specification/appcomplianceautomation/resource-manager/Microsoft.AppComplianceAutomation/preview/2022-11-16-preview/examples/Report_Update.json index db30006fcd40..452ea59c1e8a 100644 --- a/specification/appcomplianceautomation/resource-manager/Microsoft.AppComplianceAutomation/preview/2022-11-16-preview/examples/Report_Update.json +++ b/specification/appcomplianceautomation/resource-manager/Microsoft.AppComplianceAutomation/preview/2022-11-16-preview/examples/Report_Update.json @@ -47,9 +47,9 @@ ], "complianceStatus": { "m365": { - "passed": 0, - "failed": 0, - "manual": 0 + "passedCount": 0, + "failedCount": 0, + "manualCount": 0 } }, "provisioningState": "Succeeded" @@ -64,50 +64,7 @@ } } }, - "201": { - "body": { - "id": "/provider/Microsfot.AppComplianceAutomation/reports/testReportName", - "name": "testReportName", - "type": "Microsfot.AppComplianceAutomation/reports", - "properties": { - "id": "00000000-0000-0000-0000-000000000000", - "status": "Active", - "tenantId": "00000000-0000-0000-0000-000000000000", - "reportName": "testReportName", - "offerGuid": "00000000-0000-0000-0000-000000000000", - "timeZone": "GMT Standard Time", - "triggerTime": "2022-03-02T05:17:23.922Z", - "nextTriggerTime": "2022-03-02T05:17:23.922Z", - "lastTriggerTime": "2022-03-02T05:17:23.922Z", - "subscriptions": [ - "00000000-0000-0000-0000-000000000000" - ], - "resources": [ - { - "resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/myResourceGroup/providers/Microsoft.SignalRService/SignalR/mySignalRService", - "tags": { - "key1": "value1" - } - } - ], - "complianceStatus": { - "m365": { - "passed": 0, - "failed": 0, - "manual": 0 - } - }, - "provisioningState": "Succeeded" - }, - "systemData": { - "createdBy": "00000000-0000-0000-0000-000000000000", - "createdByType": "User", - "createdAt": "2021-05-14T22:34:55.4499903Z", - "lastModifiedBy": "00000000-0000-0000-0000-000000000000", - "lastModifiedByType": "User", - "lastModifiedAt": "2021-05-14T22:34:55.4499903Z" - } - }, + "202": { "headers": { "Location": "https://management.azure.com/providers/Microsoft.AppComplianceAutomation/operationResults/{operationId}", "Azure-AsyncOperation": "https://management.azure.com/providers/Microsoft.AppComplianceAutomation/operationStatuses/{operationId}" diff --git a/specification/appcomplianceautomation/resource-manager/Microsoft.AppComplianceAutomation/preview/2022-11-16-preview/examples/Reports_List.json b/specification/appcomplianceautomation/resource-manager/Microsoft.AppComplianceAutomation/preview/2022-11-16-preview/examples/Reports_List.json index 99b5311db788..3afe62be6d12 100644 --- a/specification/appcomplianceautomation/resource-manager/Microsoft.AppComplianceAutomation/preview/2022-11-16-preview/examples/Reports_List.json +++ b/specification/appcomplianceautomation/resource-manager/Microsoft.AppComplianceAutomation/preview/2022-11-16-preview/examples/Reports_List.json @@ -37,9 +37,9 @@ ], "complianceStatus": { "m365": { - "passed": 0, - "failed": 0, - "manual": 0 + "passedCount": 0, + "failedCount": 0, + "manualCount": 0 } }, "provisioningState": "Succeeded" diff --git a/specification/appcomplianceautomation/resource-manager/Microsoft.AppComplianceAutomation/preview/2022-11-16-preview/examples/Snapshot_ComplianceDetailedPdfReport_Download.json b/specification/appcomplianceautomation/resource-manager/Microsoft.AppComplianceAutomation/preview/2022-11-16-preview/examples/Snapshot_ComplianceDetailedPdfReport_Download.json index 398c1acc9f7c..8003af7e595b 100644 --- a/specification/appcomplianceautomation/resource-manager/Microsoft.AppComplianceAutomation/preview/2022-11-16-preview/examples/Snapshot_ComplianceDetailedPdfReport_Download.json +++ b/specification/appcomplianceautomation/resource-manager/Microsoft.AppComplianceAutomation/preview/2022-11-16-preview/examples/Snapshot_ComplianceDetailedPdfReport_Download.json @@ -3,9 +3,13 @@ "api-version": "2022-11-16-preview", "reportName": "testReportName", "snapshotName": "testSnapshotName", - "downloadType": "ComplianceDetailedPdfReport", - "reportCreatorTenantId": "00000000-0000-0000-0000-000000000000", - "offerGuid": "00000000-0000-0000-0000-000000000000" + "parameters": { + "properties": { + "downloadType": "ComplianceDetailedPdfReport", + "reportCreatorTenantId": "00000000-0000-0000-0000-000000000000", + "offerGuid": "00000000-0000-0000-0000-000000000000" + } + } }, "responses": { "200": { diff --git a/specification/appcomplianceautomation/resource-manager/Microsoft.AppComplianceAutomation/preview/2022-11-16-preview/examples/Snapshot_CompliancePdfReport_Download.json b/specification/appcomplianceautomation/resource-manager/Microsoft.AppComplianceAutomation/preview/2022-11-16-preview/examples/Snapshot_CompliancePdfReport_Download.json index dca8142a3208..2edd6f1ab76e 100644 --- a/specification/appcomplianceautomation/resource-manager/Microsoft.AppComplianceAutomation/preview/2022-11-16-preview/examples/Snapshot_CompliancePdfReport_Download.json +++ b/specification/appcomplianceautomation/resource-manager/Microsoft.AppComplianceAutomation/preview/2022-11-16-preview/examples/Snapshot_CompliancePdfReport_Download.json @@ -3,9 +3,13 @@ "api-version": "2022-11-16-preview", "reportName": "testReportName", "snapshotName": "testSnapshotName", - "downloadType": "CompliancePdfReport", - "reportCreatorTenantId": "00000000-0000-0000-0000-000000000000", - "offerGuid": "00000000-0000-0000-0000-000000000000" + "parameters": { + "properties": { + "downloadType": "CompliancePdfReport", + "reportCreatorTenantId": "00000000-0000-0000-0000-000000000000", + "offerGuid": "00000000-0000-0000-0000-000000000000" + } + } }, "responses": { "200": { diff --git a/specification/appcomplianceautomation/resource-manager/Microsoft.AppComplianceAutomation/preview/2022-11-16-preview/examples/Snapshot_ComplianceReport_Download.json b/specification/appcomplianceautomation/resource-manager/Microsoft.AppComplianceAutomation/preview/2022-11-16-preview/examples/Snapshot_ComplianceReport_Download.json index 0e4f5103ffaf..4ef088e79329 100644 --- a/specification/appcomplianceautomation/resource-manager/Microsoft.AppComplianceAutomation/preview/2022-11-16-preview/examples/Snapshot_ComplianceReport_Download.json +++ b/specification/appcomplianceautomation/resource-manager/Microsoft.AppComplianceAutomation/preview/2022-11-16-preview/examples/Snapshot_ComplianceReport_Download.json @@ -3,9 +3,13 @@ "api-version": "2022-11-16-preview", "reportName": "testReportName", "snapshotName": "testSnapshotName", - "downloadType": "ComplianceReport", - "reportCreatorTenantId": "00000000-0000-0000-0000-000000000000", - "offerGuid": "00000000-0000-0000-0000-000000000000" + "parameters": { + "properties": { + "downloadType": "ComplianceReport", + "reportCreatorTenantId": "00000000-0000-0000-0000-000000000000", + "offerGuid": "00000000-0000-0000-0000-000000000000" + } + } }, "responses": { "200": { diff --git a/specification/appcomplianceautomation/resource-manager/Microsoft.AppComplianceAutomation/preview/2022-11-16-preview/examples/Snapshot_Get.json b/specification/appcomplianceautomation/resource-manager/Microsoft.AppComplianceAutomation/preview/2022-11-16-preview/examples/Snapshot_Get.json index 777cad1ef538..f1800e928d25 100644 --- a/specification/appcomplianceautomation/resource-manager/Microsoft.AppComplianceAutomation/preview/2022-11-16-preview/examples/Snapshot_Get.json +++ b/specification/appcomplianceautomation/resource-manager/Microsoft.AppComplianceAutomation/preview/2022-11-16-preview/examples/Snapshot_Get.json @@ -38,9 +38,9 @@ ], "complianceStatus": { "m365": { - "passed": 0, - "failed": 0, - "manual": 0 + "passedCount": 0, + "failedCount": 0, + "manualCount": 0 } }, "provisioningState": "Succeeded" @@ -81,7 +81,7 @@ "severity": "High", "description": "Assessment Description", "remediation": "Remediation", - "isPass": true, + "isPass": "True", "policyId": "00000000-0000-0000-0000-000000000000", "resourceList": [ { diff --git a/specification/appcomplianceautomation/resource-manager/Microsoft.AppComplianceAutomation/preview/2022-11-16-preview/examples/Snapshot_ResourceList_Download.json b/specification/appcomplianceautomation/resource-manager/Microsoft.AppComplianceAutomation/preview/2022-11-16-preview/examples/Snapshot_ResourceList_Download.json index a1e2851fc682..7c908b6df477 100644 --- a/specification/appcomplianceautomation/resource-manager/Microsoft.AppComplianceAutomation/preview/2022-11-16-preview/examples/Snapshot_ResourceList_Download.json +++ b/specification/appcomplianceautomation/resource-manager/Microsoft.AppComplianceAutomation/preview/2022-11-16-preview/examples/Snapshot_ResourceList_Download.json @@ -3,9 +3,13 @@ "api-version": "2022-11-16-preview", "reportName": "testReportName", "snapshotName": "testSnapshotName", - "downloadType": "ResourceList", - "reportCreatorTenantId": "00000000-0000-0000-0000-000000000000", - "offerGuid": "00000000-0000-0000-0000-000000000000" + "parameters": { + "properties": { + "downloadType": "ResourceList", + "reportCreatorTenantId": "00000000-0000-0000-0000-000000000000", + "offerGuid": "00000000-0000-0000-0000-000000000000" + } + } }, "responses": { "200": { diff --git a/specification/appcomplianceautomation/resource-manager/Microsoft.AppComplianceAutomation/preview/2022-11-16-preview/examples/Snapshots_List.json b/specification/appcomplianceautomation/resource-manager/Microsoft.AppComplianceAutomation/preview/2022-11-16-preview/examples/Snapshots_List.json index cbac37deeae7..8d5b46a311ca 100644 --- a/specification/appcomplianceautomation/resource-manager/Microsoft.AppComplianceAutomation/preview/2022-11-16-preview/examples/Snapshots_List.json +++ b/specification/appcomplianceautomation/resource-manager/Microsoft.AppComplianceAutomation/preview/2022-11-16-preview/examples/Snapshots_List.json @@ -43,9 +43,9 @@ ], "complianceStatus": { "m365": { - "passed": 0, - "failed": 0, - "manual": 0 + "passedCount": 0, + "failedCount": 0, + "manualCount": 0 } }, "provisioningState": "Succeeded" @@ -86,7 +86,7 @@ "severity": "High", "description": "Assessment Description", "remediation": "Remediation", - "isPass": true, + "isPass": "True", "policyId": "00000000-0000-0000-0000-000000000000", "resourceList": [ {