Skip to content
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

Remove redundent resourceGroup scope from all paths #6121

Merged
merged 9 commits into from
May 28, 2019
Merged

Remove redundent resourceGroup scope from all paths #6121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c8e199e
Added regultory compliance to package-composite-v3
himarkov Apr 29, 2019
5b5b3ce
Added regultory compliance to package-composite-v3
himarkov Apr 29, 2019
ea61ac1
Merge remote-tracking branch 'upstream/master'
himarkov May 27, 2019
222c359
remove redundent resourceGroup scope
himarkov May 27, 2019
02ae45c
remove redundent resourceGroup scope
himarkov May 27, 2019
65d2ba4
remove redundent resourceGroup scope in examples
himarkov May 27, 2019
c7f40ed
remove redundent data in examples
himarkov May 27, 2019
588fdf2
remove redundent data in examples
himarkov May 27, 2019
997d478
remove redundent data in examples
himarkov May 27, 2019
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
11 changes: 4 additions & 7 deletions ...-preview/examples/RegulatoryCompliance/getRegulatoryComplianceAssessmentList_example.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
},
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
27 changes: 12 additions & 15 deletions ...1-01-preview/examples/RegulatoryCompliance/getRegulatoryComplianceAssessment_example.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,25 @@
{
"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"
},
"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
}
}
}
Expand Down
20 changes: 7 additions & 13 deletions ...-01-preview/examples/RegulatoryCompliance/getRegulatoryComplianceControlList_example.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": {
Expand All @@ -12,41 +12,35 @@
"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
}
},
{
"id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/regulatoryComplianceStandards/PCI-DSS-3.2/regulatoryComplianceControls/2",
"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
}
},
{
"id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/regulatoryComplianceStandards/PCI-DSS-3.2/regulatoryComplianceControls/2.1",
"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
}
}]
}
Expand Down
24 changes: 10 additions & 14 deletions ...9-01-01-preview/examples/RegulatoryCompliance/getRegulatoryComplianceControl_example.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
}
}
}
Expand Down
10 changes: 5 additions & 5 deletions ...01-preview/examples/RegulatoryCompliance/getRegulatoryComplianceStandardList_example.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": {
Expand All @@ -11,7 +11,7 @@
"name": "PCI-DSS-3.2",
"type": "Microsoft.Security/regulatoryComplianceStandard",
"properties": {
"state": "failed",
"state": "Failed",
"passedControls": 7,
"failedControls": 4,
"skippedControls": 0,
Expand All @@ -23,7 +23,7 @@
"name": "ISO-27001",
"type": "Microsoft.Security/regulatoryComplianceStandard",
"properties": {
"state": "skipped",
"state": "Skipped",
"passedControls": 0,
"failedControls": 0,
"skippedControls": 10,
Expand All @@ -35,7 +35,7 @@
"name": "AZURE-CIS",
"type": "Microsoft.Security/regulatoryComplianceStandard",
"properties": {
"state": "unsupported",
"state": "Unsupported",
"passedControls": 0,
"failedControls": 0,
"skippedControls": 0,
Expand All @@ -47,7 +47,7 @@
"name": "SOC-TSP",
"type": "Microsoft.Security/regulatoryComplianceStandard",
"properties": {
"state": "passed",
"state": "Passed",
"passedControls": 15,
"failedControls": 0,
"skippedControls": 0,
Expand Down
22 changes: 10 additions & 12 deletions ...-01-01-preview/examples/RegulatoryCompliance/getRegulatoryComplianceStandard_example.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
}
}
}
Expand Down
30 changes: 6 additions & 24 deletions .../resource-manager/Microsoft.Security/preview/2019-01-01-preview/regulatoryCompliance.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand All @@ -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"
Expand All @@ -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": {
Expand All @@ -86,9 +83,6 @@
{
"$ref": "../../../common/v1/types.json#/parameters/SubscriptionId"
},
{
"$ref": "../../../common/v1/types.json#/parameters/ResourceGroupName"
},
{
"$ref": "#/parameters/RegulatoryComplianceStandardName"
}
Expand All @@ -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": {
Expand All @@ -126,9 +120,6 @@
{
"$ref": "../../../common/v1/types.json#/parameters/SubscriptionId"
},
{
"$ref": "../../../common/v1/types.json#/parameters/ResourceGroupName"
},
{
"$ref": "#/parameters/RegulatoryComplianceStandardName"
},
Expand All @@ -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": {
Expand All @@ -172,9 +163,6 @@
{
"$ref": "../../../common/v1/types.json#/parameters/SubscriptionId"
},
{
"$ref": "../../../common/v1/types.json#/parameters/ResourceGroupName"
},
{
"$ref": "#/parameters/RegulatoryComplianceStandardName"
},
Expand All @@ -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": {
Expand All @@ -215,9 +203,6 @@
{
"$ref": "../../../common/v1/types.json#/parameters/SubscriptionId"
},
{
"$ref": "../../../common/v1/types.json#/parameters/ResourceGroupName"
},
{
"$ref": "#/parameters/RegulatoryComplianceStandardName"
},
Expand Down Expand Up @@ -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": {
Expand All @@ -264,9 +249,6 @@
{
"$ref": "../../../common/v1/types.json#/parameters/SubscriptionId"
},
{
"$ref": "../../../common/v1/types.json#/parameters/ResourceGroupName"
},
{
"$ref": "#/parameters/RegulatoryComplianceStandardName"
},
Expand Down