diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2019-01-01-preview/examples/RegulatoryCompliance/getRegulatoryComplianceAssessmentList_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2019-01-01-preview/examples/RegulatoryCompliance/getRegulatoryComplianceAssessmentList_example.json index c8b8c1708e43..55b829b1d694 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2019-01-01-preview/examples/RegulatoryCompliance/getRegulatoryComplianceAssessmentList_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2019-01-01-preview/examples/RegulatoryCompliance/getRegulatoryComplianceAssessmentList_example.json @@ -1,7 +1,7 @@ { "parameters": { "api-version": "2019-01-01", - "scope": "subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23", + "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23", "regulatoryComplianceStandardName": "PCI-DSS-3.2", "regulatoryComplianceControlName": "1.1" }, @@ -13,11 +13,10 @@ "name": "968548cb-02b3-8cd2-11f8-0cf64ab1a347", "type": "Microsoft.Security/regulatoryComplianceAssessment", "properties": { - "controlName": "1.1", "description": "Troubleshoot missing scan data on your machines", "assessmentType": "Assessment", "assessmentDetailsLink": "https://management.azure.com/subscriptions/a27e854a-8578-4395-8eaf-6fc7849f3050/providers/Microsoft.Security/securityStatuses/968548cb-02b3-8cd2-11f8-0cf64ab1a347", - "state": "failed", + "state": "Failed", "passedResources": 7, "failedResources": 4, "skippedResources": 0 @@ -28,11 +27,10 @@ "name": "3bcd234d-c9c7-c2a2-89e0-c01f419c1a8a", "type": "Microsoft.Security/regulatoryComplianceAssessment", "properties": { - "controlName": "1.1", "description": "Resolve endpoint protection health issues on your machines", "assessmentType": "Assessment", "assessmentDetailsLink": "https://management.azure.com/subscriptions/a27e854a-8578-4395-8eaf-6fc7849f3050/providers/Microsoft.Security/securityStatuses/3bcd234d-c9c7-c2a2-89e0-c01f419c1a8a", - "state": "skipped", + "state": "Skipped", "passedResources": 0, "failedResources": 0, "skippedResources": 10 @@ -43,11 +41,10 @@ "name": "d1db3318-01ff-16de-29eb-28b344515626", "type": "Microsoft.Security/regulatoryComplianceAssessment", "properties": { - "controlName": "1.1", "description": "Install monitoring agent on your machines", "assessmentType": "Assessment", "assessmentDetailsLink": "https://management.azure.com/subscriptions/a27e854a-8578-4395-8eaf-6fc7849f3050/providers/Microsoft.Security/securityStatuses/d1db3318-01ff-16de-29eb-28b344515626", - "state": "passed", + "state": "Passed", "passedResources": 8, "failedResources": 0, "skippedResources": 0 diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2019-01-01-preview/examples/RegulatoryCompliance/getRegulatoryComplianceAssessment_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2019-01-01-preview/examples/RegulatoryCompliance/getRegulatoryComplianceAssessment_example.json index 93b725c5b4c1..ad909db10220 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2019-01-01-preview/examples/RegulatoryCompliance/getRegulatoryComplianceAssessment_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2019-01-01-preview/examples/RegulatoryCompliance/getRegulatoryComplianceAssessment_example.json @@ -1,7 +1,7 @@ { "parameters": { "api-version": "2019-01-01", - "scope": "subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23", + "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23", "regulatoryComplianceStandardName": "PCI-DSS-3.2", "regulatoryComplianceControlName": "1.1", "regulatoryComplianceAssessmentName": "968548cb-02b3-8cd2-11f8-0cf64ab1a347" @@ -9,20 +9,17 @@ "responses": { "200": { "body": { - "value": { - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/regulatoryComplianceStandards/PCI-DSS-3.2/regulatoryComplianceControls/1.1/regulatoryComplianceAssessments/968548cb-02b3-8cd2-11f8-0cf64ab1a347", - "name": "968548cb-02b3-8cd2-11f8-0cf64ab1a347", - "type": "Microsoft.Security/regulatoryComplianceAssessment", - "properties": { - "controlName": "1.1", - "description": "Troubleshoot missing scan data on your machines", - "assessmentType": "Assessment", - "assessmentDetailsLink": "https://management.azure.com/subscriptions/a27e854a-8578-4395-8eaf-6fc7849f3050/providers/Microsoft.Security/securityStatuses/968548cb-02b3-8cd2-11f8-0cf64ab1a347", - "state": "failed", - "passedResources": 7, - "failedResources": 4, - "skippedResources": 0 - } + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/regulatoryComplianceStandards/PCI-DSS-3.2/regulatoryComplianceControls/1.1/regulatoryComplianceAssessments/968548cb-02b3-8cd2-11f8-0cf64ab1a347", + "name": "968548cb-02b3-8cd2-11f8-0cf64ab1a347", + "type": "Microsoft.Security/regulatoryComplianceAssessment", + "properties": { + "description": "Troubleshoot missing scan data on your machines", + "assessmentType": "Assessment", + "assessmentDetailsLink": "https://management.azure.com/subscriptions/a27e854a-8578-4395-8eaf-6fc7849f3050/providers/Microsoft.Security/securityStatuses/968548cb-02b3-8cd2-11f8-0cf64ab1a347", + "state": "Failed", + "passedResources": 7, + "failedResources": 4, + "skippedResources": 0 } } } diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2019-01-01-preview/examples/RegulatoryCompliance/getRegulatoryComplianceControlList_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2019-01-01-preview/examples/RegulatoryCompliance/getRegulatoryComplianceControlList_example.json index 6e9b54a5147a..7bbdbe4220ea 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2019-01-01-preview/examples/RegulatoryCompliance/getRegulatoryComplianceControlList_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2019-01-01-preview/examples/RegulatoryCompliance/getRegulatoryComplianceControlList_example.json @@ -1,7 +1,7 @@ { "parameters": { "api-version": "2019-01-01", - "scope": "subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23", + "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23", "regulatoryComplianceStandardName": "PCI-DSS-3.2" }, "responses": { @@ -12,13 +12,11 @@ "name": "1.1", "type": "Microsoft.Security/regulatoryComplianceControl", "properties": { - "standardName": "PCI-DSS-3.2", "description": "Common Criteria Related to Organization and Management.", - "state": "failed", + "state": "Failed", "passedAssessments": 7, "failedAssessments": 4, - "skippedAssessments": 0, - "unsupportedAssessments": 0 + "skippedAssessments": 0 } }, { @@ -26,13 +24,11 @@ "name": "2", "type": "Microsoft.Security/regulatoryComplianceControl", "properties": { - "standardName": "PCI-DSS-3.2", "description": "Confidential information is protected during the system design, development, testing, implementation, and change processes in accordance with confidentiality commitments and requirements.", - "state": "skipped", + "state": "Skipped", "passedAssessments": 0, "failedAssessments": 0, - "skippedAssessments": 10, - "unsupportedAssessments": 0 + "skippedAssessments": 10 } }, { @@ -40,13 +36,11 @@ "name": "2.1", "type": "Microsoft.Security/regulatoryComplianceControl", "properties": { - "standardName": "PCI-DSS-3.2", "description": "Changes to confidentiality commitments and requirements are communicated to internal and external users, vendors, and other third parties whose products and services are included in the system.", - "state": "unsupported", + "state": "Unsupported", "passedAssessments": 0, "failedAssessments": 0, - "skippedAssessments": 0, - "unsupportedAssessments": 0 + "skippedAssessments": 0 } }] } diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2019-01-01-preview/examples/RegulatoryCompliance/getRegulatoryComplianceControl_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2019-01-01-preview/examples/RegulatoryCompliance/getRegulatoryComplianceControl_example.json index c45483de043e..7ca93cf79394 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2019-01-01-preview/examples/RegulatoryCompliance/getRegulatoryComplianceControl_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2019-01-01-preview/examples/RegulatoryCompliance/getRegulatoryComplianceControl_example.json @@ -1,26 +1,22 @@ { "parameters": { "api-version": "2019-01-01", - "scope": "subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23", + "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23", "regulatoryComplianceStandardName": "PCI-DSS-3.2", "regulatoryComplianceControlName": "1.1" }, "responses": { "200": { "body": { - "value": { - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/regulatoryComplianceStandards/PCI-DSS-3.2/regulatoryComplianceControls/1.1", - "name": "1.1", - "type": "Microsoft.Security/regulatoryComplianceControl", - "properties": { - "standardName": "PCI-DSS-3.2", - "description": "Common Criteria Related to Organization and Management", - "state": "failed", - "passedAssessments": 7, - "failedAssessments": 4, - "skippedAssessments": 0, - "unsupportedAssessments": 0 - } + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/regulatoryComplianceStandards/PCI-DSS-3.2/regulatoryComplianceControls/1.1", + "name": "1.1", + "type": "Microsoft.Security/regulatoryComplianceControl", + "properties": { + "description": "Common Criteria Related to Organization and Management", + "state": "Failed", + "passedAssessments": 7, + "failedAssessments": 4, + "skippedAssessments": 0 } } } diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2019-01-01-preview/examples/RegulatoryCompliance/getRegulatoryComplianceStandardList_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2019-01-01-preview/examples/RegulatoryCompliance/getRegulatoryComplianceStandardList_example.json index 9c97bb04e544..42a64429cf99 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2019-01-01-preview/examples/RegulatoryCompliance/getRegulatoryComplianceStandardList_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2019-01-01-preview/examples/RegulatoryCompliance/getRegulatoryComplianceStandardList_example.json @@ -1,7 +1,7 @@ { "parameters": { "api-version": "2019-01-01", - "scope": "subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23" + "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23" }, "responses": { "200": { @@ -11,7 +11,7 @@ "name": "PCI-DSS-3.2", "type": "Microsoft.Security/regulatoryComplianceStandard", "properties": { - "state": "failed", + "state": "Failed", "passedControls": 7, "failedControls": 4, "skippedControls": 0, @@ -23,7 +23,7 @@ "name": "ISO-27001", "type": "Microsoft.Security/regulatoryComplianceStandard", "properties": { - "state": "skipped", + "state": "Skipped", "passedControls": 0, "failedControls": 0, "skippedControls": 10, @@ -35,7 +35,7 @@ "name": "AZURE-CIS", "type": "Microsoft.Security/regulatoryComplianceStandard", "properties": { - "state": "unsupported", + "state": "Unsupported", "passedControls": 0, "failedControls": 0, "skippedControls": 0, @@ -47,7 +47,7 @@ "name": "SOC-TSP", "type": "Microsoft.Security/regulatoryComplianceStandard", "properties": { - "state": "passed", + "state": "Passed", "passedControls": 15, "failedControls": 0, "skippedControls": 0, diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2019-01-01-preview/examples/RegulatoryCompliance/getRegulatoryComplianceStandard_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2019-01-01-preview/examples/RegulatoryCompliance/getRegulatoryComplianceStandard_example.json index 462619d5bfd1..2003b2f03b86 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2019-01-01-preview/examples/RegulatoryCompliance/getRegulatoryComplianceStandard_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2019-01-01-preview/examples/RegulatoryCompliance/getRegulatoryComplianceStandard_example.json @@ -1,23 +1,21 @@ { "parameters": { "api-version": "2019-01-01", - "scope": "subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23", + "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23", "regulatoryComplianceStandardName": "PCI-DSS-3.2" }, "responses": { "200": { "body": { - "value": { - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/regulatoryComplianceStandards/PCI-DSS-3.2", - "name": "PCI-DSS-3.2", - "type": "Microsoft.Security/regulatoryComplianceStandard", - "properties": { - "state": "failed", - "passedControls": 7, - "failedControls": 4, - "skippedControls": 0, - "unsupportedControls": 0 - } + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/regulatoryComplianceStandards/PCI-DSS-3.2", + "name": "PCI-DSS-3.2", + "type": "Microsoft.Security/regulatoryComplianceStandard", + "properties": { + "state": "Failed", + "passedControls": 7, + "failedControls": 4, + "skippedControls": 0, + "unsupportedControls": 0 } } } diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2019-01-01-preview/regulatoryCompliance.json b/specification/security/resource-manager/Microsoft.Security/preview/2019-01-01-preview/regulatoryCompliance.json index 4e35dba5fdde..18bf801876bb 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2019-01-01-preview/regulatoryCompliance.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2019-01-01-preview/regulatoryCompliance.json @@ -26,7 +26,7 @@ } }, "paths": { - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Security/regulatoryComplianceStandards": { + "/subscriptions/{subscriptionId}/providers/Microsoft.Security/regulatoryComplianceStandards": { "get": { "x-ms-examples": { "Get all supported regulatory compliance standards details and state": { @@ -42,9 +42,6 @@ }, { "$ref": "../../../common/v1/types.json#/parameters/SubscriptionId" - }, - { - "$ref": "../../../common/v1/types.json#/parameters/ResourceGroupName" }, { "$ref": "../../../common/v1/types.json#/parameters/ODataFilter" @@ -69,7 +66,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Security/regulatoryComplianceStandards/{regulatoryComplianceStandardName}": { + "/subscriptions/{subscriptionId}/providers/Microsoft.Security/regulatoryComplianceStandards/{regulatoryComplianceStandardName}": { "get": { "x-ms-examples": { "Get selected regulatory compliance standard details and state": { @@ -86,9 +83,6 @@ { "$ref": "../../../common/v1/types.json#/parameters/SubscriptionId" }, - { - "$ref": "../../../common/v1/types.json#/parameters/ResourceGroupName" - }, { "$ref": "#/parameters/RegulatoryComplianceStandardName" } @@ -109,7 +103,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Security/regulatoryComplianceStandards/{regulatoryComplianceStandardName}/regulatoryComplianceControls": { + "/subscriptions/{subscriptionId}/providers/Microsoft.Security/regulatoryComplianceStandards/{regulatoryComplianceStandardName}/regulatoryComplianceControls": { "get": { "x-ms-examples": { "Get all regulatory compliance controls details and state for selected standard": { @@ -126,9 +120,6 @@ { "$ref": "../../../common/v1/types.json#/parameters/SubscriptionId" }, - { - "$ref": "../../../common/v1/types.json#/parameters/ResourceGroupName" - }, { "$ref": "#/parameters/RegulatoryComplianceStandardName" }, @@ -155,7 +146,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Security/regulatoryComplianceStandards/{regulatoryComplianceStandardName}/regulatoryComplianceControls/{regulatoryComplianceControlName}": { + "/subscriptions/{subscriptionId}/providers/Microsoft.Security/regulatoryComplianceStandards/{regulatoryComplianceStandardName}/regulatoryComplianceControls/{regulatoryComplianceControlName}": { "get": { "x-ms-examples": { "Get selected regulatory compliance control details and state": { @@ -172,9 +163,6 @@ { "$ref": "../../../common/v1/types.json#/parameters/SubscriptionId" }, - { - "$ref": "../../../common/v1/types.json#/parameters/ResourceGroupName" - }, { "$ref": "#/parameters/RegulatoryComplianceStandardName" }, @@ -198,7 +186,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Security/regulatoryComplianceStandards/{regulatoryComplianceStandardName}/regulatoryComplianceControls/{regulatoryComplianceControlName}/regulatoryComplianceAssessments": { + "/subscriptions/{subscriptionId}/providers/Microsoft.Security/regulatoryComplianceStandards/{regulatoryComplianceStandardName}/regulatoryComplianceControls/{regulatoryComplianceControlName}/regulatoryComplianceAssessments": { "get": { "x-ms-examples": { "Get all assessments mapped to selected regulatory compliance control": { @@ -215,9 +203,6 @@ { "$ref": "../../../common/v1/types.json#/parameters/SubscriptionId" }, - { - "$ref": "../../../common/v1/types.json#/parameters/ResourceGroupName" - }, { "$ref": "#/parameters/RegulatoryComplianceStandardName" }, @@ -247,7 +232,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Security/regulatoryComplianceStandards/{regulatoryComplianceStandardName}/regulatoryComplianceControls/{regulatoryComplianceControlName}/regulatoryComplianceAssessments/{regulatoryComplianceAssessmentName}": { + "/subscriptions/{subscriptionId}/providers/Microsoft.Security/regulatoryComplianceStandards/{regulatoryComplianceStandardName}/regulatoryComplianceControls/{regulatoryComplianceControlName}/regulatoryComplianceAssessments/{regulatoryComplianceAssessmentName}": { "get": { "x-ms-examples": { "Get selected regulatory compliance assessment details and state": { @@ -264,9 +249,6 @@ { "$ref": "../../../common/v1/types.json#/parameters/SubscriptionId" }, - { - "$ref": "../../../common/v1/types.json#/parameters/ResourceGroupName" - }, { "$ref": "#/parameters/RegulatoryComplianceStandardName" },