From a62cebdbac5f08d40ed500e472c0d11f1facde2b Mon Sep 17 00:00:00 2001 From: giromm2ms <52413295+giromm2ms@users.noreply.github.com> Date: Wed, 22 Jan 2020 18:04:09 +0200 Subject: [PATCH 01/53] Set theme jekyll-theme-midnight --- _config.yml | 1 + 1 file changed, 1 insertion(+) create mode 100644 _config.yml diff --git a/_config.yml b/_config.yml new file mode 100644 index 000000000000..18854876c67f --- /dev/null +++ b/_config.yml @@ -0,0 +1 @@ +theme: jekyll-theme-midnight \ No newline at end of file From 4219c6c91af4be76cd3a1569047b827970f99277 Mon Sep 17 00:00:00 2001 From: Gideon Romm Date: Wed, 22 Jan 2020 18:01:58 +0200 Subject: [PATCH 02/53] Adding new APIs for secure score --- ...stSecureScoreControlsMetadata_example.json | 126 ++++++++++++ ...coreControlsForNameWithExpand_example.json | 194 ++++++++++++++++++ ...istSecureScoreControlsForName_example.json | 115 +++++++++++ .../ListSecureScores_example.json | 38 ++++ .../2020-01-01-preview/secureScore.json | Bin 0 -> 23598 bytes 5 files changed, 473 insertions(+) create mode 100644 specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScoreControlsMetadata/ListSecureScoreControlsMetadata_example.json create mode 100644 specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_example.json create mode 100644 specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_example.json create mode 100644 specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScores_example.json create mode 100644 specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScoreControlsMetadata/ListSecureScoreControlsMetadata_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScoreControlsMetadata/ListSecureScoreControlsMetadata_example.json new file mode 100644 index 000000000000..9e1689ce6b5a --- /dev/null +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScoreControlsMetadata/ListSecureScoreControlsMetadata_example.json @@ -0,0 +1,126 @@ +{ + "parameters": { + "api-version": "2020-01-01-preview" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/providers/Microsoft.Security/secureScoreControlsMetadata/a9909064-42b4-4d34-8143-275477afe18b", + "name": "a9909064-42b4-4d34-8143-275477afe18b", + "type": "Microsoft.Security/SecureScoresControlMetadata", + "properties": { + "source": { + "sourceType": "Builtin", + "initiativeId": "/providers/Microsoft.Authorization/policySetDefinitions/1f3afdf9-d0c9-4c3d-847f-89da613e70a8" + }, + "displayName": "Protect applications against DDoS attacks", + "description": "", + "maxScore": 2, + "assessmentsMetadata": [ + { + "id": "/providers/Microsoft.Security/assessmentMetadata/e3de1cc0-f4dd-3b34-e496-8b5381ba2d70" + } + ] + } + }, + { + "id": "/providers/Microsoft.Security/secureScoreControlsMetadata/34a42fb3-e6db-409c-b56b-7b1db6b8aee0", + "name": "34a42fb3-e6db-409c-b56b-7b1db6b8aee0", + "type": "Microsoft.Security/SecureScoresControlMetadata", + "properties": { + "source": { + "sourceType": "Builtin", + "initiativeId": "/providers/Microsoft.Authorization/policySetDefinitions/1f3afdf9-d0c9-4c3d-847f-89da613e70a8" + }, + "displayName": "Enable MFA", + "description": "", + "maxScore": 10, + "assessmentsMetadata": [ + { + "id": "/providers/Microsoft.Security/assessmentMetadata/151e82c5-5341-a74b-1eb0-bc38d2c84bb5" + }, + { + "id": "/providers/Microsoft.Security/assessmentMetadata/57e98606-6b1e-6193-0e3d-fe621387c16b" + }, + { + "id": "/providers/Microsoft.Security/assessmentMetadata/94290b00-4d0c-d7b4-7cea-064a9554e681" + } + ] + } + }, + { + "id": "/providers/Microsoft.Security/secureScoreControlsMetadata/a000c66f-6da2-4f9d-826d-2364347d2588", + "name": "a000c66f-6da2-4f9d-826d-2364347d2588", + "type": "Microsoft.Security/SecureScoresControlMetadata", + "properties": { + "source": { + "sourceType": "Builtin", + "initiativeId": "/providers/Microsoft.Authorization/policySetDefinitions/1f3afdf9-d0c9-4c3d-847f-89da613e70a8" + }, + "displayName": "Apply adaptive application control", + "description": "", + "maxScore": 3, + "assessmentsMetadata": [ + { + "id": "/providers/Microsoft.Security/assessmentMetadata/35f45c95-27cf-4e52-891f-8390d1de5828" + }, + { + "id": "/providers/Microsoft.Security/assessmentMetadata/d1db3318-01ff-16de-29eb-28b344515626" + }, + { + "id": "/providers/Microsoft.Security/assessmentMetadata/e7ee30c4-bac9-2966-54bd-2023a4282872" + }, + { + "id": "/providers/Microsoft.Security/assessmentMetadata/8e2b96ff-3de2-289b-b5c1-3b9921a3441e" + } + ] + } + }, + { + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScoreControlsMetadata/a9909064-42b4-4d34-8143-275477afe18b", + "name": "a9909064-42b4-4d34-8143-275477afe18b", + "type": "Microsoft.Security/SecureScoresControlMetadata", + "properties": { + "source": { + "sourceType": "CustomPolicy", + "initiativeId": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Authorization/policySetDefinitions/1203fdf9-eeee-ffff-847f-89da613eabcd" + }, + "displayName": "Apply adaptive application control", + "description": "", + "maxScore": 3, + "assessmentsMetadata": [ + { + "id": "/providers/Microsoft.Security/assessmentMetadata/e3de1cc0-f4dd-3b34-e496-8b5381ba2d70" + }, + { + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/assessmentMetadata/4c8a64c9-9b0f-0da9-2d2e-1d11ad316f4e" + } + ] + } + }, + { + "id": "/subscriptions/11111111-e762-44dd-bd96-202020202020/providers/Microsoft.Security/secureScoreControlsMetadata/a9909064-42b4-4d34-8143-275477afe18b", + "name": "a9909064-42b4-4d34-8143-275477afe18b", + "type": "Microsoft.Security/SecureScoresControlMetadata", + "properties": { + "source": { + "sourceType": "CustomPolicy", + "initiativeId": "/subscriptions/11111111-e762-44dd-bd96-202020202020/providers/Microsoft.Authorization/policySetDefinitions/dddddddd-eeee-ffff-847f-89da613eabcd" + }, + "displayName": "My custom application control", + "description": "", + "maxScore": 5, + "assessmentsMetadata": [ + { + "id": "/subscriptions/11111111-e762-44dd-bd96-202020202020/providers/Microsoft.Security/assessmentMetadata/12345678-9a04-0000-2eed-565656565656" + } + ] + } + } + ] + } + } + } +} \ No newline at end of file diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_example.json new file mode 100644 index 000000000000..e78e4f944847 --- /dev/null +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_example.json @@ -0,0 +1,194 @@ +{ + "parameters": { + "api-version": "2020-01-01-preview", + "scope": "subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23", + "secureScoreName": "ascDefault", + "$expand": "metadata" + }, + "responses": { + "200": { + "parameters": { + "secureScoreName": "ascDefault" + }, + "body": { + "value": [ + { + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/securescores/ascDefault/a9909064-42b4-4d34-8143-275477afe18b", + "name": "a9909064-42b4-4d34-8143-275477afe18b", + "type": "Microsoft.Security/securescorescontrol", + "properties": { + "displayName": "Protect applications against DDoS attacks", + "data": { + "healthyResources": 0, + "unhealthyResources": 0, + "notApplicableResources": 10, + "disabledResources": 50, + "achievedResourcesPoints": 0, + "totalResourcesPoints": 0, + "maxScore": 0, + "current": 0 + }, + "metadata": { + "id": "/providers/Microsoft.Security/secureScoreControlsMetadata/a9909064-42b4-4d34-8143-275477afe18b", + "name": "a9909064-42b4-4d34-8143-275477afe18b", + "type": "Microsoft.Security/SecureScoresControlMetadata", + "properties": { + "source": { + "sourceType": "Builtin", + "initiativeId": "/providers/Microsoft.Authorization/policySetDefinitions/1f3afdf9-d0c9-4c3d-847f-89da613e70a8" + }, + "displayName": "Protect applications against DDoS attacks", + "description": "", + "maxScore": 2, + "assessmentsMetadata": [ + { + "id": "/providers/Microsoft.Security/assessmentMetadata/e3de1cc0-f4dd-3b34-e496-8b5381ba2d70" + } + ] + } + } + } + }, + { + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/securescores/ascDefault/34a42fb3-e6db-409c-b56b-7b1db6b8aee0", + "name": "34a42fb3-e6db-409c-b56b-7b1db6b8aee0", + "type": "Microsoft.Security/securescorescontrol", + "properties": { + "displayName": "Enable MFA", + "data": { + "healthyResources": 0, + "unhealthyResources": 1, + "notApplicableResources": 0, + "disabledResources": 0, + "achievedResourcesPoints": 0, + "totalResourcesPoints": 1, + "maxScore": 10, + "current": 0 + }, + "metadata": { + "id": "/providers/Microsoft.Security/secureScoreControlsMetadata/34a42fb3-e6db-409c-b56b-7b1db6b8aee0", + "name": "34a42fb3-e6db-409c-b56b-7b1db6b8aee0", + "type": "Microsoft.Security/SecureScoresControlMetadata", + "properties": { + "source": { + "sourceType": "Builtin", + "initiativeId": "/providers/Microsoft.Authorization/policySetDefinitions/1f3afdf9-d0c9-4c3d-847f-89da613e70a8" + }, + "displayName": "Enable MFA", + "description": "", + "maxScore": 10, + "assessmentsMetadata": [ + { + "id": "/providers/Microsoft.Security/assessmentMetadata/151e82c5-5341-a74b-1eb0-bc38d2c84bb5" + }, + { + "id": "/providers/Microsoft.Security/assessmentMetadata/57e98606-6b1e-6193-0e3d-fe621387c16b" + }, + { + "id": "/providers/Microsoft.Security/assessmentMetadata/94290b00-4d0c-d7b4-7cea-064a9554e681" + } + ] + } + } + } + }, + { + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/securescores/ascDefault/a000c66f-6da2-4f9d-826d-2364347d2588", + "name": "a000c66f-6da2-4f9d-826d-2364347d2588", + "type": "Microsoft.Security/securescorescontrol", + "properties": { + "displayName": "Apply adaptive application control", + "data": { + "healthyResources": 20, + "unhealthyResources": 0, + "notApplicableResources": 10, + "disabledResources": 5, + "achievedResourcesPoints": 20, + "totalResourcesPoints": 20, + "maxScore": 3, + "current": 3 + }, + "metadata": { + "id": "/providers/Microsoft.Security/secureScoreControlsMetadata/a000c66f-6da2-4f9d-826d-2364347d2588", + "name": "a000c66f-6da2-4f9d-826d-2364347d2588", + "type": "Microsoft.Security/SecureScoresControlMetadata", + "properties": { + "source": { + "sourceType": "Builtin", + "initiativeId": "/providers/Microsoft.Authorization/policySetDefinitions/1f3afdf9-d0c9-4c3d-847f-89da613e70a8" + }, + "displayName": "Apply adaptive application control", + "description": "", + "maxScore": 3, + "assessmentsMetadata": [ + { + "id": "/providers/Microsoft.Security/assessmentMetadata/35f45c95-27cf-4e52-891f-8390d1de5828" + }, + { + "id": "/providers/Microsoft.Security/assessmentMetadata/d1db3318-01ff-16de-29eb-28b344515626" + }, + { + "id": "/providers/Microsoft.Security/assessmentMetadata/e7ee30c4-bac9-2966-54bd-2023a4282872" + }, + { + "id": "/providers/Microsoft.Security/assessmentMetadata/8e2b96ff-3de2-289b-b5c1-3b9921a3441e" + } + ] + } + } + } + } + ] + } + }, + "200": { + "parameters": { + "secureScoreName": "CustomA" + }, + "body": { + "value": [ + { + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/securescores/CustomA/a9909064-42b4-4d34-8143-275477afe18b", + "name": "a9909064-42b4-4d34-8143-275477afe18b", + "type": "Microsoft.Security/securescorescontrol", + "properties": { + "displayName": "Protect applications against DDoS attacks", + "data": { + "healthyResources": 0, + "unhealthyResources": 10, + "notApplicableResources": 0, + "disabledResources": 50, + "achievedResourcesPoints": 0, + "totalResourcesPoints": 10, + "maxScore": 2, + "current": 0 + }, + "metadata": { + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScoreControlsMetadata/a9909064-42b4-4d34-8143-275477afe18b", + "name": "a9909064-42b4-4d34-8143-275477afe18b", + "type": "Microsoft.Security/SecureScoresControlMetadata", + "properties": { + "source": { + "sourceType": "CustomPolicy", + "initiativeId": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Authorization/policySetDefinitions/1203fdf9-eeee-ffff-847f-89da613eabcd" + }, + "displayName": "Apply adaptive application control", + "description": "", + "maxScore": 3, + "assessmentsMetadata": [ + { + "id": "/providers/Microsoft.Security/assessmentMetadata/e3de1cc0-f4dd-3b34-e496-8b5381ba2d70" + }, + { + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/assessmentMetadata/4c8a64c9-9b0f-0da9-2d2e-1d11ad316f4e" + } + ] + } + } + } + } + ] + } + } + } +} \ No newline at end of file diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_example.json new file mode 100644 index 000000000000..591cc9bb0dd2 --- /dev/null +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_example.json @@ -0,0 +1,115 @@ +{ + "parameters": { + "api-version": "2020-01-01-preview", + "scope": "subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23" + }, + "responses": { + "200": { + "parameters": { + "secureScoreName": "ascDefault" + }, + "body": { + "value": [ + { + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/securescores/ascDefault/a9909064-42b4-4d34-8143-275477afe18b", + "name": "a9909064-42b4-4d34-8143-275477afe18b", + "type": "Microsoft.Security/securescorescontrol", + "properties": { + "displayName": "Protect applications against DDoS attacks", + "data": { + "healthyResources": 0, + "unhealthyResources": 0, + "notApplicableResources": 10, + "disabledResources": 50, + "achievedResourcesPoints": 0, + "totalResourcesPoints": 0, + "maxScore": 0, + "current": 0 + }, + "assessmentsMetadata": [ + "/providers/Microsoft.Security/assessmentMetadata/e3de1cc0-f4dd-3b34-e496-8b5381ba2d70" + ] + } + }, + { + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/securescores/ascDefault/34a42fb3-e6db-409c-b56b-7b1db6b8aee0", + "name": "34a42fb3-e6db-409c-b56b-7b1db6b8aee0", + "type": "Microsoft.Security/securescorescontrol", + "properties": { + "displayName": "Enable MFA", + "data": { + "healthyResources": 0, + "unhealthyResources": 1, + "notApplicableResources": 0, + "disabledResources": 0, + "achievedResourcesPoints": 0, + "totalResourcesPoints": 1, + "maxScore": 10, + "current": 0 + }, + "assessmentsMetadata": [ + "/providers/Microsoft.Security/assessmentMetadata/151e82c5-5341-a74b-1eb0-bc38d2c84bb5", + "/providers/Microsoft.Security/assessmentMetadata/57e98606-6b1e-6193-0e3d-fe621387c16b", + "/providers/Microsoft.Security/assessmentMetadata/94290b00-4d0c-d7b4-7cea-064a9554e681" + ] + } + }, + { + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/securescores/ascDefault/a000c66f-6da2-4f9d-826d-2364347d2588", + "name": "a000c66f-6da2-4f9d-826d-2364347d2588", + "type": "Microsoft.Security/securescorescontrol", + "properties": { + "displayName": "Apply adaptive application control", + "data": { + "healthyResources": 20, + "unhealthyResources": 0, + "notApplicableResources": 10, + "disabledResources": 5, + "achievedResourcesPoints": 20, + "totalResourcesPoints": 20, + "maxScore": 3, + "current": 3 + }, + "assessmentsMetadata": [ + "/providers/Microsoft.Security/assessmentMetadata/151e82c5-5341-a74b-1eb0-bc38d2c84bb5", + "/providers/Microsoft.Security/assessmentMetadata/57e98606-6b1e-6193-0e3d-fe621387c16b", + "/providers/Microsoft.Security/assessmentMetadata/94290b00-4d0c-d7b4-7cea-064a9554e681" + ] + } + } + ] + } + }, + "200": { + "parameters": { + "secureScoreName": "CustomA" + }, + "body": { + "value": [ + { + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/securescores/CustomA/a9909064-42b4-4d34-8143-275477afe18b", + "name": "a9909064-42b4-4d34-8143-275477afe18b", + "type": "Microsoft.Security/securescorescontrol", + "properties": { + "displayName": "Protect applications against DDoS attacks", + "data": { + "healthyResources": 0, + "unhealthyResources": 10, + "notApplicableResources": 0, + "disabledResources": 50, + "achievedResourcesPoints": 0, + "totalResourcesPoints": 10, + "maxScore": 2, + "current": 0 + }, + "assessmentsMetadata": [ + "/providers/Microsoft.Security/assessmentMetadata/e3de1cc0-f4dd-3b34-e496-8b5381ba2d70", + "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/assessmentMetadata/4c8a64c9-9b0f-0da9-2d2e-1d11ad316f4e" + ] + } + } + ] + } + } + } +} \ No newline at end of file diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScores_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScores_example.json new file mode 100644 index 000000000000..b44737c62df2 --- /dev/null +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScores_example.json @@ -0,0 +1,38 @@ +{ + "parameters": { + "api-version": "2020-01-01-preview", + "scope": "subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/securescores/ascDefault", + "name": "ascDefault", + "type": "Microsoft.Security/securescores", + "properties": { + "displayName": "asc Default", + "score": { + "maxScore": 13, + "current": 3 + } + } + }, + { + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/securescores/CustomA", + "name": "CustomA", + "type": "Microsoft.Security/securescores", + "properties": { + "displayName": "Custom A", + "score": { + "maxScore": 2, + "current": 0 + } + } + } + ] + } + } + } +} diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json new file mode 100644 index 0000000000000000000000000000000000000000..26321185f8e65b16d54af1f402bdc6ba2c076f9d GIT binary patch literal 23598 zcmeHPS#KNH6`oi3R}gG~BtR`WD%yvaJ;p}sP~JrDB+XvW|B`2At_$#o9ubq+x5VNKCbGs+&- zc%0AhJ_a|&HAfDrW6UGv*6_dLvIg8wa7Upb2luKYjO6Iabe%W#E~N4i=AQ!>-XX`g zXFGG9F|J=U%-q4OQ}CA5-oYAz>w5KX%n_{PdP1*#tVjCgkj%T@1gm&S63I}^R0fHo zQRgkbUjWvlgbw#=S-${OlNml6z)0m!a27mIfWv!8hhgv+ASb8gF1d{jPA(5_mWd>m4cgVp)XpB2}bU9NlFTR0{^s z?!B7Y)Wkvc7%)@Ic#V+I?rdR<&}akyJ)Obfp`-4c)D%xSHjl)3%%V&YwoB|ldpN+S z$lm}|+pBlJ0HsL-Y7&1$*7UDgiPM_DM>DNbnHhouzvHT6@d^K@c58xbeQf4>4V`G* z0W2oh6sst_(>*DD^cHHf>^kp!gxx#FO7}71BcP_9(La>v%ke*fa}%sZORxG)stHcz z{e@P;>YEzAL#!ekSOcc%uFY7j&-Q-lcJ_F`O;%e=Y@fiP+)@sjd=bBM(BRz+`!_RA zb2M$Y$Jy^~GGR7b@ov|WzhljIdJe$ZF=)I4&W!NaB-E^!*b{2k1S5Ez-i|wSp7Mt_ z)N3$t5`8+uD7A*0n5R5yrnO2!x*lbptI@wn6rr*dsp;iVsGG|NC1edh`WY?T2YBsu z>>)OIf^q8W{)p=(IM!ifPC=J{0yg>*jR#bp35RO2aPJ=U)!!w>t^-byE#a5nUo8%y z)7U^D9Zt3Xw3Zf1s?t4Tz-aLSeo`x;tF%k&R`n0e^g6?NKC0PiSh++w@`?N9{&?NR zfZn=oLbAngdxgN&bdFrKz}ACkR1ntOec@AGI?6Sp1#Qu@vP%IM*3A}Q%* zH~trO&U+FgsAqXgD$$I8K7xakgK_ms^&I1Af7FVl_dR3=m3}j5uE$?XOkkeH z{EFhiIDuSZ^g&r06?FT0z5KU;V35INS)WR_=7aBR9j7c0fQ9EyZO#c`n+Q4Cz`*F>vCDN6coEhRi@K;|uz_%UH@)ywMu;%SCzFC~1YsegWa_X7S z@Mujq>InC!1=JYs!HhWd#7#Co_h`$E%-SjbuPO9T9PItMVD{d$R;+e=Bx=Z=>b{2U@FElJjn8qA$Le$hp z$1Td6-z(*k&MfNo$9mDmbW^c8?lp_zqbc<--XG?1(jxnMtxo0Y8SE9cRBc-dMYA5J zah6J5g!Fbtx+%5pV%)O#Dn|^9Sd*_W#${D`7g0xA-KQ00y{dedb%Iq?uu{p-?F8#b zrt8-m`IbDm)H=K+ix4s*Da&d9IID{)UG=f9`JXT5V$Uh&HtZTT`-ZDUWhsv&j$)VW z47s9@$YZr_7t+r>oHaT|WIj5N@m($%X}px@`Q5d)lr|}4?xHhaQC`IEm!rs+E!OWY zV)4;rm!#fBFn1BmGOKjV4>ar7TCU~HwBl)AFvK-pe-7{RZff({Gugy7_9|Fu)Ke8c zzR(_n))TplA8&cu5LF!WC~^FsQF-?sVF?J_I};5tWT_pWO<= z%HAOB0)7r_#jFV)OtWsK3S$mdqdAuqr!N6lRzNR`nEINIRdmSPyozGBC`M}R0H!_t zUG$ZtR~@<6UJZHyo=~1x-#Nsmbm6SZt35f%Wm(sg&T8C4y2EnzfgCJ%b%x+9C4h7( z*_f`=JG9*FEee*>6;rr<?v|yI+ncUX_{2mCFU+g-OK4ZJ;tuAUNAP~-d3$>?``D0h$w-}pcgyz>^QO8 zlvAu-ZeLA%Qm?C@>l0l(p~2cTvE|7n;Wy=4F)_ZgPi1t_eu~k<+ok^6no>H_Yk3;$ zA@Y)LT@A6k)I;k&div7ZvOm+Uul>eRdhLV;{QxZheb0SxWK=^z>DP03P5PA9_m`sq zFN(O9`EOdwvsJV;Tfji9z#Ats=5<96Qpi`+z5E$8Pqlf63p6471n4JuYW`x3bq- z%xf%S1z!V3#)8t76Rq0^%si_nL}eW48?C#64Crqj)^5hnks z#qPEV-xQe*4rYbch>wXx|nHlWB@*B)K z-*dm$X4U)UJq7`#u02k8Rzs+HNc5NS?692NFfXe5L7BD_4JQ8ag1l|Oh6n*dZx9JW(swAk7dMH{cNiF*BqaA>mI2nC*CX)W3*SU45{R4 zelx7vJaajNhb&vOZG;$fHk&KKKh=P*hv{T81zJHX$oRS`@Y z%l7X! zMX8Fj*(2*Gjf+=f((_-;fSHG-b|H_3t{UquTAj&H-qB_X%tpul9fa%eb*I*xUNpzb z>_4%yu4t5O%?__#m-yV>@R)n0^4OH2N)<=tKlg%n6&>k#_NfPS(LBw1`*oYUvYW_v zsfXlR&}3yO_x<4D$eWS5MvPOcmpi&%!u5Ofz4ZHEcK`b-bW3ISORq{=e?EPil0O5H zd-0o9b2a}>t(D%?Psn6=@`%x?L?s*5U#h>(PI*La$opAQ61eVavzsovmv%b$5bari zEcX4r!}(2~QTYLXzX#+geHbHX&s1pR&wCmT;~1`1wk1BdPa{CCmY$z!%L}jKd0v7R z`Kg)6VLso?(-i!qzmPmOwWcNLQ@%GvK10y7?G)hZ>F}_KqdeWAoQv6*Ts2A!8{T-) zZcE$tje0~H>A8wkS(vAg1$jqJiRY!5nX)6%vQ=I5i5ot{-j(6%8N)^C809#noY%5f zsP)KuS>mXYow~ZM{u?MMPaSPSUzqRn3~`wnyvuw;>BiH6l8e|I1^T~Tk6f~M+K~q( zUQS@y_}muHr8E2GTMHtLrCEfL*X3jxttc}qzlMjC8Mjr}Sb0z16O+Qg6CbqJe8U9K zArpE%iQ)I*I8u!7Vd3dkrJP9|&mplI^Xn8wZ}C}~igukg%}((9Q%jVJ$jdmF_dOLo z&g~;}Tz!pkJAu&R=?JU01cW8Nn}ersJmx0*9)Hf`+vdoj5$fv`STcY9n0nH5GSzZ< zt!zf>nk69u(ZCr z>67RQYmTCA@|1yCn^*^zw+B+&<@~dp7?o3zv^dl`+5^=*o`t4m@U-<3&ONAq{(d{{ zS3%Q~CPn$4kFrr`q!L6M$4(tB3^N<{75Mf;p`COS)VgylVWRz!Pr1YI{KnZ_N1j&{ z`COci7Nyv`G>Nx**jTY)G?717V^6bs$l> zl;@(8slW1a@MPwd4YsTLD(`d3p31`|u;rFK$K6BL$I3het*QIzO0*Sr8p)y_o}!Sa zcA`~^c2qTw5Nx|lGtW_InHWjYe%Yy{rZZ!?W_8UsdPGg5T+;SMIU^K#7b}l7mZxQ} fYAep1-{=r4042L<&j>{Lm!WscBmN~HKUMz+hSGVH literal 0 HcmV?d00001 From 36b88dfdbd6f267e6f38d4e3106a038a777ecf3a Mon Sep 17 00:00:00 2001 From: Gideon Romm Date: Wed, 22 Jan 2020 18:17:39 +0200 Subject: [PATCH 03/53] Updated files --- _config.yml | 1 - .../2020-01-01-preview/secureScore.json | Bin 23598 -> 11798 bytes 2 files changed, 1 deletion(-) delete mode 100644 _config.yml diff --git a/_config.yml b/_config.yml deleted file mode 100644 index 18854876c67f..000000000000 --- a/_config.yml +++ /dev/null @@ -1 +0,0 @@ -theme: jekyll-theme-midnight \ No newline at end of file diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json index 26321185f8e65b16d54af1f402bdc6ba2c076f9d..1a4d24e29df726e6777cdc92d1e8c1c832f50b2f 100644 GIT binary patch literal 11798 zcmeHN-EZ4Q5`R|yiUnJsEl^8}i@S%u`RwFiTpSy9a`zAf!J1r2+frPWOUhOQ|L-?5 zJG1-{ZA*=vG(Z8vu*v1@eEep1W_CV48zuf)&*!F0epbohc$)kOk8Ck>@c+kWqft`X zDmVD@(xi21tBpD~MFs0&;V8+BPfNS1tSfNM(Z#9qE0e03E7h4zOXuCJ8plt+Kl-CC zjf(#VQa`BDcvqLHQLECeZ6?&$ru0ntaC$gBm_Em!RcY4NTqn;)x5(_m`3m=5>O#-W z5||rn+-01)B}wDc1w8h!<{h%UsH&BRkKg0RsVjWldZ|~d+@>1knf&TOC|(DAWp&yR zxoe$gCGlpc!BIl&e9(2Z;K%T+_NM$`mn)Fa6|^60H5$E#U$?xc&^j?QTUcZXWgw$; zD27d{&5F$AaGyi64(tqnyVCwa8@w%Z_&&)0^JJ2{xh=*^F_J5CTaeNwptvQ-A1F

;OuD}LNZ0vY-!t?b&U6I+_Ja^*&yA0c<@CDK3u0sK<8BE6CrgNg~8 zv8IgL08|v}Pw6yuby1P#Kx?Qug2YN!i>Rx~N7~|cBG~eiZDdYJ+2%5J07cgFD482X z7BhBpu=EG!MuXVR5)j~(^_2>rE7+;^J&N~jX=bRc@kBoDY&F5JFA+4n_Xl1!X7m9K z6bpZozQ7^%T(AsJ6W*CQr#GxDM=A?k_%Dp>!@7ISsI*r;k@RJ5R)X`7pDyc6faPVjr! zRBf@2b601?2P-#A?sQTy&H~ zAIF0lf-XdIQ)J||s?z>9H7ngRL@QhYZ?wu?IPlc9trp7MtaOp7=zuLS?;Ff|jQWxkqBZGlvK+Q$T@Ahs%>7u zi%#+xl_A+!JoC4*HsMB?`Rc-12Y!FCz#>ZhJHYG~V7PK?C6ki)Or_gu^ ztqMA}5~+DDKc{mk366sKBRu~}O5r7(_{(|;kEdaoxk>ZdL%nkr-^_IG4Y(xbsmaQD z$Pw1&sduf)y4m!e!a$;=NbRnEg{nIEdB4`XfaF@a8J2LA@^WRW@>r)OP!2;uSJ_sn zldN@KW9BUhc`qUzyF7<2p%a0$yObdgRSWAOahyxVI7&*Rv-2X~07;aR^M+_QU6y(y zHArGBvutGmP3YdCbUJ~^Zy}ARc-kwNV-?ZJ^#EVKDxqwOjP5vO$nPcpCH=&anydj@}5ig!mria*qc ztzw5Y7aS3LZ)Mxv9{~|mq6x6KkWiZ6Yv=`H|0sZgS-^#Zmh6z*$AZUfCyZ54UO?xB zie2`RrM@A`z(=r03`t$651c)$x?W5;(>Hj!uwQa_7@8Zg8<2(~p7bBuAPF@6O7OjH z9*TN-#Vv41V4LGCb2au$hB<&%YpwHEU_cZM?7D4&s0=17eBEgjNgOG+*~ciur;>2# zpX_vMcK8yf6sxP_6o2g_s>iXIcqouX$LXAz{dDBvcr}1jY8ONY?KvE?2#q%iVyc}C zVctPa_pURy4ha6b6I~GQ?3thaz#8I5w7yHacSp3t;*b@qaGXuV;r zwF2UH(h$N0XAE1O!_OnwqiB-6+yQGzZMHzgFGQV@9;=F9532FOG^W$4*(d5gl+MKF z-BVTF65PFtTYbR zA;0{>>C6CcqS?=#N_NJSdL`c@Wv(29pqhGRiaE{t9RA~{aXon3pw7 z)HISeVF8BcJfxqHy5Pl4wv~xu$Lt{==@tqgu$=K%j1}0Yfuh9N$!}L5PuiweH(^!0*2w13qY0pUYnBdQlR}2 z+pKh@Me6Ev6CU>Pb$)^qL4o{Oozq~i&ZWD}b6d>yfea4e_DchkrWte8@k4yojD7^q z3U?2@jFlzA1s%LVrweAj$EyOCTTUe?Z$KV*7tCzARF*YCI^=E?dJGgBl3+7N(RiUz z9qfoCc>t4o9qkr>j1%FSpm`tk9*l;As;sk?&EgfzP9}SUvu4BH{xEqKHhkE2APfk2 H`|S4rn#gyS literal 23598 zcmeHPS#KNH6`oi3R}gG~BtR`WD%yvaJ;p}sP~JrDB+XvW|B`2At_$#o9ubq+x5VNKCbGs+&- zc%0AhJ_a|&HAfDrW6UGv*6_dLvIg8wa7Upb2luKYjO6Iabe%W#E~N4i=AQ!>-XX`g zXFGG9F|J=U%-q4OQ}CA5-oYAz>w5KX%n_{PdP1*#tVjCgkj%T@1gm&S63I}^R0fHo zQRgkbUjWvlgbw#=S-${OlNml6z)0m!a27mIfWv!8hhgv+ASb8gF1d{jPA(5_mWd>m4cgVp)XpB2}bU9NlFTR0{^s z?!B7Y)Wkvc7%)@Ic#V+I?rdR<&}akyJ)Obfp`-4c)D%xSHjl)3%%V&YwoB|ldpN+S z$lm}|+pBlJ0HsL-Y7&1$*7UDgiPM_DM>DNbnHhouzvHT6@d^K@c58xbeQf4>4V`G* z0W2oh6sst_(>*DD^cHHf>^kp!gxx#FO7}71BcP_9(La>v%ke*fa}%sZORxG)stHcz z{e@P;>YEzAL#!ekSOcc%uFY7j&-Q-lcJ_F`O;%e=Y@fiP+)@sjd=bBM(BRz+`!_RA zb2M$Y$Jy^~GGR7b@ov|WzhljIdJe$ZF=)I4&W!NaB-E^!*b{2k1S5Ez-i|wSp7Mt_ z)N3$t5`8+uD7A*0n5R5yrnO2!x*lbptI@wn6rr*dsp;iVsGG|NC1edh`WY?T2YBsu z>>)OIf^q8W{)p=(IM!ifPC=J{0yg>*jR#bp35RO2aPJ=U)!!w>t^-byE#a5nUo8%y z)7U^D9Zt3Xw3Zf1s?t4Tz-aLSeo`x;tF%k&R`n0e^g6?NKC0PiSh++w@`?N9{&?NR zfZn=oLbAngdxgN&bdFrKz}ACkR1ntOec@AGI?6Sp1#Qu@vP%IM*3A}Q%* zH~trO&U+FgsAqXgD$$I8K7xakgK_ms^&I1Af7FVl_dR3=m3}j5uE$?XOkkeH z{EFhiIDuSZ^g&r06?FT0z5KU;V35INS)WR_=7aBR9j7c0fQ9EyZO#c`n+Q4Cz`*F>vCDN6coEhRi@K;|uz_%UH@)ywMu;%SCzFC~1YsegWa_X7S z@Mujq>InC!1=JYs!HhWd#7#Co_h`$E%-SjbuPO9T9PItMVD{d$R;+e=Bx=Z=>b{2U@FElJjn8qA$Le$hp z$1Td6-z(*k&MfNo$9mDmbW^c8?lp_zqbc<--XG?1(jxnMtxo0Y8SE9cRBc-dMYA5J zah6J5g!Fbtx+%5pV%)O#Dn|^9Sd*_W#${D`7g0xA-KQ00y{dedb%Iq?uu{p-?F8#b zrt8-m`IbDm)H=K+ix4s*Da&d9IID{)UG=f9`JXT5V$Uh&HtZTT`-ZDUWhsv&j$)VW z47s9@$YZr_7t+r>oHaT|WIj5N@m($%X}px@`Q5d)lr|}4?xHhaQC`IEm!rs+E!OWY zV)4;rm!#fBFn1BmGOKjV4>ar7TCU~HwBl)AFvK-pe-7{RZff({Gugy7_9|Fu)Ke8c zzR(_n))TplA8&cu5LF!WC~^FsQF-?sVF?J_I};5tWT_pWO<= z%HAOB0)7r_#jFV)OtWsK3S$mdqdAuqr!N6lRzNR`nEINIRdmSPyozGBC`M}R0H!_t zUG$ZtR~@<6UJZHyo=~1x-#Nsmbm6SZt35f%Wm(sg&T8C4y2EnzfgCJ%b%x+9C4h7( z*_f`=JG9*FEee*>6;rr<?v|yI+ncUX_{2mCFU+g-OK4ZJ;tuAUNAP~-d3$>?``D0h$w-}pcgyz>^QO8 zlvAu-ZeLA%Qm?C@>l0l(p~2cTvE|7n;Wy=4F)_ZgPi1t_eu~k<+ok^6no>H_Yk3;$ zA@Y)LT@A6k)I;k&div7ZvOm+Uul>eRdhLV;{QxZheb0SxWK=^z>DP03P5PA9_m`sq zFN(O9`EOdwvsJV;Tfji9z#Ats=5<96Qpi`+z5E$8Pqlf63p6471n4JuYW`x3bq- z%xf%S1z!V3#)8t76Rq0^%si_nL}eW48?C#64Crqj)^5hnks z#qPEV-xQe*4rYbch>wXx|nHlWB@*B)K z-*dm$X4U)UJq7`#u02k8Rzs+HNc5NS?692NFfXe5L7BD_4JQ8ag1l|Oh6n*dZx9JW(swAk7dMH{cNiF*BqaA>mI2nC*CX)W3*SU45{R4 zelx7vJaajNhb&vOZG;$fHk&KKKh=P*hv{T81zJHX$oRS`@Y z%l7X! zMX8Fj*(2*Gjf+=f((_-;fSHG-b|H_3t{UquTAj&H-qB_X%tpul9fa%eb*I*xUNpzb z>_4%yu4t5O%?__#m-yV>@R)n0^4OH2N)<=tKlg%n6&>k#_NfPS(LBw1`*oYUvYW_v zsfXlR&}3yO_x<4D$eWS5MvPOcmpi&%!u5Ofz4ZHEcK`b-bW3ISORq{=e?EPil0O5H zd-0o9b2a}>t(D%?Psn6=@`%x?L?s*5U#h>(PI*La$opAQ61eVavzsovmv%b$5bari zEcX4r!}(2~QTYLXzX#+geHbHX&s1pR&wCmT;~1`1wk1BdPa{CCmY$z!%L}jKd0v7R z`Kg)6VLso?(-i!qzmPmOwWcNLQ@%GvK10y7?G)hZ>F}_KqdeWAoQv6*Ts2A!8{T-) zZcE$tje0~H>A8wkS(vAg1$jqJiRY!5nX)6%vQ=I5i5ot{-j(6%8N)^C809#noY%5f zsP)KuS>mXYow~ZM{u?MMPaSPSUzqRn3~`wnyvuw;>BiH6l8e|I1^T~Tk6f~M+K~q( zUQS@y_}muHr8E2GTMHtLrCEfL*X3jxttc}qzlMjC8Mjr}Sb0z16O+Qg6CbqJe8U9K zArpE%iQ)I*I8u!7Vd3dkrJP9|&mplI^Xn8wZ}C}~igukg%}((9Q%jVJ$jdmF_dOLo z&g~;}Tz!pkJAu&R=?JU01cW8Nn}ersJmx0*9)Hf`+vdoj5$fv`STcY9n0nH5GSzZ< zt!zf>nk69u(ZCr z>67RQYmTCA@|1yCn^*^zw+B+&<@~dp7?o3zv^dl`+5^=*o`t4m@U-<3&ONAq{(d{{ zS3%Q~CPn$4kFrr`q!L6M$4(tB3^N<{75Mf;p`COS)VgylVWRz!Pr1YI{KnZ_N1j&{ z`COci7Nyv`G>Nx**jTY)G?717V^6bs$l> zl;@(8slW1a@MPwd4YsTLD(`d3p31`|u;rFK$K6BL$I3het*QIzO0*Sr8p)y_o}!Sa zcA`~^c2qTw5Nx|lGtW_InHWjYe%Yy{rZZ!?W_8UsdPGg5T+;SMIU^K#7b}l7mZxQ} fYAep1-{=r4042L<&j>{Lm!WscBmN~HKUMz+hSGVH From 44f52be96a25a360ccefb4460c764d389f86b5ab Mon Sep 17 00:00:00 2001 From: Gideon Romm Date: Wed, 22 Jan 2020 18:36:40 +0200 Subject: [PATCH 04/53] updated md file --- .../security/resource-manager/readme.md | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/specification/security/resource-manager/readme.md b/specification/security/resource-manager/readme.md index 0055b511b065..a7809da444c6 100644 --- a/specification/security/resource-manager/readme.md +++ b/specification/security/resource-manager/readme.md @@ -59,6 +59,7 @@ These settings apply only when `--tag=package-composite-v1` is specified on the ``` yaml $(tag) == 'package-composite-v1' input-file: +- Microsoft.Security/preview/2020-01-01-preview/secureScore.json - Microsoft.Security/preview/2019-01-01-preview/automations.json - Microsoft.Security/preview/2019-01-01-preview/subAssessments.json - Microsoft.Security/preview/2019-01-01-preview/regulatoryCompliance.json @@ -94,6 +95,7 @@ These settings apply only when `--tag=package-composite-v2` is specified on the ``` yaml $(tag) == 'package-composite-v2' input-file: +- Microsoft.Security/preview/2020-01-01-preview/secureScore.json - Microsoft.Security/preview/2019-01-01-preview/automations.json - Microsoft.Security/preview/2019-01-01-preview/subAssessments.json - Microsoft.Security/preview/2019-01-01-preview/regulatoryCompliance.json @@ -159,6 +161,7 @@ input-file: - Microsoft.Security/preview/2019-01-01-preview/automations.json - Microsoft.Security/preview/2019-01-01-preview/assessmentMetadata.json - Microsoft.Security/preview/2019-01-01-preview/assessments.json +- Microsoft.Security/preview/2020-01-01-preview/secureScore.json # Needed when there is more than one input file override-info: @@ -227,6 +230,19 @@ override-info: title: SecurityCenter ``` +### Tag: package-2020-01-preview-only + +These settings apply only when `--tag=package-2020-01-preview-only` is specified on the command line. + +``` yaml $(tag) == 'package-2020-01-preview-only' +input-file: +- Microsoft.Security/preview/2020-01-01-preview/secureScore.json + +# Needed when there is more than one input file +override-info: + title: SecurityCenter +``` + ### Tag: package-2017-08-only These settings apply only when `--tag=package-2017-08-only` is specified on the command line. @@ -334,7 +350,8 @@ This block is updated by an automatic script. Edits may be lost! require: $(this-folder)/../../../profiles/readme.md # all the input files across all versions -input-file: +input-file: + - $(this-folder)/Microsoft.Security/preview/2020-01-01-preview/secureScore.json - $(this-folder)/Microsoft.Security/preview/2019-01-01-preview/automations.json - $(this-folder)/Microsoft.Security/preview/2019-01-01-preview/subAssessments.json - $(this-folder)/Microsoft.Security/preview/2019-01-01-preview/regulatoryCompliance.json From 6c6d5f0f023a3f59bc520e608f1f7ee108cd9af4 Mon Sep 17 00:00:00 2001 From: Gideon Romm Date: Thu, 23 Jan 2020 09:47:20 +0200 Subject: [PATCH 05/53] Working on 1 path at a time --- .../2020-01-01-preview/secureScore.json | 93 ------------------- 1 file changed, 93 deletions(-) diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json index 1a4d24e29df7..224aa53531bf 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json @@ -72,93 +72,6 @@ "nextLinkName": "nextLink" } } - }, - "/{scope}/providers/Microsoft.Security/secureScores/{secureScoreName}/controls": { - "get": { - "x-ms-examples": { - "List secure score's controls for the specified name": { - "$ref": "./examples/secureScores/ListSecureScoreControlsForName_example.json" - }, - "Get security recommendation task from security data location with expand parameter": { - "$ref": "./examples/secureScores/ListSecureScoreControlsForNameWithExpand_example.json" - } - }, - "tags": [ - "Secure Scores" - ], - "description": "Get secure scores' controls on specific initiatives inside a scope", - "operationId": "SecureScoreControls_List", - "parameters": [ - { - "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" - }, - { - "$ref": "../../../common/v1/types.json#/parameters/Scope" - }, - { - "$ref": "#/parameters/secureScoreName" - }, - { - "$ref": "#/parameters/ExpandControlsMetadata" - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/SecureScoreControlsList" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "../../../common/v1/types.json#/definitions/CloudError" - } - } - }, - "x-ms-pageable": { - "nextLinkName": "nextLink" - } - } - }, - "/subscriptions/{subscriptionId}/providers/Microsoft.Security/secureScoreControlsMetadata": { - "get": { - "x-ms-examples": { - "List secure score controls metadata": { - "$ref": "./examples/secureScoreControlsMetadata/ListSecureScoreControlsMetadata_example.json" - } - }, - "tags": [ - "Secure Score Controls Metadata" - ], - "description": "Get metadata information on all built in secure score controls", - "operationId": "SecureScoreControlsMetadata_List", - "parameters": [ - { - "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" - }, - { - "$ref": "../../../common/v1/types.json#/parameters/SubscriptionId" - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/SecureScoreControlsMetadataList" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "../../../common/v1/types.json#/definitions/CloudError" - } - } - }, - "x-ms-pageable": { - "nextLinkName": "nextLink" - } - } } }, "definitions": { @@ -168,12 +81,6 @@ "minimum": 0, "exclusiveMinimum": false }, - "positiveInteger": { - "type": "integer", - "format": "int32", - "minimum": 0, - "exclusiveMinimum": true - }, "SecureScoreInitiativesList": { "type": "object", "description": "Page of a secure scores list", From 65d19cd312e7e98c01a7da03754b6065a1299d20 Mon Sep 17 00:00:00 2001 From: Gideon Romm Date: Thu, 23 Jan 2020 09:55:44 +0200 Subject: [PATCH 06/53] Fix type to ref --- .../2020-01-01-preview/secureScore.json | 23 ++++++------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json index 224aa53531bf..e09a07c48266 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json @@ -193,39 +193,30 @@ "$ref": "#/definitions/SecureScoreScoreDetails" }, "healthyResources": { - "type": "#/definitions/nonNegativeInteger", + "$ref": "#/definitions/nonNegativeInteger", "description": "Number of healthy resources in the control" }, "unhealthyResources": { - "type": "#/definitions/nonNegativeInteger", + "$ref": "#/definitions/nonNegativeInteger", "description": "Number of unhealthy resources in the control" }, "notApplicableResources": { - "type": "#/definitions/nonNegativeInteger", + "$ref": "#/definitions/nonNegativeInteger", "description": "Number of not applicable resources in the control" }, "disabledResources": { - "type": "#/definitions/nonNegativeInteger", + "$ref": "#/definitions/nonNegativeInteger", "description": "Number of not resources that are disabled by policy in the control" }, "achievedResourcesPoints": { - "type": "#/definitions/nonNegativeInteger", + "$ref": "#/definitions/nonNegativeInteger", "description": "Number of points achieved for the controls" }, "totalResourcesPoints": { - "type": "#/definitions/nonNegativeInteger", + "$ref": "#/definitions/nonNegativeInteger", "description": "Total Number of points available in the control" } - }, - "required": [ - "score", - "healthyResources", - "unhealthyResources", - "notApplicableResources", - "disabledResources", - "achievedResourcesPoints", - "totalResourcesPoints" - ] + } }, "SecureScoreControlsMetadataList": { "type": "object", From c48a8d2a909300dc7a21d24654cd92ffa242d641 Mon Sep 17 00:00:00 2001 From: Gideon Romm Date: Thu, 23 Jan 2020 09:57:40 +0200 Subject: [PATCH 07/53] more fixes --- .../preview/2020-01-01-preview/secureScore.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json index e09a07c48266..af5a81789525 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json @@ -137,7 +137,7 @@ "type": "object", "description": "Calculation result data", "maxScore": { - "type": "#/definitions/nonNegativeInteger", + "$ref": "#/definitions/nonNegativeInteger", "description": "Maximum score applicable for the control" }, "current": { @@ -262,7 +262,7 @@ "maxLength": 256 }, "maxScore": { - "type": "#/definitions/nonNegativeInteger", + "$ref": "#/definitions/nonNegativeInteger", "description": "Maximum control score (0..10)", "minimum": 0, "maximum": 10 From f62744db40456326ec67fdfedd4353220a7f09e9 Mon Sep 17 00:00:00 2001 From: Gideon Romm Date: Thu, 23 Jan 2020 10:06:53 +0200 Subject: [PATCH 08/53] removed ref type --- .../2020-01-01-preview/secureScore.json | 68 +++++++++++++------ 1 file changed, 46 insertions(+), 22 deletions(-) diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json index af5a81789525..ac2c1cd19ced 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json @@ -75,12 +75,6 @@ } }, "definitions": { - "nonNegativeInteger": { - "type": "integer", - "format": "int32", - "minimum": 0, - "exclusiveMinimum": false - }, "SecureScoreInitiativesList": { "type": "object", "description": "Page of a secure scores list", @@ -137,8 +131,12 @@ "type": "object", "description": "Calculation result data", "maxScore": { - "$ref": "#/definitions/nonNegativeInteger", - "description": "Maximum score applicable for the control" + "description": "Maximum score applicable for the control", + "type": "integer", + "format": "int32", + "minimum": 0, + "maximum": 10, + "exclusiveMinimum": false }, "current": { "type": "number", @@ -193,28 +191,52 @@ "$ref": "#/definitions/SecureScoreScoreDetails" }, "healthyResources": { - "$ref": "#/definitions/nonNegativeInteger", - "description": "Number of healthy resources in the control" + "description": "Number of healthy resources in the control", + "type": "integer", + "format": "int32", + "minimum": 0, + "maximum": 10, + "exclusiveMinimum": false }, "unhealthyResources": { - "$ref": "#/definitions/nonNegativeInteger", - "description": "Number of unhealthy resources in the control" + "description": "Number of unhealthy resources in the control", + "type": "integer", + "format": "int32", + "minimum": 0, + "maximum": 10, + "exclusiveMinimum": false }, "notApplicableResources": { - "$ref": "#/definitions/nonNegativeInteger", - "description": "Number of not applicable resources in the control" + "description": "Number of not applicable resources in the control", + "type": "integer", + "format": "int32", + "minimum": 0, + "maximum": 10, + "exclusiveMinimum": false }, "disabledResources": { - "$ref": "#/definitions/nonNegativeInteger", - "description": "Number of not resources that are disabled by policy in the control" + "description": "Number of not resources that are disabled by policy in the control", + "type": "integer", + "format": "int32", + "minimum": 0, + "maximum": 10, + "exclusiveMinimum": false }, "achievedResourcesPoints": { - "$ref": "#/definitions/nonNegativeInteger", - "description": "Number of points achieved for the controls" + "description": "Number of points achieved for the controls", + "type": "integer", + "format": "int32", + "minimum": 0, + "maximum": 10, + "exclusiveMinimum": false }, "totalResourcesPoints": { - "$ref": "#/definitions/nonNegativeInteger", - "description": "Total Number of points available in the control" + "description": "Total Number of points available in the control", + "type": "integer", + "format": "int32", + "minimum": 0, + "maximum": 10, + "exclusiveMinimum": false } } }, @@ -262,10 +284,12 @@ "maxLength": 256 }, "maxScore": { - "$ref": "#/definitions/nonNegativeInteger", + "type": "integer", + "format": "int32", "description": "Maximum control score (0..10)", "minimum": 0, - "maximum": 10 + "maximum": 10, + "exclusiveMinimum": false }, "source": { "$ref": "#/definitions/SecureScoreControlMetadataSource" From 3fbff1b53ed3216506dc483d5b09c3d76bc58f48 Mon Sep 17 00:00:00 2001 From: Gideon Romm Date: Thu, 23 Jan 2020 10:40:07 +0200 Subject: [PATCH 09/53] AutoRest fixes --- ...olsForNameWithExpand_builtin_example.json} | 49 ---- ...trolsForNameWithExpand_custom_example.json | 59 ++++ ...ScoreControlsForName_builtin_example.json} | 31 -- ...reScoreControlsForName_custom_example.json | 39 +++ .../2020-01-01-preview/secureScore.json | 264 +++++++++++++----- 5 files changed, 287 insertions(+), 155 deletions(-) rename specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/{ListSecureScoreControlsForNameWithExpand_example.json => ListSecureScoreControlsForNameWithExpand_builtin_example.json} (74%) create mode 100644 specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_custom_example.json rename specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/{ListSecureScoreControlsForName_example.json => ListSecureScoreControlsForName_builtin_example.json} (73%) create mode 100644 specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_custom_example.json diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_builtin_example.json similarity index 74% rename from specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_example.json rename to specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_builtin_example.json index e78e4f944847..d1f5fc348b8f 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_builtin_example.json @@ -140,55 +140,6 @@ } ] } - }, - "200": { - "parameters": { - "secureScoreName": "CustomA" - }, - "body": { - "value": [ - { - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/securescores/CustomA/a9909064-42b4-4d34-8143-275477afe18b", - "name": "a9909064-42b4-4d34-8143-275477afe18b", - "type": "Microsoft.Security/securescorescontrol", - "properties": { - "displayName": "Protect applications against DDoS attacks", - "data": { - "healthyResources": 0, - "unhealthyResources": 10, - "notApplicableResources": 0, - "disabledResources": 50, - "achievedResourcesPoints": 0, - "totalResourcesPoints": 10, - "maxScore": 2, - "current": 0 - }, - "metadata": { - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScoreControlsMetadata/a9909064-42b4-4d34-8143-275477afe18b", - "name": "a9909064-42b4-4d34-8143-275477afe18b", - "type": "Microsoft.Security/SecureScoresControlMetadata", - "properties": { - "source": { - "sourceType": "CustomPolicy", - "initiativeId": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Authorization/policySetDefinitions/1203fdf9-eeee-ffff-847f-89da613eabcd" - }, - "displayName": "Apply adaptive application control", - "description": "", - "maxScore": 3, - "assessmentsMetadata": [ - { - "id": "/providers/Microsoft.Security/assessmentMetadata/e3de1cc0-f4dd-3b34-e496-8b5381ba2d70" - }, - { - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/assessmentMetadata/4c8a64c9-9b0f-0da9-2d2e-1d11ad316f4e" - } - ] - } - } - } - } - ] - } } } } \ No newline at end of file diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_custom_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_custom_example.json new file mode 100644 index 000000000000..8b9df546efd8 --- /dev/null +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_custom_example.json @@ -0,0 +1,59 @@ +{ + "parameters": { + "api-version": "2020-01-01-preview", + "scope": "subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23", + "secureScoreName": "ascDefault", + "$expand": "metadata" + }, + "responses": { + "200": { + "parameters": { + "secureScoreName": "CustomA" + }, + "body": { + "value": [ + { + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/securescores/CustomA/a9909064-42b4-4d34-8143-275477afe18b", + "name": "a9909064-42b4-4d34-8143-275477afe18b", + "type": "Microsoft.Security/securescorescontrol", + "properties": { + "displayName": "Protect applications against DDoS attacks", + "data": { + "healthyResources": 0, + "unhealthyResources": 10, + "notApplicableResources": 0, + "disabledResources": 50, + "achievedResourcesPoints": 0, + "totalResourcesPoints": 10, + "maxScore": 2, + "current": 0 + }, + "metadata": { + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScoreControlsMetadata/a9909064-42b4-4d34-8143-275477afe18b", + "name": "a9909064-42b4-4d34-8143-275477afe18b", + "type": "Microsoft.Security/SecureScoresControlMetadata", + "properties": { + "source": { + "sourceType": "CustomPolicy", + "initiativeId": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Authorization/policySetDefinitions/1203fdf9-eeee-ffff-847f-89da613eabcd" + }, + "displayName": "Apply adaptive application control", + "description": "", + "maxScore": 3, + "assessmentsMetadata": [ + { + "id": "/providers/Microsoft.Security/assessmentMetadata/e3de1cc0-f4dd-3b34-e496-8b5381ba2d70" + }, + { + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/assessmentMetadata/4c8a64c9-9b0f-0da9-2d2e-1d11ad316f4e" + } + ] + } + } + } + } + ] + } + } + } +} \ No newline at end of file diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_builtin_example.json similarity index 73% rename from specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_example.json rename to specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_builtin_example.json index 591cc9bb0dd2..0c52534d8df2 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_builtin_example.json @@ -79,37 +79,6 @@ } ] } - }, - "200": { - "parameters": { - "secureScoreName": "CustomA" - }, - "body": { - "value": [ - { - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/securescores/CustomA/a9909064-42b4-4d34-8143-275477afe18b", - "name": "a9909064-42b4-4d34-8143-275477afe18b", - "type": "Microsoft.Security/securescorescontrol", - "properties": { - "displayName": "Protect applications against DDoS attacks", - "data": { - "healthyResources": 0, - "unhealthyResources": 10, - "notApplicableResources": 0, - "disabledResources": 50, - "achievedResourcesPoints": 0, - "totalResourcesPoints": 10, - "maxScore": 2, - "current": 0 - }, - "assessmentsMetadata": [ - "/providers/Microsoft.Security/assessmentMetadata/e3de1cc0-f4dd-3b34-e496-8b5381ba2d70", - "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/assessmentMetadata/4c8a64c9-9b0f-0da9-2d2e-1d11ad316f4e" - ] - } - } - ] - } } } } \ No newline at end of file diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_custom_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_custom_example.json new file mode 100644 index 000000000000..983e1fd1dafc --- /dev/null +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_custom_example.json @@ -0,0 +1,39 @@ +{ + "parameters": { + "api-version": "2020-01-01-preview", + "scope": "subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23" + }, + "responses": { + "200": { + "parameters": { + "secureScoreName": "CustomA" + }, + "body": { + "value": [ + { + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/securescores/CustomA/a9909064-42b4-4d34-8143-275477afe18b", + "name": "a9909064-42b4-4d34-8143-275477afe18b", + "type": "Microsoft.Security/securescorescontrol", + "properties": { + "displayName": "Protect applications against DDoS attacks", + "data": { + "healthyResources": 0, + "unhealthyResources": 10, + "notApplicableResources": 0, + "disabledResources": 50, + "achievedResourcesPoints": 0, + "totalResourcesPoints": 10, + "maxScore": 2, + "current": 0 + }, + "assessmentsMetadata": [ + "/providers/Microsoft.Security/assessmentMetadata/e3de1cc0-f4dd-3b34-e496-8b5381ba2d70", + "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/assessmentMetadata/4c8a64c9-9b0f-0da9-2d2e-1d11ad316f4e" + ] + } + } + ] + } + } + } +} \ No newline at end of file diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json index ac2c1cd19ced..f37ad88f62fb 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json @@ -72,6 +72,99 @@ "nextLinkName": "nextLink" } } + }, + "/{scope}/providers/Microsoft.Security/secureScores/{secureScoreName}/controls": { + "get": { + "x-ms-examples": { + "List secure score's controls level for the specified name (builtin initiative)": { + "$ref": "./examples/secureScores/ListSecureScoreControlsForName_builtin_example.json" + }, + "List secure score's controls level for the specified name (custom initiative)": { + "$ref": "./examples/secureScores/ListSecureScoreControlsForName_custom_example.json" + }, + "Get secure score's controls level for the specified name with expand parameter (builtin initiative)": { + "$ref": "./examples/secureScores/ListSecureScoreControlsForNameWithExpand_builtin_example.json" + }, + "Get secure score's controls level for the specified name with expand parameter (custom initiative)": { + "$ref": "./examples/secureScores/ListSecureScoreControlsForNameWithExpand_custom_example.json" + } + }, + "tags": [ + "Secure Scores" + ], + "description": "Get secure scores' controls on specific initiatives inside a scope", + "operationId": "SecureScoreControls_List", + "parameters": [ + { + "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/Scope" + }, + { + "$ref": "#/parameters/secureScoreName" + }, + { + "$ref": "#/parameters/ExpandControlsMetadata" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/SecureScoreControlsList" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "../../../common/v1/types.json#/definitions/CloudError" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.Security/secureScoreControlsMetadata": { + "get": { + "x-ms-examples": { + "List secure score controls metadata": { + "$ref": "./examples/secureScoreControlsMetadata/ListSecureScoreControlsMetadata_example.json" + } + }, + "tags": [ + "Secure Score Controls Metadata" + ], + "description": "Get metadata information on all built in secure score controls", + "operationId": "SecureScoreControlsMetadata_List", + "parameters": [ + { + "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/SubscriptionId" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/SecureScoreControlsMetadataList" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "../../../common/v1/types.json#/definitions/CloudError" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } } }, "definitions": { @@ -130,18 +223,20 @@ "SecureScoreScoreDetails": { "type": "object", "description": "Calculation result data", - "maxScore": { - "description": "Maximum score applicable for the control", - "type": "integer", - "format": "int32", - "minimum": 0, - "maximum": 10, - "exclusiveMinimum": false - }, - "current": { - "type": "number", - "format": "double", - "description": "Actual score for the control" + "properties": { + "maxScore": { + "description": "Maximum score applicable for the control", + "type": "integer", + "format": "int32", + "minimum": 0, + "maximum": 10, + "exclusiveMinimum": false + }, + "current": { + "type": "number", + "format": "double", + "description": "Actual score for the control" + } }, "required": [ "maxScore", @@ -168,17 +263,20 @@ } }, "SecureScoreControlDetails": { - "displayName": { - "type": "string", - "description": "User friendly display name of the control" - }, - "data": { - "description": "Control's score object", - "ref": "#/definitions/SecureScoreControlScoreDetails" + "type": "object", + "description": "List of security sub-assessments", + "properties": { + "displayName": { + "type": "string", + "description": "User friendly display name of the control" + } }, "allOf": [ { "$ref": "../../../common/v1/types.json#/definitions/Resource" + }, + { + "$ref": "#/definitions/SecureScoreControlScoreDetails" } ] }, @@ -260,8 +358,9 @@ } }, "SecureScoreControlMetadataDetails": { + "type": "object", + "description": "Secure Score Control's Metadata information", "properties": { - "description": "Control's metadata object", "properties": { "x-ms-client-flatten": true, "$ref": "#/definitions/SecureScoreControlMetadataProperties" @@ -274,69 +373,84 @@ ] }, "SecureScoreControlMetadataProperties": { - "displayName": { - "type": "string", - "description": "User friendly display name of the control" - }, - "description": { - "type": "string", - "description": "User friendly display name of the control", - "maxLength": 256 - }, - "maxScore": { - "type": "integer", - "format": "int32", - "description": "Maximum control score (0..10)", - "minimum": 0, - "maximum": 10, - "exclusiveMinimum": false - }, - "source": { - "$ref": "#/definitions/SecureScoreControlMetadataSource" - }, - "assessmentsMetadata": { - "type": "array", - "items": { - "$ref": "#/definitions/SecureScoreControlMetadataAssessmentsId" + "type": "object", + "description": "Secure Score Control Metadata Properties", + "properties": { + "displayName": { + "readOnly": true, + "type": "string", + "description": "User friendly display name of the control" + }, + "description": { + "readOnly": true, + "type": "string", + "description": "User friendly display name of the control", + "maxLength": 256 + }, + "maxScore": { + "readOnly": true, + "type": "integer", + "format": "int32", + "description": "Maximum control score (0..10)", + "minimum": 0, + "maximum": 10, + "exclusiveMinimum": false + }, + "source": { + "$ref": "#/definitions/SecureScoreControlMetadataSource" + }, + "assessmentsMetadata": { + "type": "array", + "items": { + "$ref": "#/definitions/SecureScoreControlMetadataAssessmentsId" + } } } }, "SecureScoreControlMetadataAssessmentsId": { - "id": { - "type": "string", - "description": "Full assessment metadata uris that build the control" + "type": "object", + "description": "Secure Score Control Metadata Properties", + "properties": { + "id": { + "type": "string", + "description": "Full assessment metadata uris that build the control" + } } }, "SecureScoreControlMetadataSource": { - "sourceType": { - "type": "string", - "description": "BuiltIn if the control is built-in from Azure Security Center managed assessments, Custom if the assessment based on custom Azure Policy definition, CustomerManaged for customers who build their own controls", - "enum": [ - "BuiltIn", - "CustomPolicy", - "CustomerManaged" - ], - "x-ms-enum": { - "name": "controlType", - "modelAsString": true, - "values": [ - { - "value": "BuiltIn", - "description": "Azure Security Center managed assessments" - }, - { - "value": "CustomPolicy", - "description": "User defined policies that are automatically ingested from Azure Policy to Azure Security Center" - }, - { - "value": "CustomerManaged", - "description": "User controls pushed directly by the user or other third party to Azure Security Center" - } - ] + "type": "object", + "description": "representing the source of the control", + "properties": { + "sourceType": { + "type": "string", + "description": "BuiltIn if the control is built-in from Azure Security Center managed assessments, Custom if the assessment based on custom Azure Policy definition, CustomerManaged for customers who build their own controls", + "enum": [ + "BuiltIn", + "CustomPolicy", + "CustomerManaged" + ], + "x-ms-enum": { + "name": "controlType", + "modelAsString": true, + "values": [ + { + "value": "BuiltIn", + "description": "Azure Security Center managed assessments" + }, + { + "value": "CustomPolicy", + "description": "User defined policies that are automatically ingested from Azure Policy to Azure Security Center" + }, + { + "value": "CustomerManaged", + "description": "User controls pushed directly by the user or other third party to Azure Security Center" + } + ] + } + }, + "initiativeId": { + "type": "string" } - }, - "initiativeId": { - "type": "string" } } }, From 6b854c8cf2f772ebbcb36304e93dd69035785724 Mon Sep 17 00:00:00 2001 From: Gideon Romm Date: Thu, 23 Jan 2020 10:48:17 +0200 Subject: [PATCH 10/53] more fixes --- .../2020-01-01-preview/secureScore.json | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json index f37ad88f62fb..e1383070470d 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json @@ -229,7 +229,6 @@ "type": "integer", "format": "int32", "minimum": 0, - "maximum": 10, "exclusiveMinimum": false }, "current": { @@ -284,16 +283,25 @@ "type": "object", "description": "Calculation result data in control level", "properties": { - "score": { - "x-ms-client-flatten": true, - "$ref": "#/definitions/SecureScoreScoreDetails" + "maxScore": { + "readOnly": true, + "type": "integer", + "format": "int32", + "description": "Maximum control score (0..10)", + "minimum": 0, + "maximum": 10, + "exclusiveMinimum": false + }, + "current": { + "type": "number", + "format": "double", + "description": "Actual score for the control" }, "healthyResources": { "description": "Number of healthy resources in the control", "type": "integer", "format": "int32", "minimum": 0, - "maximum": 10, "exclusiveMinimum": false }, "unhealthyResources": { @@ -301,7 +309,6 @@ "type": "integer", "format": "int32", "minimum": 0, - "maximum": 10, "exclusiveMinimum": false }, "notApplicableResources": { @@ -309,7 +316,6 @@ "type": "integer", "format": "int32", "minimum": 0, - "maximum": 10, "exclusiveMinimum": false }, "disabledResources": { @@ -317,7 +323,6 @@ "type": "integer", "format": "int32", "minimum": 0, - "maximum": 10, "exclusiveMinimum": false }, "achievedResourcesPoints": { @@ -325,7 +330,6 @@ "type": "integer", "format": "int32", "minimum": 0, - "maximum": 10, "exclusiveMinimum": false }, "totalResourcesPoints": { @@ -333,7 +337,6 @@ "type": "integer", "format": "int32", "minimum": 0, - "maximum": 10, "exclusiveMinimum": false } } From a8792c9fcc154bbb5b97dd8ff2b2bd18951e277b Mon Sep 17 00:00:00 2001 From: Gideon Romm Date: Thu, 23 Jan 2020 14:18:35 +0200 Subject: [PATCH 11/53] Internal PR --- ...ecureScoreControlsDefinition_example.json} | 0 .../GetSecureScoresSingle_example.json | 23 ++ ...eScoreControlsForName_builtin_example.json | 25 +- ...reScoreControlsForName_custom_example.json | 12 +- .../2020-01-01-preview/secureScore.json | 240 ++++++++++-------- 5 files changed, 171 insertions(+), 129 deletions(-) rename specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/{secureScoreControlsMetadata/ListSecureScoreControlsMetadata_example.json => secureScoreControlsDefinition/ListSecureScoreControlsDefinition_example.json} (100%) create mode 100644 specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/GetSecureScoresSingle_example.json diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScoreControlsMetadata/ListSecureScoreControlsMetadata_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScoreControlsDefinition/ListSecureScoreControlsDefinition_example.json similarity index 100% rename from specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScoreControlsMetadata/ListSecureScoreControlsMetadata_example.json rename to specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScoreControlsDefinition/ListSecureScoreControlsDefinition_example.json diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/GetSecureScoresSingle_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/GetSecureScoresSingle_example.json new file mode 100644 index 000000000000..9200559044fd --- /dev/null +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/GetSecureScoresSingle_example.json @@ -0,0 +1,23 @@ +{ + "parameters": { + "api-version": "2020-01-01-preview", + "scope": "subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23", + "secureScoreName": "ascDefault" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/securescores/ascDefault", + "name": "ascDefault", + "type": "Microsoft.Security/securescores", + "properties": { + "displayName": "asc Default", + "score": { + "maxScore": 13, + "current": 3 + } + } + } + } + } +} \ No newline at end of file diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_builtin_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_builtin_example.json index 0c52534d8df2..08e21b5d4d11 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_builtin_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_builtin_example.json @@ -1,13 +1,11 @@ { "parameters": { "api-version": "2020-01-01-preview", - "scope": "subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23" + "scope": "subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23", + "secureScoreName": "ascDefault" }, "responses": { "200": { - "parameters": { - "secureScoreName": "ascDefault" - }, "body": { "value": [ { @@ -25,10 +23,7 @@ "totalResourcesPoints": 0, "maxScore": 0, "current": 0 - }, - "assessmentsMetadata": [ - "/providers/Microsoft.Security/assessmentMetadata/e3de1cc0-f4dd-3b34-e496-8b5381ba2d70" - ] + } } }, { @@ -46,12 +41,7 @@ "totalResourcesPoints": 1, "maxScore": 10, "current": 0 - }, - "assessmentsMetadata": [ - "/providers/Microsoft.Security/assessmentMetadata/151e82c5-5341-a74b-1eb0-bc38d2c84bb5", - "/providers/Microsoft.Security/assessmentMetadata/57e98606-6b1e-6193-0e3d-fe621387c16b", - "/providers/Microsoft.Security/assessmentMetadata/94290b00-4d0c-d7b4-7cea-064a9554e681" - ] + } } }, { @@ -69,12 +59,7 @@ "totalResourcesPoints": 20, "maxScore": 3, "current": 3 - }, - "assessmentsMetadata": [ - "/providers/Microsoft.Security/assessmentMetadata/151e82c5-5341-a74b-1eb0-bc38d2c84bb5", - "/providers/Microsoft.Security/assessmentMetadata/57e98606-6b1e-6193-0e3d-fe621387c16b", - "/providers/Microsoft.Security/assessmentMetadata/94290b00-4d0c-d7b4-7cea-064a9554e681" - ] + } } } ] diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_custom_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_custom_example.json index 983e1fd1dafc..262a275d42f2 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_custom_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_custom_example.json @@ -1,13 +1,11 @@ { "parameters": { "api-version": "2020-01-01-preview", - "scope": "subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23" + "scope": "subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23", + "secureScoreName": "CustomA" }, "responses": { "200": { - "parameters": { - "secureScoreName": "CustomA" - }, "body": { "value": [ { @@ -25,11 +23,7 @@ "totalResourcesPoints": 10, "maxScore": 2, "current": 0 - }, - "assessmentsMetadata": [ - "/providers/Microsoft.Security/assessmentMetadata/e3de1cc0-f4dd-3b34-e496-8b5381ba2d70", - "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/assessmentMetadata/4c8a64c9-9b0f-0da9-2d2e-1d11ad316f4e" - ] + } } } ] diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json index e1383070470d..76ccae2ded2b 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json @@ -42,7 +42,7 @@ } }, "tags": [ - "secure Scores" + "Secure Scores" ], "description": "Get secure scores on all your initiatives inside a scope", "operationId": "SecureScores_List", @@ -58,7 +58,49 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/SecureScoreInitiativesList" + "$ref": "#/definitions/SecureScoresList" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "../../../common/v1/types.json#/definitions/CloudError" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/{scope}/providers/Microsoft.Security/secureScores/{secureScoreName}": { + "get": { + "x-ms-examples": { + "List secure scores": { + "$ref": "./examples/secureScores/GetSecureScoresSingle_example.json" + } + }, + "tags": [ + "Secure Scores" + ], + "description": "Get secure score for a specific initiatives inside a scope", + "operationId": "SecureScores_Single", + "parameters": [ + { + "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/Scope" + }, + { + "$ref": "#/parameters/secureScoreName" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/SecureScoresItem" } }, "default": { @@ -76,23 +118,23 @@ "/{scope}/providers/Microsoft.Security/secureScores/{secureScoreName}/controls": { "get": { "x-ms-examples": { - "List secure score's controls level for the specified name (builtin initiative)": { + "List secure score's controls level for the specified name (builtin)": { "$ref": "./examples/secureScores/ListSecureScoreControlsForName_builtin_example.json" }, - "List secure score's controls level for the specified name (custom initiative)": { + "List secure score's controls level for the specified name (custom)": { "$ref": "./examples/secureScores/ListSecureScoreControlsForName_custom_example.json" }, - "Get secure score's controls level for the specified name with expand parameter (builtin initiative)": { + "Get secure score's controls level for the specified name with expand parameter (builtin)": { "$ref": "./examples/secureScores/ListSecureScoreControlsForNameWithExpand_builtin_example.json" }, - "Get secure score's controls level for the specified name with expand parameter (custom initiative)": { + "Get secure score's controls level for the specified name with expand parameter (custom)": { "$ref": "./examples/secureScores/ListSecureScoreControlsForNameWithExpand_custom_example.json" } }, "tags": [ "Secure Scores" ], - "description": "Get secure scores' controls on specific initiatives inside a scope", + "description": "Get all secure score controls on specific initiatives inside a scope", "operationId": "SecureScoreControls_List", "parameters": [ { @@ -105,7 +147,7 @@ "$ref": "#/parameters/secureScoreName" }, { - "$ref": "#/parameters/ExpandControlsMetadata" + "$ref": "#/parameters/ExpandControlsDefinition" } ], "responses": { @@ -127,31 +169,31 @@ } } }, - "/subscriptions/{subscriptionId}/providers/Microsoft.Security/secureScoreControlsMetadata": { + "/{scope}/providers/Microsoft.Security/secureScoreControlsDefinition": { "get": { "x-ms-examples": { - "List secure score controls metadata": { - "$ref": "./examples/secureScoreControlsMetadata/ListSecureScoreControlsMetadata_example.json" + "List secure score controls definition": { + "$ref": "./examples/secureScoreControlsDefinition/ListSecureScoreControlsDefinition_example.json" } }, "tags": [ - "Secure Score Controls Metadata" + "Secure Score Controls Definition" ], - "description": "Get metadata information on all built in secure score controls", - "operationId": "SecureScoreControlsMetadata_List", + "description": "Get definition information on all secure score controls", + "operationId": "SecureScoreControlsDefinition_List", "parameters": [ { "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" }, { - "$ref": "../../../common/v1/types.json#/parameters/SubscriptionId" + "$ref": "../../../common/v1/types.json#/parameters/Scope" } ], "responses": { "200": { "description": "OK", "schema": { - "$ref": "#/definitions/SecureScoreControlsMetadataList" + "$ref": "#/definitions/SecureScoreControlsDefinitionList" } }, "default": { @@ -168,7 +210,7 @@ } }, "definitions": { - "SecureScoreInitiativesList": { + "SecureScoresList": { "type": "object", "description": "Page of a secure scores list", "properties": { @@ -177,7 +219,7 @@ "readOnly": true, "type": "array", "items": { - "$ref": "#/definitions/SecureScoreInitiativeDetails" + "$ref": "#/definitions/SecureScoresItem" } }, "nextLink": { @@ -187,13 +229,13 @@ } } }, - "SecureScoreInitiativeDetails": { + "SecureScoresItem": { "type": "object", - "description": "Secure score for initiative", + "description": "Secure score item", "properties": { "properties": { "x-ms-client-flatten": true, - "$ref": "#/definitions/SecureScoreInitiativeProperties" + "$ref": "#/definitions/SecureScoreItemProperties" } }, "allOf": [ @@ -202,53 +244,64 @@ } ] }, - "SecureScoreInitiativeProperties": { + "SecureScoreItemProperties": { "type": "object", "description": "Describes properties of a calculated secure score.", "properties": { "displayName": { "readOnly": true, "type": "string", - "description": "User friendly display name of the secure score initiative" + "description": "User friendly display name of the secure score item" }, "score": { "x-ms-client-flatten": true, "$ref": "#/definitions/SecureScoreScoreDetails" } - }, - "required": [ - "score" - ] + } }, "SecureScoreScoreDetails": { "type": "object", "description": "Calculation result data", "properties": { - "maxScore": { - "description": "Maximum score applicable for the control", + "max": { + "readOnly": true, + "description": "Maximum score applicable", "type": "integer", - "format": "int32", - "minimum": 0, - "exclusiveMinimum": false + "format": "int32" }, "current": { + "readOnly": true, "type": "number", "format": "double", - "description": "Actual score for the control" + "description": "Actual score" } - }, - "required": [ - "maxScore", - "current" - ] - }, + } + }, + "SecureScoreControlScoreObject": { + "type": "object", + "description": "Calculation result data", + "properties": { + "max": { + "readOnly": true, + "type": "integer", + "format": "int32", + "description": "Maximum control score (0..10)" + }, + "current": { + "readOnly": true, + "type": "number", + "format": "double", + "description": "Actual score for the control = (achieved points / total points) * max score. if total points is zeroed, the return number is 0.00" + } + } + }, "SecureScoreControlsList": { "type": "object", "description": "Page of a secure score controls list", "properties": { "value": { - "description": "Collection of secure score controls in this page", "readOnly": true, + "description": "Collection of secure score controls in this page", "type": "array", "items": { "$ref": "#/definitions/SecureScoreControlDetails" @@ -266,16 +319,17 @@ "description": "List of security sub-assessments", "properties": { "displayName": { + "readOnly": true, "type": "string", "description": "User friendly display name of the control" - } + }, + "properties": { + "$ref": "#/definitions/SecureScoreControlScoreDetails" + } }, "allOf": [ { "$ref": "../../../common/v1/types.json#/definitions/Resource" - }, - { - "$ref": "#/definitions/SecureScoreControlScoreDetails" } ] }, @@ -283,74 +337,58 @@ "type": "object", "description": "Calculation result data in control level", "properties": { - "maxScore": { - "readOnly": true, - "type": "integer", - "format": "int32", - "description": "Maximum control score (0..10)", - "minimum": 0, - "maximum": 10, - "exclusiveMinimum": false - }, - "current": { - "type": "number", - "format": "double", - "description": "Actual score for the control" - }, + "score": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/SecureScoreControlScoreObject" + }, "healthyResources": { + "readOnly": true, "description": "Number of healthy resources in the control", "type": "integer", - "format": "int32", - "minimum": 0, - "exclusiveMinimum": false + "format": "int32" }, "unhealthyResources": { + "readOnly": true, "description": "Number of unhealthy resources in the control", "type": "integer", - "format": "int32", - "minimum": 0, - "exclusiveMinimum": false + "format": "int32" }, "notApplicableResources": { + "readOnly": true, "description": "Number of not applicable resources in the control", "type": "integer", - "format": "int32", - "minimum": 0, - "exclusiveMinimum": false + "format": "int32" }, "disabledResources": { + "readOnly": true, "description": "Number of not resources that are disabled by policy in the control", "type": "integer", - "format": "int32", - "minimum": 0, - "exclusiveMinimum": false + "format": "int32" }, - "achievedResourcesPoints": { + "achievedPoints": { + "readOnly": true, "description": "Number of points achieved for the controls", "type": "integer", - "format": "int32", - "minimum": 0, - "exclusiveMinimum": false + "format": "int32" }, - "totalResourcesPoints": { + "totalPoints": { + "readOnly": true, "description": "Total Number of points available in the control", "type": "integer", - "format": "int32", - "minimum": 0, - "exclusiveMinimum": false + "format": "int32" } } }, - "SecureScoreControlsMetadataList": { + "SecureScoreControlsDefinitionList": { "type": "object", - "description": "Page of a secure score controls metadata list", + "description": "Page of a secure score controls definition list", "properties": { "value": { - "description": "Collection of secure score controls metadata in this page", + "description": "Collection of secure score controls definition in this page", "readOnly": true, "type": "array", "items": { - "$ref": "#/definitions/SecureScoreControlMetadataDetails" + "$ref": "#/definitions/SecureScoreControlDefinitionItem" } }, "nextLink": { @@ -360,13 +398,12 @@ } } }, - "SecureScoreControlMetadataDetails": { + "SecureScoreControlDefinitionItem": { "type": "object", - "description": "Secure Score Control's Metadata information", + "description": "Secure Score Control's Definition information", "properties": { "properties": { - "x-ms-client-flatten": true, - "$ref": "#/definitions/SecureScoreControlMetadataProperties" + "$ref": "#/definitions/SecureScoreControlDefinitionItemProperties" } }, "allOf": [ @@ -375,9 +412,9 @@ } ] }, - "SecureScoreControlMetadataProperties": { + "SecureScoreControlDefinitionItemProperties": { "type": "object", - "description": "Secure Score Control Metadata Properties", + "description": "Secure Score Control Definition Properties", "properties": { "displayName": { "readOnly": true, @@ -400,27 +437,27 @@ "exclusiveMinimum": false }, "source": { - "$ref": "#/definitions/SecureScoreControlMetadataSource" + "$ref": "#/definitions/SecureScoreControlDefinitionSource" }, - "assessmentsMetadata": { + "assessmentsDefinition": { "type": "array", "items": { - "$ref": "#/definitions/SecureScoreControlMetadataAssessmentsId" + "$ref": "#/definitions/SecureScoreControlDefinitionAssessmentsId" } } } }, - "SecureScoreControlMetadataAssessmentsId": { + "SecureScoreControlDefinitionAssessmentsId": { "type": "object", - "description": "Secure Score Control Metadata Properties", + "description": "Secure Score Control Definition Properties", "properties": { "id": { "type": "string", - "description": "Full assessment metadata uris that build the control" + "description": "Full assessment metadata azure ids that build the control" } } }, - "SecureScoreControlMetadataSource": { + "SecureScoreControlDefinitionSource": { "type": "object", "description": "representing the source of the control", "properties": { @@ -451,14 +488,17 @@ ] } }, - "initiativeId": { + "PolicySetDefinitionId": { + "type": "string" + }, + "GroupName": { "type": "string" } } } }, "parameters": { - "ExpandControlsMetadata": { + "ExpandControlsDefinition": { "name": "$expand", "in": "query", "required": false, @@ -466,15 +506,15 @@ "description": "OData expand. Optional.", "x-ms-parameter-location": "method", "enum": [ - "metadata" + "definition" ], "x-ms-enum": { "name": "ExpandEnum", "modelAsString": true, "values": [ { - "value": "metadata", - "description": "Add metadata object for each control" + "value": "definition", + "description": "Add definition object for each control" } ] } From 14c1c402b121100affb08da9e70d2b9c6a6dc527 Mon Sep 17 00:00:00 2001 From: Gideon Romm Date: Mon, 27 Jan 2020 10:44:41 +0200 Subject: [PATCH 12/53] fixed some static validation issues --- ...SecureScoreControlsDefinition_example.json | 10 +++--- .../GetSecureScoresSingle_example.json | 2 +- ...rolsForNameWithExpand_builtin_example.json | 32 +++++++++++-------- ...trolsForNameWithExpand_custom_example.json | 10 +++--- ...eScoreControlsForName_builtin_example.json | 19 +++++++---- ...reScoreControlsForName_custom_example.json | 16 +++++----- .../ListSecureScores_example.json | 4 +-- .../2020-01-01-preview/secureScore.json | 2 +- 8 files changed, 53 insertions(+), 42 deletions(-) diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScoreControlsDefinition/ListSecureScoreControlsDefinition_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScoreControlsDefinition/ListSecureScoreControlsDefinition_example.json index 9e1689ce6b5a..262999c8e93d 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScoreControlsDefinition/ListSecureScoreControlsDefinition_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScoreControlsDefinition/ListSecureScoreControlsDefinition_example.json @@ -7,7 +7,7 @@ "body": { "value": [ { - "id": "/providers/Microsoft.Security/secureScoreControlsMetadata/a9909064-42b4-4d34-8143-275477afe18b", + "id": "/providers/Microsoft.Security/secureScoreControlsDefinition/a9909064-42b4-4d34-8143-275477afe18b", "name": "a9909064-42b4-4d34-8143-275477afe18b", "type": "Microsoft.Security/SecureScoresControlMetadata", "properties": { @@ -26,7 +26,7 @@ } }, { - "id": "/providers/Microsoft.Security/secureScoreControlsMetadata/34a42fb3-e6db-409c-b56b-7b1db6b8aee0", + "id": "/providers/Microsoft.Security/secureScoreControlsDefinition/34a42fb3-e6db-409c-b56b-7b1db6b8aee0", "name": "34a42fb3-e6db-409c-b56b-7b1db6b8aee0", "type": "Microsoft.Security/SecureScoresControlMetadata", "properties": { @@ -51,7 +51,7 @@ } }, { - "id": "/providers/Microsoft.Security/secureScoreControlsMetadata/a000c66f-6da2-4f9d-826d-2364347d2588", + "id": "/providers/Microsoft.Security/secureScoreControlsDefinition/a000c66f-6da2-4f9d-826d-2364347d2588", "name": "a000c66f-6da2-4f9d-826d-2364347d2588", "type": "Microsoft.Security/SecureScoresControlMetadata", "properties": { @@ -79,7 +79,7 @@ } }, { - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScoreControlsMetadata/a9909064-42b4-4d34-8143-275477afe18b", + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScoreControlsDefinition/a9909064-42b4-4d34-8143-275477afe18b", "name": "a9909064-42b4-4d34-8143-275477afe18b", "type": "Microsoft.Security/SecureScoresControlMetadata", "properties": { @@ -101,7 +101,7 @@ } }, { - "id": "/subscriptions/11111111-e762-44dd-bd96-202020202020/providers/Microsoft.Security/secureScoreControlsMetadata/a9909064-42b4-4d34-8143-275477afe18b", + "id": "/subscriptions/11111111-e762-44dd-bd96-202020202020/providers/Microsoft.Security/secureScoreControlsDefinition/a9909064-42b4-4d34-8143-275477afe18b", "name": "a9909064-42b4-4d34-8143-275477afe18b", "type": "Microsoft.Security/SecureScoresControlMetadata", "properties": { diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/GetSecureScoresSingle_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/GetSecureScoresSingle_example.json index 9200559044fd..e8e89e972457 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/GetSecureScoresSingle_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/GetSecureScoresSingle_example.json @@ -13,7 +13,7 @@ "properties": { "displayName": "asc Default", "score": { - "maxScore": 13, + "max": 13, "current": 3 } } diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_builtin_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_builtin_example.json index d1f5fc348b8f..d576c80d82d2 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_builtin_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_builtin_example.json @@ -3,7 +3,7 @@ "api-version": "2020-01-01-preview", "scope": "subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23", "secureScoreName": "ascDefault", - "$expand": "metadata" + "$expand": "definition" }, "responses": { "200": { @@ -25,11 +25,13 @@ "disabledResources": 50, "achievedResourcesPoints": 0, "totalResourcesPoints": 0, - "maxScore": 0, - "current": 0 + "score": { + "max": 0, + "current": 0 + } }, - "metadata": { - "id": "/providers/Microsoft.Security/secureScoreControlsMetadata/a9909064-42b4-4d34-8143-275477afe18b", + "definition": { + "id": "/providers/Microsoft.Security/secureScoreControlsDefinition/a9909064-42b4-4d34-8143-275477afe18b", "name": "a9909064-42b4-4d34-8143-275477afe18b", "type": "Microsoft.Security/SecureScoresControlMetadata", "properties": { @@ -62,11 +64,13 @@ "disabledResources": 0, "achievedResourcesPoints": 0, "totalResourcesPoints": 1, - "maxScore": 10, - "current": 0 + "score": { + "max": 10, + "current": 0 + } }, - "metadata": { - "id": "/providers/Microsoft.Security/secureScoreControlsMetadata/34a42fb3-e6db-409c-b56b-7b1db6b8aee0", + "definition": { + "id": "/providers/Microsoft.Security/secureScoreControlsDefinition/34a42fb3-e6db-409c-b56b-7b1db6b8aee0", "name": "34a42fb3-e6db-409c-b56b-7b1db6b8aee0", "type": "Microsoft.Security/SecureScoresControlMetadata", "properties": { @@ -105,11 +109,13 @@ "disabledResources": 5, "achievedResourcesPoints": 20, "totalResourcesPoints": 20, - "maxScore": 3, - "current": 3 + "score": { + "max": 3, + "current": 3 + } }, - "metadata": { - "id": "/providers/Microsoft.Security/secureScoreControlsMetadata/a000c66f-6da2-4f9d-826d-2364347d2588", + "definition": { + "id": "/providers/Microsoft.Security/secureScoreControlsDefinition/a000c66f-6da2-4f9d-826d-2364347d2588", "name": "a000c66f-6da2-4f9d-826d-2364347d2588", "type": "Microsoft.Security/SecureScoresControlMetadata", "properties": { diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_custom_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_custom_example.json index 8b9df546efd8..94f0ff80bcab 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_custom_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_custom_example.json @@ -3,7 +3,7 @@ "api-version": "2020-01-01-preview", "scope": "subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23", "secureScoreName": "ascDefault", - "$expand": "metadata" + "$expand": "definition" }, "responses": { "200": { @@ -25,11 +25,11 @@ "disabledResources": 50, "achievedResourcesPoints": 0, "totalResourcesPoints": 10, - "maxScore": 2, - "current": 0 + "score": {"max": 3, + "current": 0} }, - "metadata": { - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScoreControlsMetadata/a9909064-42b4-4d34-8143-275477afe18b", + "definition": { + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScoreControlsDefinition/a9909064-42b4-4d34-8143-275477afe18b", "name": "a9909064-42b4-4d34-8143-275477afe18b", "type": "Microsoft.Security/SecureScoresControlMetadata", "properties": { diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_builtin_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_builtin_example.json index 08e21b5d4d11..44728973f6f0 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_builtin_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_builtin_example.json @@ -2,7 +2,6 @@ "parameters": { "api-version": "2020-01-01-preview", "scope": "subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23", - "secureScoreName": "ascDefault" }, "responses": { "200": { @@ -21,8 +20,10 @@ "disabledResources": 50, "achievedResourcesPoints": 0, "totalResourcesPoints": 0, - "maxScore": 0, - "current": 0 + "score": { + "max": 0, + "current": 0 + } } } }, @@ -39,8 +40,10 @@ "disabledResources": 0, "achievedResourcesPoints": 0, "totalResourcesPoints": 1, - "maxScore": 10, - "current": 0 + "score": { + "max": 10, + "current": 0 + } } } }, @@ -57,8 +60,10 @@ "disabledResources": 5, "achievedResourcesPoints": 20, "totalResourcesPoints": 20, - "maxScore": 3, - "current": 3 + "score": { + "max": 3, + "current": 3 + } } } } diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_custom_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_custom_example.json index 262a275d42f2..9c945fce6106 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_custom_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_custom_example.json @@ -14,14 +14,14 @@ "type": "Microsoft.Security/securescorescontrol", "properties": { "displayName": "Protect applications against DDoS attacks", - "data": { - "healthyResources": 0, - "unhealthyResources": 10, - "notApplicableResources": 0, - "disabledResources": 50, - "achievedResourcesPoints": 0, - "totalResourcesPoints": 10, - "maxScore": 2, + "healthyResources": 0, + "unhealthyResources": 10, + "notApplicableResources": 0, + "disabledResources": 50, + "achievedResourcesPoints": 0, + "totalResourcesPoints": 10, + "score": { + "max": 2, "current": 0 } } diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScores_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScores_example.json index b44737c62df2..06fe4112c996 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScores_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScores_example.json @@ -14,7 +14,7 @@ "properties": { "displayName": "asc Default", "score": { - "maxScore": 13, + "max": 13, "current": 3 } } @@ -26,7 +26,7 @@ "properties": { "displayName": "Custom A", "score": { - "maxScore": 2, + "max": 2, "current": 0 } } diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json index 76ccae2ded2b..cbd2cea7c8ed 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json @@ -76,7 +76,7 @@ "/{scope}/providers/Microsoft.Security/secureScores/{secureScoreName}": { "get": { "x-ms-examples": { - "List secure scores": { + "Get single secure score": { "$ref": "./examples/secureScores/GetSecureScoresSingle_example.json" } }, From 0972d99d1a1cbe8c020e79afaee534a4b814bff4 Mon Sep 17 00:00:00 2001 From: Gideon Romm Date: Tue, 28 Jan 2020 13:38:54 +0200 Subject: [PATCH 13/53] Fixed some more auto-rest issues --- .../2020-01-01-preview/secureScore.json | 44 +++++++++++-------- 1 file changed, 25 insertions(+), 19 deletions(-) diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json index cbd2cea7c8ed..4f53a261fb20 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json @@ -84,7 +84,7 @@ "Secure Scores" ], "description": "Get secure score for a specific initiatives inside a scope", - "operationId": "SecureScores_Single", + "operationId": "GetSecureScores_Single", "parameters": [ { "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" @@ -109,9 +109,6 @@ "$ref": "../../../common/v1/types.json#/definitions/CloudError" } } - }, - "x-ms-pageable": { - "nextLinkName": "nextLink" } } }, @@ -231,9 +228,10 @@ }, "SecureScoresItem": { "type": "object", - "description": "Secure score item", + "description": "Secure score item data model", "properties": { "properties": { + "description": "Secure score item", "x-ms-client-flatten": true, "$ref": "#/definitions/SecureScoreItemProperties" } @@ -254,6 +252,7 @@ "description": "User friendly display name of the secure score item" }, "score": { + "description": "score object", "x-ms-client-flatten": true, "$ref": "#/definitions/SecureScoreScoreDetails" } @@ -318,14 +317,10 @@ "type": "object", "description": "List of security sub-assessments", "properties": { - "displayName": { - "readOnly": true, - "type": "string", - "description": "User friendly display name of the control" - }, - "properties": { - "$ref": "#/definitions/SecureScoreControlScoreDetails" - } + "properties":{ + "x-ms-client-flatten": true, + "$ref": "#/definitions/SecureScoreControlScoreDetails" + } }, "allOf": [ { @@ -337,10 +332,16 @@ "type": "object", "description": "Calculation result data in control level", "properties": { - "score": { + "displayName": { + "readOnly": true, + "type": "string", + "description": "User friendly display name of the control" + }, + "score": { + "description": "Actual score object for the control", "x-ms-client-flatten": true, - "$ref": "#/definitions/SecureScoreControlScoreObject" - }, + "$ref": "#/definitions/SecureScoreControlScoreObject" + }, "healthyResources": { "readOnly": true, "description": "Number of healthy resources in the control", @@ -403,6 +404,7 @@ "description": "Secure Score Control's Definition information", "properties": { "properties": { + "x-ms-client-flatten": true, "$ref": "#/definitions/SecureScoreControlDefinitionItemProperties" } }, @@ -437,9 +439,11 @@ "exclusiveMinimum": false }, "source": { + "description": "Source object from which the control was created", "$ref": "#/definitions/SecureScoreControlDefinitionSource" }, "assessmentsDefinition": { + "description": "array of assessments metadata ids", "type": "array", "items": { "$ref": "#/definitions/SecureScoreControlDefinitionAssessmentsId" @@ -488,10 +492,12 @@ ] } }, - "PolicySetDefinitionId": { + "policySetDefinitionId": { + "description": "id of the policy set definition id from which the control was generated", "type": "string" - }, - "GroupName": { + }, + "groupName": { + "description": "represents the GroupName within the specific policy set definition", "type": "string" } } From eed33c9806144d575a78457dc5ad57290b255993 Mon Sep 17 00:00:00 2001 From: Gideon Romm Date: Tue, 28 Jan 2020 14:26:53 +0200 Subject: [PATCH 14/53] Fixed example + organizing readonly attribute --- ...eScoreControlsForName_builtin_example.json | 2 +- .../2020-01-01-preview/secureScore.json | 101 ++++++++++-------- 2 files changed, 56 insertions(+), 47 deletions(-) diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_builtin_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_builtin_example.json index 44728973f6f0..5a4318239473 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_builtin_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_builtin_example.json @@ -1,7 +1,7 @@ { "parameters": { "api-version": "2020-01-01-preview", - "scope": "subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23", + "scope": "subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23" }, "responses": { "200": { diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json index 4f53a261fb20..5c3430cc3b8d 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json @@ -220,18 +220,20 @@ } }, "nextLink": { + "description": "The URI to fetch the next page.", "readOnly": true, - "type": "string", - "description": "The URI to fetch the next page." + "type": "string" } } }, "SecureScoresItem": { - "type": "object", "description": "Secure score item data model", + "readOnly": true, + "type": "object", "properties": { "properties": { "description": "Secure score item", + "readOnly": true, "x-ms-client-flatten": true, "$ref": "#/definitions/SecureScoreItemProperties" } @@ -243,79 +245,82 @@ ] }, "SecureScoreItemProperties": { - "type": "object", "description": "Describes properties of a calculated secure score.", + "readOnly": true, + "type": "object", "properties": { "displayName": { + "description": "User friendly display name of the secure score item", "readOnly": true, - "type": "string", - "description": "User friendly display name of the secure score item" + "type": "string" }, "score": { "description": "score object", + "readOnly": true, "x-ms-client-flatten": true, "$ref": "#/definitions/SecureScoreScoreDetails" } } }, "SecureScoreScoreDetails": { - "type": "object", "description": "Calculation result data", + "readOnly": true, + "type": "object", "properties": { "max": { - "readOnly": true, "description": "Maximum score applicable", + "readOnly": true, "type": "integer", "format": "int32" }, "current": { + "description": "Actual score", "readOnly": true, "type": "number", - "format": "double", - "description": "Actual score" + "format": "double" } } }, "SecureScoreControlScoreObject": { - "type": "object", "description": "Calculation result data", + "type": "object", "properties": { "max": { - "readOnly": true, - "type": "integer", - "format": "int32", - "description": "Maximum control score (0..10)" + "description": "Maximum control score (0..10)", + "readOnly": true, + "type": "integer", + "format": "int32" }, "current": { - "readOnly": true, - "type": "number", - "format": "double", - "description": "Actual score for the control = (achieved points / total points) * max score. if total points is zeroed, the return number is 0.00" + "description": "Actual score for the control = (achieved points / total points) * max score. if total points is zeroed, the return number is 0.00", + "readOnly": true, + "type": "number", + "format": "double" } } }, "SecureScoreControlsList": { - "type": "object", "description": "Page of a secure score controls list", + "type": "object", "properties": { "value": { - "readOnly": true, "description": "Collection of secure score controls in this page", + "readOnly": true, "type": "array", "items": { "$ref": "#/definitions/SecureScoreControlDetails" } }, "nextLink": { + "description": "The URI to fetch the next page.", "readOnly": true, - "type": "string", - "description": "The URI to fetch the next page." + "type": "string" } } }, "SecureScoreControlDetails": { - "type": "object", "description": "List of security sub-assessments", + "type": "object", "properties": { "properties":{ "x-ms-client-flatten": true, @@ -329,13 +334,13 @@ ] }, "SecureScoreControlScoreDetails": { - "type": "object", "description": "Calculation result data in control level", + "type": "object", "properties": { "displayName": { + "description": "User friendly display name of the control", "readOnly": true, - "type": "string", - "description": "User friendly display name of the control" + "type": "string" }, "score": { "description": "Actual score object for the control", @@ -343,46 +348,46 @@ "$ref": "#/definitions/SecureScoreControlScoreObject" }, "healthyResources": { - "readOnly": true, "description": "Number of healthy resources in the control", + "readOnly": true, "type": "integer", "format": "int32" }, "unhealthyResources": { - "readOnly": true, "description": "Number of unhealthy resources in the control", + "readOnly": true, "type": "integer", "format": "int32" }, "notApplicableResources": { - "readOnly": true, "description": "Number of not applicable resources in the control", + "readOnly": true, "type": "integer", "format": "int32" }, "disabledResources": { - "readOnly": true, "description": "Number of not resources that are disabled by policy in the control", + "readOnly": true, "type": "integer", "format": "int32" }, "achievedPoints": { - "readOnly": true, "description": "Number of points achieved for the controls", + "readOnly": true, "type": "integer", "format": "int32" }, "totalPoints": { - "readOnly": true, "description": "Total Number of points available in the control", + "readOnly": true, "type": "integer", "format": "int32" } } }, "SecureScoreControlsDefinitionList": { - "type": "object", "description": "Page of a secure score controls definition list", + "type": "object", "properties": { "value": { "description": "Collection of secure score controls definition in this page", @@ -393,15 +398,15 @@ } }, "nextLink": { + "description": "The URI to fetch the next page.", "readOnly": true, - "type": "string", - "description": "The URI to fetch the next page." + "type": "string" } } }, "SecureScoreControlDefinitionItem": { - "type": "object", "description": "Secure Score Control's Definition information", + "type": "object", "properties": { "properties": { "x-ms-client-flatten": true, @@ -415,35 +420,37 @@ ] }, "SecureScoreControlDefinitionItemProperties": { - "type": "object", "description": "Secure Score Control Definition Properties", + "type": "object", "properties": { "displayName": { + "description": "User friendly display name of the control", "readOnly": true, - "type": "string", - "description": "User friendly display name of the control" + "type": "string" }, "description": { + "description": "User friendly display name of the control", "readOnly": true, "type": "string", - "description": "User friendly display name of the control", "maxLength": 256 }, "maxScore": { + "description": "Maximum control score (0..10)", "readOnly": true, "type": "integer", "format": "int32", - "description": "Maximum control score (0..10)", "minimum": 0, "maximum": 10, "exclusiveMinimum": false }, "source": { "description": "Source object from which the control was created", + "readOnly": true, "$ref": "#/definitions/SecureScoreControlDefinitionSource" }, "assessmentsDefinition": { "description": "array of assessments metadata ids", + "readOnly": true, "type": "array", "items": { "$ref": "#/definitions/SecureScoreControlDefinitionAssessmentsId" @@ -456,18 +463,20 @@ "description": "Secure Score Control Definition Properties", "properties": { "id": { - "type": "string", - "description": "Full assessment metadata azure ids that build the control" + "description": "Full assessment metadata azure ids that build the control", + "readOnly": true, + "type": "string" } } }, "SecureScoreControlDefinitionSource": { - "type": "object", "description": "representing the source of the control", + "readOnly": true, + "type": "object", "properties": { "sourceType": { - "type": "string", "description": "BuiltIn if the control is built-in from Azure Security Center managed assessments, Custom if the assessment based on custom Azure Policy definition, CustomerManaged for customers who build their own controls", + "type": "string", "enum": [ "BuiltIn", "CustomPolicy", From be2f79879440002989bb8f17c27b3ee7fbe1c9ab Mon Sep 17 00:00:00 2001 From: Gideon Romm Date: Tue, 28 Jan 2020 14:35:48 +0200 Subject: [PATCH 15/53] Run prettier on files --- ...SecureScoreControlsDefinition_example.json | 250 ++-- .../GetSecureScoresSingle_example.json | 44 +- ...rolsForNameWithExpand_builtin_example.json | 300 ++--- ...trolsForNameWithExpand_custom_example.json | 118 +- ...eScoreControlsForName_builtin_example.json | 146 +-- ...reScoreControlsForName_custom_example.json | 64 +- .../ListSecureScores_example.json | 4 +- .../2020-01-01-preview/secureScore.json | 1076 ++++++++--------- 8 files changed, 1002 insertions(+), 1000 deletions(-) diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScoreControlsDefinition/ListSecureScoreControlsDefinition_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScoreControlsDefinition/ListSecureScoreControlsDefinition_example.json index 262999c8e93d..7e0aa1d850c0 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScoreControlsDefinition/ListSecureScoreControlsDefinition_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScoreControlsDefinition/ListSecureScoreControlsDefinition_example.json @@ -1,126 +1,126 @@ { - "parameters": { - "api-version": "2020-01-01-preview" - }, - "responses": { - "200": { - "body": { - "value": [ - { - "id": "/providers/Microsoft.Security/secureScoreControlsDefinition/a9909064-42b4-4d34-8143-275477afe18b", - "name": "a9909064-42b4-4d34-8143-275477afe18b", - "type": "Microsoft.Security/SecureScoresControlMetadata", - "properties": { - "source": { - "sourceType": "Builtin", - "initiativeId": "/providers/Microsoft.Authorization/policySetDefinitions/1f3afdf9-d0c9-4c3d-847f-89da613e70a8" - }, - "displayName": "Protect applications against DDoS attacks", - "description": "", - "maxScore": 2, - "assessmentsMetadata": [ - { - "id": "/providers/Microsoft.Security/assessmentMetadata/e3de1cc0-f4dd-3b34-e496-8b5381ba2d70" - } - ] - } - }, - { - "id": "/providers/Microsoft.Security/secureScoreControlsDefinition/34a42fb3-e6db-409c-b56b-7b1db6b8aee0", - "name": "34a42fb3-e6db-409c-b56b-7b1db6b8aee0", - "type": "Microsoft.Security/SecureScoresControlMetadata", - "properties": { - "source": { - "sourceType": "Builtin", - "initiativeId": "/providers/Microsoft.Authorization/policySetDefinitions/1f3afdf9-d0c9-4c3d-847f-89da613e70a8" - }, - "displayName": "Enable MFA", - "description": "", - "maxScore": 10, - "assessmentsMetadata": [ - { - "id": "/providers/Microsoft.Security/assessmentMetadata/151e82c5-5341-a74b-1eb0-bc38d2c84bb5" - }, - { - "id": "/providers/Microsoft.Security/assessmentMetadata/57e98606-6b1e-6193-0e3d-fe621387c16b" - }, - { - "id": "/providers/Microsoft.Security/assessmentMetadata/94290b00-4d0c-d7b4-7cea-064a9554e681" - } - ] - } - }, - { - "id": "/providers/Microsoft.Security/secureScoreControlsDefinition/a000c66f-6da2-4f9d-826d-2364347d2588", - "name": "a000c66f-6da2-4f9d-826d-2364347d2588", - "type": "Microsoft.Security/SecureScoresControlMetadata", - "properties": { - "source": { - "sourceType": "Builtin", - "initiativeId": "/providers/Microsoft.Authorization/policySetDefinitions/1f3afdf9-d0c9-4c3d-847f-89da613e70a8" - }, - "displayName": "Apply adaptive application control", - "description": "", - "maxScore": 3, - "assessmentsMetadata": [ - { - "id": "/providers/Microsoft.Security/assessmentMetadata/35f45c95-27cf-4e52-891f-8390d1de5828" - }, - { - "id": "/providers/Microsoft.Security/assessmentMetadata/d1db3318-01ff-16de-29eb-28b344515626" - }, - { - "id": "/providers/Microsoft.Security/assessmentMetadata/e7ee30c4-bac9-2966-54bd-2023a4282872" - }, - { - "id": "/providers/Microsoft.Security/assessmentMetadata/8e2b96ff-3de2-289b-b5c1-3b9921a3441e" - } - ] - } - }, - { - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScoreControlsDefinition/a9909064-42b4-4d34-8143-275477afe18b", - "name": "a9909064-42b4-4d34-8143-275477afe18b", - "type": "Microsoft.Security/SecureScoresControlMetadata", - "properties": { - "source": { - "sourceType": "CustomPolicy", - "initiativeId": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Authorization/policySetDefinitions/1203fdf9-eeee-ffff-847f-89da613eabcd" - }, - "displayName": "Apply adaptive application control", - "description": "", - "maxScore": 3, - "assessmentsMetadata": [ - { - "id": "/providers/Microsoft.Security/assessmentMetadata/e3de1cc0-f4dd-3b34-e496-8b5381ba2d70" - }, - { - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/assessmentMetadata/4c8a64c9-9b0f-0da9-2d2e-1d11ad316f4e" - } - ] - } - }, - { - "id": "/subscriptions/11111111-e762-44dd-bd96-202020202020/providers/Microsoft.Security/secureScoreControlsDefinition/a9909064-42b4-4d34-8143-275477afe18b", - "name": "a9909064-42b4-4d34-8143-275477afe18b", - "type": "Microsoft.Security/SecureScoresControlMetadata", - "properties": { - "source": { - "sourceType": "CustomPolicy", - "initiativeId": "/subscriptions/11111111-e762-44dd-bd96-202020202020/providers/Microsoft.Authorization/policySetDefinitions/dddddddd-eeee-ffff-847f-89da613eabcd" - }, - "displayName": "My custom application control", - "description": "", - "maxScore": 5, - "assessmentsMetadata": [ - { - "id": "/subscriptions/11111111-e762-44dd-bd96-202020202020/providers/Microsoft.Security/assessmentMetadata/12345678-9a04-0000-2eed-565656565656" - } - ] - } - } - ] - } - } - } -} \ No newline at end of file + "parameters": { + "api-version": "2020-01-01-preview" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/providers/Microsoft.Security/secureScoreControlsDefinition/a9909064-42b4-4d34-8143-275477afe18b", + "name": "a9909064-42b4-4d34-8143-275477afe18b", + "type": "Microsoft.Security/SecureScoresControlMetadata", + "properties": { + "source": { + "sourceType": "Builtin", + "initiativeId": "/providers/Microsoft.Authorization/policySetDefinitions/1f3afdf9-d0c9-4c3d-847f-89da613e70a8" + }, + "displayName": "Protect applications against DDoS attacks", + "description": "", + "maxScore": 2, + "assessmentsMetadata": [ + { + "id": "/providers/Microsoft.Security/assessmentMetadata/e3de1cc0-f4dd-3b34-e496-8b5381ba2d70" + } + ] + } + }, + { + "id": "/providers/Microsoft.Security/secureScoreControlsDefinition/34a42fb3-e6db-409c-b56b-7b1db6b8aee0", + "name": "34a42fb3-e6db-409c-b56b-7b1db6b8aee0", + "type": "Microsoft.Security/SecureScoresControlMetadata", + "properties": { + "source": { + "sourceType": "Builtin", + "initiativeId": "/providers/Microsoft.Authorization/policySetDefinitions/1f3afdf9-d0c9-4c3d-847f-89da613e70a8" + }, + "displayName": "Enable MFA", + "description": "", + "maxScore": 10, + "assessmentsMetadata": [ + { + "id": "/providers/Microsoft.Security/assessmentMetadata/151e82c5-5341-a74b-1eb0-bc38d2c84bb5" + }, + { + "id": "/providers/Microsoft.Security/assessmentMetadata/57e98606-6b1e-6193-0e3d-fe621387c16b" + }, + { + "id": "/providers/Microsoft.Security/assessmentMetadata/94290b00-4d0c-d7b4-7cea-064a9554e681" + } + ] + } + }, + { + "id": "/providers/Microsoft.Security/secureScoreControlsDefinition/a000c66f-6da2-4f9d-826d-2364347d2588", + "name": "a000c66f-6da2-4f9d-826d-2364347d2588", + "type": "Microsoft.Security/SecureScoresControlMetadata", + "properties": { + "source": { + "sourceType": "Builtin", + "initiativeId": "/providers/Microsoft.Authorization/policySetDefinitions/1f3afdf9-d0c9-4c3d-847f-89da613e70a8" + }, + "displayName": "Apply adaptive application control", + "description": "", + "maxScore": 3, + "assessmentsMetadata": [ + { + "id": "/providers/Microsoft.Security/assessmentMetadata/35f45c95-27cf-4e52-891f-8390d1de5828" + }, + { + "id": "/providers/Microsoft.Security/assessmentMetadata/d1db3318-01ff-16de-29eb-28b344515626" + }, + { + "id": "/providers/Microsoft.Security/assessmentMetadata/e7ee30c4-bac9-2966-54bd-2023a4282872" + }, + { + "id": "/providers/Microsoft.Security/assessmentMetadata/8e2b96ff-3de2-289b-b5c1-3b9921a3441e" + } + ] + } + }, + { + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScoreControlsDefinition/a9909064-42b4-4d34-8143-275477afe18b", + "name": "a9909064-42b4-4d34-8143-275477afe18b", + "type": "Microsoft.Security/SecureScoresControlMetadata", + "properties": { + "source": { + "sourceType": "CustomPolicy", + "initiativeId": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Authorization/policySetDefinitions/1203fdf9-eeee-ffff-847f-89da613eabcd" + }, + "displayName": "Apply adaptive application control", + "description": "", + "maxScore": 3, + "assessmentsMetadata": [ + { + "id": "/providers/Microsoft.Security/assessmentMetadata/e3de1cc0-f4dd-3b34-e496-8b5381ba2d70" + }, + { + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/assessmentMetadata/4c8a64c9-9b0f-0da9-2d2e-1d11ad316f4e" + } + ] + } + }, + { + "id": "/subscriptions/11111111-e762-44dd-bd96-202020202020/providers/Microsoft.Security/secureScoreControlsDefinition/a9909064-42b4-4d34-8143-275477afe18b", + "name": "a9909064-42b4-4d34-8143-275477afe18b", + "type": "Microsoft.Security/SecureScoresControlMetadata", + "properties": { + "source": { + "sourceType": "CustomPolicy", + "initiativeId": "/subscriptions/11111111-e762-44dd-bd96-202020202020/providers/Microsoft.Authorization/policySetDefinitions/dddddddd-eeee-ffff-847f-89da613eabcd" + }, + "displayName": "My custom application control", + "description": "", + "maxScore": 5, + "assessmentsMetadata": [ + { + "id": "/subscriptions/11111111-e762-44dd-bd96-202020202020/providers/Microsoft.Security/assessmentMetadata/12345678-9a04-0000-2eed-565656565656" + } + ] + } + } + ] + } + } + } +} diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/GetSecureScoresSingle_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/GetSecureScoresSingle_example.json index e8e89e972457..b022f979a61b 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/GetSecureScoresSingle_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/GetSecureScoresSingle_example.json @@ -1,23 +1,23 @@ { - "parameters": { - "api-version": "2020-01-01-preview", - "scope": "subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23", - "secureScoreName": "ascDefault" - }, - "responses": { - "200": { - "body": { - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/securescores/ascDefault", - "name": "ascDefault", - "type": "Microsoft.Security/securescores", - "properties": { - "displayName": "asc Default", - "score": { - "max": 13, - "current": 3 - } - } - } - } - } -} \ No newline at end of file + "parameters": { + "api-version": "2020-01-01-preview", + "scope": "subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23", + "secureScoreName": "ascDefault" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/securescores/ascDefault", + "name": "ascDefault", + "type": "Microsoft.Security/securescores", + "properties": { + "displayName": "asc Default", + "score": { + "max": 13, + "current": 3 + } + } + } + } + } +} diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_builtin_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_builtin_example.json index d576c80d82d2..b4ab5919654e 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_builtin_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_builtin_example.json @@ -1,151 +1,151 @@ { - "parameters": { - "api-version": "2020-01-01-preview", - "scope": "subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23", - "secureScoreName": "ascDefault", - "$expand": "definition" - }, - "responses": { - "200": { - "parameters": { - "secureScoreName": "ascDefault" - }, - "body": { - "value": [ - { - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/securescores/ascDefault/a9909064-42b4-4d34-8143-275477afe18b", - "name": "a9909064-42b4-4d34-8143-275477afe18b", - "type": "Microsoft.Security/securescorescontrol", - "properties": { - "displayName": "Protect applications against DDoS attacks", - "data": { - "healthyResources": 0, - "unhealthyResources": 0, - "notApplicableResources": 10, - "disabledResources": 50, - "achievedResourcesPoints": 0, - "totalResourcesPoints": 0, - "score": { - "max": 0, - "current": 0 - } - }, - "definition": { - "id": "/providers/Microsoft.Security/secureScoreControlsDefinition/a9909064-42b4-4d34-8143-275477afe18b", - "name": "a9909064-42b4-4d34-8143-275477afe18b", - "type": "Microsoft.Security/SecureScoresControlMetadata", - "properties": { - "source": { - "sourceType": "Builtin", - "initiativeId": "/providers/Microsoft.Authorization/policySetDefinitions/1f3afdf9-d0c9-4c3d-847f-89da613e70a8" - }, - "displayName": "Protect applications against DDoS attacks", - "description": "", - "maxScore": 2, - "assessmentsMetadata": [ - { - "id": "/providers/Microsoft.Security/assessmentMetadata/e3de1cc0-f4dd-3b34-e496-8b5381ba2d70" - } - ] - } - } - } - }, - { - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/securescores/ascDefault/34a42fb3-e6db-409c-b56b-7b1db6b8aee0", - "name": "34a42fb3-e6db-409c-b56b-7b1db6b8aee0", - "type": "Microsoft.Security/securescorescontrol", - "properties": { - "displayName": "Enable MFA", - "data": { - "healthyResources": 0, - "unhealthyResources": 1, - "notApplicableResources": 0, - "disabledResources": 0, - "achievedResourcesPoints": 0, - "totalResourcesPoints": 1, - "score": { - "max": 10, - "current": 0 - } - }, - "definition": { - "id": "/providers/Microsoft.Security/secureScoreControlsDefinition/34a42fb3-e6db-409c-b56b-7b1db6b8aee0", - "name": "34a42fb3-e6db-409c-b56b-7b1db6b8aee0", - "type": "Microsoft.Security/SecureScoresControlMetadata", - "properties": { - "source": { - "sourceType": "Builtin", - "initiativeId": "/providers/Microsoft.Authorization/policySetDefinitions/1f3afdf9-d0c9-4c3d-847f-89da613e70a8" - }, - "displayName": "Enable MFA", - "description": "", - "maxScore": 10, - "assessmentsMetadata": [ - { - "id": "/providers/Microsoft.Security/assessmentMetadata/151e82c5-5341-a74b-1eb0-bc38d2c84bb5" - }, - { - "id": "/providers/Microsoft.Security/assessmentMetadata/57e98606-6b1e-6193-0e3d-fe621387c16b" - }, - { - "id": "/providers/Microsoft.Security/assessmentMetadata/94290b00-4d0c-d7b4-7cea-064a9554e681" - } - ] - } - } - } - }, - { - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/securescores/ascDefault/a000c66f-6da2-4f9d-826d-2364347d2588", - "name": "a000c66f-6da2-4f9d-826d-2364347d2588", - "type": "Microsoft.Security/securescorescontrol", - "properties": { - "displayName": "Apply adaptive application control", - "data": { - "healthyResources": 20, - "unhealthyResources": 0, - "notApplicableResources": 10, - "disabledResources": 5, - "achievedResourcesPoints": 20, - "totalResourcesPoints": 20, - "score": { - "max": 3, - "current": 3 - } - }, - "definition": { - "id": "/providers/Microsoft.Security/secureScoreControlsDefinition/a000c66f-6da2-4f9d-826d-2364347d2588", - "name": "a000c66f-6da2-4f9d-826d-2364347d2588", - "type": "Microsoft.Security/SecureScoresControlMetadata", - "properties": { - "source": { - "sourceType": "Builtin", - "initiativeId": "/providers/Microsoft.Authorization/policySetDefinitions/1f3afdf9-d0c9-4c3d-847f-89da613e70a8" - }, - "displayName": "Apply adaptive application control", - "description": "", - "maxScore": 3, - "assessmentsMetadata": [ - { - "id": "/providers/Microsoft.Security/assessmentMetadata/35f45c95-27cf-4e52-891f-8390d1de5828" - }, - { - "id": "/providers/Microsoft.Security/assessmentMetadata/d1db3318-01ff-16de-29eb-28b344515626" - }, - { - "id": "/providers/Microsoft.Security/assessmentMetadata/e7ee30c4-bac9-2966-54bd-2023a4282872" - }, - { - "id": "/providers/Microsoft.Security/assessmentMetadata/8e2b96ff-3de2-289b-b5c1-3b9921a3441e" - } - ] - } - } - } - } - ] - } - } - } -} \ No newline at end of file + "parameters": { + "api-version": "2020-01-01-preview", + "scope": "subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23", + "secureScoreName": "ascDefault", + "$expand": "definition" + }, + "responses": { + "200": { + "parameters": { + "secureScoreName": "ascDefault" + }, + "body": { + "value": [ + { + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/securescores/ascDefault/a9909064-42b4-4d34-8143-275477afe18b", + "name": "a9909064-42b4-4d34-8143-275477afe18b", + "type": "Microsoft.Security/securescorescontrol", + "properties": { + "displayName": "Protect applications against DDoS attacks", + "data": { + "healthyResources": 0, + "unhealthyResources": 0, + "notApplicableResources": 10, + "disabledResources": 50, + "achievedResourcesPoints": 0, + "totalResourcesPoints": 0, + "score": { + "max": 0, + "current": 0 + } + }, + "definition": { + "id": "/providers/Microsoft.Security/secureScoreControlsDefinition/a9909064-42b4-4d34-8143-275477afe18b", + "name": "a9909064-42b4-4d34-8143-275477afe18b", + "type": "Microsoft.Security/SecureScoresControlMetadata", + "properties": { + "source": { + "sourceType": "Builtin", + "initiativeId": "/providers/Microsoft.Authorization/policySetDefinitions/1f3afdf9-d0c9-4c3d-847f-89da613e70a8" + }, + "displayName": "Protect applications against DDoS attacks", + "description": "", + "maxScore": 2, + "assessmentsMetadata": [ + { + "id": "/providers/Microsoft.Security/assessmentMetadata/e3de1cc0-f4dd-3b34-e496-8b5381ba2d70" + } + ] + } + } + } + }, + { + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/securescores/ascDefault/34a42fb3-e6db-409c-b56b-7b1db6b8aee0", + "name": "34a42fb3-e6db-409c-b56b-7b1db6b8aee0", + "type": "Microsoft.Security/securescorescontrol", + "properties": { + "displayName": "Enable MFA", + "data": { + "healthyResources": 0, + "unhealthyResources": 1, + "notApplicableResources": 0, + "disabledResources": 0, + "achievedResourcesPoints": 0, + "totalResourcesPoints": 1, + "score": { + "max": 10, + "current": 0 + } + }, + "definition": { + "id": "/providers/Microsoft.Security/secureScoreControlsDefinition/34a42fb3-e6db-409c-b56b-7b1db6b8aee0", + "name": "34a42fb3-e6db-409c-b56b-7b1db6b8aee0", + "type": "Microsoft.Security/SecureScoresControlMetadata", + "properties": { + "source": { + "sourceType": "Builtin", + "initiativeId": "/providers/Microsoft.Authorization/policySetDefinitions/1f3afdf9-d0c9-4c3d-847f-89da613e70a8" + }, + "displayName": "Enable MFA", + "description": "", + "maxScore": 10, + "assessmentsMetadata": [ + { + "id": "/providers/Microsoft.Security/assessmentMetadata/151e82c5-5341-a74b-1eb0-bc38d2c84bb5" + }, + { + "id": "/providers/Microsoft.Security/assessmentMetadata/57e98606-6b1e-6193-0e3d-fe621387c16b" + }, + { + "id": "/providers/Microsoft.Security/assessmentMetadata/94290b00-4d0c-d7b4-7cea-064a9554e681" + } + ] + } + } + } + }, + { + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/securescores/ascDefault/a000c66f-6da2-4f9d-826d-2364347d2588", + "name": "a000c66f-6da2-4f9d-826d-2364347d2588", + "type": "Microsoft.Security/securescorescontrol", + "properties": { + "displayName": "Apply adaptive application control", + "data": { + "healthyResources": 20, + "unhealthyResources": 0, + "notApplicableResources": 10, + "disabledResources": 5, + "achievedResourcesPoints": 20, + "totalResourcesPoints": 20, + "score": { + "max": 3, + "current": 3 + } + }, + "definition": { + "id": "/providers/Microsoft.Security/secureScoreControlsDefinition/a000c66f-6da2-4f9d-826d-2364347d2588", + "name": "a000c66f-6da2-4f9d-826d-2364347d2588", + "type": "Microsoft.Security/SecureScoresControlMetadata", + "properties": { + "source": { + "sourceType": "Builtin", + "initiativeId": "/providers/Microsoft.Authorization/policySetDefinitions/1f3afdf9-d0c9-4c3d-847f-89da613e70a8" + }, + "displayName": "Apply adaptive application control", + "description": "", + "maxScore": 3, + "assessmentsMetadata": [ + { + "id": "/providers/Microsoft.Security/assessmentMetadata/35f45c95-27cf-4e52-891f-8390d1de5828" + }, + { + "id": "/providers/Microsoft.Security/assessmentMetadata/d1db3318-01ff-16de-29eb-28b344515626" + }, + { + "id": "/providers/Microsoft.Security/assessmentMetadata/e7ee30c4-bac9-2966-54bd-2023a4282872" + }, + { + "id": "/providers/Microsoft.Security/assessmentMetadata/8e2b96ff-3de2-289b-b5c1-3b9921a3441e" + } + ] + } + } + } + } + ] + } + } + } +} diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_custom_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_custom_example.json index 94f0ff80bcab..cb209313d7c4 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_custom_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_custom_example.json @@ -1,59 +1,61 @@ { - "parameters": { - "api-version": "2020-01-01-preview", - "scope": "subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23", - "secureScoreName": "ascDefault", - "$expand": "definition" - }, - "responses": { - "200": { - "parameters": { - "secureScoreName": "CustomA" - }, - "body": { - "value": [ - { - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/securescores/CustomA/a9909064-42b4-4d34-8143-275477afe18b", - "name": "a9909064-42b4-4d34-8143-275477afe18b", - "type": "Microsoft.Security/securescorescontrol", - "properties": { - "displayName": "Protect applications against DDoS attacks", - "data": { - "healthyResources": 0, - "unhealthyResources": 10, - "notApplicableResources": 0, - "disabledResources": 50, - "achievedResourcesPoints": 0, - "totalResourcesPoints": 10, - "score": {"max": 3, - "current": 0} - }, - "definition": { - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScoreControlsDefinition/a9909064-42b4-4d34-8143-275477afe18b", - "name": "a9909064-42b4-4d34-8143-275477afe18b", - "type": "Microsoft.Security/SecureScoresControlMetadata", - "properties": { - "source": { - "sourceType": "CustomPolicy", - "initiativeId": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Authorization/policySetDefinitions/1203fdf9-eeee-ffff-847f-89da613eabcd" - }, - "displayName": "Apply adaptive application control", - "description": "", - "maxScore": 3, - "assessmentsMetadata": [ - { - "id": "/providers/Microsoft.Security/assessmentMetadata/e3de1cc0-f4dd-3b34-e496-8b5381ba2d70" - }, - { - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/assessmentMetadata/4c8a64c9-9b0f-0da9-2d2e-1d11ad316f4e" - } - ] - } - } - } - } - ] - } - } - } -} \ No newline at end of file + "parameters": { + "api-version": "2020-01-01-preview", + "scope": "subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23", + "secureScoreName": "ascDefault", + "$expand": "definition" + }, + "responses": { + "200": { + "parameters": { + "secureScoreName": "CustomA" + }, + "body": { + "value": [ + { + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/securescores/CustomA/a9909064-42b4-4d34-8143-275477afe18b", + "name": "a9909064-42b4-4d34-8143-275477afe18b", + "type": "Microsoft.Security/securescorescontrol", + "properties": { + "displayName": "Protect applications against DDoS attacks", + "data": { + "healthyResources": 0, + "unhealthyResources": 10, + "notApplicableResources": 0, + "disabledResources": 50, + "achievedResourcesPoints": 0, + "totalResourcesPoints": 10, + "score": { + "max": 3, + "current": 0 + } + }, + "definition": { + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScoreControlsDefinition/a9909064-42b4-4d34-8143-275477afe18b", + "name": "a9909064-42b4-4d34-8143-275477afe18b", + "type": "Microsoft.Security/SecureScoresControlMetadata", + "properties": { + "source": { + "sourceType": "CustomPolicy", + "initiativeId": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Authorization/policySetDefinitions/1203fdf9-eeee-ffff-847f-89da613eabcd" + }, + "displayName": "Apply adaptive application control", + "description": "", + "maxScore": 3, + "assessmentsMetadata": [ + { + "id": "/providers/Microsoft.Security/assessmentMetadata/e3de1cc0-f4dd-3b34-e496-8b5381ba2d70" + }, + { + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/assessmentMetadata/4c8a64c9-9b0f-0da9-2d2e-1d11ad316f4e" + } + ] + } + } + } + } + ] + } + } + } +} diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_builtin_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_builtin_example.json index 5a4318239473..c31a12faa25d 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_builtin_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_builtin_example.json @@ -1,74 +1,74 @@ { - "parameters": { - "api-version": "2020-01-01-preview", - "scope": "subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23" - }, - "responses": { - "200": { - "body": { - "value": [ - { - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/securescores/ascDefault/a9909064-42b4-4d34-8143-275477afe18b", - "name": "a9909064-42b4-4d34-8143-275477afe18b", - "type": "Microsoft.Security/securescorescontrol", - "properties": { - "displayName": "Protect applications against DDoS attacks", - "data": { - "healthyResources": 0, - "unhealthyResources": 0, - "notApplicableResources": 10, - "disabledResources": 50, - "achievedResourcesPoints": 0, - "totalResourcesPoints": 0, - "score": { - "max": 0, - "current": 0 - } - } - } - }, - { - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/securescores/ascDefault/34a42fb3-e6db-409c-b56b-7b1db6b8aee0", - "name": "34a42fb3-e6db-409c-b56b-7b1db6b8aee0", - "type": "Microsoft.Security/securescorescontrol", - "properties": { - "displayName": "Enable MFA", - "data": { - "healthyResources": 0, - "unhealthyResources": 1, - "notApplicableResources": 0, - "disabledResources": 0, - "achievedResourcesPoints": 0, - "totalResourcesPoints": 1, - "score": { - "max": 10, - "current": 0 - } - } - } - }, - { - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/securescores/ascDefault/a000c66f-6da2-4f9d-826d-2364347d2588", - "name": "a000c66f-6da2-4f9d-826d-2364347d2588", - "type": "Microsoft.Security/securescorescontrol", - "properties": { - "displayName": "Apply adaptive application control", - "data": { - "healthyResources": 20, - "unhealthyResources": 0, - "notApplicableResources": 10, - "disabledResources": 5, - "achievedResourcesPoints": 20, - "totalResourcesPoints": 20, - "score": { - "max": 3, - "current": 3 - } - } - } - } - ] - } - } - } -} \ No newline at end of file + "parameters": { + "api-version": "2020-01-01-preview", + "scope": "subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/securescores/ascDefault/a9909064-42b4-4d34-8143-275477afe18b", + "name": "a9909064-42b4-4d34-8143-275477afe18b", + "type": "Microsoft.Security/securescorescontrol", + "properties": { + "displayName": "Protect applications against DDoS attacks", + "data": { + "healthyResources": 0, + "unhealthyResources": 0, + "notApplicableResources": 10, + "disabledResources": 50, + "achievedResourcesPoints": 0, + "totalResourcesPoints": 0, + "score": { + "max": 0, + "current": 0 + } + } + } + }, + { + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/securescores/ascDefault/34a42fb3-e6db-409c-b56b-7b1db6b8aee0", + "name": "34a42fb3-e6db-409c-b56b-7b1db6b8aee0", + "type": "Microsoft.Security/securescorescontrol", + "properties": { + "displayName": "Enable MFA", + "data": { + "healthyResources": 0, + "unhealthyResources": 1, + "notApplicableResources": 0, + "disabledResources": 0, + "achievedResourcesPoints": 0, + "totalResourcesPoints": 1, + "score": { + "max": 10, + "current": 0 + } + } + } + }, + { + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/securescores/ascDefault/a000c66f-6da2-4f9d-826d-2364347d2588", + "name": "a000c66f-6da2-4f9d-826d-2364347d2588", + "type": "Microsoft.Security/securescorescontrol", + "properties": { + "displayName": "Apply adaptive application control", + "data": { + "healthyResources": 20, + "unhealthyResources": 0, + "notApplicableResources": 10, + "disabledResources": 5, + "achievedResourcesPoints": 20, + "totalResourcesPoints": 20, + "score": { + "max": 3, + "current": 3 + } + } + } + } + ] + } + } + } +} diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_custom_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_custom_example.json index 9c945fce6106..30c9f4abb65b 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_custom_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_custom_example.json @@ -1,33 +1,33 @@ { - "parameters": { - "api-version": "2020-01-01-preview", - "scope": "subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23", - "secureScoreName": "CustomA" - }, - "responses": { - "200": { - "body": { - "value": [ - { - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/securescores/CustomA/a9909064-42b4-4d34-8143-275477afe18b", - "name": "a9909064-42b4-4d34-8143-275477afe18b", - "type": "Microsoft.Security/securescorescontrol", - "properties": { - "displayName": "Protect applications against DDoS attacks", - "healthyResources": 0, - "unhealthyResources": 10, - "notApplicableResources": 0, - "disabledResources": 50, - "achievedResourcesPoints": 0, - "totalResourcesPoints": 10, - "score": { - "max": 2, - "current": 0 - } - } - } - ] - } - } - } -} \ No newline at end of file + "parameters": { + "api-version": "2020-01-01-preview", + "scope": "subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23", + "secureScoreName": "CustomA" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/securescores/CustomA/a9909064-42b4-4d34-8143-275477afe18b", + "name": "a9909064-42b4-4d34-8143-275477afe18b", + "type": "Microsoft.Security/securescorescontrol", + "properties": { + "displayName": "Protect applications against DDoS attacks", + "healthyResources": 0, + "unhealthyResources": 10, + "notApplicableResources": 0, + "disabledResources": 50, + "achievedResourcesPoints": 0, + "totalResourcesPoints": 10, + "score": { + "max": 2, + "current": 0 + } + } + } + ] + } + } + } +} diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScores_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScores_example.json index 06fe4112c996..7912d3d7cf95 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScores_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScores_example.json @@ -15,7 +15,7 @@ "displayName": "asc Default", "score": { "max": 13, - "current": 3 + "current": 3 } } }, @@ -27,7 +27,7 @@ "displayName": "Custom A", "score": { "max": 2, - "current": 0 + "current": 0 } } } diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json index 5c3430cc3b8d..2ccf324d7776 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json @@ -1,546 +1,546 @@ { - "swagger": "2.0", - "info": { - "title": "Security Center", - "description": "API spec for Microsoft.Security (Azure Security Center) resource provider", - "version": "2020-01-01-preview" - }, - "host": "management.azure.com", - "schemes": [ - "https" - ], - "consumes": [ - "application/json" - ], - "produces": [ - "application/json" - ], - "security": [ - { - "azure_auth": [ - "user_impersonation" - ] - } - ], - "securityDefinitions": { - "azure_auth": { - "type": "oauth2", - "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", - "flow": "implicit", - "description": "Azure Active Directory OAuth2 Flow", - "scopes": { - "user_impersonation": "impersonate your user account" - } - } - }, - "paths": { - "/{scope}/providers/Microsoft.Security/secureScores": { - "get": { - "x-ms-examples": { - "List secure scores": { - "$ref": "./examples/secureScores/ListSecureScores_example.json" - } - }, - "tags": [ - "Secure Scores" - ], - "description": "Get secure scores on all your initiatives inside a scope", - "operationId": "SecureScores_List", - "parameters": [ - { - "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" - }, - { - "$ref": "../../../common/v1/types.json#/parameters/Scope" - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/SecureScoresList" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "../../../common/v1/types.json#/definitions/CloudError" - } - } - }, - "x-ms-pageable": { - "nextLinkName": "nextLink" - } - } - }, - "/{scope}/providers/Microsoft.Security/secureScores/{secureScoreName}": { - "get": { - "x-ms-examples": { - "Get single secure score": { - "$ref": "./examples/secureScores/GetSecureScoresSingle_example.json" - } - }, - "tags": [ - "Secure Scores" - ], - "description": "Get secure score for a specific initiatives inside a scope", - "operationId": "GetSecureScores_Single", - "parameters": [ - { - "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" - }, - { - "$ref": "../../../common/v1/types.json#/parameters/Scope" + "swagger": "2.0", + "info": { + "title": "Security Center", + "description": "API spec for Microsoft.Security (Azure Security Center) resource provider", + "version": "2020-01-01-preview" + }, + "host": "management.azure.com", + "schemes": [ + "https" + ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "security": [ + { + "azure_auth": [ + "user_impersonation" + ] + } + ], + "securityDefinitions": { + "azure_auth": { + "type": "oauth2", + "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", + "flow": "implicit", + "description": "Azure Active Directory OAuth2 Flow", + "scopes": { + "user_impersonation": "impersonate your user account" + } + } + }, + "paths": { + "/{scope}/providers/Microsoft.Security/secureScores": { + "get": { + "x-ms-examples": { + "List secure scores": { + "$ref": "./examples/secureScores/ListSecureScores_example.json" + } + }, + "tags": [ + "Secure Scores" + ], + "description": "Get secure scores on all your initiatives inside a scope", + "operationId": "SecureScores_List", + "parameters": [ + { + "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/Scope" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/SecureScoresList" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "../../../common/v1/types.json#/definitions/CloudError" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/{scope}/providers/Microsoft.Security/secureScores/{secureScoreName}": { + "get": { + "x-ms-examples": { + "Get single secure score": { + "$ref": "./examples/secureScores/GetSecureScoresSingle_example.json" + } + }, + "tags": [ + "Secure Scores" + ], + "description": "Get secure score for a specific initiatives inside a scope", + "operationId": "GetSecureScores_Single", + "parameters": [ + { + "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/Scope" }, { - "$ref": "#/parameters/secureScoreName" - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/SecureScoresItem" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "../../../common/v1/types.json#/definitions/CloudError" - } - } - } - } - }, - "/{scope}/providers/Microsoft.Security/secureScores/{secureScoreName}/controls": { - "get": { - "x-ms-examples": { - "List secure score's controls level for the specified name (builtin)": { - "$ref": "./examples/secureScores/ListSecureScoreControlsForName_builtin_example.json" - }, - "List secure score's controls level for the specified name (custom)": { - "$ref": "./examples/secureScores/ListSecureScoreControlsForName_custom_example.json" - }, - "Get secure score's controls level for the specified name with expand parameter (builtin)": { - "$ref": "./examples/secureScores/ListSecureScoreControlsForNameWithExpand_builtin_example.json" - }, - "Get secure score's controls level for the specified name with expand parameter (custom)": { - "$ref": "./examples/secureScores/ListSecureScoreControlsForNameWithExpand_custom_example.json" - } - }, - "tags": [ - "Secure Scores" - ], - "description": "Get all secure score controls on specific initiatives inside a scope", - "operationId": "SecureScoreControls_List", - "parameters": [ - { - "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" - }, - { - "$ref": "../../../common/v1/types.json#/parameters/Scope" - }, - { - "$ref": "#/parameters/secureScoreName" - }, - { - "$ref": "#/parameters/ExpandControlsDefinition" - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/SecureScoreControlsList" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "../../../common/v1/types.json#/definitions/CloudError" - } - } - }, - "x-ms-pageable": { - "nextLinkName": "nextLink" - } - } - }, - "/{scope}/providers/Microsoft.Security/secureScoreControlsDefinition": { - "get": { - "x-ms-examples": { - "List secure score controls definition": { - "$ref": "./examples/secureScoreControlsDefinition/ListSecureScoreControlsDefinition_example.json" - } - }, - "tags": [ - "Secure Score Controls Definition" - ], - "description": "Get definition information on all secure score controls", - "operationId": "SecureScoreControlsDefinition_List", - "parameters": [ - { - "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" - }, - { - "$ref": "../../../common/v1/types.json#/parameters/Scope" - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/SecureScoreControlsDefinitionList" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "../../../common/v1/types.json#/definitions/CloudError" - } - } - }, - "x-ms-pageable": { - "nextLinkName": "nextLink" - } - } - } - }, - "definitions": { - "SecureScoresList": { - "type": "object", - "description": "Page of a secure scores list", - "properties": { - "value": { - "description": "Collection of secure scores in this page", - "readOnly": true, - "type": "array", - "items": { - "$ref": "#/definitions/SecureScoresItem" - } - }, - "nextLink": { - "description": "The URI to fetch the next page.", - "readOnly": true, - "type": "string" - } - } - }, - "SecureScoresItem": { - "description": "Secure score item data model", - "readOnly": true, - "type": "object", - "properties": { - "properties": { - "description": "Secure score item", - "readOnly": true, - "x-ms-client-flatten": true, - "$ref": "#/definitions/SecureScoreItemProperties" - } - }, - "allOf": [ - { - "$ref": "../../../common/v1/types.json#/definitions/Resource" - } - ] - }, - "SecureScoreItemProperties": { - "description": "Describes properties of a calculated secure score.", - "readOnly": true, - "type": "object", - "properties": { - "displayName": { - "description": "User friendly display name of the secure score item", - "readOnly": true, - "type": "string" - }, - "score": { - "description": "score object", - "readOnly": true, - "x-ms-client-flatten": true, - "$ref": "#/definitions/SecureScoreScoreDetails" - } - } - }, - "SecureScoreScoreDetails": { - "description": "Calculation result data", - "readOnly": true, - "type": "object", - "properties": { - "max": { - "description": "Maximum score applicable", - "readOnly": true, - "type": "integer", - "format": "int32" - }, - "current": { - "description": "Actual score", - "readOnly": true, - "type": "number", - "format": "double" - } - } + "$ref": "#/parameters/secureScoreName" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/SecureScoresItem" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "../../../common/v1/types.json#/definitions/CloudError" + } + } + } + } }, - "SecureScoreControlScoreObject": { - "description": "Calculation result data", - "type": "object", - "properties": { + "/{scope}/providers/Microsoft.Security/secureScores/{secureScoreName}/controls": { + "get": { + "x-ms-examples": { + "List secure score's controls level for the specified name (builtin)": { + "$ref": "./examples/secureScores/ListSecureScoreControlsForName_builtin_example.json" + }, + "List secure score's controls level for the specified name (custom)": { + "$ref": "./examples/secureScores/ListSecureScoreControlsForName_custom_example.json" + }, + "Get secure score's controls level for the specified name with expand parameter (builtin)": { + "$ref": "./examples/secureScores/ListSecureScoreControlsForNameWithExpand_builtin_example.json" + }, + "Get secure score's controls level for the specified name with expand parameter (custom)": { + "$ref": "./examples/secureScores/ListSecureScoreControlsForNameWithExpand_custom_example.json" + } + }, + "tags": [ + "Secure Scores" + ], + "description": "Get all secure score controls on specific initiatives inside a scope", + "operationId": "SecureScoreControls_List", + "parameters": [ + { + "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/Scope" + }, + { + "$ref": "#/parameters/secureScoreName" + }, + { + "$ref": "#/parameters/ExpandControlsDefinition" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/SecureScoreControlsList" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "../../../common/v1/types.json#/definitions/CloudError" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/{scope}/providers/Microsoft.Security/secureScoreControlsDefinition": { + "get": { + "x-ms-examples": { + "List secure score controls definition": { + "$ref": "./examples/secureScoreControlsDefinition/ListSecureScoreControlsDefinition_example.json" + } + }, + "tags": [ + "Secure Score Controls Definition" + ], + "description": "Get definition information on all secure score controls", + "operationId": "SecureScoreControlsDefinition_List", + "parameters": [ + { + "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/Scope" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/SecureScoreControlsDefinitionList" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "../../../common/v1/types.json#/definitions/CloudError" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + } + }, + "definitions": { + "SecureScoresList": { + "type": "object", + "description": "Page of a secure scores list", + "properties": { + "value": { + "description": "Collection of secure scores in this page", + "readOnly": true, + "type": "array", + "items": { + "$ref": "#/definitions/SecureScoresItem" + } + }, + "nextLink": { + "description": "The URI to fetch the next page.", + "readOnly": true, + "type": "string" + } + } + }, + "SecureScoresItem": { + "description": "Secure score item data model", + "readOnly": true, + "type": "object", + "properties": { + "properties": { + "description": "Secure score item", + "readOnly": true, + "x-ms-client-flatten": true, + "$ref": "#/definitions/SecureScoreItemProperties" + } + }, + "allOf": [ + { + "$ref": "../../../common/v1/types.json#/definitions/Resource" + } + ] + }, + "SecureScoreItemProperties": { + "description": "Describes properties of a calculated secure score.", + "readOnly": true, + "type": "object", + "properties": { + "displayName": { + "description": "User friendly display name of the secure score item", + "readOnly": true, + "type": "string" + }, + "score": { + "description": "score object", + "readOnly": true, + "x-ms-client-flatten": true, + "$ref": "#/definitions/SecureScoreScoreDetails" + } + } + }, + "SecureScoreScoreDetails": { + "description": "Calculation result data", + "readOnly": true, + "type": "object", + "properties": { "max": { - "description": "Maximum control score (0..10)", - "readOnly": true, - "type": "integer", - "format": "int32" + "description": "Maximum score applicable", + "readOnly": true, + "type": "integer", + "format": "int32" }, "current": { - "description": "Actual score for the control = (achieved points / total points) * max score. if total points is zeroed, the return number is 0.00", - "readOnly": true, - "type": "number", - "format": "double" + "description": "Actual score", + "readOnly": true, + "type": "number", + "format": "double" + } + } + }, + "SecureScoreControlScoreObject": { + "description": "Calculation result data", + "type": "object", + "properties": { + "max": { + "description": "Maximum control score (0..10)", + "readOnly": true, + "type": "integer", + "format": "int32" + }, + "current": { + "description": "Actual score for the control = (achieved points / total points) * max score. if total points is zeroed, the return number is 0.00", + "readOnly": true, + "type": "number", + "format": "double" + } + } + }, + "SecureScoreControlsList": { + "description": "Page of a secure score controls list", + "type": "object", + "properties": { + "value": { + "description": "Collection of secure score controls in this page", + "readOnly": true, + "type": "array", + "items": { + "$ref": "#/definitions/SecureScoreControlDetails" + } + }, + "nextLink": { + "description": "The URI to fetch the next page.", + "readOnly": true, + "type": "string" + } + } + }, + "SecureScoreControlDetails": { + "description": "List of security sub-assessments", + "type": "object", + "properties": { + "properties": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/SecureScoreControlScoreDetails" + } + }, + "allOf": [ + { + "$ref": "../../../common/v1/types.json#/definitions/Resource" + } + ] + }, + "SecureScoreControlScoreDetails": { + "description": "Calculation result data in control level", + "type": "object", + "properties": { + "displayName": { + "description": "User friendly display name of the control", + "readOnly": true, + "type": "string" + }, + "score": { + "description": "Actual score object for the control", + "x-ms-client-flatten": true, + "$ref": "#/definitions/SecureScoreControlScoreObject" + }, + "healthyResources": { + "description": "Number of healthy resources in the control", + "readOnly": true, + "type": "integer", + "format": "int32" + }, + "unhealthyResources": { + "description": "Number of unhealthy resources in the control", + "readOnly": true, + "type": "integer", + "format": "int32" + }, + "notApplicableResources": { + "description": "Number of not applicable resources in the control", + "readOnly": true, + "type": "integer", + "format": "int32" + }, + "disabledResources": { + "description": "Number of not resources that are disabled by policy in the control", + "readOnly": true, + "type": "integer", + "format": "int32" + }, + "achievedPoints": { + "description": "Number of points achieved for the controls", + "readOnly": true, + "type": "integer", + "format": "int32" + }, + "totalPoints": { + "description": "Total Number of points available in the control", + "readOnly": true, + "type": "integer", + "format": "int32" + } + } + }, + "SecureScoreControlsDefinitionList": { + "description": "Page of a secure score controls definition list", + "type": "object", + "properties": { + "value": { + "description": "Collection of secure score controls definition in this page", + "readOnly": true, + "type": "array", + "items": { + "$ref": "#/definitions/SecureScoreControlDefinitionItem" + } + }, + "nextLink": { + "description": "The URI to fetch the next page.", + "readOnly": true, + "type": "string" + } + } + }, + "SecureScoreControlDefinitionItem": { + "description": "Secure Score Control's Definition information", + "type": "object", + "properties": { + "properties": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/SecureScoreControlDefinitionItemProperties" } - } - }, - "SecureScoreControlsList": { - "description": "Page of a secure score controls list", - "type": "object", - "properties": { - "value": { - "description": "Collection of secure score controls in this page", - "readOnly": true, - "type": "array", - "items": { - "$ref": "#/definitions/SecureScoreControlDetails" - } - }, - "nextLink": { - "description": "The URI to fetch the next page.", - "readOnly": true, - "type": "string" - } - } - }, - "SecureScoreControlDetails": { - "description": "List of security sub-assessments", - "type": "object", - "properties": { - "properties":{ - "x-ms-client-flatten": true, - "$ref": "#/definitions/SecureScoreControlScoreDetails" - } - }, - "allOf": [ - { - "$ref": "../../../common/v1/types.json#/definitions/Resource" - } - ] - }, - "SecureScoreControlScoreDetails": { - "description": "Calculation result data in control level", - "type": "object", - "properties": { - "displayName": { - "description": "User friendly display name of the control", - "readOnly": true, - "type": "string" - }, - "score": { - "description": "Actual score object for the control", - "x-ms-client-flatten": true, - "$ref": "#/definitions/SecureScoreControlScoreObject" - }, - "healthyResources": { - "description": "Number of healthy resources in the control", - "readOnly": true, - "type": "integer", - "format": "int32" - }, - "unhealthyResources": { - "description": "Number of unhealthy resources in the control", - "readOnly": true, - "type": "integer", - "format": "int32" - }, - "notApplicableResources": { - "description": "Number of not applicable resources in the control", - "readOnly": true, - "type": "integer", - "format": "int32" - }, - "disabledResources": { - "description": "Number of not resources that are disabled by policy in the control", - "readOnly": true, - "type": "integer", - "format": "int32" - }, - "achievedPoints": { - "description": "Number of points achieved for the controls", - "readOnly": true, - "type": "integer", - "format": "int32" - }, - "totalPoints": { - "description": "Total Number of points available in the control", - "readOnly": true, - "type": "integer", - "format": "int32" - } - } - }, - "SecureScoreControlsDefinitionList": { - "description": "Page of a secure score controls definition list", - "type": "object", - "properties": { - "value": { - "description": "Collection of secure score controls definition in this page", - "readOnly": true, - "type": "array", - "items": { - "$ref": "#/definitions/SecureScoreControlDefinitionItem" - } - }, - "nextLink": { - "description": "The URI to fetch the next page.", - "readOnly": true, - "type": "string" - } - } - }, - "SecureScoreControlDefinitionItem": { - "description": "Secure Score Control's Definition information", - "type": "object", - "properties": { - "properties": { - "x-ms-client-flatten": true, - "$ref": "#/definitions/SecureScoreControlDefinitionItemProperties" - } - }, - "allOf": [ - { - "$ref": "../../../common/v1/types.json#/definitions/Resource" - } - ] - }, - "SecureScoreControlDefinitionItemProperties": { - "description": "Secure Score Control Definition Properties", - "type": "object", - "properties": { - "displayName": { - "description": "User friendly display name of the control", - "readOnly": true, - "type": "string" - }, - "description": { - "description": "User friendly display name of the control", - "readOnly": true, - "type": "string", - "maxLength": 256 - }, - "maxScore": { - "description": "Maximum control score (0..10)", - "readOnly": true, - "type": "integer", - "format": "int32", - "minimum": 0, - "maximum": 10, - "exclusiveMinimum": false - }, - "source": { - "description": "Source object from which the control was created", - "readOnly": true, - "$ref": "#/definitions/SecureScoreControlDefinitionSource" - }, - "assessmentsDefinition": { - "description": "array of assessments metadata ids", - "readOnly": true, - "type": "array", - "items": { - "$ref": "#/definitions/SecureScoreControlDefinitionAssessmentsId" - } - } - } - }, - "SecureScoreControlDefinitionAssessmentsId": { - "type": "object", - "description": "Secure Score Control Definition Properties", - "properties": { - "id": { - "description": "Full assessment metadata azure ids that build the control", - "readOnly": true, - "type": "string" - } - } - }, - "SecureScoreControlDefinitionSource": { - "description": "representing the source of the control", - "readOnly": true, - "type": "object", - "properties": { - "sourceType": { - "description": "BuiltIn if the control is built-in from Azure Security Center managed assessments, Custom if the assessment based on custom Azure Policy definition, CustomerManaged for customers who build their own controls", - "type": "string", - "enum": [ - "BuiltIn", - "CustomPolicy", - "CustomerManaged" - ], - "x-ms-enum": { - "name": "controlType", - "modelAsString": true, - "values": [ - { - "value": "BuiltIn", - "description": "Azure Security Center managed assessments" - }, - { - "value": "CustomPolicy", - "description": "User defined policies that are automatically ingested from Azure Policy to Azure Security Center" - }, - { - "value": "CustomerManaged", - "description": "User controls pushed directly by the user or other third party to Azure Security Center" - } - ] - } - }, - "policySetDefinitionId": { - "description": "id of the policy set definition id from which the control was generated", - "type": "string" - }, - "groupName": { - "description": "represents the GroupName within the specific policy set definition", - "type": "string" - } - } - } - }, - "parameters": { - "ExpandControlsDefinition": { - "name": "$expand", - "in": "query", - "required": false, - "type": "string", - "description": "OData expand. Optional.", - "x-ms-parameter-location": "method", - "enum": [ - "definition" - ], - "x-ms-enum": { - "name": "ExpandEnum", - "modelAsString": true, - "values": [ - { - "value": "definition", - "description": "Add definition object for each control" - } - ] - } - }, - "secureScoreName": { - "name": "secureScoreName", - "in": "path", - "required": true, - "type": "string", - "description": "The secure score initiative name", - "x-ms-parameter-location": "method" - } - } -} \ No newline at end of file + }, + "allOf": [ + { + "$ref": "../../../common/v1/types.json#/definitions/Resource" + } + ] + }, + "SecureScoreControlDefinitionItemProperties": { + "description": "Secure Score Control Definition Properties", + "type": "object", + "properties": { + "displayName": { + "description": "User friendly display name of the control", + "readOnly": true, + "type": "string" + }, + "description": { + "description": "User friendly display name of the control", + "readOnly": true, + "type": "string", + "maxLength": 256 + }, + "maxScore": { + "description": "Maximum control score (0..10)", + "readOnly": true, + "type": "integer", + "format": "int32", + "minimum": 0, + "maximum": 10, + "exclusiveMinimum": false + }, + "source": { + "description": "Source object from which the control was created", + "readOnly": true, + "$ref": "#/definitions/SecureScoreControlDefinitionSource" + }, + "assessmentsDefinition": { + "description": "array of assessments metadata ids", + "readOnly": true, + "type": "array", + "items": { + "$ref": "#/definitions/SecureScoreControlDefinitionAssessmentsId" + } + } + } + }, + "SecureScoreControlDefinitionAssessmentsId": { + "type": "object", + "description": "Secure Score Control Definition Properties", + "properties": { + "id": { + "description": "Full assessment metadata azure ids that build the control", + "readOnly": true, + "type": "string" + } + } + }, + "SecureScoreControlDefinitionSource": { + "description": "representing the source of the control", + "readOnly": true, + "type": "object", + "properties": { + "sourceType": { + "description": "BuiltIn if the control is built-in from Azure Security Center managed assessments, Custom if the assessment based on custom Azure Policy definition, CustomerManaged for customers who build their own controls", + "type": "string", + "enum": [ + "BuiltIn", + "CustomPolicy", + "CustomerManaged" + ], + "x-ms-enum": { + "name": "controlType", + "modelAsString": true, + "values": [ + { + "value": "BuiltIn", + "description": "Azure Security Center managed assessments" + }, + { + "value": "CustomPolicy", + "description": "User defined policies that are automatically ingested from Azure Policy to Azure Security Center" + }, + { + "value": "CustomerManaged", + "description": "User controls pushed directly by the user or other third party to Azure Security Center" + } + ] + } + }, + "policySetDefinitionId": { + "description": "id of the policy set definition id from which the control was generated", + "type": "string" + }, + "groupName": { + "description": "represents the GroupName within the specific policy set definition", + "type": "string" + } + } + } + }, + "parameters": { + "ExpandControlsDefinition": { + "name": "$expand", + "in": "query", + "required": false, + "type": "string", + "description": "OData expand. Optional.", + "x-ms-parameter-location": "method", + "enum": [ + "definition" + ], + "x-ms-enum": { + "name": "ExpandEnum", + "modelAsString": true, + "values": [ + { + "value": "definition", + "description": "Add definition object for each control" + } + ] + } + }, + "secureScoreName": { + "name": "secureScoreName", + "in": "path", + "required": true, + "type": "string", + "description": "The secure score initiative name", + "x-ms-parameter-location": "method" + } + } +} From a92a2d71f94363081fdc31c65dfc60da64fc5760 Mon Sep 17 00:00:00 2001 From: Gideon Romm Date: Tue, 28 Jan 2020 14:40:40 +0200 Subject: [PATCH 16/53] Changed initiativeId to policySetDefinitionId in the sample files --- .../ListSecureScoreControlsDefinition_example.json | 10 +++++----- ...ScoreControlsForNameWithExpand_builtin_example.json | 6 +++--- ...eScoreControlsForNameWithExpand_custom_example.json | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScoreControlsDefinition/ListSecureScoreControlsDefinition_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScoreControlsDefinition/ListSecureScoreControlsDefinition_example.json index 7e0aa1d850c0..592acc79a432 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScoreControlsDefinition/ListSecureScoreControlsDefinition_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScoreControlsDefinition/ListSecureScoreControlsDefinition_example.json @@ -13,7 +13,7 @@ "properties": { "source": { "sourceType": "Builtin", - "initiativeId": "/providers/Microsoft.Authorization/policySetDefinitions/1f3afdf9-d0c9-4c3d-847f-89da613e70a8" + "policySetDefinitionId": "/providers/Microsoft.Authorization/policySetDefinitions/1f3afdf9-d0c9-4c3d-847f-89da613e70a8" }, "displayName": "Protect applications against DDoS attacks", "description": "", @@ -32,7 +32,7 @@ "properties": { "source": { "sourceType": "Builtin", - "initiativeId": "/providers/Microsoft.Authorization/policySetDefinitions/1f3afdf9-d0c9-4c3d-847f-89da613e70a8" + "policySetDefinitionId": "/providers/Microsoft.Authorization/policySetDefinitions/1f3afdf9-d0c9-4c3d-847f-89da613e70a8" }, "displayName": "Enable MFA", "description": "", @@ -57,7 +57,7 @@ "properties": { "source": { "sourceType": "Builtin", - "initiativeId": "/providers/Microsoft.Authorization/policySetDefinitions/1f3afdf9-d0c9-4c3d-847f-89da613e70a8" + "policySetDefinitionId": "/providers/Microsoft.Authorization/policySetDefinitions/1f3afdf9-d0c9-4c3d-847f-89da613e70a8" }, "displayName": "Apply adaptive application control", "description": "", @@ -85,7 +85,7 @@ "properties": { "source": { "sourceType": "CustomPolicy", - "initiativeId": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Authorization/policySetDefinitions/1203fdf9-eeee-ffff-847f-89da613eabcd" + "policySetDefinitionId": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Authorization/policySetDefinitions/1203fdf9-eeee-ffff-847f-89da613eabcd" }, "displayName": "Apply adaptive application control", "description": "", @@ -107,7 +107,7 @@ "properties": { "source": { "sourceType": "CustomPolicy", - "initiativeId": "/subscriptions/11111111-e762-44dd-bd96-202020202020/providers/Microsoft.Authorization/policySetDefinitions/dddddddd-eeee-ffff-847f-89da613eabcd" + "policySetDefinitionId": "/subscriptions/11111111-e762-44dd-bd96-202020202020/providers/Microsoft.Authorization/policySetDefinitions/dddddddd-eeee-ffff-847f-89da613eabcd" }, "displayName": "My custom application control", "description": "", diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_builtin_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_builtin_example.json index b4ab5919654e..49b8685819c9 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_builtin_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_builtin_example.json @@ -37,7 +37,7 @@ "properties": { "source": { "sourceType": "Builtin", - "initiativeId": "/providers/Microsoft.Authorization/policySetDefinitions/1f3afdf9-d0c9-4c3d-847f-89da613e70a8" + "policySetDefinitionId": "/providers/Microsoft.Authorization/policySetDefinitions/1f3afdf9-d0c9-4c3d-847f-89da613e70a8" }, "displayName": "Protect applications against DDoS attacks", "description": "", @@ -76,7 +76,7 @@ "properties": { "source": { "sourceType": "Builtin", - "initiativeId": "/providers/Microsoft.Authorization/policySetDefinitions/1f3afdf9-d0c9-4c3d-847f-89da613e70a8" + "policySetDefinitionId": "/providers/Microsoft.Authorization/policySetDefinitions/1f3afdf9-d0c9-4c3d-847f-89da613e70a8" }, "displayName": "Enable MFA", "description": "", @@ -121,7 +121,7 @@ "properties": { "source": { "sourceType": "Builtin", - "initiativeId": "/providers/Microsoft.Authorization/policySetDefinitions/1f3afdf9-d0c9-4c3d-847f-89da613e70a8" + "policySetDefinitionId": "/providers/Microsoft.Authorization/policySetDefinitions/1f3afdf9-d0c9-4c3d-847f-89da613e70a8" }, "displayName": "Apply adaptive application control", "description": "", diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_custom_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_custom_example.json index cb209313d7c4..396424be56a9 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_custom_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_custom_example.json @@ -37,7 +37,7 @@ "properties": { "source": { "sourceType": "CustomPolicy", - "initiativeId": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Authorization/policySetDefinitions/1203fdf9-eeee-ffff-847f-89da613eabcd" + "policySetDefinitionId": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Authorization/policySetDefinitions/1203fdf9-eeee-ffff-847f-89da613eabcd" }, "displayName": "Apply adaptive application control", "description": "", From 246ce75597332ade4b5b791ec9f53d7508923234 Mon Sep 17 00:00:00 2001 From: Gideon Romm Date: Tue, 28 Jan 2020 14:42:38 +0200 Subject: [PATCH 17/53] Changed assessmentsMetadata to assessmentsDefinition --- .../ListSecureScoreControlsDefinition_example.json | 10 +++++----- ...ScoreControlsForNameWithExpand_builtin_example.json | 6 +++--- ...eScoreControlsForNameWithExpand_custom_example.json | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScoreControlsDefinition/ListSecureScoreControlsDefinition_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScoreControlsDefinition/ListSecureScoreControlsDefinition_example.json index 592acc79a432..8bca1dd3018d 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScoreControlsDefinition/ListSecureScoreControlsDefinition_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScoreControlsDefinition/ListSecureScoreControlsDefinition_example.json @@ -18,7 +18,7 @@ "displayName": "Protect applications against DDoS attacks", "description": "", "maxScore": 2, - "assessmentsMetadata": [ + "assessmentsDefinition": [ { "id": "/providers/Microsoft.Security/assessmentMetadata/e3de1cc0-f4dd-3b34-e496-8b5381ba2d70" } @@ -37,7 +37,7 @@ "displayName": "Enable MFA", "description": "", "maxScore": 10, - "assessmentsMetadata": [ + "assessmentsDefinition": [ { "id": "/providers/Microsoft.Security/assessmentMetadata/151e82c5-5341-a74b-1eb0-bc38d2c84bb5" }, @@ -62,7 +62,7 @@ "displayName": "Apply adaptive application control", "description": "", "maxScore": 3, - "assessmentsMetadata": [ + "assessmentsDefinition": [ { "id": "/providers/Microsoft.Security/assessmentMetadata/35f45c95-27cf-4e52-891f-8390d1de5828" }, @@ -90,7 +90,7 @@ "displayName": "Apply adaptive application control", "description": "", "maxScore": 3, - "assessmentsMetadata": [ + "assessmentsDefinition": [ { "id": "/providers/Microsoft.Security/assessmentMetadata/e3de1cc0-f4dd-3b34-e496-8b5381ba2d70" }, @@ -112,7 +112,7 @@ "displayName": "My custom application control", "description": "", "maxScore": 5, - "assessmentsMetadata": [ + "assessmentsDefinition": [ { "id": "/subscriptions/11111111-e762-44dd-bd96-202020202020/providers/Microsoft.Security/assessmentMetadata/12345678-9a04-0000-2eed-565656565656" } diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_builtin_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_builtin_example.json index 49b8685819c9..00d3e9cba432 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_builtin_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_builtin_example.json @@ -42,7 +42,7 @@ "displayName": "Protect applications against DDoS attacks", "description": "", "maxScore": 2, - "assessmentsMetadata": [ + "assessmentsDefinition": [ { "id": "/providers/Microsoft.Security/assessmentMetadata/e3de1cc0-f4dd-3b34-e496-8b5381ba2d70" } @@ -81,7 +81,7 @@ "displayName": "Enable MFA", "description": "", "maxScore": 10, - "assessmentsMetadata": [ + "assessmentsDefinition": [ { "id": "/providers/Microsoft.Security/assessmentMetadata/151e82c5-5341-a74b-1eb0-bc38d2c84bb5" }, @@ -126,7 +126,7 @@ "displayName": "Apply adaptive application control", "description": "", "maxScore": 3, - "assessmentsMetadata": [ + "assessmentsDefinition": [ { "id": "/providers/Microsoft.Security/assessmentMetadata/35f45c95-27cf-4e52-891f-8390d1de5828" }, diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_custom_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_custom_example.json index 396424be56a9..b3e8a0c3238b 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_custom_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_custom_example.json @@ -42,7 +42,7 @@ "displayName": "Apply adaptive application control", "description": "", "maxScore": 3, - "assessmentsMetadata": [ + "assessmentsDefinition": [ { "id": "/providers/Microsoft.Security/assessmentMetadata/e3de1cc0-f4dd-3b34-e496-8b5381ba2d70" }, From 0e8e4e6294d48de5fe352ab265475a2d6990aeda Mon Sep 17 00:00:00 2001 From: Gideon Romm Date: Tue, 28 Jan 2020 14:49:36 +0200 Subject: [PATCH 18/53] Added scope in defintions example and adjust enum value of BuiltIn --- .../ListSecureScoreControlsDefinition_example.json | 9 +++++---- ...reScoreControlsForNameWithExpand_builtin_example.json | 6 +++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScoreControlsDefinition/ListSecureScoreControlsDefinition_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScoreControlsDefinition/ListSecureScoreControlsDefinition_example.json index 8bca1dd3018d..4984d0b015bd 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScoreControlsDefinition/ListSecureScoreControlsDefinition_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScoreControlsDefinition/ListSecureScoreControlsDefinition_example.json @@ -1,6 +1,7 @@ { "parameters": { - "api-version": "2020-01-01-preview" + "api-version": "2020-01-01-preview", + "scope": "" }, "responses": { "200": { @@ -12,7 +13,7 @@ "type": "Microsoft.Security/SecureScoresControlMetadata", "properties": { "source": { - "sourceType": "Builtin", + "sourceType": "BuiltIn", "policySetDefinitionId": "/providers/Microsoft.Authorization/policySetDefinitions/1f3afdf9-d0c9-4c3d-847f-89da613e70a8" }, "displayName": "Protect applications against DDoS attacks", @@ -31,7 +32,7 @@ "type": "Microsoft.Security/SecureScoresControlMetadata", "properties": { "source": { - "sourceType": "Builtin", + "sourceType": "BuiltIn", "policySetDefinitionId": "/providers/Microsoft.Authorization/policySetDefinitions/1f3afdf9-d0c9-4c3d-847f-89da613e70a8" }, "displayName": "Enable MFA", @@ -56,7 +57,7 @@ "type": "Microsoft.Security/SecureScoresControlMetadata", "properties": { "source": { - "sourceType": "Builtin", + "sourceType": "BuiltIn", "policySetDefinitionId": "/providers/Microsoft.Authorization/policySetDefinitions/1f3afdf9-d0c9-4c3d-847f-89da613e70a8" }, "displayName": "Apply adaptive application control", diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_builtin_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_builtin_example.json index 00d3e9cba432..5fb669f6da4d 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_builtin_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_builtin_example.json @@ -36,7 +36,7 @@ "type": "Microsoft.Security/SecureScoresControlMetadata", "properties": { "source": { - "sourceType": "Builtin", + "sourceType": "BuiltIn", "policySetDefinitionId": "/providers/Microsoft.Authorization/policySetDefinitions/1f3afdf9-d0c9-4c3d-847f-89da613e70a8" }, "displayName": "Protect applications against DDoS attacks", @@ -75,7 +75,7 @@ "type": "Microsoft.Security/SecureScoresControlMetadata", "properties": { "source": { - "sourceType": "Builtin", + "sourceType": "BuiltIn", "policySetDefinitionId": "/providers/Microsoft.Authorization/policySetDefinitions/1f3afdf9-d0c9-4c3d-847f-89da613e70a8" }, "displayName": "Enable MFA", @@ -120,7 +120,7 @@ "type": "Microsoft.Security/SecureScoresControlMetadata", "properties": { "source": { - "sourceType": "Builtin", + "sourceType": "BuiltIn", "policySetDefinitionId": "/providers/Microsoft.Authorization/policySetDefinitions/1f3afdf9-d0c9-4c3d-847f-89da613e70a8" }, "displayName": "Apply adaptive application control", From 3abf5eaae15a32a1dcd540ab40d4cc0a2c6509ce Mon Sep 17 00:00:00 2001 From: Gideon Romm Date: Tue, 28 Jan 2020 14:58:07 +0200 Subject: [PATCH 19/53] Added missing fields and align examples --- ...rolsForNameWithExpand_builtin_example.json | 60 ++++++++---------- ...trolsForNameWithExpand_custom_example.json | 20 +++--- ...eScoreControlsForName_builtin_example.json | 63 +++++++++---------- 3 files changed, 65 insertions(+), 78 deletions(-) diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_builtin_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_builtin_example.json index 5fb669f6da4d..aa3c3e639def 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_builtin_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_builtin_example.json @@ -18,17 +18,15 @@ "type": "Microsoft.Security/securescorescontrol", "properties": { "displayName": "Protect applications against DDoS attacks", - "data": { - "healthyResources": 0, - "unhealthyResources": 0, - "notApplicableResources": 10, - "disabledResources": 50, - "achievedResourcesPoints": 0, - "totalResourcesPoints": 0, - "score": { - "max": 0, - "current": 0 - } + "healthyResources": 0, + "unhealthyResources": 0, + "notApplicableResources": 10, + "disabledResources": 50, + "achievedResourcesPoints": 0, + "totalResourcesPoints": 0, + "score": { + "max": 0, + "current": 0 }, "definition": { "id": "/providers/Microsoft.Security/secureScoreControlsDefinition/a9909064-42b4-4d34-8143-275477afe18b", @@ -57,17 +55,15 @@ "type": "Microsoft.Security/securescorescontrol", "properties": { "displayName": "Enable MFA", - "data": { - "healthyResources": 0, - "unhealthyResources": 1, - "notApplicableResources": 0, - "disabledResources": 0, - "achievedResourcesPoints": 0, - "totalResourcesPoints": 1, - "score": { - "max": 10, - "current": 0 - } + "healthyResources": 0, + "unhealthyResources": 1, + "notApplicableResources": 0, + "disabledResources": 0, + "achievedResourcesPoints": 0, + "totalResourcesPoints": 1, + "score": { + "max": 10, + "current": 0 }, "definition": { "id": "/providers/Microsoft.Security/secureScoreControlsDefinition/34a42fb3-e6db-409c-b56b-7b1db6b8aee0", @@ -102,17 +98,15 @@ "type": "Microsoft.Security/securescorescontrol", "properties": { "displayName": "Apply adaptive application control", - "data": { - "healthyResources": 20, - "unhealthyResources": 0, - "notApplicableResources": 10, - "disabledResources": 5, - "achievedResourcesPoints": 20, - "totalResourcesPoints": 20, - "score": { - "max": 3, - "current": 3 - } + "healthyResources": 20, + "unhealthyResources": 0, + "notApplicableResources": 10, + "disabledResources": 5, + "achievedResourcesPoints": 20, + "totalResourcesPoints": 20, + "score": { + "max": 3, + "current": 3 }, "definition": { "id": "/providers/Microsoft.Security/secureScoreControlsDefinition/a000c66f-6da2-4f9d-826d-2364347d2588", diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_custom_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_custom_example.json index b3e8a0c3238b..362caa6d3bc3 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_custom_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_custom_example.json @@ -18,17 +18,15 @@ "type": "Microsoft.Security/securescorescontrol", "properties": { "displayName": "Protect applications against DDoS attacks", - "data": { - "healthyResources": 0, - "unhealthyResources": 10, - "notApplicableResources": 0, - "disabledResources": 50, - "achievedResourcesPoints": 0, - "totalResourcesPoints": 10, - "score": { - "max": 3, - "current": 0 - } + "healthyResources": 0, + "unhealthyResources": 10, + "notApplicableResources": 0, + "disabledResources": 50, + "achievedResourcesPoints": 0, + "totalResourcesPoints": 10, + "score": { + "max": 3, + "current": 0 }, "definition": { "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScoreControlsDefinition/a9909064-42b4-4d34-8143-275477afe18b", diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_builtin_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_builtin_example.json index c31a12faa25d..4b6449230148 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_builtin_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_builtin_example.json @@ -1,7 +1,8 @@ { "parameters": { "api-version": "2020-01-01-preview", - "scope": "subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23" + "scope": "subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23", + "secureScoreName": "ascDefault" }, "responses": { "200": { @@ -13,17 +14,15 @@ "type": "Microsoft.Security/securescorescontrol", "properties": { "displayName": "Protect applications against DDoS attacks", - "data": { - "healthyResources": 0, - "unhealthyResources": 0, - "notApplicableResources": 10, - "disabledResources": 50, - "achievedResourcesPoints": 0, - "totalResourcesPoints": 0, - "score": { - "max": 0, - "current": 0 - } + "healthyResources": 0, + "unhealthyResources": 0, + "notApplicableResources": 10, + "disabledResources": 50, + "achievedResourcesPoints": 0, + "totalResourcesPoints": 0, + "score": { + "max": 0, + "current": 0 } } }, @@ -33,17 +32,15 @@ "type": "Microsoft.Security/securescorescontrol", "properties": { "displayName": "Enable MFA", - "data": { - "healthyResources": 0, - "unhealthyResources": 1, - "notApplicableResources": 0, - "disabledResources": 0, - "achievedResourcesPoints": 0, - "totalResourcesPoints": 1, - "score": { - "max": 10, - "current": 0 - } + "healthyResources": 0, + "unhealthyResources": 1, + "notApplicableResources": 0, + "disabledResources": 0, + "achievedResourcesPoints": 0, + "totalResourcesPoints": 1, + "score": { + "max": 10, + "current": 0 } } }, @@ -53,17 +50,15 @@ "type": "Microsoft.Security/securescorescontrol", "properties": { "displayName": "Apply adaptive application control", - "data": { - "healthyResources": 20, - "unhealthyResources": 0, - "notApplicableResources": 10, - "disabledResources": 5, - "achievedResourcesPoints": 20, - "totalResourcesPoints": 20, - "score": { - "max": 3, - "current": 3 - } + "healthyResources": 20, + "unhealthyResources": 0, + "notApplicableResources": 10, + "disabledResources": 5, + "achievedResourcesPoints": 20, + "totalResourcesPoints": 20, + "score": { + "max": 3, + "current": 3 } } } From ad5edf2af10889b9e00659e9570492788852f5da Mon Sep 17 00:00:00 2001 From: Gideon Romm Date: Tue, 28 Jan 2020 15:11:12 +0200 Subject: [PATCH 20/53] Renamed fields in example files --- ...oreControlsForNameWithExpand_builtin_example.json | 12 ++++++------ ...coreControlsForNameWithExpand_custom_example.json | 4 ++-- ...stSecureScoreControlsForName_builtin_example.json | 12 ++++++------ ...istSecureScoreControlsForName_custom_example.json | 4 ++-- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_builtin_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_builtin_example.json index aa3c3e639def..410579e8d927 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_builtin_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_builtin_example.json @@ -22,8 +22,8 @@ "unhealthyResources": 0, "notApplicableResources": 10, "disabledResources": 50, - "achievedResourcesPoints": 0, - "totalResourcesPoints": 0, + "achievedPoints": 0, + "totalPoints": 0, "score": { "max": 0, "current": 0 @@ -59,8 +59,8 @@ "unhealthyResources": 1, "notApplicableResources": 0, "disabledResources": 0, - "achievedResourcesPoints": 0, - "totalResourcesPoints": 1, + "achievedPoints": 0, + "totalPoints": 1, "score": { "max": 10, "current": 0 @@ -102,8 +102,8 @@ "unhealthyResources": 0, "notApplicableResources": 10, "disabledResources": 5, - "achievedResourcesPoints": 20, - "totalResourcesPoints": 20, + "achievedPoints": 20, + "totalPoints": 20, "score": { "max": 3, "current": 3 diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_custom_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_custom_example.json index 362caa6d3bc3..743394ac4776 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_custom_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_custom_example.json @@ -22,8 +22,8 @@ "unhealthyResources": 10, "notApplicableResources": 0, "disabledResources": 50, - "achievedResourcesPoints": 0, - "totalResourcesPoints": 10, + "achievedPoints": 0, + "totalPoints": 10, "score": { "max": 3, "current": 0 diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_builtin_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_builtin_example.json index 4b6449230148..9c405078aa0b 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_builtin_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_builtin_example.json @@ -18,8 +18,8 @@ "unhealthyResources": 0, "notApplicableResources": 10, "disabledResources": 50, - "achievedResourcesPoints": 0, - "totalResourcesPoints": 0, + "achievedPoints": 0, + "totalPoints": 0, "score": { "max": 0, "current": 0 @@ -36,8 +36,8 @@ "unhealthyResources": 1, "notApplicableResources": 0, "disabledResources": 0, - "achievedResourcesPoints": 0, - "totalResourcesPoints": 1, + "achievedPoints": 0, + "totalPoints": 1, "score": { "max": 10, "current": 0 @@ -54,8 +54,8 @@ "unhealthyResources": 0, "notApplicableResources": 10, "disabledResources": 5, - "achievedResourcesPoints": 20, - "totalResourcesPoints": 20, + "achievedPoints": 20, + "totalPoints": 20, "score": { "max": 3, "current": 3 diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_custom_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_custom_example.json index 30c9f4abb65b..0b4f3bd4cb4c 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_custom_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_custom_example.json @@ -18,8 +18,8 @@ "unhealthyResources": 10, "notApplicableResources": 0, "disabledResources": 50, - "achievedResourcesPoints": 0, - "totalResourcesPoints": 10, + "achievedPoints": 0, + "totalPoints": 10, "score": { "max": 2, "current": 0 From 3a5ad17382dff598ded886b674a74a00534ede67 Mon Sep 17 00:00:00 2001 From: Gideon Romm Date: Tue, 28 Jan 2020 17:08:02 +0200 Subject: [PATCH 21/53] Changed return value --- .../examples/secureScores/ListSecureScores_example.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScores_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScores_example.json index 7912d3d7cf95..956c1b81dfe3 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScores_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScores_example.json @@ -15,7 +15,7 @@ "displayName": "asc Default", "score": { "max": 13, - "current": 3 + "current": 3.5 } } }, @@ -27,7 +27,7 @@ "displayName": "Custom A", "score": { "max": 2, - "current": 0 + "current": 0.00 } } } From e04d4b7a01c0fc228bf8d4ae11a8c773741f237a Mon Sep 17 00:00:00 2001 From: Gideon Romm Date: Tue, 28 Jan 2020 17:43:06 +0200 Subject: [PATCH 22/53] Added control definitions per subscription scope --- ...SecureScoreControlsDefinition_example.json | 3 +- ...ntrolsDefinition_subscription_example.json | 105 ++++++++++++++++++ .../2020-01-01-preview/secureScore.json | 46 +++++++- 3 files changed, 147 insertions(+), 7 deletions(-) create mode 100644 specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScoreControlsDefinition/ListSecureScoreControlsDefinition_subscription_example.json diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScoreControlsDefinition/ListSecureScoreControlsDefinition_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScoreControlsDefinition/ListSecureScoreControlsDefinition_example.json index 4984d0b015bd..84168e5f57d2 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScoreControlsDefinition/ListSecureScoreControlsDefinition_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScoreControlsDefinition/ListSecureScoreControlsDefinition_example.json @@ -1,7 +1,6 @@ { "parameters": { - "api-version": "2020-01-01-preview", - "scope": "" + "api-version": "2020-01-01-preview" }, "responses": { "200": { diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScoreControlsDefinition/ListSecureScoreControlsDefinition_subscription_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScoreControlsDefinition/ListSecureScoreControlsDefinition_subscription_example.json new file mode 100644 index 000000000000..086bd7599b97 --- /dev/null +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScoreControlsDefinition/ListSecureScoreControlsDefinition_subscription_example.json @@ -0,0 +1,105 @@ +{ + "parameters": { + "api-version": "2020-01-01-preview", + "subscriptionId": "11111111-e762-44dd-bd96-202020202020" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/providers/Microsoft.Security/secureScoreControlsDefinition/a9909064-42b4-4d34-8143-275477afe18b", + "name": "a9909064-42b4-4d34-8143-275477afe18b", + "type": "Microsoft.Security/SecureScoresControlMetadata", + "properties": { + "source": { + "sourceType": "BuiltIn", + "policySetDefinitionId": "/providers/Microsoft.Authorization/policySetDefinitions/1f3afdf9-d0c9-4c3d-847f-89da613e70a8" + }, + "displayName": "Protect applications against DDoS attacks", + "description": "", + "maxScore": 2, + "assessmentsDefinition": [ + { + "id": "/providers/Microsoft.Security/assessmentMetadata/e3de1cc0-f4dd-3b34-e496-8b5381ba2d70" + } + ] + } + }, + { + "id": "/providers/Microsoft.Security/secureScoreControlsDefinition/34a42fb3-e6db-409c-b56b-7b1db6b8aee0", + "name": "34a42fb3-e6db-409c-b56b-7b1db6b8aee0", + "type": "Microsoft.Security/SecureScoresControlMetadata", + "properties": { + "source": { + "sourceType": "BuiltIn", + "policySetDefinitionId": "/providers/Microsoft.Authorization/policySetDefinitions/1f3afdf9-d0c9-4c3d-847f-89da613e70a8" + }, + "displayName": "Enable MFA", + "description": "", + "maxScore": 10, + "assessmentsDefinition": [ + { + "id": "/providers/Microsoft.Security/assessmentMetadata/151e82c5-5341-a74b-1eb0-bc38d2c84bb5" + }, + { + "id": "/providers/Microsoft.Security/assessmentMetadata/57e98606-6b1e-6193-0e3d-fe621387c16b" + }, + { + "id": "/providers/Microsoft.Security/assessmentMetadata/94290b00-4d0c-d7b4-7cea-064a9554e681" + } + ] + } + }, + { + "id": "/providers/Microsoft.Security/secureScoreControlsDefinition/a000c66f-6da2-4f9d-826d-2364347d2588", + "name": "a000c66f-6da2-4f9d-826d-2364347d2588", + "type": "Microsoft.Security/SecureScoresControlMetadata", + "properties": { + "source": { + "sourceType": "BuiltIn", + "policySetDefinitionId": "/providers/Microsoft.Authorization/policySetDefinitions/1f3afdf9-d0c9-4c3d-847f-89da613e70a8" + }, + "displayName": "Apply adaptive application control", + "description": "", + "maxScore": 3, + "assessmentsDefinition": [ + { + "id": "/providers/Microsoft.Security/assessmentMetadata/35f45c95-27cf-4e52-891f-8390d1de5828" + }, + { + "id": "/providers/Microsoft.Security/assessmentMetadata/d1db3318-01ff-16de-29eb-28b344515626" + }, + { + "id": "/providers/Microsoft.Security/assessmentMetadata/e7ee30c4-bac9-2966-54bd-2023a4282872" + }, + { + "id": "/providers/Microsoft.Security/assessmentMetadata/8e2b96ff-3de2-289b-b5c1-3b9921a3441e" + } + ] + } + }, + { + "id": "/subscriptions/11111111-e762-44dd-bd96-202020202020/providers/Microsoft.Security/secureScoreControlsDefinition/a9909064-42b4-4d34-8143-275477afe18b", + "name": "a9909064-42b4-4d34-8143-275477afe18b", + "type": "Microsoft.Security/SecureScoresControlMetadata", + "properties": { + "source": { + "sourceType": "CustomPolicy", + "policySetDefinitionId": "/subscriptions/11111111-e762-44dd-bd96-202020202020/providers/Microsoft.Authorization/policySetDefinitions/dddddddd-eeee-ffff-847f-89da613eabcd" + }, + "displayName": "My custom application control", + "description": "", + "maxScore": 5, + "assessmentsDefinition": [ + { + "id": "/subscriptions/11111111-e762-44dd-bd96-202020202020/providers/Microsoft.Security/assessmentMetadata/12345678-9a04-0000-2eed-565656565656" + } + ] + } + } + ] + } + } + } +} diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json index 2ccf324d7776..cf0eb014cc88 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json @@ -166,7 +166,7 @@ } } }, - "/{scope}/providers/Microsoft.Security/secureScoreControlsDefinition": { + "/providers/Microsoft.Security/secureScoreControlsDefinition": { "get": { "x-ms-examples": { "List secure score controls definition": { @@ -181,9 +181,6 @@ "parameters": [ { "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" - }, - { - "$ref": "../../../common/v1/types.json#/parameters/Scope" } ], "responses": { @@ -204,7 +201,46 @@ "nextLinkName": "nextLink" } } - } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.Security/secureScoreControlsDefinition": { + "get": { + "x-ms-examples": { + "List secure score controls definition": { + "$ref": "./examples/secureScoreControlsDefinition/ListSecureScoreControlsDefinition_subscription_example.json" + } + }, + "tags": [ + "Secure Score Controls Definition" + ], + "description": "Get definition information on all secure score controls in subscription level", + "operationId": "SecureScoreControlsDefinitionSubscription_List", + "parameters": [ + { + "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/SubscriptionId" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/SecureScoreControlsDefinitionList" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "../../../common/v1/types.json#/definitions/CloudError" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + } }, "definitions": { "SecureScoresList": { From 8121bcf9f2c74f61bffba56fd31c3eb76eb5fdc6 Mon Sep 17 00:00:00 2001 From: Gideon Romm Date: Wed, 29 Jan 2020 10:18:07 +0200 Subject: [PATCH 23/53] Added definition property (optional, in case of $expand) --- .../preview/2020-01-01-preview/secureScore.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json index cf0eb014cc88..4ba8ecc08826 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json @@ -418,7 +418,10 @@ "readOnly": true, "type": "integer", "format": "int32" - } + }, + "definition": { + "$ref": "#/definitions/SecureScoreControlDefinitionItem" + } } }, "SecureScoreControlsDefinitionList": { From ff354964ff47cac1494263e2df83c95350565659 Mon Sep 17 00:00:00 2001 From: Gideon Romm Date: Wed, 29 Jan 2020 10:32:22 +0200 Subject: [PATCH 24/53] prettier updated files --- ...ntrolsDefinition_subscription_example.json | 2 +- .../2020-01-01-preview/secureScore.json | 1087 +++++++++-------- 2 files changed, 545 insertions(+), 544 deletions(-) diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScoreControlsDefinition/ListSecureScoreControlsDefinition_subscription_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScoreControlsDefinition/ListSecureScoreControlsDefinition_subscription_example.json index 086bd7599b97..3923ab1be260 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScoreControlsDefinition/ListSecureScoreControlsDefinition_subscription_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScoreControlsDefinition/ListSecureScoreControlsDefinition_subscription_example.json @@ -1,7 +1,7 @@ { "parameters": { "api-version": "2020-01-01-preview", - "subscriptionId": "11111111-e762-44dd-bd96-202020202020" + "subscriptionId": "11111111-e762-44dd-bd96-202020202020" }, "responses": { "200": { diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json index 4ba8ecc08826..4d1ad7110ec8 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json @@ -1,208 +1,208 @@ { - "swagger": "2.0", - "info": { - "title": "Security Center", - "description": "API spec for Microsoft.Security (Azure Security Center) resource provider", - "version": "2020-01-01-preview" - }, - "host": "management.azure.com", - "schemes": [ - "https" - ], - "consumes": [ - "application/json" - ], - "produces": [ - "application/json" - ], - "security": [ - { - "azure_auth": [ - "user_impersonation" - ] - } - ], - "securityDefinitions": { - "azure_auth": { - "type": "oauth2", - "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", - "flow": "implicit", - "description": "Azure Active Directory OAuth2 Flow", - "scopes": { - "user_impersonation": "impersonate your user account" - } - } - }, - "paths": { - "/{scope}/providers/Microsoft.Security/secureScores": { - "get": { - "x-ms-examples": { - "List secure scores": { - "$ref": "./examples/secureScores/ListSecureScores_example.json" - } - }, - "tags": [ - "Secure Scores" - ], - "description": "Get secure scores on all your initiatives inside a scope", - "operationId": "SecureScores_List", - "parameters": [ - { - "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" - }, - { - "$ref": "../../../common/v1/types.json#/parameters/Scope" - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/SecureScoresList" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "../../../common/v1/types.json#/definitions/CloudError" - } - } - }, - "x-ms-pageable": { - "nextLinkName": "nextLink" - } - } - }, - "/{scope}/providers/Microsoft.Security/secureScores/{secureScoreName}": { - "get": { - "x-ms-examples": { - "Get single secure score": { - "$ref": "./examples/secureScores/GetSecureScoresSingle_example.json" - } - }, - "tags": [ - "Secure Scores" - ], - "description": "Get secure score for a specific initiatives inside a scope", - "operationId": "GetSecureScores_Single", - "parameters": [ - { - "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" - }, - { - "$ref": "../../../common/v1/types.json#/parameters/Scope" - }, - { - "$ref": "#/parameters/secureScoreName" - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/SecureScoresItem" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "../../../common/v1/types.json#/definitions/CloudError" - } - } - } - } - }, - "/{scope}/providers/Microsoft.Security/secureScores/{secureScoreName}/controls": { - "get": { - "x-ms-examples": { - "List secure score's controls level for the specified name (builtin)": { - "$ref": "./examples/secureScores/ListSecureScoreControlsForName_builtin_example.json" - }, - "List secure score's controls level for the specified name (custom)": { - "$ref": "./examples/secureScores/ListSecureScoreControlsForName_custom_example.json" - }, - "Get secure score's controls level for the specified name with expand parameter (builtin)": { - "$ref": "./examples/secureScores/ListSecureScoreControlsForNameWithExpand_builtin_example.json" - }, - "Get secure score's controls level for the specified name with expand parameter (custom)": { - "$ref": "./examples/secureScores/ListSecureScoreControlsForNameWithExpand_custom_example.json" - } - }, - "tags": [ - "Secure Scores" - ], - "description": "Get all secure score controls on specific initiatives inside a scope", - "operationId": "SecureScoreControls_List", - "parameters": [ - { - "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" - }, - { - "$ref": "../../../common/v1/types.json#/parameters/Scope" - }, - { - "$ref": "#/parameters/secureScoreName" - }, - { - "$ref": "#/parameters/ExpandControlsDefinition" - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/SecureScoreControlsList" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "../../../common/v1/types.json#/definitions/CloudError" - } - } - }, - "x-ms-pageable": { - "nextLinkName": "nextLink" - } - } - }, - "/providers/Microsoft.Security/secureScoreControlsDefinition": { - "get": { - "x-ms-examples": { - "List secure score controls definition": { - "$ref": "./examples/secureScoreControlsDefinition/ListSecureScoreControlsDefinition_example.json" - } - }, - "tags": [ - "Secure Score Controls Definition" - ], - "description": "Get definition information on all secure score controls", - "operationId": "SecureScoreControlsDefinition_List", - "parameters": [ - { - "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/SecureScoreControlsDefinitionList" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "../../../common/v1/types.json#/definitions/CloudError" - } - } - }, - "x-ms-pageable": { - "nextLinkName": "nextLink" - } - } + "swagger": "2.0", + "info": { + "title": "Security Center", + "description": "API spec for Microsoft.Security (Azure Security Center) resource provider", + "version": "2020-01-01-preview" }, - "/subscriptions/{subscriptionId}/providers/Microsoft.Security/secureScoreControlsDefinition": { + "host": "management.azure.com", + "schemes": [ + "https" + ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "security": [ + { + "azure_auth": [ + "user_impersonation" + ] + } + ], + "securityDefinitions": { + "azure_auth": { + "type": "oauth2", + "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", + "flow": "implicit", + "description": "Azure Active Directory OAuth2 Flow", + "scopes": { + "user_impersonation": "impersonate your user account" + } + } + }, + "paths": { + "/{scope}/providers/Microsoft.Security/secureScores": { + "get": { + "x-ms-examples": { + "List secure scores": { + "$ref": "./examples/secureScores/ListSecureScores_example.json" + } + }, + "tags": [ + "Secure Scores" + ], + "description": "Get secure scores on all your initiatives inside a scope", + "operationId": "SecureScores_List", + "parameters": [ + { + "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/Scope" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/SecureScoresList" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "../../../common/v1/types.json#/definitions/CloudError" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/{scope}/providers/Microsoft.Security/secureScores/{secureScoreName}": { + "get": { + "x-ms-examples": { + "Get single secure score": { + "$ref": "./examples/secureScores/GetSecureScoresSingle_example.json" + } + }, + "tags": [ + "Secure Scores" + ], + "description": "Get secure score for a specific initiatives inside a scope", + "operationId": "GetSecureScores_Single", + "parameters": [ + { + "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/Scope" + }, + { + "$ref": "#/parameters/secureScoreName" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/SecureScoresItem" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "../../../common/v1/types.json#/definitions/CloudError" + } + } + } + } + }, + "/{scope}/providers/Microsoft.Security/secureScores/{secureScoreName}/controls": { + "get": { + "x-ms-examples": { + "List secure score's controls level for the specified name (builtin)": { + "$ref": "./examples/secureScores/ListSecureScoreControlsForName_builtin_example.json" + }, + "List secure score's controls level for the specified name (custom)": { + "$ref": "./examples/secureScores/ListSecureScoreControlsForName_custom_example.json" + }, + "Get secure score's controls level for the specified name with expand parameter (builtin)": { + "$ref": "./examples/secureScores/ListSecureScoreControlsForNameWithExpand_builtin_example.json" + }, + "Get secure score's controls level for the specified name with expand parameter (custom)": { + "$ref": "./examples/secureScores/ListSecureScoreControlsForNameWithExpand_custom_example.json" + } + }, + "tags": [ + "Secure Scores" + ], + "description": "Get all secure score controls on specific initiatives inside a scope", + "operationId": "SecureScoreControls_List", + "parameters": [ + { + "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/Scope" + }, + { + "$ref": "#/parameters/secureScoreName" + }, + { + "$ref": "#/parameters/ExpandControlsDefinition" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/SecureScoreControlsList" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "../../../common/v1/types.json#/definitions/CloudError" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/providers/Microsoft.Security/secureScoreControlsDefinition": { + "get": { + "x-ms-examples": { + "List secure score controls definition": { + "$ref": "./examples/secureScoreControlsDefinition/ListSecureScoreControlsDefinition_example.json" + } + }, + "tags": [ + "Secure Score Controls Definition" + ], + "description": "Get definition information on all secure score controls", + "operationId": "SecureScoreControlsDefinition_List", + "parameters": [ + { + "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/SecureScoreControlsDefinitionList" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "../../../common/v1/types.json#/definitions/CloudError" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.Security/secureScoreControlsDefinition": { "get": { "x-ms-examples": { "List secure score controls definition": { @@ -219,7 +219,7 @@ "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" }, { - "$ref": "../../../common/v1/types.json#/parameters/SubscriptionId" + "$ref": "../../../common/v1/types.json#/parameters/SubscriptionId" } ], "responses": { @@ -240,346 +240,347 @@ "nextLinkName": "nextLink" } } - } - }, - "definitions": { - "SecureScoresList": { - "type": "object", - "description": "Page of a secure scores list", - "properties": { - "value": { - "description": "Collection of secure scores in this page", - "readOnly": true, - "type": "array", - "items": { - "$ref": "#/definitions/SecureScoresItem" - } - }, - "nextLink": { - "description": "The URI to fetch the next page.", - "readOnly": true, - "type": "string" - } - } - }, - "SecureScoresItem": { - "description": "Secure score item data model", - "readOnly": true, - "type": "object", - "properties": { - "properties": { - "description": "Secure score item", - "readOnly": true, - "x-ms-client-flatten": true, - "$ref": "#/definitions/SecureScoreItemProperties" - } - }, - "allOf": [ - { - "$ref": "../../../common/v1/types.json#/definitions/Resource" - } - ] - }, - "SecureScoreItemProperties": { - "description": "Describes properties of a calculated secure score.", - "readOnly": true, - "type": "object", - "properties": { - "displayName": { - "description": "User friendly display name of the secure score item", - "readOnly": true, - "type": "string" - }, - "score": { - "description": "score object", - "readOnly": true, - "x-ms-client-flatten": true, - "$ref": "#/definitions/SecureScoreScoreDetails" - } - } - }, - "SecureScoreScoreDetails": { - "description": "Calculation result data", - "readOnly": true, - "type": "object", - "properties": { - "max": { - "description": "Maximum score applicable", - "readOnly": true, - "type": "integer", - "format": "int32" - }, - "current": { - "description": "Actual score", - "readOnly": true, - "type": "number", - "format": "double" - } - } - }, - "SecureScoreControlScoreObject": { - "description": "Calculation result data", - "type": "object", - "properties": { - "max": { - "description": "Maximum control score (0..10)", - "readOnly": true, - "type": "integer", - "format": "int32" - }, - "current": { - "description": "Actual score for the control = (achieved points / total points) * max score. if total points is zeroed, the return number is 0.00", - "readOnly": true, - "type": "number", - "format": "double" - } - } - }, - "SecureScoreControlsList": { - "description": "Page of a secure score controls list", - "type": "object", - "properties": { - "value": { - "description": "Collection of secure score controls in this page", - "readOnly": true, - "type": "array", - "items": { - "$ref": "#/definitions/SecureScoreControlDetails" - } - }, - "nextLink": { - "description": "The URI to fetch the next page.", - "readOnly": true, - "type": "string" - } - } - }, - "SecureScoreControlDetails": { - "description": "List of security sub-assessments", - "type": "object", - "properties": { - "properties": { - "x-ms-client-flatten": true, - "$ref": "#/definitions/SecureScoreControlScoreDetails" - } - }, - "allOf": [ - { - "$ref": "../../../common/v1/types.json#/definitions/Resource" - } - ] - }, - "SecureScoreControlScoreDetails": { - "description": "Calculation result data in control level", - "type": "object", - "properties": { - "displayName": { - "description": "User friendly display name of the control", - "readOnly": true, - "type": "string" - }, - "score": { - "description": "Actual score object for the control", - "x-ms-client-flatten": true, - "$ref": "#/definitions/SecureScoreControlScoreObject" - }, - "healthyResources": { - "description": "Number of healthy resources in the control", - "readOnly": true, - "type": "integer", - "format": "int32" - }, - "unhealthyResources": { - "description": "Number of unhealthy resources in the control", - "readOnly": true, - "type": "integer", - "format": "int32" - }, - "notApplicableResources": { - "description": "Number of not applicable resources in the control", - "readOnly": true, - "type": "integer", - "format": "int32" - }, - "disabledResources": { - "description": "Number of not resources that are disabled by policy in the control", - "readOnly": true, - "type": "integer", - "format": "int32" - }, - "achievedPoints": { - "description": "Number of points achieved for the controls", - "readOnly": true, - "type": "integer", - "format": "int32" - }, - "totalPoints": { - "description": "Total Number of points available in the control", - "readOnly": true, - "type": "integer", - "format": "int32" + } + }, + "definitions": { + "SecureScoresList": { + "type": "object", + "description": "Page of a secure scores list", + "properties": { + "value": { + "description": "Collection of secure scores in this page", + "readOnly": true, + "type": "array", + "items": { + "$ref": "#/definitions/SecureScoresItem" + } + }, + "nextLink": { + "description": "The URI to fetch the next page.", + "readOnly": true, + "type": "string" + } + } + }, + "SecureScoresItem": { + "description": "Secure score item data model", + "readOnly": true, + "type": "object", + "properties": { + "properties": { + "description": "Secure score item", + "readOnly": true, + "x-ms-client-flatten": true, + "$ref": "#/definitions/SecureScoreItemProperties" + } + }, + "allOf": [ + { + "$ref": "../../../common/v1/types.json#/definitions/Resource" + } + ] + }, + "SecureScoreItemProperties": { + "description": "Describes properties of a calculated secure score.", + "readOnly": true, + "type": "object", + "properties": { + "displayName": { + "description": "User friendly display name of the secure score item", + "readOnly": true, + "type": "string" + }, + "score": { + "description": "score object", + "readOnly": true, + "x-ms-client-flatten": true, + "$ref": "#/definitions/SecureScoreScoreDetails" + } + } + }, + "SecureScoreScoreDetails": { + "description": "Calculation result data", + "readOnly": true, + "type": "object", + "properties": { + "max": { + "description": "Maximum score applicable", + "readOnly": true, + "type": "integer", + "format": "int32" + }, + "current": { + "description": "Actual score", + "readOnly": true, + "type": "number", + "format": "double" + } + } + }, + "SecureScoreControlScoreObject": { + "description": "Calculation result data", + "type": "object", + "properties": { + "max": { + "description": "Maximum control score (0..10)", + "readOnly": true, + "type": "integer", + "format": "int32" + }, + "current": { + "description": "Actual score for the control = (achieved points / total points) * max score. if total points is zeroed, the return number is 0.00", + "readOnly": true, + "type": "number", + "format": "double" + } + } + }, + "SecureScoreControlsList": { + "description": "Page of a secure score controls list", + "type": "object", + "properties": { + "value": { + "description": "Collection of secure score controls in this page", + "readOnly": true, + "type": "array", + "items": { + "$ref": "#/definitions/SecureScoreControlDetails" + } + }, + "nextLink": { + "description": "The URI to fetch the next page.", + "readOnly": true, + "type": "string" + } + } + }, + "SecureScoreControlDetails": { + "description": "List of security sub-assessments", + "type": "object", + "properties": { + "properties": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/SecureScoreControlScoreDetails" + } }, - "definition": { + "allOf": [ + { + "$ref": "../../../common/v1/types.json#/definitions/Resource" + } + ] + }, + "SecureScoreControlScoreDetails": { + "description": "Calculation result data in control level", + "type": "object", + "properties": { + "displayName": { + "description": "User friendly display name of the control", + "readOnly": true, + "type": "string" + }, + "score": { + "description": "Actual score object for the control", + "x-ms-client-flatten": true, + "$ref": "#/definitions/SecureScoreControlScoreObject" + }, + "healthyResources": { + "description": "Number of healthy resources in the control", + "readOnly": true, + "type": "integer", + "format": "int32" + }, + "unhealthyResources": { + "description": "Number of unhealthy resources in the control", + "readOnly": true, + "type": "integer", + "format": "int32" + }, + "notApplicableResources": { + "description": "Number of not applicable resources in the control", + "readOnly": true, + "type": "integer", + "format": "int32" + }, + "disabledResources": { + "description": "Number of not resources that are disabled by policy in the control", + "readOnly": true, + "type": "integer", + "format": "int32" + }, + "achievedPoints": { + "description": "Number of points achieved for the controls", + "readOnly": true, + "type": "integer", + "format": "int32" + }, + "totalPoints": { + "description": "Total Number of points available in the control", + "readOnly": true, + "type": "integer", + "format": "int32" + }, + "definition": { "$ref": "#/definitions/SecureScoreControlDefinitionItem" + } } - } - }, - "SecureScoreControlsDefinitionList": { - "description": "Page of a secure score controls definition list", - "type": "object", - "properties": { - "value": { - "description": "Collection of secure score controls definition in this page", - "readOnly": true, - "type": "array", - "items": { - "$ref": "#/definitions/SecureScoreControlDefinitionItem" - } - }, - "nextLink": { - "description": "The URI to fetch the next page.", - "readOnly": true, - "type": "string" - } - } - }, - "SecureScoreControlDefinitionItem": { - "description": "Secure Score Control's Definition information", - "type": "object", - "properties": { - "properties": { - "x-ms-client-flatten": true, - "$ref": "#/definitions/SecureScoreControlDefinitionItemProperties" - } - }, - "allOf": [ - { - "$ref": "../../../common/v1/types.json#/definitions/Resource" - } - ] - }, - "SecureScoreControlDefinitionItemProperties": { - "description": "Secure Score Control Definition Properties", - "type": "object", - "properties": { - "displayName": { - "description": "User friendly display name of the control", - "readOnly": true, - "type": "string" - }, - "description": { - "description": "User friendly display name of the control", - "readOnly": true, - "type": "string", - "maxLength": 256 - }, - "maxScore": { - "description": "Maximum control score (0..10)", - "readOnly": true, - "type": "integer", - "format": "int32", - "minimum": 0, - "maximum": 10, - "exclusiveMinimum": false - }, - "source": { - "description": "Source object from which the control was created", - "readOnly": true, - "$ref": "#/definitions/SecureScoreControlDefinitionSource" - }, - "assessmentsDefinition": { - "description": "array of assessments metadata ids", - "readOnly": true, - "type": "array", - "items": { - "$ref": "#/definitions/SecureScoreControlDefinitionAssessmentsId" - } - } - } - }, - "SecureScoreControlDefinitionAssessmentsId": { - "type": "object", - "description": "Secure Score Control Definition Properties", - "properties": { - "id": { - "description": "Full assessment metadata azure ids that build the control", - "readOnly": true, - "type": "string" - } - } - }, - "SecureScoreControlDefinitionSource": { - "description": "representing the source of the control", - "readOnly": true, - "type": "object", - "properties": { - "sourceType": { - "description": "BuiltIn if the control is built-in from Azure Security Center managed assessments, Custom if the assessment based on custom Azure Policy definition, CustomerManaged for customers who build their own controls", - "type": "string", - "enum": [ - "BuiltIn", - "CustomPolicy", - "CustomerManaged" - ], - "x-ms-enum": { - "name": "controlType", - "modelAsString": true, - "values": [ - { - "value": "BuiltIn", - "description": "Azure Security Center managed assessments" - }, - { - "value": "CustomPolicy", - "description": "User defined policies that are automatically ingested from Azure Policy to Azure Security Center" - }, - { - "value": "CustomerManaged", - "description": "User controls pushed directly by the user or other third party to Azure Security Center" - } - ] - } - }, - "policySetDefinitionId": { - "description": "id of the policy set definition id from which the control was generated", - "type": "string" - }, - "groupName": { - "description": "represents the GroupName within the specific policy set definition", - "type": "string" - } - } - } - }, - "parameters": { - "ExpandControlsDefinition": { - "name": "$expand", - "in": "query", - "required": false, - "type": "string", - "description": "OData expand. Optional.", - "x-ms-parameter-location": "method", - "enum": [ - "definition" - ], - "x-ms-enum": { - "name": "ExpandEnum", - "modelAsString": true, - "values": [ - { - "value": "definition", - "description": "Add definition object for each control" - } - ] - } - }, - "secureScoreName": { - "name": "secureScoreName", - "in": "path", - "required": true, - "type": "string", - "description": "The secure score initiative name", - "x-ms-parameter-location": "method" - } + }, + "SecureScoreControlsDefinitionList": { + "description": "Page of a secure score controls definition list", + "type": "object", + "properties": { + "value": { + "description": "Collection of secure score controls definition in this page", + "readOnly": true, + "type": "array", + "items": { + "$ref": "#/definitions/SecureScoreControlDefinitionItem" + } + }, + "nextLink": { + "description": "The URI to fetch the next page.", + "readOnly": true, + "type": "string" + } + } + }, + "SecureScoreControlDefinitionItem": { + "description": "Secure Score Control's Definition information", + "type": "object", + "properties": { + "properties": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/SecureScoreControlDefinitionItemProperties" + } + }, + "allOf": [ + { + "$ref": "../../../common/v1/types.json#/definitions/Resource" + } + ] + }, + "SecureScoreControlDefinitionItemProperties": { + "description": "Secure Score Control Definition Properties", + "type": "object", + "properties": { + "displayName": { + "description": "User friendly display name of the control", + "readOnly": true, + "type": "string" + }, + "description": { + "description": "User friendly display name of the control", + "readOnly": true, + "type": "string", + "maxLength": 256 + }, + "maxScore": { + "description": "Maximum control score (0..10)", + "readOnly": true, + "type": "integer", + "format": "int32", + "minimum": 0, + "maximum": 10, + "exclusiveMinimum": false + }, + "source": { + "description": "Source object from which the control was created", + "readOnly": true, + "$ref": "#/definitions/SecureScoreControlDefinitionSource" + }, + "assessmentsDefinition": { + "description": "array of assessments metadata ids", + "readOnly": true, + "type": "array", + "items": { + "$ref": "#/definitions/SecureScoreControlDefinitionAssessmentsId" + } + } + } + }, + "SecureScoreControlDefinitionAssessmentsId": { + "type": "object", + "description": "Secure Score Control Definition Properties", + "properties": { + "id": { + "description": "Full assessment metadata azure ids that build the control", + "readOnly": true, + "type": "string" + } + } + }, + "SecureScoreControlDefinitionSource": { + "description": "representing the source of the control", + "readOnly": true, + "type": "object", + "properties": { + "sourceType": { + "description": "BuiltIn if the control is built-in from Azure Security Center managed assessments, Custom if the assessment based on custom Azure Policy definition, CustomerManaged for customers who build their own controls", + "type": "string", + "enum": [ + "BuiltIn", + "CustomPolicy", + "CustomerManaged" + ], + "x-ms-enum": { + "name": "controlType", + "modelAsString": true, + "values": [ + { + "value": "BuiltIn", + "description": "Azure Security Center managed assessments" + }, + { + "value": "CustomPolicy", + "description": "User defined policies that are automatically ingested from Azure Policy to Azure Security Center" + }, + { + "value": "CustomerManaged", + "description": "User controls pushed directly by the user or other third party to Azure Security Center" + } + ] + } + }, + "policySetDefinitionId": { + "description": "id of the policy set definition id from which the control was generated", + "type": "string" + }, + "groupName": { + "description": "represents the GroupName within the specific policy set definition", + "type": "string" + } + } + } + }, + "parameters": { + "ExpandControlsDefinition": { + "name": "$expand", + "in": "query", + "required": false, + "type": "string", + "description": "OData expand. Optional.", + "x-ms-parameter-location": "method", + "enum": [ + "definition" + ], + "x-ms-enum": { + "name": "ExpandEnum", + "modelAsString": true, + "values": [ + { + "value": "definition", + "description": "Add definition object for each control" + } + ] + } + }, + "secureScoreName": { + "name": "secureScoreName", + "in": "path", + "required": true, + "type": "string", + "description": "The secure score initiative name", + "x-ms-parameter-location": "method" + } + } } -} + \ No newline at end of file From 26973e6447a475116fc13240577e7ea281cb6cb6 Mon Sep 17 00:00:00 2001 From: Gideon Romm Date: Wed, 29 Jan 2020 10:36:37 +0200 Subject: [PATCH 25/53] prettier again ... --- .../2020-01-01-preview/secureScore.json | 1167 ++++++++--------- 1 file changed, 583 insertions(+), 584 deletions(-) diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json index 4d1ad7110ec8..4825fa449d36 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json @@ -1,586 +1,585 @@ { - "swagger": "2.0", - "info": { - "title": "Security Center", - "description": "API spec for Microsoft.Security (Azure Security Center) resource provider", - "version": "2020-01-01-preview" - }, - "host": "management.azure.com", - "schemes": [ - "https" - ], - "consumes": [ - "application/json" - ], - "produces": [ - "application/json" - ], - "security": [ - { - "azure_auth": [ - "user_impersonation" - ] - } - ], - "securityDefinitions": { - "azure_auth": { - "type": "oauth2", - "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", - "flow": "implicit", - "description": "Azure Active Directory OAuth2 Flow", - "scopes": { - "user_impersonation": "impersonate your user account" - } - } - }, - "paths": { - "/{scope}/providers/Microsoft.Security/secureScores": { - "get": { - "x-ms-examples": { - "List secure scores": { - "$ref": "./examples/secureScores/ListSecureScores_example.json" - } - }, - "tags": [ - "Secure Scores" - ], - "description": "Get secure scores on all your initiatives inside a scope", - "operationId": "SecureScores_List", - "parameters": [ - { - "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" - }, - { - "$ref": "../../../common/v1/types.json#/parameters/Scope" - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/SecureScoresList" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "../../../common/v1/types.json#/definitions/CloudError" - } - } - }, - "x-ms-pageable": { - "nextLinkName": "nextLink" - } - } - }, - "/{scope}/providers/Microsoft.Security/secureScores/{secureScoreName}": { - "get": { - "x-ms-examples": { - "Get single secure score": { - "$ref": "./examples/secureScores/GetSecureScoresSingle_example.json" - } - }, - "tags": [ - "Secure Scores" - ], - "description": "Get secure score for a specific initiatives inside a scope", - "operationId": "GetSecureScores_Single", - "parameters": [ - { - "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" - }, - { - "$ref": "../../../common/v1/types.json#/parameters/Scope" - }, - { - "$ref": "#/parameters/secureScoreName" - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/SecureScoresItem" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "../../../common/v1/types.json#/definitions/CloudError" - } - } - } - } - }, - "/{scope}/providers/Microsoft.Security/secureScores/{secureScoreName}/controls": { - "get": { - "x-ms-examples": { - "List secure score's controls level for the specified name (builtin)": { - "$ref": "./examples/secureScores/ListSecureScoreControlsForName_builtin_example.json" - }, - "List secure score's controls level for the specified name (custom)": { - "$ref": "./examples/secureScores/ListSecureScoreControlsForName_custom_example.json" - }, - "Get secure score's controls level for the specified name with expand parameter (builtin)": { - "$ref": "./examples/secureScores/ListSecureScoreControlsForNameWithExpand_builtin_example.json" - }, - "Get secure score's controls level for the specified name with expand parameter (custom)": { - "$ref": "./examples/secureScores/ListSecureScoreControlsForNameWithExpand_custom_example.json" - } - }, - "tags": [ - "Secure Scores" - ], - "description": "Get all secure score controls on specific initiatives inside a scope", - "operationId": "SecureScoreControls_List", - "parameters": [ - { - "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" - }, - { - "$ref": "../../../common/v1/types.json#/parameters/Scope" - }, - { - "$ref": "#/parameters/secureScoreName" - }, - { - "$ref": "#/parameters/ExpandControlsDefinition" - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/SecureScoreControlsList" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "../../../common/v1/types.json#/definitions/CloudError" - } - } - }, - "x-ms-pageable": { - "nextLinkName": "nextLink" - } - } - }, - "/providers/Microsoft.Security/secureScoreControlsDefinition": { - "get": { - "x-ms-examples": { - "List secure score controls definition": { - "$ref": "./examples/secureScoreControlsDefinition/ListSecureScoreControlsDefinition_example.json" - } - }, - "tags": [ - "Secure Score Controls Definition" - ], - "description": "Get definition information on all secure score controls", - "operationId": "SecureScoreControlsDefinition_List", - "parameters": [ - { - "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/SecureScoreControlsDefinitionList" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "../../../common/v1/types.json#/definitions/CloudError" - } - } - }, - "x-ms-pageable": { - "nextLinkName": "nextLink" - } - } - }, - "/subscriptions/{subscriptionId}/providers/Microsoft.Security/secureScoreControlsDefinition": { - "get": { - "x-ms-examples": { - "List secure score controls definition": { - "$ref": "./examples/secureScoreControlsDefinition/ListSecureScoreControlsDefinition_subscription_example.json" - } - }, - "tags": [ - "Secure Score Controls Definition" - ], - "description": "Get definition information on all secure score controls in subscription level", - "operationId": "SecureScoreControlsDefinitionSubscription_List", - "parameters": [ - { - "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" - }, - { - "$ref": "../../../common/v1/types.json#/parameters/SubscriptionId" - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/SecureScoreControlsDefinitionList" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "../../../common/v1/types.json#/definitions/CloudError" - } - } - }, - "x-ms-pageable": { - "nextLinkName": "nextLink" - } - } - } - }, - "definitions": { - "SecureScoresList": { - "type": "object", - "description": "Page of a secure scores list", - "properties": { - "value": { - "description": "Collection of secure scores in this page", - "readOnly": true, - "type": "array", - "items": { - "$ref": "#/definitions/SecureScoresItem" - } - }, - "nextLink": { - "description": "The URI to fetch the next page.", - "readOnly": true, - "type": "string" - } - } - }, - "SecureScoresItem": { - "description": "Secure score item data model", - "readOnly": true, - "type": "object", - "properties": { - "properties": { - "description": "Secure score item", - "readOnly": true, - "x-ms-client-flatten": true, - "$ref": "#/definitions/SecureScoreItemProperties" - } - }, - "allOf": [ - { - "$ref": "../../../common/v1/types.json#/definitions/Resource" - } - ] - }, - "SecureScoreItemProperties": { - "description": "Describes properties of a calculated secure score.", - "readOnly": true, - "type": "object", - "properties": { - "displayName": { - "description": "User friendly display name of the secure score item", - "readOnly": true, - "type": "string" - }, - "score": { - "description": "score object", - "readOnly": true, - "x-ms-client-flatten": true, - "$ref": "#/definitions/SecureScoreScoreDetails" - } - } - }, - "SecureScoreScoreDetails": { - "description": "Calculation result data", - "readOnly": true, - "type": "object", - "properties": { - "max": { - "description": "Maximum score applicable", - "readOnly": true, - "type": "integer", - "format": "int32" - }, - "current": { - "description": "Actual score", - "readOnly": true, - "type": "number", - "format": "double" - } - } - }, - "SecureScoreControlScoreObject": { - "description": "Calculation result data", - "type": "object", - "properties": { - "max": { - "description": "Maximum control score (0..10)", - "readOnly": true, - "type": "integer", - "format": "int32" - }, - "current": { - "description": "Actual score for the control = (achieved points / total points) * max score. if total points is zeroed, the return number is 0.00", - "readOnly": true, - "type": "number", - "format": "double" - } - } - }, - "SecureScoreControlsList": { - "description": "Page of a secure score controls list", - "type": "object", - "properties": { - "value": { - "description": "Collection of secure score controls in this page", - "readOnly": true, - "type": "array", - "items": { - "$ref": "#/definitions/SecureScoreControlDetails" - } - }, - "nextLink": { - "description": "The URI to fetch the next page.", - "readOnly": true, - "type": "string" - } - } - }, - "SecureScoreControlDetails": { - "description": "List of security sub-assessments", - "type": "object", - "properties": { - "properties": { - "x-ms-client-flatten": true, - "$ref": "#/definitions/SecureScoreControlScoreDetails" - } - }, - "allOf": [ - { - "$ref": "../../../common/v1/types.json#/definitions/Resource" - } - ] - }, - "SecureScoreControlScoreDetails": { - "description": "Calculation result data in control level", - "type": "object", - "properties": { - "displayName": { - "description": "User friendly display name of the control", - "readOnly": true, - "type": "string" - }, - "score": { - "description": "Actual score object for the control", - "x-ms-client-flatten": true, - "$ref": "#/definitions/SecureScoreControlScoreObject" - }, - "healthyResources": { - "description": "Number of healthy resources in the control", - "readOnly": true, - "type": "integer", - "format": "int32" - }, - "unhealthyResources": { - "description": "Number of unhealthy resources in the control", - "readOnly": true, - "type": "integer", - "format": "int32" - }, - "notApplicableResources": { - "description": "Number of not applicable resources in the control", - "readOnly": true, - "type": "integer", - "format": "int32" - }, - "disabledResources": { - "description": "Number of not resources that are disabled by policy in the control", - "readOnly": true, - "type": "integer", - "format": "int32" - }, - "achievedPoints": { - "description": "Number of points achieved for the controls", - "readOnly": true, - "type": "integer", - "format": "int32" - }, - "totalPoints": { - "description": "Total Number of points available in the control", - "readOnly": true, - "type": "integer", - "format": "int32" - }, - "definition": { - "$ref": "#/definitions/SecureScoreControlDefinitionItem" - } - } - }, - "SecureScoreControlsDefinitionList": { - "description": "Page of a secure score controls definition list", - "type": "object", - "properties": { - "value": { - "description": "Collection of secure score controls definition in this page", - "readOnly": true, - "type": "array", - "items": { - "$ref": "#/definitions/SecureScoreControlDefinitionItem" - } - }, - "nextLink": { - "description": "The URI to fetch the next page.", - "readOnly": true, - "type": "string" - } - } - }, - "SecureScoreControlDefinitionItem": { - "description": "Secure Score Control's Definition information", - "type": "object", - "properties": { - "properties": { - "x-ms-client-flatten": true, - "$ref": "#/definitions/SecureScoreControlDefinitionItemProperties" - } - }, - "allOf": [ - { - "$ref": "../../../common/v1/types.json#/definitions/Resource" - } - ] - }, - "SecureScoreControlDefinitionItemProperties": { - "description": "Secure Score Control Definition Properties", - "type": "object", - "properties": { - "displayName": { - "description": "User friendly display name of the control", - "readOnly": true, - "type": "string" - }, - "description": { - "description": "User friendly display name of the control", - "readOnly": true, - "type": "string", - "maxLength": 256 - }, - "maxScore": { - "description": "Maximum control score (0..10)", - "readOnly": true, - "type": "integer", - "format": "int32", - "minimum": 0, - "maximum": 10, - "exclusiveMinimum": false - }, - "source": { - "description": "Source object from which the control was created", - "readOnly": true, - "$ref": "#/definitions/SecureScoreControlDefinitionSource" - }, - "assessmentsDefinition": { - "description": "array of assessments metadata ids", - "readOnly": true, - "type": "array", - "items": { - "$ref": "#/definitions/SecureScoreControlDefinitionAssessmentsId" - } - } - } - }, - "SecureScoreControlDefinitionAssessmentsId": { - "type": "object", - "description": "Secure Score Control Definition Properties", - "properties": { - "id": { - "description": "Full assessment metadata azure ids that build the control", - "readOnly": true, - "type": "string" - } - } - }, - "SecureScoreControlDefinitionSource": { - "description": "representing the source of the control", - "readOnly": true, - "type": "object", - "properties": { - "sourceType": { - "description": "BuiltIn if the control is built-in from Azure Security Center managed assessments, Custom if the assessment based on custom Azure Policy definition, CustomerManaged for customers who build their own controls", - "type": "string", - "enum": [ - "BuiltIn", - "CustomPolicy", - "CustomerManaged" - ], - "x-ms-enum": { - "name": "controlType", - "modelAsString": true, - "values": [ - { - "value": "BuiltIn", - "description": "Azure Security Center managed assessments" - }, - { - "value": "CustomPolicy", - "description": "User defined policies that are automatically ingested from Azure Policy to Azure Security Center" - }, - { - "value": "CustomerManaged", - "description": "User controls pushed directly by the user or other third party to Azure Security Center" - } - ] - } - }, - "policySetDefinitionId": { - "description": "id of the policy set definition id from which the control was generated", - "type": "string" - }, - "groupName": { - "description": "represents the GroupName within the specific policy set definition", - "type": "string" - } - } - } - }, - "parameters": { - "ExpandControlsDefinition": { - "name": "$expand", - "in": "query", - "required": false, - "type": "string", - "description": "OData expand. Optional.", - "x-ms-parameter-location": "method", - "enum": [ - "definition" - ], - "x-ms-enum": { - "name": "ExpandEnum", - "modelAsString": true, - "values": [ - { - "value": "definition", - "description": "Add definition object for each control" - } - ] - } - }, - "secureScoreName": { - "name": "secureScoreName", - "in": "path", - "required": true, - "type": "string", - "description": "The secure score initiative name", - "x-ms-parameter-location": "method" - } - } + "swagger": "2.0", + "info": { + "title": "Security Center", + "description": "API spec for Microsoft.Security (Azure Security Center) resource provider", + "version": "2020-01-01-preview" + }, + "host": "management.azure.com", + "schemes": [ + "https" + ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "security": [ + { + "azure_auth": [ + "user_impersonation" + ] + } + ], + "securityDefinitions": { + "azure_auth": { + "type": "oauth2", + "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", + "flow": "implicit", + "description": "Azure Active Directory OAuth2 Flow", + "scopes": { + "user_impersonation": "impersonate your user account" + } + } + }, + "paths": { + "/{scope}/providers/Microsoft.Security/secureScores": { + "get": { + "x-ms-examples": { + "List secure scores": { + "$ref": "./examples/secureScores/ListSecureScores_example.json" + } + }, + "tags": [ + "Secure Scores" + ], + "description": "Get secure scores on all your initiatives inside a scope", + "operationId": "SecureScores_List", + "parameters": [ + { + "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/Scope" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/SecureScoresList" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "../../../common/v1/types.json#/definitions/CloudError" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/{scope}/providers/Microsoft.Security/secureScores/{secureScoreName}": { + "get": { + "x-ms-examples": { + "Get single secure score": { + "$ref": "./examples/secureScores/GetSecureScoresSingle_example.json" + } + }, + "tags": [ + "Secure Scores" + ], + "description": "Get secure score for a specific initiatives inside a scope", + "operationId": "GetSecureScores_Single", + "parameters": [ + { + "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/Scope" + }, + { + "$ref": "#/parameters/secureScoreName" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/SecureScoresItem" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "../../../common/v1/types.json#/definitions/CloudError" + } + } + } + } + }, + "/{scope}/providers/Microsoft.Security/secureScores/{secureScoreName}/controls": { + "get": { + "x-ms-examples": { + "List secure score's controls level for the specified name (builtin)": { + "$ref": "./examples/secureScores/ListSecureScoreControlsForName_builtin_example.json" + }, + "List secure score's controls level for the specified name (custom)": { + "$ref": "./examples/secureScores/ListSecureScoreControlsForName_custom_example.json" + }, + "Get secure score's controls level for the specified name with expand parameter (builtin)": { + "$ref": "./examples/secureScores/ListSecureScoreControlsForNameWithExpand_builtin_example.json" + }, + "Get secure score's controls level for the specified name with expand parameter (custom)": { + "$ref": "./examples/secureScores/ListSecureScoreControlsForNameWithExpand_custom_example.json" + } + }, + "tags": [ + "Secure Scores" + ], + "description": "Get all secure score controls on specific initiatives inside a scope", + "operationId": "SecureScoreControls_List", + "parameters": [ + { + "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/Scope" + }, + { + "$ref": "#/parameters/secureScoreName" + }, + { + "$ref": "#/parameters/ExpandControlsDefinition" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/SecureScoreControlsList" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "../../../common/v1/types.json#/definitions/CloudError" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/providers/Microsoft.Security/secureScoreControlsDefinition": { + "get": { + "x-ms-examples": { + "List secure score controls definition": { + "$ref": "./examples/secureScoreControlsDefinition/ListSecureScoreControlsDefinition_example.json" + } + }, + "tags": [ + "Secure Score Controls Definition" + ], + "description": "Get definition information on all secure score controls", + "operationId": "SecureScoreControlsDefinition_List", + "parameters": [ + { + "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/SecureScoreControlsDefinitionList" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "../../../common/v1/types.json#/definitions/CloudError" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.Security/secureScoreControlsDefinition": { + "get": { + "x-ms-examples": { + "List secure score controls definition": { + "$ref": "./examples/secureScoreControlsDefinition/ListSecureScoreControlsDefinition_subscription_example.json" + } + }, + "tags": [ + "Secure Score Controls Definition" + ], + "description": "Get definition information on all secure score controls in subscription level", + "operationId": "SecureScoreControlsDefinitionSubscription_List", + "parameters": [ + { + "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/SubscriptionId" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/SecureScoreControlsDefinitionList" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "../../../common/v1/types.json#/definitions/CloudError" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + } + }, + "definitions": { + "SecureScoresList": { + "type": "object", + "description": "Page of a secure scores list", + "properties": { + "value": { + "description": "Collection of secure scores in this page", + "readOnly": true, + "type": "array", + "items": { + "$ref": "#/definitions/SecureScoresItem" + } + }, + "nextLink": { + "description": "The URI to fetch the next page.", + "readOnly": true, + "type": "string" + } + } + }, + "SecureScoresItem": { + "description": "Secure score item data model", + "readOnly": true, + "type": "object", + "properties": { + "properties": { + "description": "Secure score item", + "readOnly": true, + "x-ms-client-flatten": true, + "$ref": "#/definitions/SecureScoreItemProperties" + } + }, + "allOf": [ + { + "$ref": "../../../common/v1/types.json#/definitions/Resource" + } + ] + }, + "SecureScoreItemProperties": { + "description": "Describes properties of a calculated secure score.", + "readOnly": true, + "type": "object", + "properties": { + "displayName": { + "description": "User friendly display name of the secure score item", + "readOnly": true, + "type": "string" + }, + "score": { + "description": "score object", + "readOnly": true, + "x-ms-client-flatten": true, + "$ref": "#/definitions/SecureScoreScoreDetails" + } + } + }, + "SecureScoreScoreDetails": { + "description": "Calculation result data", + "readOnly": true, + "type": "object", + "properties": { + "max": { + "description": "Maximum score applicable", + "readOnly": true, + "type": "integer", + "format": "int32" + }, + "current": { + "description": "Actual score", + "readOnly": true, + "type": "number", + "format": "double" + } + } + }, + "SecureScoreControlScoreObject": { + "description": "Calculation result data", + "type": "object", + "properties": { + "max": { + "description": "Maximum control score (0..10)", + "readOnly": true, + "type": "integer", + "format": "int32" + }, + "current": { + "description": "Actual score for the control = (achieved points / total points) * max score. if total points is zeroed, the return number is 0.00", + "readOnly": true, + "type": "number", + "format": "double" + } + } + }, + "SecureScoreControlsList": { + "description": "Page of a secure score controls list", + "type": "object", + "properties": { + "value": { + "description": "Collection of secure score controls in this page", + "readOnly": true, + "type": "array", + "items": { + "$ref": "#/definitions/SecureScoreControlDetails" + } + }, + "nextLink": { + "description": "The URI to fetch the next page.", + "readOnly": true, + "type": "string" + } + } + }, + "SecureScoreControlDetails": { + "description": "List of security sub-assessments", + "type": "object", + "properties": { + "properties": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/SecureScoreControlScoreDetails" + } + }, + "allOf": [ + { + "$ref": "../../../common/v1/types.json#/definitions/Resource" + } + ] + }, + "SecureScoreControlScoreDetails": { + "description": "Calculation result data in control level", + "type": "object", + "properties": { + "displayName": { + "description": "User friendly display name of the control", + "readOnly": true, + "type": "string" + }, + "score": { + "description": "Actual score object for the control", + "x-ms-client-flatten": true, + "$ref": "#/definitions/SecureScoreControlScoreObject" + }, + "healthyResources": { + "description": "Number of healthy resources in the control", + "readOnly": true, + "type": "integer", + "format": "int32" + }, + "unhealthyResources": { + "description": "Number of unhealthy resources in the control", + "readOnly": true, + "type": "integer", + "format": "int32" + }, + "notApplicableResources": { + "description": "Number of not applicable resources in the control", + "readOnly": true, + "type": "integer", + "format": "int32" + }, + "disabledResources": { + "description": "Number of not resources that are disabled by policy in the control", + "readOnly": true, + "type": "integer", + "format": "int32" + }, + "achievedPoints": { + "description": "Number of points achieved for the controls", + "readOnly": true, + "type": "integer", + "format": "int32" + }, + "totalPoints": { + "description": "Total Number of points available in the control", + "readOnly": true, + "type": "integer", + "format": "int32" + }, + "definition": { + "$ref": "#/definitions/SecureScoreControlDefinitionItem" + } + } + }, + "SecureScoreControlsDefinitionList": { + "description": "Page of a secure score controls definition list", + "type": "object", + "properties": { + "value": { + "description": "Collection of secure score controls definition in this page", + "readOnly": true, + "type": "array", + "items": { + "$ref": "#/definitions/SecureScoreControlDefinitionItem" + } + }, + "nextLink": { + "description": "The URI to fetch the next page.", + "readOnly": true, + "type": "string" + } + } + }, + "SecureScoreControlDefinitionItem": { + "description": "Secure Score Control's Definition information", + "type": "object", + "properties": { + "properties": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/SecureScoreControlDefinitionItemProperties" + } + }, + "allOf": [ + { + "$ref": "../../../common/v1/types.json#/definitions/Resource" + } + ] + }, + "SecureScoreControlDefinitionItemProperties": { + "description": "Secure Score Control Definition Properties", + "type": "object", + "properties": { + "displayName": { + "description": "User friendly display name of the control", + "readOnly": true, + "type": "string" + }, + "description": { + "description": "User friendly display name of the control", + "readOnly": true, + "type": "string", + "maxLength": 256 + }, + "maxScore": { + "description": "Maximum control score (0..10)", + "readOnly": true, + "type": "integer", + "format": "int32", + "minimum": 0, + "maximum": 10, + "exclusiveMinimum": false + }, + "source": { + "description": "Source object from which the control was created", + "readOnly": true, + "$ref": "#/definitions/SecureScoreControlDefinitionSource" + }, + "assessmentsDefinition": { + "description": "array of assessments metadata ids", + "readOnly": true, + "type": "array", + "items": { + "$ref": "#/definitions/SecureScoreControlDefinitionAssessmentsId" + } + } + } + }, + "SecureScoreControlDefinitionAssessmentsId": { + "type": "object", + "description": "Secure Score Control Definition Properties", + "properties": { + "id": { + "description": "Full assessment metadata azure ids that build the control", + "readOnly": true, + "type": "string" + } + } + }, + "SecureScoreControlDefinitionSource": { + "description": "representing the source of the control", + "readOnly": true, + "type": "object", + "properties": { + "sourceType": { + "description": "BuiltIn if the control is built-in from Azure Security Center managed assessments, Custom if the assessment based on custom Azure Policy definition, CustomerManaged for customers who build their own controls", + "type": "string", + "enum": [ + "BuiltIn", + "CustomPolicy", + "CustomerManaged" + ], + "x-ms-enum": { + "name": "controlType", + "modelAsString": true, + "values": [ + { + "value": "BuiltIn", + "description": "Azure Security Center managed assessments" + }, + { + "value": "CustomPolicy", + "description": "User defined policies that are automatically ingested from Azure Policy to Azure Security Center" + }, + { + "value": "CustomerManaged", + "description": "User controls pushed directly by the user or other third party to Azure Security Center" + } + ] + } + }, + "policySetDefinitionId": { + "description": "id of the policy set definition id from which the control was generated", + "type": "string" + }, + "groupName": { + "description": "represents the GroupName within the specific policy set definition", + "type": "string" + } + } + } + }, + "parameters": { + "ExpandControlsDefinition": { + "name": "$expand", + "in": "query", + "required": false, + "type": "string", + "description": "OData expand. Optional.", + "x-ms-parameter-location": "method", + "enum": [ + "definition" + ], + "x-ms-enum": { + "name": "ExpandEnum", + "modelAsString": true, + "values": [ + { + "value": "definition", + "description": "Add definition object for each control" + } + ] + } + }, + "secureScoreName": { + "name": "secureScoreName", + "in": "path", + "required": true, + "type": "string", + "description": "The secure score initiative name", + "x-ms-parameter-location": "method" + } } - \ No newline at end of file +} From 67c5eb43aea9c0a202595fe52e000ad5fbd3ebb9 Mon Sep 17 00:00:00 2001 From: Gideon Romm Date: Tue, 4 Feb 2020 13:14:38 +0200 Subject: [PATCH 26/53] PR comments --- ...ntrolsDefinition_subscription_example.json | 15 ++-- ...rolsForNameWithExpand_builtin_example.json | 6 -- ...trolsForNameWithExpand_custom_example.json | 2 - ...eScoreControlsForName_builtin_example.json | 6 -- ...reScoreControlsForName_custom_example.json | 2 - .../ListSecureScoreControls_example.json | 79 +++++++++++++++++++ .../2020-01-01-preview/secureScore.json | 60 ++++++++++---- 7 files changed, 133 insertions(+), 37 deletions(-) create mode 100644 specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControls_example.json diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScoreControlsDefinition/ListSecureScoreControlsDefinition_subscription_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScoreControlsDefinition/ListSecureScoreControlsDefinition_subscription_example.json index 3923ab1be260..fa8ff462f814 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScoreControlsDefinition/ListSecureScoreControlsDefinition_subscription_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScoreControlsDefinition/ListSecureScoreControlsDefinition_subscription_example.json @@ -1,7 +1,7 @@ { "parameters": { "api-version": "2020-01-01-preview", - "subscriptionId": "11111111-e762-44dd-bd96-202020202020" + "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23" }, "responses": { "200": { @@ -80,20 +80,23 @@ } }, { - "id": "/subscriptions/11111111-e762-44dd-bd96-202020202020/providers/Microsoft.Security/secureScoreControlsDefinition/a9909064-42b4-4d34-8143-275477afe18b", + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScoreControlsDefinition/a9909064-42b4-4d34-8143-275477afe18b", "name": "a9909064-42b4-4d34-8143-275477afe18b", "type": "Microsoft.Security/SecureScoresControlMetadata", "properties": { "source": { "sourceType": "CustomPolicy", - "policySetDefinitionId": "/subscriptions/11111111-e762-44dd-bd96-202020202020/providers/Microsoft.Authorization/policySetDefinitions/dddddddd-eeee-ffff-847f-89da613eabcd" + "policySetDefinitionId": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Authorization/policySetDefinitions/1203fdf9-eeee-ffff-847f-89da613eabcd" }, - "displayName": "My custom application control", + "displayName": "Apply adaptive application control", "description": "", - "maxScore": 5, + "maxScore": 3, "assessmentsDefinition": [ { - "id": "/subscriptions/11111111-e762-44dd-bd96-202020202020/providers/Microsoft.Security/assessmentMetadata/12345678-9a04-0000-2eed-565656565656" + "id": "/providers/Microsoft.Security/assessmentMetadata/e3de1cc0-f4dd-3b34-e496-8b5381ba2d70" + }, + { + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/assessmentMetadata/4c8a64c9-9b0f-0da9-2d2e-1d11ad316f4e" } ] } diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_builtin_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_builtin_example.json index 410579e8d927..482dcf5e7bb5 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_builtin_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_builtin_example.json @@ -22,8 +22,6 @@ "unhealthyResources": 0, "notApplicableResources": 10, "disabledResources": 50, - "achievedPoints": 0, - "totalPoints": 0, "score": { "max": 0, "current": 0 @@ -59,8 +57,6 @@ "unhealthyResources": 1, "notApplicableResources": 0, "disabledResources": 0, - "achievedPoints": 0, - "totalPoints": 1, "score": { "max": 10, "current": 0 @@ -102,8 +98,6 @@ "unhealthyResources": 0, "notApplicableResources": 10, "disabledResources": 5, - "achievedPoints": 20, - "totalPoints": 20, "score": { "max": 3, "current": 3 diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_custom_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_custom_example.json index 743394ac4776..0084f434c23f 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_custom_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_custom_example.json @@ -22,8 +22,6 @@ "unhealthyResources": 10, "notApplicableResources": 0, "disabledResources": 50, - "achievedPoints": 0, - "totalPoints": 10, "score": { "max": 3, "current": 0 diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_builtin_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_builtin_example.json index 9c405078aa0b..b4ad73667340 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_builtin_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_builtin_example.json @@ -18,8 +18,6 @@ "unhealthyResources": 0, "notApplicableResources": 10, "disabledResources": 50, - "achievedPoints": 0, - "totalPoints": 0, "score": { "max": 0, "current": 0 @@ -36,8 +34,6 @@ "unhealthyResources": 1, "notApplicableResources": 0, "disabledResources": 0, - "achievedPoints": 0, - "totalPoints": 1, "score": { "max": 10, "current": 0 @@ -54,8 +50,6 @@ "unhealthyResources": 0, "notApplicableResources": 10, "disabledResources": 5, - "achievedPoints": 20, - "totalPoints": 20, "score": { "max": 3, "current": 3 diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_custom_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_custom_example.json index 0b4f3bd4cb4c..3d65f29f0110 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_custom_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_custom_example.json @@ -18,8 +18,6 @@ "unhealthyResources": 10, "notApplicableResources": 0, "disabledResources": 50, - "achievedPoints": 0, - "totalPoints": 10, "score": { "max": 2, "current": 0 diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControls_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControls_example.json new file mode 100644 index 000000000000..1328861b9874 --- /dev/null +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControls_example.json @@ -0,0 +1,79 @@ +{ + "parameters": { + "api-version": "2020-01-01-preview", + "scope": "subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23", + "secureScoreName": "ascDefault" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/securescores/ascDefault/a9909064-42b4-4d34-8143-275477afe18b", + "name": "a9909064-42b4-4d34-8143-275477afe18b", + "type": "Microsoft.Security/securescorescontrol", + "properties": { + "displayName": "Protect applications against DDoS attacks", + "healthyResources": 0, + "unhealthyResources": 0, + "notApplicableResources": 10, + "disabledResources": 50, + "score": { + "max": 0, + "current": 0 + } + } + }, + { + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/securescores/ascDefault/34a42fb3-e6db-409c-b56b-7b1db6b8aee0", + "name": "34a42fb3-e6db-409c-b56b-7b1db6b8aee0", + "type": "Microsoft.Security/securescorescontrol", + "properties": { + "displayName": "Enable MFA", + "healthyResources": 0, + "unhealthyResources": 1, + "notApplicableResources": 0, + "disabledResources": 0, + "score": { + "max": 10, + "current": 0 + } + } + }, + { + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/securescores/ascDefault/a000c66f-6da2-4f9d-826d-2364347d2588", + "name": "a000c66f-6da2-4f9d-826d-2364347d2588", + "type": "Microsoft.Security/securescorescontrol", + "properties": { + "displayName": "Apply adaptive application control", + "healthyResources": 20, + "unhealthyResources": 0, + "notApplicableResources": 10, + "disabledResources": 5, + "score": { + "max": 3, + "current": 3 + } + } + }, + { + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/securescores/CustomA/a9909064-42b4-4d34-8143-275477afe18b", + "name": "a9909064-42b4-4d34-8143-275477afe18b", + "type": "Microsoft.Security/securescorescontrol", + "properties": { + "displayName": "Protect applications against DDoS attacks", + "healthyResources": 0, + "unhealthyResources": 10, + "notApplicableResources": 0, + "disabledResources": 50, + "score": { + "max": 2, + "current": 0 + } + } + } + ] + } + } + } +} diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json index 4825fa449d36..bede44742449 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json @@ -112,7 +112,7 @@ } } }, - "/{scope}/providers/Microsoft.Security/secureScores/{secureScoreName}/controls": { + "/{scope}/providers/Microsoft.Security/secureScores/{secureScoreName}/secureScoreControls": { "get": { "x-ms-examples": { "List secure score's controls level for the specified name (builtin)": { @@ -165,7 +165,49 @@ "nextLinkName": "nextLink" } } - }, + }, + "/{scope}/providers/Microsoft.Security/secureScoreControls": { + "get": { + "x-ms-examples": { + "List all secure scores controls": { + "$ref": "./examples/secureScores/ListSecureScoreControls_example.json" + } + }, + "tags": [ + "Secure Scores" + ], + "description": "Get all secure score controls on specific initiatives inside a scope", + "operationId": "SecureScoreControls_List", + "parameters": [ + { + "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/Scope" + }, + { + "$ref": "#/parameters/ExpandControlsDefinition" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/SecureScoreControlsList" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "../../../common/v1/types.json#/definitions/CloudError" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, "/providers/Microsoft.Security/secureScoreControlsDefinition": { "get": { "x-ms-examples": { @@ -205,7 +247,7 @@ "/subscriptions/{subscriptionId}/providers/Microsoft.Security/secureScoreControlsDefinition": { "get": { "x-ms-examples": { - "List secure score controls definition": { + "List secure score controls definition by subscription": { "$ref": "./examples/secureScoreControlsDefinition/ListSecureScoreControlsDefinition_subscription_example.json" } }, @@ -407,18 +449,6 @@ "type": "integer", "format": "int32" }, - "achievedPoints": { - "description": "Number of points achieved for the controls", - "readOnly": true, - "type": "integer", - "format": "int32" - }, - "totalPoints": { - "description": "Total Number of points available in the control", - "readOnly": true, - "type": "integer", - "format": "int32" - }, "definition": { "$ref": "#/definitions/SecureScoreControlDefinitionItem" } From b71bd8db6d0ac1b786e81c8d6d09e574b61180ad Mon Sep 17 00:00:00 2001 From: Gideon Romm Date: Tue, 4 Feb 2020 15:37:55 +0200 Subject: [PATCH 27/53] Renamed enum --- .../preview/2020-01-01-preview/secureScore.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json index bede44742449..cf1e1e58c752 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json @@ -593,7 +593,7 @@ "definition" ], "x-ms-enum": { - "name": "ExpandEnum", + "name": "ExpandControlsEnum", "modelAsString": true, "values": [ { From 4ab07c50101743dd45a5cdca4f4b36f15c38c8c0 Mon Sep 17 00:00:00 2001 From: Gideon Romm Date: Tue, 4 Feb 2020 17:44:56 +0200 Subject: [PATCH 28/53] Fixed some errors --- .../ListSecureScoreControls_example.json | 2 +- .../2020-01-01-preview/secureScore.json | 86 +++++++++---------- 2 files changed, 44 insertions(+), 44 deletions(-) diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControls_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControls_example.json index 1328861b9874..1e01bcd64263 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControls_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControls_example.json @@ -56,7 +56,7 @@ } } }, - { + { "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/securescores/CustomA/a9909064-42b4-4d34-8143-275477afe18b", "name": "a9909064-42b4-4d34-8143-275477afe18b", "type": "Microsoft.Security/securescorescontrol", diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json index cf1e1e58c752..c91f5f98e3c1 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json @@ -132,7 +132,7 @@ "Secure Scores" ], "description": "Get all secure score controls on specific initiatives inside a scope", - "operationId": "SecureScoreControls_List", + "operationId": "SecureScoreControlsByName_List", "parameters": [ { "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" @@ -165,49 +165,49 @@ "nextLinkName": "nextLink" } } - }, + }, "/{scope}/providers/Microsoft.Security/secureScoreControls": { - "get": { - "x-ms-examples": { - "List all secure scores controls": { - "$ref": "./examples/secureScores/ListSecureScoreControls_example.json" - } - }, - "tags": [ - "Secure Scores" - ], - "description": "Get all secure score controls on specific initiatives inside a scope", - "operationId": "SecureScoreControls_List", - "parameters": [ - { - "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" - }, - { - "$ref": "../../../common/v1/types.json#/parameters/Scope" - }, - { - "$ref": "#/parameters/ExpandControlsDefinition" - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/SecureScoreControlsList" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "../../../common/v1/types.json#/definitions/CloudError" - } - } - }, - "x-ms-pageable": { - "nextLinkName": "nextLink" - } - } - }, + "get": { + "x-ms-examples": { + "List all secure scores controls": { + "$ref": "./examples/secureScores/ListSecureScoreControls_example.json" + } + }, + "tags": [ + "Secure Scores" + ], + "description": "Get all secure score controls on specific initiatives inside a scope", + "operationId": "SecureScoreControls_List", + "parameters": [ + { + "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/Scope" + }, + { + "$ref": "#/parameters/ExpandControlsDefinition" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/SecureScoreControlsList" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "../../../common/v1/types.json#/definitions/CloudError" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, "/providers/Microsoft.Security/secureScoreControlsDefinition": { "get": { "x-ms-examples": { From 26887fe3edf5e2ba8dc4b2d9cbec786a05e4d39a Mon Sep 17 00:00:00 2001 From: Gideon Romm Date: Wed, 5 Feb 2020 11:25:34 +0200 Subject: [PATCH 29/53] Remove "secureScoreName" parameter from example --- .../examples/secureScores/ListSecureScoreControls_example.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControls_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControls_example.json index 1e01bcd64263..8008a2ab07c8 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControls_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControls_example.json @@ -1,8 +1,7 @@ { "parameters": { "api-version": "2020-01-01-preview", - "scope": "subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23", - "secureScoreName": "ascDefault" + "scope": "subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23" }, "responses": { "200": { From d8d8d7879758c71cbed86fa3eae15b552b1eda23 Mon Sep 17 00:00:00 2001 From: Gideon Romm Date: Thu, 6 Feb 2020 14:11:51 +0200 Subject: [PATCH 30/53] Changed operationId from GetSecureScores_Single to SecureScores_Get --- .../2020-01-01-preview/secureScore.json | 1227 +++++++++-------- 1 file changed, 614 insertions(+), 613 deletions(-) diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json index c91f5f98e3c1..0b29831da4dc 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json @@ -1,615 +1,616 @@ { - "swagger": "2.0", - "info": { - "title": "Security Center", - "description": "API spec for Microsoft.Security (Azure Security Center) resource provider", - "version": "2020-01-01-preview" - }, - "host": "management.azure.com", - "schemes": [ - "https" - ], - "consumes": [ - "application/json" - ], - "produces": [ - "application/json" - ], - "security": [ - { - "azure_auth": [ - "user_impersonation" - ] - } - ], - "securityDefinitions": { - "azure_auth": { - "type": "oauth2", - "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", - "flow": "implicit", - "description": "Azure Active Directory OAuth2 Flow", - "scopes": { - "user_impersonation": "impersonate your user account" - } - } - }, - "paths": { - "/{scope}/providers/Microsoft.Security/secureScores": { - "get": { - "x-ms-examples": { - "List secure scores": { - "$ref": "./examples/secureScores/ListSecureScores_example.json" - } - }, - "tags": [ - "Secure Scores" - ], - "description": "Get secure scores on all your initiatives inside a scope", - "operationId": "SecureScores_List", - "parameters": [ - { - "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" - }, - { - "$ref": "../../../common/v1/types.json#/parameters/Scope" - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/SecureScoresList" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "../../../common/v1/types.json#/definitions/CloudError" - } - } - }, - "x-ms-pageable": { - "nextLinkName": "nextLink" - } - } - }, - "/{scope}/providers/Microsoft.Security/secureScores/{secureScoreName}": { - "get": { - "x-ms-examples": { - "Get single secure score": { - "$ref": "./examples/secureScores/GetSecureScoresSingle_example.json" - } - }, - "tags": [ - "Secure Scores" - ], - "description": "Get secure score for a specific initiatives inside a scope", - "operationId": "GetSecureScores_Single", - "parameters": [ - { - "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" - }, - { - "$ref": "../../../common/v1/types.json#/parameters/Scope" - }, - { - "$ref": "#/parameters/secureScoreName" - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/SecureScoresItem" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "../../../common/v1/types.json#/definitions/CloudError" - } - } - } - } - }, - "/{scope}/providers/Microsoft.Security/secureScores/{secureScoreName}/secureScoreControls": { - "get": { - "x-ms-examples": { - "List secure score's controls level for the specified name (builtin)": { - "$ref": "./examples/secureScores/ListSecureScoreControlsForName_builtin_example.json" - }, - "List secure score's controls level for the specified name (custom)": { - "$ref": "./examples/secureScores/ListSecureScoreControlsForName_custom_example.json" - }, - "Get secure score's controls level for the specified name with expand parameter (builtin)": { - "$ref": "./examples/secureScores/ListSecureScoreControlsForNameWithExpand_builtin_example.json" - }, - "Get secure score's controls level for the specified name with expand parameter (custom)": { - "$ref": "./examples/secureScores/ListSecureScoreControlsForNameWithExpand_custom_example.json" - } - }, - "tags": [ - "Secure Scores" - ], - "description": "Get all secure score controls on specific initiatives inside a scope", - "operationId": "SecureScoreControlsByName_List", - "parameters": [ - { - "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" - }, - { - "$ref": "../../../common/v1/types.json#/parameters/Scope" - }, - { - "$ref": "#/parameters/secureScoreName" - }, - { - "$ref": "#/parameters/ExpandControlsDefinition" - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/SecureScoreControlsList" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "../../../common/v1/types.json#/definitions/CloudError" - } - } - }, - "x-ms-pageable": { - "nextLinkName": "nextLink" - } - } - }, - "/{scope}/providers/Microsoft.Security/secureScoreControls": { - "get": { - "x-ms-examples": { - "List all secure scores controls": { - "$ref": "./examples/secureScores/ListSecureScoreControls_example.json" - } - }, - "tags": [ - "Secure Scores" - ], - "description": "Get all secure score controls on specific initiatives inside a scope", - "operationId": "SecureScoreControls_List", - "parameters": [ - { - "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" - }, - { - "$ref": "../../../common/v1/types.json#/parameters/Scope" - }, - { - "$ref": "#/parameters/ExpandControlsDefinition" - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/SecureScoreControlsList" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "../../../common/v1/types.json#/definitions/CloudError" - } - } - }, - "x-ms-pageable": { - "nextLinkName": "nextLink" - } - } - }, - "/providers/Microsoft.Security/secureScoreControlsDefinition": { - "get": { - "x-ms-examples": { - "List secure score controls definition": { - "$ref": "./examples/secureScoreControlsDefinition/ListSecureScoreControlsDefinition_example.json" - } - }, - "tags": [ - "Secure Score Controls Definition" - ], - "description": "Get definition information on all secure score controls", - "operationId": "SecureScoreControlsDefinition_List", - "parameters": [ - { - "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/SecureScoreControlsDefinitionList" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "../../../common/v1/types.json#/definitions/CloudError" - } - } - }, - "x-ms-pageable": { - "nextLinkName": "nextLink" - } - } - }, - "/subscriptions/{subscriptionId}/providers/Microsoft.Security/secureScoreControlsDefinition": { - "get": { - "x-ms-examples": { - "List secure score controls definition by subscription": { - "$ref": "./examples/secureScoreControlsDefinition/ListSecureScoreControlsDefinition_subscription_example.json" - } - }, - "tags": [ - "Secure Score Controls Definition" - ], - "description": "Get definition information on all secure score controls in subscription level", - "operationId": "SecureScoreControlsDefinitionSubscription_List", - "parameters": [ - { - "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" - }, - { - "$ref": "../../../common/v1/types.json#/parameters/SubscriptionId" - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/SecureScoreControlsDefinitionList" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "../../../common/v1/types.json#/definitions/CloudError" - } - } - }, - "x-ms-pageable": { - "nextLinkName": "nextLink" - } - } - } - }, - "definitions": { - "SecureScoresList": { - "type": "object", - "description": "Page of a secure scores list", - "properties": { - "value": { - "description": "Collection of secure scores in this page", - "readOnly": true, - "type": "array", - "items": { - "$ref": "#/definitions/SecureScoresItem" - } - }, - "nextLink": { - "description": "The URI to fetch the next page.", - "readOnly": true, - "type": "string" - } - } - }, - "SecureScoresItem": { - "description": "Secure score item data model", - "readOnly": true, - "type": "object", - "properties": { - "properties": { - "description": "Secure score item", - "readOnly": true, - "x-ms-client-flatten": true, - "$ref": "#/definitions/SecureScoreItemProperties" - } - }, - "allOf": [ - { - "$ref": "../../../common/v1/types.json#/definitions/Resource" - } - ] - }, - "SecureScoreItemProperties": { - "description": "Describes properties of a calculated secure score.", - "readOnly": true, - "type": "object", - "properties": { - "displayName": { - "description": "User friendly display name of the secure score item", - "readOnly": true, - "type": "string" - }, - "score": { - "description": "score object", - "readOnly": true, - "x-ms-client-flatten": true, - "$ref": "#/definitions/SecureScoreScoreDetails" - } - } - }, - "SecureScoreScoreDetails": { - "description": "Calculation result data", - "readOnly": true, - "type": "object", - "properties": { - "max": { - "description": "Maximum score applicable", - "readOnly": true, - "type": "integer", - "format": "int32" - }, - "current": { - "description": "Actual score", - "readOnly": true, - "type": "number", - "format": "double" - } - } - }, - "SecureScoreControlScoreObject": { - "description": "Calculation result data", - "type": "object", - "properties": { - "max": { - "description": "Maximum control score (0..10)", - "readOnly": true, - "type": "integer", - "format": "int32" - }, - "current": { - "description": "Actual score for the control = (achieved points / total points) * max score. if total points is zeroed, the return number is 0.00", - "readOnly": true, - "type": "number", - "format": "double" - } - } - }, - "SecureScoreControlsList": { - "description": "Page of a secure score controls list", - "type": "object", - "properties": { - "value": { - "description": "Collection of secure score controls in this page", - "readOnly": true, - "type": "array", - "items": { - "$ref": "#/definitions/SecureScoreControlDetails" - } - }, - "nextLink": { - "description": "The URI to fetch the next page.", - "readOnly": true, - "type": "string" - } - } - }, - "SecureScoreControlDetails": { - "description": "List of security sub-assessments", - "type": "object", - "properties": { - "properties": { - "x-ms-client-flatten": true, - "$ref": "#/definitions/SecureScoreControlScoreDetails" - } - }, - "allOf": [ - { - "$ref": "../../../common/v1/types.json#/definitions/Resource" - } - ] - }, - "SecureScoreControlScoreDetails": { - "description": "Calculation result data in control level", - "type": "object", - "properties": { - "displayName": { - "description": "User friendly display name of the control", - "readOnly": true, - "type": "string" - }, - "score": { - "description": "Actual score object for the control", - "x-ms-client-flatten": true, - "$ref": "#/definitions/SecureScoreControlScoreObject" - }, - "healthyResources": { - "description": "Number of healthy resources in the control", - "readOnly": true, - "type": "integer", - "format": "int32" - }, - "unhealthyResources": { - "description": "Number of unhealthy resources in the control", - "readOnly": true, - "type": "integer", - "format": "int32" - }, - "notApplicableResources": { - "description": "Number of not applicable resources in the control", - "readOnly": true, - "type": "integer", - "format": "int32" - }, - "disabledResources": { - "description": "Number of not resources that are disabled by policy in the control", - "readOnly": true, - "type": "integer", - "format": "int32" - }, - "definition": { - "$ref": "#/definitions/SecureScoreControlDefinitionItem" - } - } - }, - "SecureScoreControlsDefinitionList": { - "description": "Page of a secure score controls definition list", - "type": "object", - "properties": { - "value": { - "description": "Collection of secure score controls definition in this page", - "readOnly": true, - "type": "array", - "items": { - "$ref": "#/definitions/SecureScoreControlDefinitionItem" - } - }, - "nextLink": { - "description": "The URI to fetch the next page.", - "readOnly": true, - "type": "string" - } - } - }, - "SecureScoreControlDefinitionItem": { - "description": "Secure Score Control's Definition information", - "type": "object", - "properties": { - "properties": { - "x-ms-client-flatten": true, - "$ref": "#/definitions/SecureScoreControlDefinitionItemProperties" - } - }, - "allOf": [ - { - "$ref": "../../../common/v1/types.json#/definitions/Resource" - } - ] - }, - "SecureScoreControlDefinitionItemProperties": { - "description": "Secure Score Control Definition Properties", - "type": "object", - "properties": { - "displayName": { - "description": "User friendly display name of the control", - "readOnly": true, - "type": "string" - }, - "description": { - "description": "User friendly display name of the control", - "readOnly": true, - "type": "string", - "maxLength": 256 - }, - "maxScore": { - "description": "Maximum control score (0..10)", - "readOnly": true, - "type": "integer", - "format": "int32", - "minimum": 0, - "maximum": 10, - "exclusiveMinimum": false - }, - "source": { - "description": "Source object from which the control was created", - "readOnly": true, - "$ref": "#/definitions/SecureScoreControlDefinitionSource" - }, - "assessmentsDefinition": { - "description": "array of assessments metadata ids", - "readOnly": true, - "type": "array", - "items": { - "$ref": "#/definitions/SecureScoreControlDefinitionAssessmentsId" - } - } - } - }, - "SecureScoreControlDefinitionAssessmentsId": { - "type": "object", - "description": "Secure Score Control Definition Properties", - "properties": { - "id": { - "description": "Full assessment metadata azure ids that build the control", - "readOnly": true, - "type": "string" - } - } - }, - "SecureScoreControlDefinitionSource": { - "description": "representing the source of the control", - "readOnly": true, - "type": "object", - "properties": { - "sourceType": { - "description": "BuiltIn if the control is built-in from Azure Security Center managed assessments, Custom if the assessment based on custom Azure Policy definition, CustomerManaged for customers who build their own controls", - "type": "string", - "enum": [ - "BuiltIn", - "CustomPolicy", - "CustomerManaged" - ], - "x-ms-enum": { - "name": "controlType", - "modelAsString": true, - "values": [ - { - "value": "BuiltIn", - "description": "Azure Security Center managed assessments" - }, - { - "value": "CustomPolicy", - "description": "User defined policies that are automatically ingested from Azure Policy to Azure Security Center" - }, - { - "value": "CustomerManaged", - "description": "User controls pushed directly by the user or other third party to Azure Security Center" - } - ] - } - }, - "policySetDefinitionId": { - "description": "id of the policy set definition id from which the control was generated", - "type": "string" - }, - "groupName": { - "description": "represents the GroupName within the specific policy set definition", - "type": "string" - } - } - } - }, - "parameters": { - "ExpandControlsDefinition": { - "name": "$expand", - "in": "query", - "required": false, - "type": "string", - "description": "OData expand. Optional.", - "x-ms-parameter-location": "method", - "enum": [ - "definition" - ], - "x-ms-enum": { - "name": "ExpandControlsEnum", - "modelAsString": true, - "values": [ - { - "value": "definition", - "description": "Add definition object for each control" - } - ] - } - }, - "secureScoreName": { - "name": "secureScoreName", - "in": "path", - "required": true, - "type": "string", - "description": "The secure score initiative name", - "x-ms-parameter-location": "method" - } + "swagger": "2.0", + "info": { + "title": "Security Center", + "description": "API spec for Microsoft.Security (Azure Security Center) resource provider", + "version": "2020-01-01-preview" + }, + "host": "management.azure.com", + "schemes": [ + "https" + ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "security": [ + { + "azure_auth": [ + "user_impersonation" + ] + } + ], + "securityDefinitions": { + "azure_auth": { + "type": "oauth2", + "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", + "flow": "implicit", + "description": "Azure Active Directory OAuth2 Flow", + "scopes": { + "user_impersonation": "impersonate your user account" + } + } + }, + "paths": { + "/{scope}/providers/Microsoft.Security/secureScores": { + "get": { + "x-ms-examples": { + "List secure scores": { + "$ref": "./examples/secureScores/ListSecureScores_example.json" + } + }, + "tags": [ + "Secure Scores" + ], + "description": "Get secure scores on all your initiatives inside a scope", + "operationId": "SecureScores_List", + "parameters": [ + { + "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/Scope" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/SecureScoresList" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "../../../common/v1/types.json#/definitions/CloudError" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/{scope}/providers/Microsoft.Security/secureScores/{secureScoreName}": { + "get": { + "x-ms-examples": { + "Get single secure score": { + "$ref": "./examples/secureScores/GetSecureScoresSingle_example.json" + } + }, + "tags": [ + "Secure Scores" + ], + "description": "Get secure score for a specific initiatives inside a scope", + "operationId": "SecureScores_Get", + "parameters": [ + { + "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/Scope" + }, + { + "$ref": "#/parameters/secureScoreName" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/SecureScoresItem" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "../../../common/v1/types.json#/definitions/CloudError" + } + } + } + } + }, + "/{scope}/providers/Microsoft.Security/secureScores/{secureScoreName}/secureScoreControls": { + "get": { + "x-ms-examples": { + "List secure score's controls level for the specified name (builtin)": { + "$ref": "./examples/secureScores/ListSecureScoreControlsForName_builtin_example.json" + }, + "List secure score's controls level for the specified name (custom)": { + "$ref": "./examples/secureScores/ListSecureScoreControlsForName_custom_example.json" + }, + "Get secure score's controls level for the specified name with expand parameter (builtin)": { + "$ref": "./examples/secureScores/ListSecureScoreControlsForNameWithExpand_builtin_example.json" + }, + "Get secure score's controls level for the specified name with expand parameter (custom)": { + "$ref": "./examples/secureScores/ListSecureScoreControlsForNameWithExpand_custom_example.json" + } + }, + "tags": [ + "Secure Scores" + ], + "description": "Get all secure score controls on specific initiatives inside a scope", + "operationId": "SecureScoreControlsByName_List", + "parameters": [ + { + "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/Scope" + }, + { + "$ref": "#/parameters/secureScoreName" + }, + { + "$ref": "#/parameters/ExpandControlsDefinition" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/SecureScoreControlsList" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "../../../common/v1/types.json#/definitions/CloudError" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/{scope}/providers/Microsoft.Security/secureScoreControls": { + "get": { + "x-ms-examples": { + "List all secure scores controls": { + "$ref": "./examples/secureScores/ListSecureScoreControls_example.json" + } + }, + "tags": [ + "Secure Scores" + ], + "description": "Get all secure score controls on specific initiatives inside a scope", + "operationId": "SecureScoreControls_List", + "parameters": [ + { + "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/Scope" + }, + { + "$ref": "#/parameters/ExpandControlsDefinition" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/SecureScoreControlsList" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "../../../common/v1/types.json#/definitions/CloudError" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/providers/Microsoft.Security/secureScoreControlsDefinition": { + "get": { + "x-ms-examples": { + "List secure score controls definition": { + "$ref": "./examples/secureScoreControlsDefinition/ListSecureScoreControlsDefinition_example.json" + } + }, + "tags": [ + "Secure Score Controls Definition" + ], + "description": "Get definition information on all secure score controls", + "operationId": "SecureScoreControlsDefinition_List", + "parameters": [ + { + "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/SecureScoreControlsDefinitionList" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "../../../common/v1/types.json#/definitions/CloudError" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.Security/secureScoreControlsDefinition": { + "get": { + "x-ms-examples": { + "List secure score controls definition by subscription": { + "$ref": "./examples/secureScoreControlsDefinition/ListSecureScoreControlsDefinition_subscription_example.json" + } + }, + "tags": [ + "Secure Score Controls Definition" + ], + "description": "Get definition information on all secure score controls in subscription level", + "operationId": "SecureScoreControlsDefinitionSubscription_List", + "parameters": [ + { + "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/SubscriptionId" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/SecureScoreControlsDefinitionList" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "../../../common/v1/types.json#/definitions/CloudError" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + } + }, + "definitions": { + "SecureScoresList": { + "type": "object", + "description": "Page of a secure scores list", + "properties": { + "value": { + "description": "Collection of secure scores in this page", + "readOnly": true, + "type": "array", + "items": { + "$ref": "#/definitions/SecureScoresItem" + } + }, + "nextLink": { + "description": "The URI to fetch the next page.", + "readOnly": true, + "type": "string" + } + } + }, + "SecureScoresItem": { + "description": "Secure score item data model", + "readOnly": true, + "type": "object", + "properties": { + "properties": { + "description": "Secure score item", + "readOnly": true, + "x-ms-client-flatten": true, + "$ref": "#/definitions/SecureScoreItemProperties" + } + }, + "allOf": [ + { + "$ref": "../../../common/v1/types.json#/definitions/Resource" + } + ] + }, + "SecureScoreItemProperties": { + "description": "Describes properties of a calculated secure score.", + "readOnly": true, + "type": "object", + "properties": { + "displayName": { + "description": "User friendly display name of the secure score item", + "readOnly": true, + "type": "string" + }, + "score": { + "description": "score object", + "readOnly": true, + "x-ms-client-flatten": true, + "$ref": "#/definitions/SecureScoreScoreDetails" + } + } + }, + "SecureScoreScoreDetails": { + "description": "Calculation result data", + "readOnly": true, + "type": "object", + "properties": { + "max": { + "description": "Maximum score applicable", + "readOnly": true, + "type": "integer", + "format": "int32" + }, + "current": { + "description": "Actual score", + "readOnly": true, + "type": "number", + "format": "double" + } + } + }, + "SecureScoreControlScoreObject": { + "description": "Calculation result data", + "type": "object", + "properties": { + "max": { + "description": "Maximum control score (0..10)", + "readOnly": true, + "type": "integer", + "format": "int32" + }, + "current": { + "description": "Actual score for the control = (achieved points / total points) * max score. if total points is zeroed, the return number is 0.00", + "readOnly": true, + "type": "number", + "format": "double" + } + } + }, + "SecureScoreControlsList": { + "description": "Page of a secure score controls list", + "type": "object", + "properties": { + "value": { + "description": "Collection of secure score controls in this page", + "readOnly": true, + "type": "array", + "items": { + "$ref": "#/definitions/SecureScoreControlDetails" + } + }, + "nextLink": { + "description": "The URI to fetch the next page.", + "readOnly": true, + "type": "string" + } + } + }, + "SecureScoreControlDetails": { + "description": "List of security sub-assessments", + "type": "object", + "properties": { + "properties": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/SecureScoreControlScoreDetails" + } + }, + "allOf": [ + { + "$ref": "../../../common/v1/types.json#/definitions/Resource" + } + ] + }, + "SecureScoreControlScoreDetails": { + "description": "Calculation result data in control level", + "type": "object", + "properties": { + "displayName": { + "description": "User friendly display name of the control", + "readOnly": true, + "type": "string" + }, + "score": { + "description": "Actual score object for the control", + "x-ms-client-flatten": true, + "$ref": "#/definitions/SecureScoreControlScoreObject" + }, + "healthyResources": { + "description": "Number of healthy resources in the control", + "readOnly": true, + "type": "integer", + "format": "int32" + }, + "unhealthyResources": { + "description": "Number of unhealthy resources in the control", + "readOnly": true, + "type": "integer", + "format": "int32" + }, + "notApplicableResources": { + "description": "Number of not applicable resources in the control", + "readOnly": true, + "type": "integer", + "format": "int32" + }, + "disabledResources": { + "description": "Number of not resources that are disabled by policy in the control", + "readOnly": true, + "type": "integer", + "format": "int32" + }, + "definition": { + "$ref": "#/definitions/SecureScoreControlDefinitionItem" + } + } + }, + "SecureScoreControlsDefinitionList": { + "description": "Page of a secure score controls definition list", + "type": "object", + "properties": { + "value": { + "description": "Collection of secure score controls definition in this page", + "readOnly": true, + "type": "array", + "items": { + "$ref": "#/definitions/SecureScoreControlDefinitionItem" + } + }, + "nextLink": { + "description": "The URI to fetch the next page.", + "readOnly": true, + "type": "string" + } + } + }, + "SecureScoreControlDefinitionItem": { + "description": "Secure Score Control's Definition information", + "type": "object", + "properties": { + "properties": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/SecureScoreControlDefinitionItemProperties" + } + }, + "allOf": [ + { + "$ref": "../../../common/v1/types.json#/definitions/Resource" + } + ] + }, + "SecureScoreControlDefinitionItemProperties": { + "description": "Secure Score Control Definition Properties", + "type": "object", + "properties": { + "displayName": { + "description": "User friendly display name of the control", + "readOnly": true, + "type": "string" + }, + "description": { + "description": "User friendly display name of the control", + "readOnly": true, + "type": "string", + "maxLength": 256 + }, + "maxScore": { + "description": "Maximum control score (0..10)", + "readOnly": true, + "type": "integer", + "format": "int32", + "minimum": 0, + "maximum": 10, + "exclusiveMinimum": false + }, + "source": { + "description": "Source object from which the control was created", + "readOnly": true, + "$ref": "#/definitions/SecureScoreControlDefinitionSource" + }, + "assessmentsDefinition": { + "description": "array of assessments metadata ids", + "readOnly": true, + "type": "array", + "items": { + "$ref": "#/definitions/SecureScoreControlDefinitionAssessmentsId" + } + } + } + }, + "SecureScoreControlDefinitionAssessmentsId": { + "type": "object", + "description": "Secure Score Control Definition Properties", + "properties": { + "id": { + "description": "Full assessment metadata azure ids that build the control", + "readOnly": true, + "type": "string" + } + } + }, + "SecureScoreControlDefinitionSource": { + "description": "representing the source of the control", + "readOnly": true, + "type": "object", + "properties": { + "sourceType": { + "description": "BuiltIn if the control is built-in from Azure Security Center managed assessments, Custom if the assessment based on custom Azure Policy definition, CustomerManaged for customers who build their own controls", + "type": "string", + "enum": [ + "BuiltIn", + "CustomPolicy", + "CustomerManaged" + ], + "x-ms-enum": { + "name": "controlType", + "modelAsString": true, + "values": [ + { + "value": "BuiltIn", + "description": "Azure Security Center managed assessments" + }, + { + "value": "CustomPolicy", + "description": "User defined policies that are automatically ingested from Azure Policy to Azure Security Center" + }, + { + "value": "CustomerManaged", + "description": "User controls pushed directly by the user or other third party to Azure Security Center" + } + ] + } + }, + "policySetDefinitionId": { + "description": "id of the policy set definition id from which the control was generated", + "type": "string" + }, + "groupName": { + "description": "represents the GroupName within the specific policy set definition", + "type": "string" + } + } + } + }, + "parameters": { + "ExpandControlsDefinition": { + "name": "$expand", + "in": "query", + "required": false, + "type": "string", + "description": "OData expand. Optional.", + "x-ms-parameter-location": "method", + "enum": [ + "definition" + ], + "x-ms-enum": { + "name": "ExpandControlsEnum", + "modelAsString": true, + "values": [ + { + "value": "definition", + "description": "Add definition object for each control" + } + ] + } + }, + "secureScoreName": { + "name": "secureScoreName", + "in": "path", + "required": true, + "type": "string", + "description": "The secure score initiative name", + "x-ms-parameter-location": "method" + } + } } -} + \ No newline at end of file From 7be3fda4b16537940405b6099be87e6f275e0f56 Mon Sep 17 00:00:00 2001 From: Gideon Romm Date: Sun, 9 Feb 2020 11:26:07 +0200 Subject: [PATCH 31/53] prettifying the code --- .../2020-01-01-preview/secureScore.json | 1227 ++++++++--------- 1 file changed, 613 insertions(+), 614 deletions(-) diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json index 0b29831da4dc..2ec66838fef9 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json @@ -1,616 +1,615 @@ { - "swagger": "2.0", - "info": { - "title": "Security Center", - "description": "API spec for Microsoft.Security (Azure Security Center) resource provider", - "version": "2020-01-01-preview" - }, - "host": "management.azure.com", - "schemes": [ - "https" - ], - "consumes": [ - "application/json" - ], - "produces": [ - "application/json" - ], - "security": [ - { - "azure_auth": [ - "user_impersonation" - ] - } - ], - "securityDefinitions": { - "azure_auth": { - "type": "oauth2", - "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", - "flow": "implicit", - "description": "Azure Active Directory OAuth2 Flow", - "scopes": { - "user_impersonation": "impersonate your user account" - } - } - }, - "paths": { - "/{scope}/providers/Microsoft.Security/secureScores": { - "get": { - "x-ms-examples": { - "List secure scores": { - "$ref": "./examples/secureScores/ListSecureScores_example.json" - } - }, - "tags": [ - "Secure Scores" - ], - "description": "Get secure scores on all your initiatives inside a scope", - "operationId": "SecureScores_List", - "parameters": [ - { - "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" - }, - { - "$ref": "../../../common/v1/types.json#/parameters/Scope" - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/SecureScoresList" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "../../../common/v1/types.json#/definitions/CloudError" - } - } - }, - "x-ms-pageable": { - "nextLinkName": "nextLink" - } - } - }, - "/{scope}/providers/Microsoft.Security/secureScores/{secureScoreName}": { - "get": { - "x-ms-examples": { - "Get single secure score": { - "$ref": "./examples/secureScores/GetSecureScoresSingle_example.json" - } - }, - "tags": [ - "Secure Scores" - ], - "description": "Get secure score for a specific initiatives inside a scope", - "operationId": "SecureScores_Get", - "parameters": [ - { - "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" - }, - { - "$ref": "../../../common/v1/types.json#/parameters/Scope" - }, - { - "$ref": "#/parameters/secureScoreName" - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/SecureScoresItem" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "../../../common/v1/types.json#/definitions/CloudError" - } - } - } - } - }, - "/{scope}/providers/Microsoft.Security/secureScores/{secureScoreName}/secureScoreControls": { - "get": { - "x-ms-examples": { - "List secure score's controls level for the specified name (builtin)": { - "$ref": "./examples/secureScores/ListSecureScoreControlsForName_builtin_example.json" - }, - "List secure score's controls level for the specified name (custom)": { - "$ref": "./examples/secureScores/ListSecureScoreControlsForName_custom_example.json" - }, - "Get secure score's controls level for the specified name with expand parameter (builtin)": { - "$ref": "./examples/secureScores/ListSecureScoreControlsForNameWithExpand_builtin_example.json" - }, - "Get secure score's controls level for the specified name with expand parameter (custom)": { - "$ref": "./examples/secureScores/ListSecureScoreControlsForNameWithExpand_custom_example.json" - } - }, - "tags": [ - "Secure Scores" - ], - "description": "Get all secure score controls on specific initiatives inside a scope", - "operationId": "SecureScoreControlsByName_List", - "parameters": [ - { - "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" - }, - { - "$ref": "../../../common/v1/types.json#/parameters/Scope" - }, - { - "$ref": "#/parameters/secureScoreName" - }, - { - "$ref": "#/parameters/ExpandControlsDefinition" - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/SecureScoreControlsList" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "../../../common/v1/types.json#/definitions/CloudError" - } - } - }, - "x-ms-pageable": { - "nextLinkName": "nextLink" - } - } - }, - "/{scope}/providers/Microsoft.Security/secureScoreControls": { - "get": { - "x-ms-examples": { - "List all secure scores controls": { - "$ref": "./examples/secureScores/ListSecureScoreControls_example.json" - } - }, - "tags": [ - "Secure Scores" - ], - "description": "Get all secure score controls on specific initiatives inside a scope", - "operationId": "SecureScoreControls_List", - "parameters": [ - { - "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" - }, - { - "$ref": "../../../common/v1/types.json#/parameters/Scope" - }, - { - "$ref": "#/parameters/ExpandControlsDefinition" - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/SecureScoreControlsList" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "../../../common/v1/types.json#/definitions/CloudError" - } - } - }, - "x-ms-pageable": { - "nextLinkName": "nextLink" - } - } - }, - "/providers/Microsoft.Security/secureScoreControlsDefinition": { - "get": { - "x-ms-examples": { - "List secure score controls definition": { - "$ref": "./examples/secureScoreControlsDefinition/ListSecureScoreControlsDefinition_example.json" - } - }, - "tags": [ - "Secure Score Controls Definition" - ], - "description": "Get definition information on all secure score controls", - "operationId": "SecureScoreControlsDefinition_List", - "parameters": [ - { - "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/SecureScoreControlsDefinitionList" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "../../../common/v1/types.json#/definitions/CloudError" - } - } - }, - "x-ms-pageable": { - "nextLinkName": "nextLink" - } - } - }, - "/subscriptions/{subscriptionId}/providers/Microsoft.Security/secureScoreControlsDefinition": { - "get": { - "x-ms-examples": { - "List secure score controls definition by subscription": { - "$ref": "./examples/secureScoreControlsDefinition/ListSecureScoreControlsDefinition_subscription_example.json" - } - }, - "tags": [ - "Secure Score Controls Definition" - ], - "description": "Get definition information on all secure score controls in subscription level", - "operationId": "SecureScoreControlsDefinitionSubscription_List", - "parameters": [ - { - "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" - }, - { - "$ref": "../../../common/v1/types.json#/parameters/SubscriptionId" - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/SecureScoreControlsDefinitionList" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "../../../common/v1/types.json#/definitions/CloudError" - } - } - }, - "x-ms-pageable": { - "nextLinkName": "nextLink" - } - } - } - }, - "definitions": { - "SecureScoresList": { - "type": "object", - "description": "Page of a secure scores list", - "properties": { - "value": { - "description": "Collection of secure scores in this page", - "readOnly": true, - "type": "array", - "items": { - "$ref": "#/definitions/SecureScoresItem" - } - }, - "nextLink": { - "description": "The URI to fetch the next page.", - "readOnly": true, - "type": "string" - } - } - }, - "SecureScoresItem": { - "description": "Secure score item data model", - "readOnly": true, - "type": "object", - "properties": { - "properties": { - "description": "Secure score item", - "readOnly": true, - "x-ms-client-flatten": true, - "$ref": "#/definitions/SecureScoreItemProperties" - } - }, - "allOf": [ - { - "$ref": "../../../common/v1/types.json#/definitions/Resource" - } - ] - }, - "SecureScoreItemProperties": { - "description": "Describes properties of a calculated secure score.", - "readOnly": true, - "type": "object", - "properties": { - "displayName": { - "description": "User friendly display name of the secure score item", - "readOnly": true, - "type": "string" - }, - "score": { - "description": "score object", - "readOnly": true, - "x-ms-client-flatten": true, - "$ref": "#/definitions/SecureScoreScoreDetails" - } - } - }, - "SecureScoreScoreDetails": { - "description": "Calculation result data", - "readOnly": true, - "type": "object", - "properties": { - "max": { - "description": "Maximum score applicable", - "readOnly": true, - "type": "integer", - "format": "int32" - }, - "current": { - "description": "Actual score", - "readOnly": true, - "type": "number", - "format": "double" - } - } - }, - "SecureScoreControlScoreObject": { - "description": "Calculation result data", - "type": "object", - "properties": { - "max": { - "description": "Maximum control score (0..10)", - "readOnly": true, - "type": "integer", - "format": "int32" - }, - "current": { - "description": "Actual score for the control = (achieved points / total points) * max score. if total points is zeroed, the return number is 0.00", - "readOnly": true, - "type": "number", - "format": "double" - } - } - }, - "SecureScoreControlsList": { - "description": "Page of a secure score controls list", - "type": "object", - "properties": { - "value": { - "description": "Collection of secure score controls in this page", - "readOnly": true, - "type": "array", - "items": { - "$ref": "#/definitions/SecureScoreControlDetails" - } - }, - "nextLink": { - "description": "The URI to fetch the next page.", - "readOnly": true, - "type": "string" - } - } - }, - "SecureScoreControlDetails": { - "description": "List of security sub-assessments", - "type": "object", - "properties": { - "properties": { - "x-ms-client-flatten": true, - "$ref": "#/definitions/SecureScoreControlScoreDetails" - } - }, - "allOf": [ - { - "$ref": "../../../common/v1/types.json#/definitions/Resource" - } - ] - }, - "SecureScoreControlScoreDetails": { - "description": "Calculation result data in control level", - "type": "object", - "properties": { - "displayName": { - "description": "User friendly display name of the control", - "readOnly": true, - "type": "string" - }, - "score": { - "description": "Actual score object for the control", - "x-ms-client-flatten": true, - "$ref": "#/definitions/SecureScoreControlScoreObject" - }, - "healthyResources": { - "description": "Number of healthy resources in the control", - "readOnly": true, - "type": "integer", - "format": "int32" - }, - "unhealthyResources": { - "description": "Number of unhealthy resources in the control", - "readOnly": true, - "type": "integer", - "format": "int32" - }, - "notApplicableResources": { - "description": "Number of not applicable resources in the control", - "readOnly": true, - "type": "integer", - "format": "int32" - }, - "disabledResources": { - "description": "Number of not resources that are disabled by policy in the control", - "readOnly": true, - "type": "integer", - "format": "int32" - }, - "definition": { - "$ref": "#/definitions/SecureScoreControlDefinitionItem" - } - } - }, - "SecureScoreControlsDefinitionList": { - "description": "Page of a secure score controls definition list", - "type": "object", - "properties": { - "value": { - "description": "Collection of secure score controls definition in this page", - "readOnly": true, - "type": "array", - "items": { - "$ref": "#/definitions/SecureScoreControlDefinitionItem" - } - }, - "nextLink": { - "description": "The URI to fetch the next page.", - "readOnly": true, - "type": "string" - } - } - }, - "SecureScoreControlDefinitionItem": { - "description": "Secure Score Control's Definition information", - "type": "object", - "properties": { - "properties": { - "x-ms-client-flatten": true, - "$ref": "#/definitions/SecureScoreControlDefinitionItemProperties" - } - }, - "allOf": [ - { - "$ref": "../../../common/v1/types.json#/definitions/Resource" - } - ] - }, - "SecureScoreControlDefinitionItemProperties": { - "description": "Secure Score Control Definition Properties", - "type": "object", - "properties": { - "displayName": { - "description": "User friendly display name of the control", - "readOnly": true, - "type": "string" - }, - "description": { - "description": "User friendly display name of the control", - "readOnly": true, - "type": "string", - "maxLength": 256 - }, - "maxScore": { - "description": "Maximum control score (0..10)", - "readOnly": true, - "type": "integer", - "format": "int32", - "minimum": 0, - "maximum": 10, - "exclusiveMinimum": false - }, - "source": { - "description": "Source object from which the control was created", - "readOnly": true, - "$ref": "#/definitions/SecureScoreControlDefinitionSource" - }, - "assessmentsDefinition": { - "description": "array of assessments metadata ids", - "readOnly": true, - "type": "array", - "items": { - "$ref": "#/definitions/SecureScoreControlDefinitionAssessmentsId" - } - } - } - }, - "SecureScoreControlDefinitionAssessmentsId": { - "type": "object", - "description": "Secure Score Control Definition Properties", - "properties": { - "id": { - "description": "Full assessment metadata azure ids that build the control", - "readOnly": true, - "type": "string" - } - } - }, - "SecureScoreControlDefinitionSource": { - "description": "representing the source of the control", - "readOnly": true, - "type": "object", - "properties": { - "sourceType": { - "description": "BuiltIn if the control is built-in from Azure Security Center managed assessments, Custom if the assessment based on custom Azure Policy definition, CustomerManaged for customers who build their own controls", - "type": "string", - "enum": [ - "BuiltIn", - "CustomPolicy", - "CustomerManaged" - ], - "x-ms-enum": { - "name": "controlType", - "modelAsString": true, - "values": [ - { - "value": "BuiltIn", - "description": "Azure Security Center managed assessments" - }, - { - "value": "CustomPolicy", - "description": "User defined policies that are automatically ingested from Azure Policy to Azure Security Center" - }, - { - "value": "CustomerManaged", - "description": "User controls pushed directly by the user or other third party to Azure Security Center" - } - ] - } - }, - "policySetDefinitionId": { - "description": "id of the policy set definition id from which the control was generated", - "type": "string" - }, - "groupName": { - "description": "represents the GroupName within the specific policy set definition", - "type": "string" - } - } - } - }, - "parameters": { - "ExpandControlsDefinition": { - "name": "$expand", - "in": "query", - "required": false, - "type": "string", - "description": "OData expand. Optional.", - "x-ms-parameter-location": "method", - "enum": [ - "definition" - ], - "x-ms-enum": { - "name": "ExpandControlsEnum", - "modelAsString": true, - "values": [ - { - "value": "definition", - "description": "Add definition object for each control" - } - ] - } - }, - "secureScoreName": { - "name": "secureScoreName", - "in": "path", - "required": true, - "type": "string", - "description": "The secure score initiative name", - "x-ms-parameter-location": "method" - } - } + "swagger": "2.0", + "info": { + "title": "Security Center", + "description": "API spec for Microsoft.Security (Azure Security Center) resource provider", + "version": "2020-01-01-preview" + }, + "host": "management.azure.com", + "schemes": [ + "https" + ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "security": [ + { + "azure_auth": [ + "user_impersonation" + ] + } + ], + "securityDefinitions": { + "azure_auth": { + "type": "oauth2", + "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", + "flow": "implicit", + "description": "Azure Active Directory OAuth2 Flow", + "scopes": { + "user_impersonation": "impersonate your user account" + } + } + }, + "paths": { + "/{scope}/providers/Microsoft.Security/secureScores": { + "get": { + "x-ms-examples": { + "List secure scores": { + "$ref": "./examples/secureScores/ListSecureScores_example.json" + } + }, + "tags": [ + "Secure Scores" + ], + "description": "Get secure scores on all your initiatives inside a scope", + "operationId": "SecureScores_List", + "parameters": [ + { + "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/Scope" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/SecureScoresList" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "../../../common/v1/types.json#/definitions/CloudError" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/{scope}/providers/Microsoft.Security/secureScores/{secureScoreName}": { + "get": { + "x-ms-examples": { + "Get single secure score": { + "$ref": "./examples/secureScores/GetSecureScoresSingle_example.json" + } + }, + "tags": [ + "Secure Scores" + ], + "description": "Get secure score for a specific initiatives inside a scope", + "operationId": "SecureScores_Get", + "parameters": [ + { + "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/Scope" + }, + { + "$ref": "#/parameters/secureScoreName" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/SecureScoresItem" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "../../../common/v1/types.json#/definitions/CloudError" + } + } + } + } + }, + "/{scope}/providers/Microsoft.Security/secureScores/{secureScoreName}/secureScoreControls": { + "get": { + "x-ms-examples": { + "List secure score's controls level for the specified name (builtin)": { + "$ref": "./examples/secureScores/ListSecureScoreControlsForName_builtin_example.json" + }, + "List secure score's controls level for the specified name (custom)": { + "$ref": "./examples/secureScores/ListSecureScoreControlsForName_custom_example.json" + }, + "Get secure score's controls level for the specified name with expand parameter (builtin)": { + "$ref": "./examples/secureScores/ListSecureScoreControlsForNameWithExpand_builtin_example.json" + }, + "Get secure score's controls level for the specified name with expand parameter (custom)": { + "$ref": "./examples/secureScores/ListSecureScoreControlsForNameWithExpand_custom_example.json" + } + }, + "tags": [ + "Secure Scores" + ], + "description": "Get all secure score controls on specific initiatives inside a scope", + "operationId": "SecureScoreControlsByName_List", + "parameters": [ + { + "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/Scope" + }, + { + "$ref": "#/parameters/secureScoreName" + }, + { + "$ref": "#/parameters/ExpandControlsDefinition" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/SecureScoreControlsList" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "../../../common/v1/types.json#/definitions/CloudError" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/{scope}/providers/Microsoft.Security/secureScoreControls": { + "get": { + "x-ms-examples": { + "List all secure scores controls": { + "$ref": "./examples/secureScores/ListSecureScoreControls_example.json" + } + }, + "tags": [ + "Secure Scores" + ], + "description": "Get all secure score controls on specific initiatives inside a scope", + "operationId": "SecureScoreControls_List", + "parameters": [ + { + "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/Scope" + }, + { + "$ref": "#/parameters/ExpandControlsDefinition" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/SecureScoreControlsList" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "../../../common/v1/types.json#/definitions/CloudError" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/providers/Microsoft.Security/secureScoreControlsDefinition": { + "get": { + "x-ms-examples": { + "List secure score controls definition": { + "$ref": "./examples/secureScoreControlsDefinition/ListSecureScoreControlsDefinition_example.json" + } + }, + "tags": [ + "Secure Score Controls Definition" + ], + "description": "Get definition information on all secure score controls", + "operationId": "SecureScoreControlsDefinition_List", + "parameters": [ + { + "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/SecureScoreControlsDefinitionList" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "../../../common/v1/types.json#/definitions/CloudError" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.Security/secureScoreControlsDefinition": { + "get": { + "x-ms-examples": { + "List secure score controls definition by subscription": { + "$ref": "./examples/secureScoreControlsDefinition/ListSecureScoreControlsDefinition_subscription_example.json" + } + }, + "tags": [ + "Secure Score Controls Definition" + ], + "description": "Get definition information on all secure score controls in subscription level", + "operationId": "SecureScoreControlsDefinitionSubscription_List", + "parameters": [ + { + "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/SubscriptionId" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/SecureScoreControlsDefinitionList" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "../../../common/v1/types.json#/definitions/CloudError" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + } + }, + "definitions": { + "SecureScoresList": { + "type": "object", + "description": "Page of a secure scores list", + "properties": { + "value": { + "description": "Collection of secure scores in this page", + "readOnly": true, + "type": "array", + "items": { + "$ref": "#/definitions/SecureScoresItem" + } + }, + "nextLink": { + "description": "The URI to fetch the next page.", + "readOnly": true, + "type": "string" + } + } + }, + "SecureScoresItem": { + "description": "Secure score item data model", + "readOnly": true, + "type": "object", + "properties": { + "properties": { + "description": "Secure score item", + "readOnly": true, + "x-ms-client-flatten": true, + "$ref": "#/definitions/SecureScoreItemProperties" + } + }, + "allOf": [ + { + "$ref": "../../../common/v1/types.json#/definitions/Resource" + } + ] + }, + "SecureScoreItemProperties": { + "description": "Describes properties of a calculated secure score.", + "readOnly": true, + "type": "object", + "properties": { + "displayName": { + "description": "User friendly display name of the secure score item", + "readOnly": true, + "type": "string" + }, + "score": { + "description": "score object", + "readOnly": true, + "x-ms-client-flatten": true, + "$ref": "#/definitions/SecureScoreScoreDetails" + } + } + }, + "SecureScoreScoreDetails": { + "description": "Calculation result data", + "readOnly": true, + "type": "object", + "properties": { + "max": { + "description": "Maximum score applicable", + "readOnly": true, + "type": "integer", + "format": "int32" + }, + "current": { + "description": "Actual score", + "readOnly": true, + "type": "number", + "format": "double" + } + } + }, + "SecureScoreControlScoreObject": { + "description": "Calculation result data", + "type": "object", + "properties": { + "max": { + "description": "Maximum control score (0..10)", + "readOnly": true, + "type": "integer", + "format": "int32" + }, + "current": { + "description": "Actual score for the control = (achieved points / total points) * max score. if total points is zeroed, the return number is 0.00", + "readOnly": true, + "type": "number", + "format": "double" + } + } + }, + "SecureScoreControlsList": { + "description": "Page of a secure score controls list", + "type": "object", + "properties": { + "value": { + "description": "Collection of secure score controls in this page", + "readOnly": true, + "type": "array", + "items": { + "$ref": "#/definitions/SecureScoreControlDetails" + } + }, + "nextLink": { + "description": "The URI to fetch the next page.", + "readOnly": true, + "type": "string" + } + } + }, + "SecureScoreControlDetails": { + "description": "List of security sub-assessments", + "type": "object", + "properties": { + "properties": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/SecureScoreControlScoreDetails" + } + }, + "allOf": [ + { + "$ref": "../../../common/v1/types.json#/definitions/Resource" + } + ] + }, + "SecureScoreControlScoreDetails": { + "description": "Calculation result data in control level", + "type": "object", + "properties": { + "displayName": { + "description": "User friendly display name of the control", + "readOnly": true, + "type": "string" + }, + "score": { + "description": "Actual score object for the control", + "x-ms-client-flatten": true, + "$ref": "#/definitions/SecureScoreControlScoreObject" + }, + "healthyResources": { + "description": "Number of healthy resources in the control", + "readOnly": true, + "type": "integer", + "format": "int32" + }, + "unhealthyResources": { + "description": "Number of unhealthy resources in the control", + "readOnly": true, + "type": "integer", + "format": "int32" + }, + "notApplicableResources": { + "description": "Number of not applicable resources in the control", + "readOnly": true, + "type": "integer", + "format": "int32" + }, + "disabledResources": { + "description": "Number of not resources that are disabled by policy in the control", + "readOnly": true, + "type": "integer", + "format": "int32" + }, + "definition": { + "$ref": "#/definitions/SecureScoreControlDefinitionItem" + } + } + }, + "SecureScoreControlsDefinitionList": { + "description": "Page of a secure score controls definition list", + "type": "object", + "properties": { + "value": { + "description": "Collection of secure score controls definition in this page", + "readOnly": true, + "type": "array", + "items": { + "$ref": "#/definitions/SecureScoreControlDefinitionItem" + } + }, + "nextLink": { + "description": "The URI to fetch the next page.", + "readOnly": true, + "type": "string" + } + } + }, + "SecureScoreControlDefinitionItem": { + "description": "Secure Score Control's Definition information", + "type": "object", + "properties": { + "properties": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/SecureScoreControlDefinitionItemProperties" + } + }, + "allOf": [ + { + "$ref": "../../../common/v1/types.json#/definitions/Resource" + } + ] + }, + "SecureScoreControlDefinitionItemProperties": { + "description": "Secure Score Control Definition Properties", + "type": "object", + "properties": { + "displayName": { + "description": "User friendly display name of the control", + "readOnly": true, + "type": "string" + }, + "description": { + "description": "User friendly display name of the control", + "readOnly": true, + "type": "string", + "maxLength": 256 + }, + "maxScore": { + "description": "Maximum control score (0..10)", + "readOnly": true, + "type": "integer", + "format": "int32", + "minimum": 0, + "maximum": 10, + "exclusiveMinimum": false + }, + "source": { + "description": "Source object from which the control was created", + "readOnly": true, + "$ref": "#/definitions/SecureScoreControlDefinitionSource" + }, + "assessmentsDefinition": { + "description": "array of assessments metadata ids", + "readOnly": true, + "type": "array", + "items": { + "$ref": "#/definitions/SecureScoreControlDefinitionAssessmentsId" + } + } + } + }, + "SecureScoreControlDefinitionAssessmentsId": { + "type": "object", + "description": "Secure Score Control Definition Properties", + "properties": { + "id": { + "description": "Full assessment metadata azure ids that build the control", + "readOnly": true, + "type": "string" + } + } + }, + "SecureScoreControlDefinitionSource": { + "description": "representing the source of the control", + "readOnly": true, + "type": "object", + "properties": { + "sourceType": { + "description": "BuiltIn if the control is built-in from Azure Security Center managed assessments, Custom if the assessment based on custom Azure Policy definition, CustomerManaged for customers who build their own controls", + "type": "string", + "enum": [ + "BuiltIn", + "CustomPolicy", + "CustomerManaged" + ], + "x-ms-enum": { + "name": "controlType", + "modelAsString": true, + "values": [ + { + "value": "BuiltIn", + "description": "Azure Security Center managed assessments" + }, + { + "value": "CustomPolicy", + "description": "User defined policies that are automatically ingested from Azure Policy to Azure Security Center" + }, + { + "value": "CustomerManaged", + "description": "User controls pushed directly by the user or other third party to Azure Security Center" + } + ] + } + }, + "policySetDefinitionId": { + "description": "id of the policy set definition id from which the control was generated", + "type": "string" + }, + "groupName": { + "description": "represents the GroupName within the specific policy set definition", + "type": "string" + } + } + } + }, + "parameters": { + "ExpandControlsDefinition": { + "name": "$expand", + "in": "query", + "required": false, + "type": "string", + "description": "OData expand. Optional.", + "x-ms-parameter-location": "method", + "enum": [ + "definition" + ], + "x-ms-enum": { + "name": "ExpandControlsEnum", + "modelAsString": true, + "values": [ + { + "value": "definition", + "description": "Add definition object for each control" + } + ] + } + }, + "secureScoreName": { + "name": "secureScoreName", + "in": "path", + "required": true, + "type": "string", + "description": "The secure score initiative name", + "x-ms-parameter-location": "method" + } } - \ No newline at end of file +} From f8303fbe5072304eb3d4ac0ce84a1a531e7f0bed Mon Sep 17 00:00:00 2001 From: Gideon Romm Date: Mon, 10 Feb 2020 17:54:12 +0200 Subject: [PATCH 32/53] Updated based on PR comments --- ...ecureScoreControlDefinitions_example.json} | 0 ...trolDefinitions_subscription_example.json} | 0 ...rolsForNameWithExpand_builtin_example.json | 21 ++-- ...trolsForNameWithExpand_custom_example.json | 7 +- ...eScoreControlsForName_builtin_example.json | 21 ++-- ...reScoreControlsForName_custom_example.json | 7 +- .../ListSecureScoreControls_example.json | 28 +++-- .../2020-01-01-preview/secureScore.json | 102 ++++++------------ .../resource-manager/common/v1/types.json | 19 ++++ 9 files changed, 90 insertions(+), 115 deletions(-) rename specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/{secureScoreControlsDefinition/ListSecureScoreControlsDefinition_example.json => secureScoreControlDefinitions/ListSecureScoreControlDefinitions_example.json} (100%) rename specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/{secureScoreControlsDefinition/ListSecureScoreControlsDefinition_subscription_example.json => secureScoreControlDefinitions/ListSecureScoreControlDefinitions_subscription_example.json} (100%) diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScoreControlsDefinition/ListSecureScoreControlsDefinition_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScoreControlDefinitions/ListSecureScoreControlDefinitions_example.json similarity index 100% rename from specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScoreControlsDefinition/ListSecureScoreControlsDefinition_example.json rename to specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScoreControlDefinitions/ListSecureScoreControlDefinitions_example.json diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScoreControlsDefinition/ListSecureScoreControlsDefinition_subscription_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScoreControlDefinitions/ListSecureScoreControlDefinitions_subscription_example.json similarity index 100% rename from specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScoreControlsDefinition/ListSecureScoreControlsDefinition_subscription_example.json rename to specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScoreControlDefinitions/ListSecureScoreControlDefinitions_subscription_example.json diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_builtin_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_builtin_example.json index 482dcf5e7bb5..ef7b2dffe69a 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_builtin_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_builtin_example.json @@ -18,10 +18,9 @@ "type": "Microsoft.Security/securescorescontrol", "properties": { "displayName": "Protect applications against DDoS attacks", - "healthyResources": 0, - "unhealthyResources": 0, - "notApplicableResources": 10, - "disabledResources": 50, + "healthyResourceCount": 0, + "unhealthyResourceCount": 0, + "notApplicableResourceCount": 10, "score": { "max": 0, "current": 0 @@ -53,10 +52,9 @@ "type": "Microsoft.Security/securescorescontrol", "properties": { "displayName": "Enable MFA", - "healthyResources": 0, - "unhealthyResources": 1, - "notApplicableResources": 0, - "disabledResources": 0, + "healthyResourceCount": 0, + "unhealthyResourceCount": 1, + "notApplicableResourceCount": 0, "score": { "max": 10, "current": 0 @@ -94,10 +92,9 @@ "type": "Microsoft.Security/securescorescontrol", "properties": { "displayName": "Apply adaptive application control", - "healthyResources": 20, - "unhealthyResources": 0, - "notApplicableResources": 10, - "disabledResources": 5, + "healthyResourceCount": 20, + "unhealthyResourceCount": 0, + "notApplicableResourceCount": 10, "score": { "max": 3, "current": 3 diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_custom_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_custom_example.json index 0084f434c23f..dca72c511051 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_custom_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_custom_example.json @@ -18,10 +18,9 @@ "type": "Microsoft.Security/securescorescontrol", "properties": { "displayName": "Protect applications against DDoS attacks", - "healthyResources": 0, - "unhealthyResources": 10, - "notApplicableResources": 0, - "disabledResources": 50, + "healthyResourceCount": 0, + "unhealthyResourceCount": 10, + "notApplicableResourceCount": 0, "score": { "max": 3, "current": 0 diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_builtin_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_builtin_example.json index b4ad73667340..b5ab1c1c3178 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_builtin_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_builtin_example.json @@ -14,10 +14,9 @@ "type": "Microsoft.Security/securescorescontrol", "properties": { "displayName": "Protect applications against DDoS attacks", - "healthyResources": 0, - "unhealthyResources": 0, - "notApplicableResources": 10, - "disabledResources": 50, + "healthyResourceCount": 0, + "unhealthyResourceCount": 0, + "notApplicableResourceCount": 10, "score": { "max": 0, "current": 0 @@ -30,10 +29,9 @@ "type": "Microsoft.Security/securescorescontrol", "properties": { "displayName": "Enable MFA", - "healthyResources": 0, - "unhealthyResources": 1, - "notApplicableResources": 0, - "disabledResources": 0, + "healthyResourceCount": 0, + "unhealthyResourceCount": 1, + "notApplicableResourceCount": 0, "score": { "max": 10, "current": 0 @@ -46,10 +44,9 @@ "type": "Microsoft.Security/securescorescontrol", "properties": { "displayName": "Apply adaptive application control", - "healthyResources": 20, - "unhealthyResources": 0, - "notApplicableResources": 10, - "disabledResources": 5, + "healthyResourceCount": 20, + "unhealthyResourceCount": 0, + "notApplicableResourceCount": 10, "score": { "max": 3, "current": 3 diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_custom_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_custom_example.json index 3d65f29f0110..a420853fe4f5 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_custom_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_custom_example.json @@ -14,10 +14,9 @@ "type": "Microsoft.Security/securescorescontrol", "properties": { "displayName": "Protect applications against DDoS attacks", - "healthyResources": 0, - "unhealthyResources": 10, - "notApplicableResources": 0, - "disabledResources": 50, + "healthyResourceCount": 0, + "unhealthyResourceCount": 10, + "notApplicableResourceCount": 0, "score": { "max": 2, "current": 0 diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControls_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControls_example.json index 8008a2ab07c8..4727cf89ced0 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControls_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControls_example.json @@ -13,10 +13,9 @@ "type": "Microsoft.Security/securescorescontrol", "properties": { "displayName": "Protect applications against DDoS attacks", - "healthyResources": 0, - "unhealthyResources": 0, - "notApplicableResources": 10, - "disabledResources": 50, + "healthyResourceCount": 0, + "unhealthyResourceCount": 0, + "notApplicableResourceCount": 10, "score": { "max": 0, "current": 0 @@ -29,10 +28,9 @@ "type": "Microsoft.Security/securescorescontrol", "properties": { "displayName": "Enable MFA", - "healthyResources": 0, - "unhealthyResources": 1, - "notApplicableResources": 0, - "disabledResources": 0, + "healthyResourceCount": 0, + "unhealthyResourceCount": 1, + "notApplicableResourceCount": 0, "score": { "max": 10, "current": 0 @@ -45,10 +43,9 @@ "type": "Microsoft.Security/securescorescontrol", "properties": { "displayName": "Apply adaptive application control", - "healthyResources": 20, - "unhealthyResources": 0, - "notApplicableResources": 10, - "disabledResources": 5, + "healthyResourceCount": 20, + "unhealthyResourceCount": 0, + "notApplicableResourceCount": 10, "score": { "max": 3, "current": 3 @@ -61,10 +58,9 @@ "type": "Microsoft.Security/securescorescontrol", "properties": { "displayName": "Protect applications against DDoS attacks", - "healthyResources": 0, - "unhealthyResources": 10, - "notApplicableResources": 0, - "disabledResources": 50, + "healthyResourceCount": 0, + "unhealthyResourceCount": 10, + "notApplicableResourceCount": 0, "score": { "max": 2, "current": 0 diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json index 2ec66838fef9..d9e728ae93d4 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json @@ -100,7 +100,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/SecureScoresItem" + "$ref": "#/definitions/SecureScoreItem" } }, "default": { @@ -115,24 +115,18 @@ "/{scope}/providers/Microsoft.Security/secureScores/{secureScoreName}/secureScoreControls": { "get": { "x-ms-examples": { - "List secure score's controls level for the specified name (builtin)": { + "List secure score's controls level for the specified name": { "$ref": "./examples/secureScores/ListSecureScoreControlsForName_builtin_example.json" }, - "List secure score's controls level for the specified name (custom)": { - "$ref": "./examples/secureScores/ListSecureScoreControlsForName_custom_example.json" - }, "Get secure score's controls level for the specified name with expand parameter (builtin)": { "$ref": "./examples/secureScores/ListSecureScoreControlsForNameWithExpand_builtin_example.json" - }, - "Get secure score's controls level for the specified name with expand parameter (custom)": { - "$ref": "./examples/secureScores/ListSecureScoreControlsForNameWithExpand_custom_example.json" } }, "tags": [ "Secure Scores" ], "description": "Get all secure score controls on specific initiatives inside a scope", - "operationId": "SecureScoreControlsByName_List", + "operationId": "SecureScoreControls_ListBySecureScore", "parameters": [ { "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" @@ -208,18 +202,18 @@ } } }, - "/providers/Microsoft.Security/secureScoreControlsDefinition": { + "/providers/Microsoft.Security/secureScoreControlDefinitions": { "get": { "x-ms-examples": { "List secure score controls definition": { - "$ref": "./examples/secureScoreControlsDefinition/ListSecureScoreControlsDefinition_example.json" + "$ref": "./examples/secureScoreControlDefinitions/ListsecureScoreControlDefinitions_example.json" } }, "tags": [ "Secure Score Controls Definition" ], "description": "Get definition information on all secure score controls", - "operationId": "SecureScoreControlsDefinition_List", + "operationId": "secureScoreControlDefinitions_List", "parameters": [ { "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" @@ -229,7 +223,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/SecureScoreControlsDefinitionList" + "$ref": "#/definitions/secureScoreControlDefinitionList" } }, "default": { @@ -244,18 +238,18 @@ } } }, - "/subscriptions/{subscriptionId}/providers/Microsoft.Security/secureScoreControlsDefinition": { + "/subscriptions/{subscriptionId}/providers/Microsoft.Security/secureScoreControlDefinitions": { "get": { "x-ms-examples": { "List secure score controls definition by subscription": { - "$ref": "./examples/secureScoreControlsDefinition/ListSecureScoreControlsDefinition_subscription_example.json" + "$ref": "./examples/secureScoreControlDefinitions/ListsecureScoreControlDefinitions_subscription_example.json" } }, "tags": [ "Secure Score Controls Definition" ], "description": "Get definition information on all secure score controls in subscription level", - "operationId": "SecureScoreControlsDefinitionSubscription_List", + "operationId": "SecureScoreControlDefinitions_ListBySubscription", "parameters": [ { "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" @@ -268,7 +262,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/SecureScoreControlsDefinitionList" + "$ref": "#/definitions/secureScoreControlDefinitionList" } }, "default": { @@ -294,7 +288,7 @@ "readOnly": true, "type": "array", "items": { - "$ref": "#/definitions/SecureScoresItem" + "$ref": "#/definitions/SecureScoreItem" } }, "nextLink": { @@ -304,7 +298,7 @@ } } }, - "SecureScoresItem": { + "SecureScoreItem": { "description": "Secure score item data model", "readOnly": true, "type": "object", @@ -349,13 +343,17 @@ "description": "Maximum score applicable", "readOnly": true, "type": "integer", - "format": "int32" + "format": "int32", + "minimum": 0, + "exclusiveMinimum": false }, "current": { "description": "Actual score", "readOnly": true, "type": "number", - "format": "double" + "format": "double", + "minimum": 0.00, + "exclusiveMinimum": false } } }, @@ -367,13 +365,19 @@ "description": "Maximum control score (0..10)", "readOnly": true, "type": "integer", - "format": "int32" + "format": "int32", + "minimum": 0, + "maximum": 10, + "exclusiveMinimum": false }, "current": { "description": "Actual score for the control = (achieved points / total points) * max score. if total points is zeroed, the return number is 0.00", "readOnly": true, "type": "number", - "format": "double" + "format": "double", + "minimum": 0.00, + "maximum": 10.00, + "exclusiveMinimum": false } } }, @@ -397,7 +401,7 @@ } }, "SecureScoreControlDetails": { - "description": "List of security sub-assessments", + "description": "Secure score control (calculated) object", "type": "object", "properties": { "properties": { @@ -425,36 +429,30 @@ "x-ms-client-flatten": true, "$ref": "#/definitions/SecureScoreControlScoreObject" }, - "healthyResources": { + "healthyResourceCount": { "description": "Number of healthy resources in the control", "readOnly": true, "type": "integer", "format": "int32" }, - "unhealthyResources": { + "unhealthyResourceCount": { "description": "Number of unhealthy resources in the control", "readOnly": true, "type": "integer", "format": "int32" }, - "notApplicableResources": { + "notApplicableResourceCount": { "description": "Number of not applicable resources in the control", "readOnly": true, "type": "integer", "format": "int32" }, - "disabledResources": { - "description": "Number of not resources that are disabled by policy in the control", - "readOnly": true, - "type": "integer", - "format": "int32" - }, "definition": { "$ref": "#/definitions/SecureScoreControlDefinitionItem" } } }, - "SecureScoreControlsDefinitionList": { + "secureScoreControlDefinitionList": { "description": "Page of a secure score controls definition list", "type": "object", "properties": { @@ -498,7 +496,7 @@ "type": "string" }, "description": { - "description": "User friendly display name of the control", + "description": "User friendly description of the control", "readOnly": true, "type": "string", "maxLength": 256 @@ -518,23 +516,9 @@ "$ref": "#/definitions/SecureScoreControlDefinitionSource" }, "assessmentsDefinition": { - "description": "array of assessments metadata ids", + "description": "array of assessments metadata IDs that are included in this control", "readOnly": true, - "type": "array", - "items": { - "$ref": "#/definitions/SecureScoreControlDefinitionAssessmentsId" - } - } - } - }, - "SecureScoreControlDefinitionAssessmentsId": { - "type": "object", - "description": "Secure Score Control Definition Properties", - "properties": { - "id": { - "description": "Full assessment metadata azure ids that build the control", - "readOnly": true, - "type": "string" + "$ref": "../../../common/v1/types.json#/definitions/AzureResourceLinks" } } }, @@ -558,25 +542,9 @@ { "value": "BuiltIn", "description": "Azure Security Center managed assessments" - }, - { - "value": "CustomPolicy", - "description": "User defined policies that are automatically ingested from Azure Policy to Azure Security Center" - }, - { - "value": "CustomerManaged", - "description": "User controls pushed directly by the user or other third party to Azure Security Center" } ] } - }, - "policySetDefinitionId": { - "description": "id of the policy set definition id from which the control was generated", - "type": "string" - }, - "groupName": { - "description": "represents the GroupName within the specific policy set definition", - "type": "string" } } } diff --git a/specification/security/resource-manager/common/v1/types.json b/specification/security/resource-manager/common/v1/types.json index 5996220fe2bc..1dd01005fbcc 100644 --- a/specification/security/resource-manager/common/v1/types.json +++ b/specification/security/resource-manager/common/v1/types.json @@ -241,6 +241,25 @@ "sourceComputerId", "machineName" ] + }, + "AzureResourceLinks": { + "description": "array of azure resource IDs", + "readOnly": true, + "type": "array", + "items": { + "$ref": "#/definitions/AzureResourceLink" + } + }, + "AzureResourceLink": { + "type": "object", + "description": "Describes an Azure resource with kind", + "properties": { + "id": { + "readOnly": true, + "type": "string", + "description": "Azure resource Id" + } + } } }, "parameters": { From 0ce27884d57586583d6336026bdbc6183399a2fb Mon Sep 17 00:00:00 2001 From: Gideon Romm Date: Mon, 10 Feb 2020 18:02:41 +0200 Subject: [PATCH 33/53] Fix casing issues in example files name --- .../preview/2020-01-01-preview/secureScore.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json index d9e728ae93d4..6a86cf45bd01 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json @@ -206,7 +206,7 @@ "get": { "x-ms-examples": { "List secure score controls definition": { - "$ref": "./examples/secureScoreControlDefinitions/ListsecureScoreControlDefinitions_example.json" + "$ref": "./examples/secureScoreControlDefinitions/ListSecureScoreControlDefinitions_example.json" } }, "tags": [ @@ -242,7 +242,7 @@ "get": { "x-ms-examples": { "List secure score controls definition by subscription": { - "$ref": "./examples/secureScoreControlDefinitions/ListsecureScoreControlDefinitions_subscription_example.json" + "$ref": "./examples/secureScoreControlDefinitions/ListSecureScoreControlDefinitions_subscription_example.json" } }, "tags": [ From 5e692ee05a31df3a71b23657b5b6ca13109cba9b Mon Sep 17 00:00:00 2001 From: Gideon Romm Date: Tue, 11 Feb 2020 11:02:52 +0200 Subject: [PATCH 34/53] Fixing sample files and remove some enum options --- ...SecureScoreControlDefinitions_example.json | 50 +---------------- ...ntrolDefinitions_subscription_example.json | 31 +--------- ...rolsForNameWithExpand_builtin_example.json | 9 +-- ...trolsForNameWithExpand_custom_example.json | 56 ------------------- ...reScoreControlsForName_custom_example.json | 30 ---------- .../2020-01-01-preview/secureScore.json | 6 +- 6 files changed, 11 insertions(+), 171 deletions(-) delete mode 100644 specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_custom_example.json delete mode 100644 specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_custom_example.json diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScoreControlDefinitions/ListSecureScoreControlDefinitions_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScoreControlDefinitions/ListSecureScoreControlDefinitions_example.json index 84168e5f57d2..150fc0260771 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScoreControlDefinitions/ListSecureScoreControlDefinitions_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScoreControlDefinitions/ListSecureScoreControlDefinitions_example.json @@ -12,8 +12,7 @@ "type": "Microsoft.Security/SecureScoresControlMetadata", "properties": { "source": { - "sourceType": "BuiltIn", - "policySetDefinitionId": "/providers/Microsoft.Authorization/policySetDefinitions/1f3afdf9-d0c9-4c3d-847f-89da613e70a8" + "sourceType": "BuiltIn" }, "displayName": "Protect applications against DDoS attacks", "description": "", @@ -31,8 +30,7 @@ "type": "Microsoft.Security/SecureScoresControlMetadata", "properties": { "source": { - "sourceType": "BuiltIn", - "policySetDefinitionId": "/providers/Microsoft.Authorization/policySetDefinitions/1f3afdf9-d0c9-4c3d-847f-89da613e70a8" + "sourceType": "BuiltIn" }, "displayName": "Enable MFA", "description": "", @@ -56,8 +54,7 @@ "type": "Microsoft.Security/SecureScoresControlMetadata", "properties": { "source": { - "sourceType": "BuiltIn", - "policySetDefinitionId": "/providers/Microsoft.Authorization/policySetDefinitions/1f3afdf9-d0c9-4c3d-847f-89da613e70a8" + "sourceType": "BuiltIn" }, "displayName": "Apply adaptive application control", "description": "", @@ -77,47 +74,6 @@ } ] } - }, - { - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScoreControlsDefinition/a9909064-42b4-4d34-8143-275477afe18b", - "name": "a9909064-42b4-4d34-8143-275477afe18b", - "type": "Microsoft.Security/SecureScoresControlMetadata", - "properties": { - "source": { - "sourceType": "CustomPolicy", - "policySetDefinitionId": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Authorization/policySetDefinitions/1203fdf9-eeee-ffff-847f-89da613eabcd" - }, - "displayName": "Apply adaptive application control", - "description": "", - "maxScore": 3, - "assessmentsDefinition": [ - { - "id": "/providers/Microsoft.Security/assessmentMetadata/e3de1cc0-f4dd-3b34-e496-8b5381ba2d70" - }, - { - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/assessmentMetadata/4c8a64c9-9b0f-0da9-2d2e-1d11ad316f4e" - } - ] - } - }, - { - "id": "/subscriptions/11111111-e762-44dd-bd96-202020202020/providers/Microsoft.Security/secureScoreControlsDefinition/a9909064-42b4-4d34-8143-275477afe18b", - "name": "a9909064-42b4-4d34-8143-275477afe18b", - "type": "Microsoft.Security/SecureScoresControlMetadata", - "properties": { - "source": { - "sourceType": "CustomPolicy", - "policySetDefinitionId": "/subscriptions/11111111-e762-44dd-bd96-202020202020/providers/Microsoft.Authorization/policySetDefinitions/dddddddd-eeee-ffff-847f-89da613eabcd" - }, - "displayName": "My custom application control", - "description": "", - "maxScore": 5, - "assessmentsDefinition": [ - { - "id": "/subscriptions/11111111-e762-44dd-bd96-202020202020/providers/Microsoft.Security/assessmentMetadata/12345678-9a04-0000-2eed-565656565656" - } - ] - } } ] } diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScoreControlDefinitions/ListSecureScoreControlDefinitions_subscription_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScoreControlDefinitions/ListSecureScoreControlDefinitions_subscription_example.json index fa8ff462f814..d0fb81b92426 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScoreControlDefinitions/ListSecureScoreControlDefinitions_subscription_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScoreControlDefinitions/ListSecureScoreControlDefinitions_subscription_example.json @@ -13,8 +13,7 @@ "type": "Microsoft.Security/SecureScoresControlMetadata", "properties": { "source": { - "sourceType": "BuiltIn", - "policySetDefinitionId": "/providers/Microsoft.Authorization/policySetDefinitions/1f3afdf9-d0c9-4c3d-847f-89da613e70a8" + "sourceType": "BuiltIn" }, "displayName": "Protect applications against DDoS attacks", "description": "", @@ -32,8 +31,7 @@ "type": "Microsoft.Security/SecureScoresControlMetadata", "properties": { "source": { - "sourceType": "BuiltIn", - "policySetDefinitionId": "/providers/Microsoft.Authorization/policySetDefinitions/1f3afdf9-d0c9-4c3d-847f-89da613e70a8" + "sourceType": "BuiltIn" }, "displayName": "Enable MFA", "description": "", @@ -57,8 +55,7 @@ "type": "Microsoft.Security/SecureScoresControlMetadata", "properties": { "source": { - "sourceType": "BuiltIn", - "policySetDefinitionId": "/providers/Microsoft.Authorization/policySetDefinitions/1f3afdf9-d0c9-4c3d-847f-89da613e70a8" + "sourceType": "BuiltIn" }, "displayName": "Apply adaptive application control", "description": "", @@ -78,28 +75,6 @@ } ] } - }, - { - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScoreControlsDefinition/a9909064-42b4-4d34-8143-275477afe18b", - "name": "a9909064-42b4-4d34-8143-275477afe18b", - "type": "Microsoft.Security/SecureScoresControlMetadata", - "properties": { - "source": { - "sourceType": "CustomPolicy", - "policySetDefinitionId": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Authorization/policySetDefinitions/1203fdf9-eeee-ffff-847f-89da613eabcd" - }, - "displayName": "Apply adaptive application control", - "description": "", - "maxScore": 3, - "assessmentsDefinition": [ - { - "id": "/providers/Microsoft.Security/assessmentMetadata/e3de1cc0-f4dd-3b34-e496-8b5381ba2d70" - }, - { - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/assessmentMetadata/4c8a64c9-9b0f-0da9-2d2e-1d11ad316f4e" - } - ] - } } ] } diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_builtin_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_builtin_example.json index ef7b2dffe69a..24f9647bc2f1 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_builtin_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_builtin_example.json @@ -31,8 +31,7 @@ "type": "Microsoft.Security/SecureScoresControlMetadata", "properties": { "source": { - "sourceType": "BuiltIn", - "policySetDefinitionId": "/providers/Microsoft.Authorization/policySetDefinitions/1f3afdf9-d0c9-4c3d-847f-89da613e70a8" + "sourceType": "BuiltIn" }, "displayName": "Protect applications against DDoS attacks", "description": "", @@ -65,8 +64,7 @@ "type": "Microsoft.Security/SecureScoresControlMetadata", "properties": { "source": { - "sourceType": "BuiltIn", - "policySetDefinitionId": "/providers/Microsoft.Authorization/policySetDefinitions/1f3afdf9-d0c9-4c3d-847f-89da613e70a8" + "sourceType": "BuiltIn" }, "displayName": "Enable MFA", "description": "", @@ -105,8 +103,7 @@ "type": "Microsoft.Security/SecureScoresControlMetadata", "properties": { "source": { - "sourceType": "BuiltIn", - "policySetDefinitionId": "/providers/Microsoft.Authorization/policySetDefinitions/1f3afdf9-d0c9-4c3d-847f-89da613e70a8" + "sourceType": "BuiltIn" }, "displayName": "Apply adaptive application control", "description": "", diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_custom_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_custom_example.json deleted file mode 100644 index dca72c511051..000000000000 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_custom_example.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "parameters": { - "api-version": "2020-01-01-preview", - "scope": "subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23", - "secureScoreName": "ascDefault", - "$expand": "definition" - }, - "responses": { - "200": { - "parameters": { - "secureScoreName": "CustomA" - }, - "body": { - "value": [ - { - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/securescores/CustomA/a9909064-42b4-4d34-8143-275477afe18b", - "name": "a9909064-42b4-4d34-8143-275477afe18b", - "type": "Microsoft.Security/securescorescontrol", - "properties": { - "displayName": "Protect applications against DDoS attacks", - "healthyResourceCount": 0, - "unhealthyResourceCount": 10, - "notApplicableResourceCount": 0, - "score": { - "max": 3, - "current": 0 - }, - "definition": { - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScoreControlsDefinition/a9909064-42b4-4d34-8143-275477afe18b", - "name": "a9909064-42b4-4d34-8143-275477afe18b", - "type": "Microsoft.Security/SecureScoresControlMetadata", - "properties": { - "source": { - "sourceType": "CustomPolicy", - "policySetDefinitionId": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Authorization/policySetDefinitions/1203fdf9-eeee-ffff-847f-89da613eabcd" - }, - "displayName": "Apply adaptive application control", - "description": "", - "maxScore": 3, - "assessmentsDefinition": [ - { - "id": "/providers/Microsoft.Security/assessmentMetadata/e3de1cc0-f4dd-3b34-e496-8b5381ba2d70" - }, - { - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/assessmentMetadata/4c8a64c9-9b0f-0da9-2d2e-1d11ad316f4e" - } - ] - } - } - } - } - ] - } - } - } -} diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_custom_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_custom_example.json deleted file mode 100644 index a420853fe4f5..000000000000 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_custom_example.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "parameters": { - "api-version": "2020-01-01-preview", - "scope": "subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23", - "secureScoreName": "CustomA" - }, - "responses": { - "200": { - "body": { - "value": [ - { - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/securescores/CustomA/a9909064-42b4-4d34-8143-275477afe18b", - "name": "a9909064-42b4-4d34-8143-275477afe18b", - "type": "Microsoft.Security/securescorescontrol", - "properties": { - "displayName": "Protect applications against DDoS attacks", - "healthyResourceCount": 0, - "unhealthyResourceCount": 10, - "notApplicableResourceCount": 0, - "score": { - "max": 2, - "current": 0 - } - } - } - ] - } - } - } -} diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json index 6a86cf45bd01..7c526b0c6020 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json @@ -528,12 +528,10 @@ "type": "object", "properties": { "sourceType": { - "description": "BuiltIn if the control is built-in from Azure Security Center managed assessments, Custom if the assessment based on custom Azure Policy definition, CustomerManaged for customers who build their own controls", + "description": "BuiltIn if the control is built-in from Azure Security Center managed assessments, Custom (Future) if the assessment based on custom Azure Policy definition, CustomerManaged (future) for customers who build their own controls", "type": "string", "enum": [ - "BuiltIn", - "CustomPolicy", - "CustomerManaged" + "BuiltIn" ], "x-ms-enum": { "name": "controlType", From 6d4d1ef20d03fb498c7000cebfd525cedd1b7b6d Mon Sep 17 00:00:00 2001 From: Gideon Romm Date: Tue, 11 Feb 2020 11:29:05 +0200 Subject: [PATCH 35/53] Updated readme.md file --- specification/security/resource-manager/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/security/resource-manager/readme.md b/specification/security/resource-manager/readme.md index a7809da444c6..fa5ddad249f6 100644 --- a/specification/security/resource-manager/readme.md +++ b/specification/security/resource-manager/readme.md @@ -161,7 +161,7 @@ input-file: - Microsoft.Security/preview/2019-01-01-preview/automations.json - Microsoft.Security/preview/2019-01-01-preview/assessmentMetadata.json - Microsoft.Security/preview/2019-01-01-preview/assessments.json -- Microsoft.Security/preview/2020-01-01-preview/secureScore.json +- Microsoft.Security/preview/2020-01-01-preview/secureScore.json # Needed when there is more than one input file override-info: From 1a70c2e48a5fe2560a90a8a40fbc4e6e82b0335f Mon Sep 17 00:00:00 2001 From: Gideon Romm Date: Tue, 11 Feb 2020 11:29:40 +0200 Subject: [PATCH 36/53] Remove trailing whitespace --- specification/security/resource-manager/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/security/resource-manager/readme.md b/specification/security/resource-manager/readme.md index fa5ddad249f6..a7809da444c6 100644 --- a/specification/security/resource-manager/readme.md +++ b/specification/security/resource-manager/readme.md @@ -161,7 +161,7 @@ input-file: - Microsoft.Security/preview/2019-01-01-preview/automations.json - Microsoft.Security/preview/2019-01-01-preview/assessmentMetadata.json - Microsoft.Security/preview/2019-01-01-preview/assessments.json -- Microsoft.Security/preview/2020-01-01-preview/secureScore.json +- Microsoft.Security/preview/2020-01-01-preview/secureScore.json # Needed when there is more than one input file override-info: From fc5ade9ab4ac4dc331cea85f6e6f177ad6f9e6e5 Mon Sep 17 00:00:00 2001 From: giromm2ms <52413295+giromm2ms@users.noreply.github.com> Date: Thu, 5 Mar 2020 09:48:29 +0200 Subject: [PATCH 37/53] Update specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json Co-Authored-By: Chen Lahav --- .../preview/2020-01-01-preview/secureScore.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json index 7c526b0c6020..1f054bed7c42 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json @@ -334,7 +334,7 @@ } } }, - "SecureScoreScoreDetails": { + "ScoreDetails": { "description": "Calculation result data", "readOnly": true, "type": "object", From 3c87e72930171db943666b66c33a33ef2f5a96df Mon Sep 17 00:00:00 2001 From: giromm2ms <52413295+giromm2ms@users.noreply.github.com> Date: Thu, 5 Mar 2020 09:48:39 +0200 Subject: [PATCH 38/53] Update specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json Co-Authored-By: Chen Lahav --- .../preview/2020-01-01-preview/secureScore.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json index 1f054bed7c42..ca873232971e 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json @@ -357,7 +357,7 @@ } } }, - "SecureScoreControlScoreObject": { + "SecureScoreControlScore": { "description": "Calculation result data", "type": "object", "properties": { From 8c805ecc71fe4683df8e7bd99fbad5f2dff260e0 Mon Sep 17 00:00:00 2001 From: giromm2ms <52413295+giromm2ms@users.noreply.github.com> Date: Thu, 5 Mar 2020 09:49:57 +0200 Subject: [PATCH 39/53] Update specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json Co-Authored-By: Chen Lahav --- .../preview/2020-01-01-preview/secureScore.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json index ca873232971e..908d6eedbac2 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json @@ -381,7 +381,7 @@ } } }, - "SecureScoreControlsList": { + "SecureScoreControlList": { "description": "Page of a secure score controls list", "type": "object", "properties": { From 2ea3c6a6eb0bf0e45999ec3cf8dd572d6e964023 Mon Sep 17 00:00:00 2001 From: giromm2ms <52413295+giromm2ms@users.noreply.github.com> Date: Thu, 5 Mar 2020 09:51:55 +0200 Subject: [PATCH 40/53] Update specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json Co-Authored-By: Chen Lahav --- .../preview/2020-01-01-preview/secureScore.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json index 908d6eedbac2..25d43af4043b 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json @@ -515,7 +515,7 @@ "readOnly": true, "$ref": "#/definitions/SecureScoreControlDefinitionSource" }, - "assessmentsDefinition": { + "assessmentDefinitions": { "description": "array of assessments metadata IDs that are included in this control", "readOnly": true, "$ref": "../../../common/v1/types.json#/definitions/AzureResourceLinks" From 1e10a9ea65c87d36f100809ddc74dd7d59a3a49b Mon Sep 17 00:00:00 2001 From: giromm2ms <52413295+giromm2ms@users.noreply.github.com> Date: Thu, 5 Mar 2020 09:52:17 +0200 Subject: [PATCH 41/53] Update specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json Co-Authored-By: Chen Lahav --- .../preview/2020-01-01-preview/secureScore.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json index 25d43af4043b..004c928309cf 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json @@ -448,7 +448,7 @@ "format": "int32" }, "definition": { - "$ref": "#/definitions/SecureScoreControlDefinitionItem" + "$ref": "#/definitions/SecureScoreControlDefinitionItemProperties" } } }, From e3c096b0c35e15ba1cd3f59c292828b7579b32ea Mon Sep 17 00:00:00 2001 From: giromm2ms <52413295+giromm2ms@users.noreply.github.com> Date: Thu, 5 Mar 2020 09:52:33 +0200 Subject: [PATCH 42/53] Update specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/GetSecureScoresSingle_example.json Co-Authored-By: Chen Lahav --- .../examples/secureScores/GetSecureScoresSingle_example.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/GetSecureScoresSingle_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/GetSecureScoresSingle_example.json index b022f979a61b..fcb5716639cf 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/GetSecureScoresSingle_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/GetSecureScoresSingle_example.json @@ -11,7 +11,7 @@ "name": "ascDefault", "type": "Microsoft.Security/securescores", "properties": { - "displayName": "asc Default", + "displayName": "ASC Default", "score": { "max": 13, "current": 3 From 6e8c8e91de68fc683b341051694e2df9488e75e6 Mon Sep 17 00:00:00 2001 From: Gideon Romm Date: Thu, 5 Mar 2020 10:09:48 +0200 Subject: [PATCH 43/53] Fixed PR comments --- ...tSecureScoreControlDefinitions_example.json | 12 ++++++------ ...ontrolDefinitions_subscription_example.json | 12 ++++++------ .../GetSecureScoresSingle_example.json | 6 +++--- ...trolsForNameWithExpand_builtin_example.json | 18 +++++++++--------- ...reScoreControlsForName_builtin_example.json | 6 +++--- .../ListSecureScoreControls_example.json | 8 ++++---- .../secureScores/ListSecureScores_example.json | 8 ++++---- 7 files changed, 35 insertions(+), 35 deletions(-) diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScoreControlDefinitions/ListSecureScoreControlDefinitions_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScoreControlDefinitions/ListSecureScoreControlDefinitions_example.json index 150fc0260771..fbaf93bed342 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScoreControlDefinitions/ListSecureScoreControlDefinitions_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScoreControlDefinitions/ListSecureScoreControlDefinitions_example.json @@ -9,13 +9,13 @@ { "id": "/providers/Microsoft.Security/secureScoreControlsDefinition/a9909064-42b4-4d34-8143-275477afe18b", "name": "a9909064-42b4-4d34-8143-275477afe18b", - "type": "Microsoft.Security/SecureScoresControlMetadata", + "type": "Microsoft.Security/SecureScoresControlDefinitions", "properties": { "source": { "sourceType": "BuiltIn" }, "displayName": "Protect applications against DDoS attacks", - "description": "", + "description": "This control contains recommendations regarding DDoS attack prevention", "maxScore": 2, "assessmentsDefinition": [ { @@ -27,13 +27,13 @@ { "id": "/providers/Microsoft.Security/secureScoreControlsDefinition/34a42fb3-e6db-409c-b56b-7b1db6b8aee0", "name": "34a42fb3-e6db-409c-b56b-7b1db6b8aee0", - "type": "Microsoft.Security/SecureScoresControlMetadata", + "type": "Microsoft.Security/SecureScoresControlDefinitions", "properties": { "source": { "sourceType": "BuiltIn" }, "displayName": "Enable MFA", - "description": "", + "description": "This control contains recommendations regarding MFA", "maxScore": 10, "assessmentsDefinition": [ { @@ -51,13 +51,13 @@ { "id": "/providers/Microsoft.Security/secureScoreControlsDefinition/a000c66f-6da2-4f9d-826d-2364347d2588", "name": "a000c66f-6da2-4f9d-826d-2364347d2588", - "type": "Microsoft.Security/SecureScoresControlMetadata", + "type": "Microsoft.Security/SecureScoresControlDefinitions", "properties": { "source": { "sourceType": "BuiltIn" }, "displayName": "Apply adaptive application control", - "description": "", + "description": "This control contains recommendations regarding enable of adaptive application control", "maxScore": 3, "assessmentsDefinition": [ { diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScoreControlDefinitions/ListSecureScoreControlDefinitions_subscription_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScoreControlDefinitions/ListSecureScoreControlDefinitions_subscription_example.json index d0fb81b92426..2006ae66088b 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScoreControlDefinitions/ListSecureScoreControlDefinitions_subscription_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScoreControlDefinitions/ListSecureScoreControlDefinitions_subscription_example.json @@ -10,13 +10,13 @@ { "id": "/providers/Microsoft.Security/secureScoreControlsDefinition/a9909064-42b4-4d34-8143-275477afe18b", "name": "a9909064-42b4-4d34-8143-275477afe18b", - "type": "Microsoft.Security/SecureScoresControlMetadata", + "type": "Microsoft.Security/SecureScoresControlDefinitions", "properties": { "source": { "sourceType": "BuiltIn" }, "displayName": "Protect applications against DDoS attacks", - "description": "", + "description": "This control contains recommendations regarding DDoS attack prevention", "maxScore": 2, "assessmentsDefinition": [ { @@ -28,13 +28,13 @@ { "id": "/providers/Microsoft.Security/secureScoreControlsDefinition/34a42fb3-e6db-409c-b56b-7b1db6b8aee0", "name": "34a42fb3-e6db-409c-b56b-7b1db6b8aee0", - "type": "Microsoft.Security/SecureScoresControlMetadata", + "type": "Microsoft.Security/SecureScoresControlDefinitions", "properties": { "source": { "sourceType": "BuiltIn" }, "displayName": "Enable MFA", - "description": "", + "description": "This control contains recommendations regarding MFA", "maxScore": 10, "assessmentsDefinition": [ { @@ -52,13 +52,13 @@ { "id": "/providers/Microsoft.Security/secureScoreControlsDefinition/a000c66f-6da2-4f9d-826d-2364347d2588", "name": "a000c66f-6da2-4f9d-826d-2364347d2588", - "type": "Microsoft.Security/SecureScoresControlMetadata", + "type": "Microsoft.Security/SecureScoresControlDefinitions", "properties": { "source": { "sourceType": "BuiltIn" }, "displayName": "Apply adaptive application control", - "description": "", + "description": "This control contains recommendations regarding enable of adaptive application control", "maxScore": 3, "assessmentsDefinition": [ { diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/GetSecureScoresSingle_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/GetSecureScoresSingle_example.json index fcb5716639cf..721c42bc1827 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/GetSecureScoresSingle_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/GetSecureScoresSingle_example.json @@ -2,14 +2,14 @@ "parameters": { "api-version": "2020-01-01-preview", "scope": "subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23", - "secureScoreName": "ascDefault" + "secureScoreName": "default" }, "responses": { "200": { "body": { - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/securescores/ascDefault", + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScores/default", "name": "ascDefault", - "type": "Microsoft.Security/securescores", + "type": "Microsoft.Security/secureScores", "properties": { "displayName": "ASC Default", "score": { diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_builtin_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_builtin_example.json index 24f9647bc2f1..5ddfb356f57e 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_builtin_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_builtin_example.json @@ -13,7 +13,7 @@ "body": { "value": [ { - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/securescores/ascDefault/a9909064-42b4-4d34-8143-275477afe18b", + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScores/ascDefault/a9909064-42b4-4d34-8143-275477afe18b", "name": "a9909064-42b4-4d34-8143-275477afe18b", "type": "Microsoft.Security/securescorescontrol", "properties": { @@ -28,13 +28,13 @@ "definition": { "id": "/providers/Microsoft.Security/secureScoreControlsDefinition/a9909064-42b4-4d34-8143-275477afe18b", "name": "a9909064-42b4-4d34-8143-275477afe18b", - "type": "Microsoft.Security/SecureScoresControlMetadata", + "type": "Microsoft.Security/SecureScoresControlDefinitions", "properties": { "source": { "sourceType": "BuiltIn" }, "displayName": "Protect applications against DDoS attacks", - "description": "", + "description": "This control contains recommendations regarding DDoS attack prevention", "maxScore": 2, "assessmentsDefinition": [ { @@ -46,7 +46,7 @@ } }, { - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/securescores/ascDefault/34a42fb3-e6db-409c-b56b-7b1db6b8aee0", + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScores/ascDefault/34a42fb3-e6db-409c-b56b-7b1db6b8aee0", "name": "34a42fb3-e6db-409c-b56b-7b1db6b8aee0", "type": "Microsoft.Security/securescorescontrol", "properties": { @@ -61,13 +61,13 @@ "definition": { "id": "/providers/Microsoft.Security/secureScoreControlsDefinition/34a42fb3-e6db-409c-b56b-7b1db6b8aee0", "name": "34a42fb3-e6db-409c-b56b-7b1db6b8aee0", - "type": "Microsoft.Security/SecureScoresControlMetadata", + "type": "Microsoft.Security/SecureScoresControlDefinitions", "properties": { "source": { "sourceType": "BuiltIn" }, "displayName": "Enable MFA", - "description": "", + "description": "This control contains recommendations regarding MFA", "maxScore": 10, "assessmentsDefinition": [ { @@ -85,7 +85,7 @@ } }, { - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/securescores/ascDefault/a000c66f-6da2-4f9d-826d-2364347d2588", + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScores/ascDefault/a000c66f-6da2-4f9d-826d-2364347d2588", "name": "a000c66f-6da2-4f9d-826d-2364347d2588", "type": "Microsoft.Security/securescorescontrol", "properties": { @@ -100,13 +100,13 @@ "definition": { "id": "/providers/Microsoft.Security/secureScoreControlsDefinition/a000c66f-6da2-4f9d-826d-2364347d2588", "name": "a000c66f-6da2-4f9d-826d-2364347d2588", - "type": "Microsoft.Security/SecureScoresControlMetadata", + "type": "Microsoft.Security/SecureScoresControlDefinitions", "properties": { "source": { "sourceType": "BuiltIn" }, "displayName": "Apply adaptive application control", - "description": "", + "description": "This control contains recommendations regarding enable of adaptive application control", "maxScore": 3, "assessmentsDefinition": [ { diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_builtin_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_builtin_example.json index b5ab1c1c3178..39fe766fabfe 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_builtin_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_builtin_example.json @@ -9,7 +9,7 @@ "body": { "value": [ { - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/securescores/ascDefault/a9909064-42b4-4d34-8143-275477afe18b", + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScores/ascDefault/a9909064-42b4-4d34-8143-275477afe18b", "name": "a9909064-42b4-4d34-8143-275477afe18b", "type": "Microsoft.Security/securescorescontrol", "properties": { @@ -24,7 +24,7 @@ } }, { - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/securescores/ascDefault/34a42fb3-e6db-409c-b56b-7b1db6b8aee0", + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScores/ascDefault/34a42fb3-e6db-409c-b56b-7b1db6b8aee0", "name": "34a42fb3-e6db-409c-b56b-7b1db6b8aee0", "type": "Microsoft.Security/securescorescontrol", "properties": { @@ -39,7 +39,7 @@ } }, { - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/securescores/ascDefault/a000c66f-6da2-4f9d-826d-2364347d2588", + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScores/ascDefault/a000c66f-6da2-4f9d-826d-2364347d2588", "name": "a000c66f-6da2-4f9d-826d-2364347d2588", "type": "Microsoft.Security/securescorescontrol", "properties": { diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControls_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControls_example.json index 4727cf89ced0..35d172d5a519 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControls_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControls_example.json @@ -8,7 +8,7 @@ "body": { "value": [ { - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/securescores/ascDefault/a9909064-42b4-4d34-8143-275477afe18b", + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScores/ascDefault/a9909064-42b4-4d34-8143-275477afe18b", "name": "a9909064-42b4-4d34-8143-275477afe18b", "type": "Microsoft.Security/securescorescontrol", "properties": { @@ -23,7 +23,7 @@ } }, { - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/securescores/ascDefault/34a42fb3-e6db-409c-b56b-7b1db6b8aee0", + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScores/ascDefault/34a42fb3-e6db-409c-b56b-7b1db6b8aee0", "name": "34a42fb3-e6db-409c-b56b-7b1db6b8aee0", "type": "Microsoft.Security/securescorescontrol", "properties": { @@ -38,7 +38,7 @@ } }, { - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/securescores/ascDefault/a000c66f-6da2-4f9d-826d-2364347d2588", + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScores/ascDefault/a000c66f-6da2-4f9d-826d-2364347d2588", "name": "a000c66f-6da2-4f9d-826d-2364347d2588", "type": "Microsoft.Security/securescorescontrol", "properties": { @@ -53,7 +53,7 @@ } }, { - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/securescores/CustomA/a9909064-42b4-4d34-8143-275477afe18b", + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScores/CustomA/a9909064-42b4-4d34-8143-275477afe18b", "name": "a9909064-42b4-4d34-8143-275477afe18b", "type": "Microsoft.Security/securescorescontrol", "properties": { diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScores_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScores_example.json index 956c1b81dfe3..f0bab9c28d24 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScores_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScores_example.json @@ -8,9 +8,9 @@ "body": { "value": [ { - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/securescores/ascDefault", + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScores/ascDefault", "name": "ascDefault", - "type": "Microsoft.Security/securescores", + "type": "Microsoft.Security/secureScores", "properties": { "displayName": "asc Default", "score": { @@ -20,9 +20,9 @@ } }, { - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/securescores/CustomA", + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScores/CustomA", "name": "CustomA", - "type": "Microsoft.Security/securescores", + "type": "Microsoft.Security/secureScores", "properties": { "displayName": "Custom A", "score": { From 47640dac3c61c6b9c439391fc04cb6d3cf8e0455 Mon Sep 17 00:00:00 2001 From: Gideon Romm Date: Thu, 5 Mar 2020 12:58:30 +0200 Subject: [PATCH 44/53] Fix definitions renaming --- .../preview/2020-01-01-preview/secureScore.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json index 004c928309cf..8e9911ef6329 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json @@ -145,7 +145,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/SecureScoreControlsList" + "$ref": "#/definitions/SecureScoreControlList" } }, "default": { @@ -187,7 +187,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/SecureScoreControlsList" + "$ref": "#/definitions/SecureScoreControlList" } }, "default": { @@ -330,7 +330,7 @@ "description": "score object", "readOnly": true, "x-ms-client-flatten": true, - "$ref": "#/definitions/SecureScoreScoreDetails" + "$ref": "#/definitions/ScoreDetails" } } }, @@ -427,7 +427,7 @@ "score": { "description": "Actual score object for the control", "x-ms-client-flatten": true, - "$ref": "#/definitions/SecureScoreControlScoreObject" + "$ref": "#/definitions/ScoreDetails" }, "healthyResourceCount": { "description": "Number of healthy resources in the control", From 78e71af706d89efe43b49cde1ac80fe47588a0c0 Mon Sep 17 00:00:00 2001 From: Gideon Romm Date: Thu, 5 Mar 2020 13:23:46 +0200 Subject: [PATCH 45/53] Fix examples --- .../ListSecureScoreControlDefinitions_example.json | 6 +++--- ...tSecureScoreControlDefinitions_subscription_example.json | 6 +++--- ...ecureScoreControlsForNameWithExpand_builtin_example.json | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScoreControlDefinitions/ListSecureScoreControlDefinitions_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScoreControlDefinitions/ListSecureScoreControlDefinitions_example.json index fbaf93bed342..d6a4a2abc5ab 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScoreControlDefinitions/ListSecureScoreControlDefinitions_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScoreControlDefinitions/ListSecureScoreControlDefinitions_example.json @@ -17,7 +17,7 @@ "displayName": "Protect applications against DDoS attacks", "description": "This control contains recommendations regarding DDoS attack prevention", "maxScore": 2, - "assessmentsDefinition": [ + "assessmentDefinitions": [ { "id": "/providers/Microsoft.Security/assessmentMetadata/e3de1cc0-f4dd-3b34-e496-8b5381ba2d70" } @@ -35,7 +35,7 @@ "displayName": "Enable MFA", "description": "This control contains recommendations regarding MFA", "maxScore": 10, - "assessmentsDefinition": [ + "assessmentDefinitions": [ { "id": "/providers/Microsoft.Security/assessmentMetadata/151e82c5-5341-a74b-1eb0-bc38d2c84bb5" }, @@ -59,7 +59,7 @@ "displayName": "Apply adaptive application control", "description": "This control contains recommendations regarding enable of adaptive application control", "maxScore": 3, - "assessmentsDefinition": [ + "assessmentDefinitions": [ { "id": "/providers/Microsoft.Security/assessmentMetadata/35f45c95-27cf-4e52-891f-8390d1de5828" }, diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScoreControlDefinitions/ListSecureScoreControlDefinitions_subscription_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScoreControlDefinitions/ListSecureScoreControlDefinitions_subscription_example.json index 2006ae66088b..73efe3e75b85 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScoreControlDefinitions/ListSecureScoreControlDefinitions_subscription_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScoreControlDefinitions/ListSecureScoreControlDefinitions_subscription_example.json @@ -18,7 +18,7 @@ "displayName": "Protect applications against DDoS attacks", "description": "This control contains recommendations regarding DDoS attack prevention", "maxScore": 2, - "assessmentsDefinition": [ + "assessmentDefinitions": [ { "id": "/providers/Microsoft.Security/assessmentMetadata/e3de1cc0-f4dd-3b34-e496-8b5381ba2d70" } @@ -36,7 +36,7 @@ "displayName": "Enable MFA", "description": "This control contains recommendations regarding MFA", "maxScore": 10, - "assessmentsDefinition": [ + "assessmentDefinitions": [ { "id": "/providers/Microsoft.Security/assessmentMetadata/151e82c5-5341-a74b-1eb0-bc38d2c84bb5" }, @@ -60,7 +60,7 @@ "displayName": "Apply adaptive application control", "description": "This control contains recommendations regarding enable of adaptive application control", "maxScore": 3, - "assessmentsDefinition": [ + "assessmentDefinitions": [ { "id": "/providers/Microsoft.Security/assessmentMetadata/35f45c95-27cf-4e52-891f-8390d1de5828" }, diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_builtin_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_builtin_example.json index 5ddfb356f57e..b42c481ad596 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_builtin_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_builtin_example.json @@ -36,7 +36,7 @@ "displayName": "Protect applications against DDoS attacks", "description": "This control contains recommendations regarding DDoS attack prevention", "maxScore": 2, - "assessmentsDefinition": [ + "assessmentDefinitions": [ { "id": "/providers/Microsoft.Security/assessmentMetadata/e3de1cc0-f4dd-3b34-e496-8b5381ba2d70" } @@ -69,7 +69,7 @@ "displayName": "Enable MFA", "description": "This control contains recommendations regarding MFA", "maxScore": 10, - "assessmentsDefinition": [ + "assessmentDefinitions": [ { "id": "/providers/Microsoft.Security/assessmentMetadata/151e82c5-5341-a74b-1eb0-bc38d2c84bb5" }, @@ -108,7 +108,7 @@ "displayName": "Apply adaptive application control", "description": "This control contains recommendations regarding enable of adaptive application control", "maxScore": 3, - "assessmentsDefinition": [ + "assessmentDefinitions": [ { "id": "/providers/Microsoft.Security/assessmentMetadata/35f45c95-27cf-4e52-891f-8390d1de5828" }, From 5875bd28e15704268f64c801496668fbacee313c Mon Sep 17 00:00:00 2001 From: Gideon Romm Date: Thu, 5 Mar 2020 13:43:26 +0200 Subject: [PATCH 46/53] Trying to fix model validation --- ...ureScoreControlsForNameWithExpand_builtin_example.json | 6 +++--- .../ListSecureScoreControlsForName_builtin_example.json | 6 +++--- .../secureScores/ListSecureScoreControls_example.json | 8 ++++---- .../preview/2020-01-01-preview/secureScore.json | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_builtin_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_builtin_example.json index b42c481ad596..afb999f8df21 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_builtin_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_builtin_example.json @@ -15,7 +15,7 @@ { "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScores/ascDefault/a9909064-42b4-4d34-8143-275477afe18b", "name": "a9909064-42b4-4d34-8143-275477afe18b", - "type": "Microsoft.Security/securescorescontrol", + "type": "Microsoft.Security/secureScoresControl", "properties": { "displayName": "Protect applications against DDoS attacks", "healthyResourceCount": 0, @@ -48,7 +48,7 @@ { "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScores/ascDefault/34a42fb3-e6db-409c-b56b-7b1db6b8aee0", "name": "34a42fb3-e6db-409c-b56b-7b1db6b8aee0", - "type": "Microsoft.Security/securescorescontrol", + "type": "Microsoft.Security/secureScoresControl", "properties": { "displayName": "Enable MFA", "healthyResourceCount": 0, @@ -87,7 +87,7 @@ { "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScores/ascDefault/a000c66f-6da2-4f9d-826d-2364347d2588", "name": "a000c66f-6da2-4f9d-826d-2364347d2588", - "type": "Microsoft.Security/securescorescontrol", + "type": "Microsoft.Security/secureScoresControl", "properties": { "displayName": "Apply adaptive application control", "healthyResourceCount": 20, diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_builtin_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_builtin_example.json index 39fe766fabfe..756cf5dc0ba6 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_builtin_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_builtin_example.json @@ -11,7 +11,7 @@ { "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScores/ascDefault/a9909064-42b4-4d34-8143-275477afe18b", "name": "a9909064-42b4-4d34-8143-275477afe18b", - "type": "Microsoft.Security/securescorescontrol", + "type": "Microsoft.Security/secureScoresControl", "properties": { "displayName": "Protect applications against DDoS attacks", "healthyResourceCount": 0, @@ -26,7 +26,7 @@ { "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScores/ascDefault/34a42fb3-e6db-409c-b56b-7b1db6b8aee0", "name": "34a42fb3-e6db-409c-b56b-7b1db6b8aee0", - "type": "Microsoft.Security/securescorescontrol", + "type": "Microsoft.Security/secureScoresControl", "properties": { "displayName": "Enable MFA", "healthyResourceCount": 0, @@ -41,7 +41,7 @@ { "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScores/ascDefault/a000c66f-6da2-4f9d-826d-2364347d2588", "name": "a000c66f-6da2-4f9d-826d-2364347d2588", - "type": "Microsoft.Security/securescorescontrol", + "type": "Microsoft.Security/secureScoresControl", "properties": { "displayName": "Apply adaptive application control", "healthyResourceCount": 20, diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControls_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControls_example.json index 35d172d5a519..1eb663d379b2 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControls_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControls_example.json @@ -10,7 +10,7 @@ { "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScores/ascDefault/a9909064-42b4-4d34-8143-275477afe18b", "name": "a9909064-42b4-4d34-8143-275477afe18b", - "type": "Microsoft.Security/securescorescontrol", + "type": "Microsoft.Security/secureScoresControl", "properties": { "displayName": "Protect applications against DDoS attacks", "healthyResourceCount": 0, @@ -25,7 +25,7 @@ { "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScores/ascDefault/34a42fb3-e6db-409c-b56b-7b1db6b8aee0", "name": "34a42fb3-e6db-409c-b56b-7b1db6b8aee0", - "type": "Microsoft.Security/securescorescontrol", + "type": "Microsoft.Security/secureScoresControl", "properties": { "displayName": "Enable MFA", "healthyResourceCount": 0, @@ -40,7 +40,7 @@ { "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScores/ascDefault/a000c66f-6da2-4f9d-826d-2364347d2588", "name": "a000c66f-6da2-4f9d-826d-2364347d2588", - "type": "Microsoft.Security/securescorescontrol", + "type": "Microsoft.Security/secureScoresControl", "properties": { "displayName": "Apply adaptive application control", "healthyResourceCount": 20, @@ -55,7 +55,7 @@ { "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScores/CustomA/a9909064-42b4-4d34-8143-275477afe18b", "name": "a9909064-42b4-4d34-8143-275477afe18b", - "type": "Microsoft.Security/securescorescontrol", + "type": "Microsoft.Security/secureScoresControl", "properties": { "displayName": "Protect applications against DDoS attacks", "healthyResourceCount": 0, diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json index 8e9911ef6329..98255b493759 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json @@ -448,7 +448,7 @@ "format": "int32" }, "definition": { - "$ref": "#/definitions/SecureScoreControlDefinitionItemProperties" + "$ref": "#/definitions/SecureScoreControlDefinitionItem" } } }, From ef6cf060b069a6f571e52716db202ae11d9e65e6 Mon Sep 17 00:00:00 2001 From: Gideon Romm Date: Thu, 5 Mar 2020 14:02:11 +0200 Subject: [PATCH 47/53] Changed example type --- ...ontrolsForNameWithExpand_builtin_example.json | 16 ++++++++-------- ...cureScoreControlsForName_builtin_example.json | 6 +++--- .../ListSecureScoreControls_example.json | 8 ++++---- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_builtin_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_builtin_example.json index afb999f8df21..8907e98060e4 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_builtin_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_builtin_example.json @@ -2,20 +2,20 @@ "parameters": { "api-version": "2020-01-01-preview", "scope": "subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23", - "secureScoreName": "ascDefault", + "secureScoreName": "default", "$expand": "definition" }, "responses": { "200": { "parameters": { - "secureScoreName": "ascDefault" + "secureScoreName": "default" }, "body": { "value": [ { - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScores/ascDefault/a9909064-42b4-4d34-8143-275477afe18b", + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScores/default/a9909064-42b4-4d34-8143-275477afe18b", "name": "a9909064-42b4-4d34-8143-275477afe18b", - "type": "Microsoft.Security/secureScoresControl", + "type": "Microsoft.Security/secureScoresControls", "properties": { "displayName": "Protect applications against DDoS attacks", "healthyResourceCount": 0, @@ -46,9 +46,9 @@ } }, { - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScores/ascDefault/34a42fb3-e6db-409c-b56b-7b1db6b8aee0", + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScores/default/34a42fb3-e6db-409c-b56b-7b1db6b8aee0", "name": "34a42fb3-e6db-409c-b56b-7b1db6b8aee0", - "type": "Microsoft.Security/secureScoresControl", + "type": "Microsoft.Security/secureScoresControls", "properties": { "displayName": "Enable MFA", "healthyResourceCount": 0, @@ -85,9 +85,9 @@ } }, { - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScores/ascDefault/a000c66f-6da2-4f9d-826d-2364347d2588", + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScores/default/a000c66f-6da2-4f9d-826d-2364347d2588", "name": "a000c66f-6da2-4f9d-826d-2364347d2588", - "type": "Microsoft.Security/secureScoresControl", + "type": "Microsoft.Security/secureScoresControls", "properties": { "displayName": "Apply adaptive application control", "healthyResourceCount": 20, diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_builtin_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_builtin_example.json index 756cf5dc0ba6..19cc4c363a65 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_builtin_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_builtin_example.json @@ -11,7 +11,7 @@ { "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScores/ascDefault/a9909064-42b4-4d34-8143-275477afe18b", "name": "a9909064-42b4-4d34-8143-275477afe18b", - "type": "Microsoft.Security/secureScoresControl", + "type": "Microsoft.Security/secureScoresControls", "properties": { "displayName": "Protect applications against DDoS attacks", "healthyResourceCount": 0, @@ -26,7 +26,7 @@ { "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScores/ascDefault/34a42fb3-e6db-409c-b56b-7b1db6b8aee0", "name": "34a42fb3-e6db-409c-b56b-7b1db6b8aee0", - "type": "Microsoft.Security/secureScoresControl", + "type": "Microsoft.Security/secureScoresControls", "properties": { "displayName": "Enable MFA", "healthyResourceCount": 0, @@ -41,7 +41,7 @@ { "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScores/ascDefault/a000c66f-6da2-4f9d-826d-2364347d2588", "name": "a000c66f-6da2-4f9d-826d-2364347d2588", - "type": "Microsoft.Security/secureScoresControl", + "type": "Microsoft.Security/secureScoresControls", "properties": { "displayName": "Apply adaptive application control", "healthyResourceCount": 20, diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControls_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControls_example.json index 1eb663d379b2..f2a8f324ce9e 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControls_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControls_example.json @@ -10,7 +10,7 @@ { "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScores/ascDefault/a9909064-42b4-4d34-8143-275477afe18b", "name": "a9909064-42b4-4d34-8143-275477afe18b", - "type": "Microsoft.Security/secureScoresControl", + "type": "Microsoft.Security/secureScoresControls", "properties": { "displayName": "Protect applications against DDoS attacks", "healthyResourceCount": 0, @@ -25,7 +25,7 @@ { "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScores/ascDefault/34a42fb3-e6db-409c-b56b-7b1db6b8aee0", "name": "34a42fb3-e6db-409c-b56b-7b1db6b8aee0", - "type": "Microsoft.Security/secureScoresControl", + "type": "Microsoft.Security/secureScoresControls", "properties": { "displayName": "Enable MFA", "healthyResourceCount": 0, @@ -40,7 +40,7 @@ { "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScores/ascDefault/a000c66f-6da2-4f9d-826d-2364347d2588", "name": "a000c66f-6da2-4f9d-826d-2364347d2588", - "type": "Microsoft.Security/secureScoresControl", + "type": "Microsoft.Security/secureScoresControls", "properties": { "displayName": "Apply adaptive application control", "healthyResourceCount": 20, @@ -55,7 +55,7 @@ { "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScores/CustomA/a9909064-42b4-4d34-8143-275477afe18b", "name": "a9909064-42b4-4d34-8143-275477afe18b", - "type": "Microsoft.Security/secureScoresControl", + "type": "Microsoft.Security/secureScoresControls", "properties": { "displayName": "Protect applications against DDoS attacks", "healthyResourceCount": 0, From 10ecffd2619461424cefc5bb1280d0e576b93933 Mon Sep 17 00:00:00 2001 From: Gideon Romm Date: Mon, 16 Mar 2020 21:10:48 +0200 Subject: [PATCH 48/53] Updating from master (Resolving conflicts) --- specification/security/resource-manager/readme.md | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/specification/security/resource-manager/readme.md b/specification/security/resource-manager/readme.md index 0d99dd136632..0d7b5cf7f74f 100644 --- a/specification/security/resource-manager/readme.md +++ b/specification/security/resource-manager/readme.md @@ -141,7 +141,6 @@ input-file: - Microsoft.Security/stable/2019-08-01/deviceSecurityGroups.json - Microsoft.Security/stable/2019-08-01/iotSecuritySolutions.json - Microsoft.Security/stable/2019-08-01/iotSecuritySolutionAnalytics.json -- Microsoft.Security/preview/2015-06-01-preview/allowedConnections.json - Microsoft.Security/preview/2015-06-01-preview/discoveredSecuritySolutions.json - Microsoft.Security/preview/2015-06-01-preview/externalSecuritySolutions.json - Microsoft.Security/preview/2015-06-01-preview/jitNetworkAccessPolicies.json @@ -149,7 +148,6 @@ input-file: - Microsoft.Security/preview/2015-06-01-preview/locations.json - Microsoft.Security/preview/2015-06-01-preview/operations.json - Microsoft.Security/preview/2015-06-01-preview/tasks.json -- Microsoft.Security/preview/2015-06-01-preview/topologies.json - Microsoft.Security/preview/2017-08-01-preview/autoProvisioningSettings.json - Microsoft.Security/preview/2017-08-01-preview/compliances.json - Microsoft.Security/preview/2017-08-01-preview/informationProtectionPolicies.json @@ -159,10 +157,14 @@ input-file: - Microsoft.Security/preview/2019-01-01-preview/serverVulnerabilityAssessments.json - Microsoft.Security/preview/2019-01-01-preview/subAssessments.json - Microsoft.Security/preview/2019-01-01-preview/automations.json -- Microsoft.Security/preview/2019-01-01-preview/assessmentMetadata.json -- Microsoft.Security/preview/2019-01-01-preview/assessments.json +- Microsoft.Security/stable/2020-01-01/assessmentMetadata.json +- Microsoft.Security/stable/2020-01-01/assessments.json +- Microsoft.Security/stable/2020-01-01/adaptiveNetworkHardenings.json +- Microsoft.Security/stable/2020-01-01/allowedConnections.json +- Microsoft.Security/stable/2020-01-01/topologies.json - Microsoft.Security/preview/2020-01-01-preview/secureScore.json + # Needed when there is more than one input file override-info: title: SecurityCenter @@ -388,6 +390,9 @@ input-file: - $(this-folder)/Microsoft.Security/preview/2019-01-01-preview/serverVulnerabilityAssessments.json - $(this-folder)/Microsoft.Security/stable/2020-01-01/assessmentMetadata.json - $(this-folder)/Microsoft.Security/stable/2020-01-01/assessments.json + - $(this-folder)/Microsoft.Security/stable/2020-01-01/adaptiveNetworkHardenings.json + - $(this-folder)/Microsoft.Security/stable/2020-01-01/allowedConnections.json + - $(this-folder)/Microsoft.Security/stable/2020-01-01/topologies.json - $(this-folder)/Microsoft.Security/preview/2019-01-01-preview/assessmentMetadata.json - $(this-folder)/Microsoft.Security/preview/2019-01-01-preview/assessments.json From d44d228ef2a1e526e890d71fc8e3e9129e25b95b Mon Sep 17 00:00:00 2001 From: Gideon Romm Date: Mon, 16 Mar 2020 21:56:12 +0200 Subject: [PATCH 49/53] Converting all EOL to CRLF + remove trailing blanks --- specification/security/resource-manager/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/security/resource-manager/readme.md b/specification/security/resource-manager/readme.md index 0d7b5cf7f74f..b888bb139c76 100644 --- a/specification/security/resource-manager/readme.md +++ b/specification/security/resource-manager/readme.md @@ -402,6 +402,6 @@ If there are files that should not be in the `all-api-versions` set, uncomment the `exclude-file` section below and add the file paths. ``` yaml $(tag) == 'all-api-versions' -#exclude-file: +#exclude-file: # - $(this-folder)/Microsoft.Example/stable/2010-01-01/somefile.json ``` \ No newline at end of file From d5337cad46c3668ed4057923dcde533c12148d15 Mon Sep 17 00:00:00 2001 From: Gideon Romm Date: Wed, 22 Apr 2020 16:06:05 +0300 Subject: [PATCH 50/53] Removed Scope paths, updated examples --- .../GetSecureScoresSingle_example.json | 10 +++++----- ...rolsForNameWithExpand_builtin_example.json | 10 +++++----- ...eScoreControlsForName_builtin_example.json | 8 ++++---- .../ListSecureScoreControls_example.json | 2 +- .../ListSecureScores_example.json | 20 ++++--------------- .../2020-01-01-preview/secureScore.json | 20 +++++++++++-------- 6 files changed, 31 insertions(+), 39 deletions(-) diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/GetSecureScoresSingle_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/GetSecureScoresSingle_example.json index 721c42bc1827..f543777c76e2 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/GetSecureScoresSingle_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/GetSecureScoresSingle_example.json @@ -1,17 +1,17 @@ { "parameters": { "api-version": "2020-01-01-preview", - "scope": "subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23", - "secureScoreName": "default" + "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23", + "secureScoreName": "ascScore" }, "responses": { "200": { "body": { - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScores/default", - "name": "ascDefault", + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScores/ascScore", + "name": "ascScore", "type": "Microsoft.Security/secureScores", "properties": { - "displayName": "ASC Default", + "displayName": "Asc Score", "score": { "max": 13, "current": 3 diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_builtin_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_builtin_example.json index 8907e98060e4..4d7124e3b8df 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_builtin_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_builtin_example.json @@ -2,18 +2,18 @@ "parameters": { "api-version": "2020-01-01-preview", "scope": "subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23", - "secureScoreName": "default", + "secureScoreName": "ascScore", "$expand": "definition" }, "responses": { "200": { "parameters": { - "secureScoreName": "default" + "secureScoreName": "ascScore" }, "body": { "value": [ { - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScores/default/a9909064-42b4-4d34-8143-275477afe18b", + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScores/ascScore/a9909064-42b4-4d34-8143-275477afe18b", "name": "a9909064-42b4-4d34-8143-275477afe18b", "type": "Microsoft.Security/secureScoresControls", "properties": { @@ -46,7 +46,7 @@ } }, { - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScores/default/34a42fb3-e6db-409c-b56b-7b1db6b8aee0", + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScores/ascScore/34a42fb3-e6db-409c-b56b-7b1db6b8aee0", "name": "34a42fb3-e6db-409c-b56b-7b1db6b8aee0", "type": "Microsoft.Security/secureScoresControls", "properties": { @@ -85,7 +85,7 @@ } }, { - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScores/default/a000c66f-6da2-4f9d-826d-2364347d2588", + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScores/ascScore/a000c66f-6da2-4f9d-826d-2364347d2588", "name": "a000c66f-6da2-4f9d-826d-2364347d2588", "type": "Microsoft.Security/secureScoresControls", "properties": { diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_builtin_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_builtin_example.json index 19cc4c363a65..c33bf985ed0e 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_builtin_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_builtin_example.json @@ -2,14 +2,14 @@ "parameters": { "api-version": "2020-01-01-preview", "scope": "subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23", - "secureScoreName": "ascDefault" + "secureScoreName": "ascScore" }, "responses": { "200": { "body": { "value": [ { - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScores/ascDefault/a9909064-42b4-4d34-8143-275477afe18b", + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScores/ascScore/a9909064-42b4-4d34-8143-275477afe18b", "name": "a9909064-42b4-4d34-8143-275477afe18b", "type": "Microsoft.Security/secureScoresControls", "properties": { @@ -24,7 +24,7 @@ } }, { - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScores/ascDefault/34a42fb3-e6db-409c-b56b-7b1db6b8aee0", + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScores/ascScore/34a42fb3-e6db-409c-b56b-7b1db6b8aee0", "name": "34a42fb3-e6db-409c-b56b-7b1db6b8aee0", "type": "Microsoft.Security/secureScoresControls", "properties": { @@ -39,7 +39,7 @@ } }, { - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScores/ascDefault/a000c66f-6da2-4f9d-826d-2364347d2588", + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScores/ascScore/a000c66f-6da2-4f9d-826d-2364347d2588", "name": "a000c66f-6da2-4f9d-826d-2364347d2588", "type": "Microsoft.Security/secureScoresControls", "properties": { diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControls_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControls_example.json index f2a8f324ce9e..ba0296cf47ac 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControls_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControls_example.json @@ -1,7 +1,7 @@ { "parameters": { "api-version": "2020-01-01-preview", - "scope": "subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23" + "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23" }, "responses": { "200": { diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScores_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScores_example.json index f0bab9c28d24..ebe793feb7dc 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScores_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScores_example.json @@ -1,35 +1,23 @@ { "parameters": { "api-version": "2020-01-01-preview", - "scope": "subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23" + "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23" }, "responses": { "200": { "body": { "value": [ { - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScores/ascDefault", - "name": "ascDefault", + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScores/ascScore", + "name": "ascScore", "type": "Microsoft.Security/secureScores", "properties": { - "displayName": "asc Default", + "displayName": "Asc Score", "score": { "max": 13, "current": 3.5 } } - }, - { - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScores/CustomA", - "name": "CustomA", - "type": "Microsoft.Security/secureScores", - "properties": { - "displayName": "Custom A", - "score": { - "max": 2, - "current": 0.00 - } - } } ] } diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json index 98255b493759..f41e3a6af43c 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/secureScore.json @@ -34,7 +34,7 @@ } }, "paths": { - "/{scope}/providers/Microsoft.Security/secureScores": { + "/subscriptions/{subscriptionId}/providers/Microsoft.Security/secureScores": { "get": { "x-ms-examples": { "List secure scores": { @@ -51,7 +51,7 @@ "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" }, { - "$ref": "../../../common/v1/types.json#/parameters/Scope" + "$ref": "../../../common/v1/types.json#/parameters/SubscriptionId" } ], "responses": { @@ -73,7 +73,7 @@ } } }, - "/{scope}/providers/Microsoft.Security/secureScores/{secureScoreName}": { + "/subscriptions/{subscriptionId}/providers/Microsoft.Security/secureScores/{secureScoreName}": { "get": { "x-ms-examples": { "Get single secure score": { @@ -90,7 +90,7 @@ "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" }, { - "$ref": "../../../common/v1/types.json#/parameters/Scope" + "$ref": "../../../common/v1/types.json#/parameters/SubscriptionId" }, { "$ref": "#/parameters/secureScoreName" @@ -112,7 +112,7 @@ } } }, - "/{scope}/providers/Microsoft.Security/secureScores/{secureScoreName}/secureScoreControls": { + "/subscriptions/{subscriptionId}/providers/Microsoft.Security/secureScores/{secureScoreName}/secureScoreControls": { "get": { "x-ms-examples": { "List secure score's controls level for the specified name": { @@ -132,7 +132,7 @@ "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" }, { - "$ref": "../../../common/v1/types.json#/parameters/Scope" + "$ref": "../../../common/v1/types.json#/parameters/SubscriptionId" }, { "$ref": "#/parameters/secureScoreName" @@ -160,7 +160,7 @@ } } }, - "/{scope}/providers/Microsoft.Security/secureScoreControls": { + "/subscriptions/{subscriptionId}/providers/Microsoft.Security/secureScoreControls": { "get": { "x-ms-examples": { "List all secure scores controls": { @@ -177,7 +177,7 @@ "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" }, { - "$ref": "../../../common/v1/types.json#/parameters/Scope" + "$ref": "../../../common/v1/types.json#/parameters/SubscriptionId" }, { "$ref": "#/parameters/ExpandControlsDefinition" @@ -540,6 +540,10 @@ { "value": "BuiltIn", "description": "Azure Security Center managed assessments" + }, + { + "value": "Custom", + "description": "Non Azure Security Center managed assessments" } ] } From ee6375e6554fdc8eb923aa4feab9d750cb17c212 Mon Sep 17 00:00:00 2001 From: Gideon Romm Date: Wed, 22 Apr 2020 16:24:29 +0300 Subject: [PATCH 51/53] Replaced scope with sub id in example --- ...istSecureScoreControlsForNameWithExpand_builtin_example.json | 2 +- .../ListSecureScoreControlsForName_builtin_example.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_builtin_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_builtin_example.json index 4d7124e3b8df..cba21dc37d6f 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_builtin_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_builtin_example.json @@ -1,7 +1,7 @@ { "parameters": { "api-version": "2020-01-01-preview", - "scope": "subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23", + "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23", "secureScoreName": "ascScore", "$expand": "definition" }, diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_builtin_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_builtin_example.json index c33bf985ed0e..8acd47f3d410 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_builtin_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_builtin_example.json @@ -1,7 +1,7 @@ { "parameters": { "api-version": "2020-01-01-preview", - "scope": "subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23", + "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23", "secureScoreName": "ascScore" }, "responses": { From 202a27ce77803bbc073552f47e7435972641f5b5 Mon Sep 17 00:00:00 2001 From: Gideon Romm Date: Wed, 22 Apr 2020 16:42:56 +0300 Subject: [PATCH 52/53] updated secureScoresControls id in examples --- ...rolsForNameWithExpand_builtin_example.json | 6 +++--- ...eScoreControlsForName_builtin_example.json | 6 +++--- .../ListSecureScoreControls_example.json | 21 +++---------------- 3 files changed, 9 insertions(+), 24 deletions(-) diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_builtin_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_builtin_example.json index cba21dc37d6f..b616008cedeb 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_builtin_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_builtin_example.json @@ -13,7 +13,7 @@ "body": { "value": [ { - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScores/ascScore/a9909064-42b4-4d34-8143-275477afe18b", + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScoresControls/a9909064-42b4-4d34-8143-275477afe18b", "name": "a9909064-42b4-4d34-8143-275477afe18b", "type": "Microsoft.Security/secureScoresControls", "properties": { @@ -46,7 +46,7 @@ } }, { - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScores/ascScore/34a42fb3-e6db-409c-b56b-7b1db6b8aee0", + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScoresControls/34a42fb3-e6db-409c-b56b-7b1db6b8aee0", "name": "34a42fb3-e6db-409c-b56b-7b1db6b8aee0", "type": "Microsoft.Security/secureScoresControls", "properties": { @@ -85,7 +85,7 @@ } }, { - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScores/ascScore/a000c66f-6da2-4f9d-826d-2364347d2588", + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScoresControls/a000c66f-6da2-4f9d-826d-2364347d2588", "name": "a000c66f-6da2-4f9d-826d-2364347d2588", "type": "Microsoft.Security/secureScoresControls", "properties": { diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_builtin_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_builtin_example.json index 8acd47f3d410..9b02071b5f46 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_builtin_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_builtin_example.json @@ -9,7 +9,7 @@ "body": { "value": [ { - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScores/ascScore/a9909064-42b4-4d34-8143-275477afe18b", + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScoresControls/a9909064-42b4-4d34-8143-275477afe18b", "name": "a9909064-42b4-4d34-8143-275477afe18b", "type": "Microsoft.Security/secureScoresControls", "properties": { @@ -24,7 +24,7 @@ } }, { - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScores/ascScore/34a42fb3-e6db-409c-b56b-7b1db6b8aee0", + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScoresControls/34a42fb3-e6db-409c-b56b-7b1db6b8aee0", "name": "34a42fb3-e6db-409c-b56b-7b1db6b8aee0", "type": "Microsoft.Security/secureScoresControls", "properties": { @@ -39,7 +39,7 @@ } }, { - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScores/ascScore/a000c66f-6da2-4f9d-826d-2364347d2588", + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScoresControls/a000c66f-6da2-4f9d-826d-2364347d2588", "name": "a000c66f-6da2-4f9d-826d-2364347d2588", "type": "Microsoft.Security/secureScoresControls", "properties": { diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControls_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControls_example.json index ba0296cf47ac..53f2fbc09c89 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControls_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControls_example.json @@ -8,7 +8,7 @@ "body": { "value": [ { - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScores/ascDefault/a9909064-42b4-4d34-8143-275477afe18b", + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScoresControls/a9909064-42b4-4d34-8143-275477afe18b", "name": "a9909064-42b4-4d34-8143-275477afe18b", "type": "Microsoft.Security/secureScoresControls", "properties": { @@ -23,7 +23,7 @@ } }, { - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScores/ascDefault/34a42fb3-e6db-409c-b56b-7b1db6b8aee0", + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScoresControls/34a42fb3-e6db-409c-b56b-7b1db6b8aee0", "name": "34a42fb3-e6db-409c-b56b-7b1db6b8aee0", "type": "Microsoft.Security/secureScoresControls", "properties": { @@ -38,7 +38,7 @@ } }, { - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScores/ascDefault/a000c66f-6da2-4f9d-826d-2364347d2588", + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScoresControls/a000c66f-6da2-4f9d-826d-2364347d2588", "name": "a000c66f-6da2-4f9d-826d-2364347d2588", "type": "Microsoft.Security/secureScoresControls", "properties": { @@ -51,21 +51,6 @@ "current": 3 } } - }, - { - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScores/CustomA/a9909064-42b4-4d34-8143-275477afe18b", - "name": "a9909064-42b4-4d34-8143-275477afe18b", - "type": "Microsoft.Security/secureScoresControls", - "properties": { - "displayName": "Protect applications against DDoS attacks", - "healthyResourceCount": 0, - "unhealthyResourceCount": 10, - "notApplicableResourceCount": 0, - "score": { - "max": 2, - "current": 0 - } - } } ] } From 84db6e2f6b2d631e2d4245064589736318860c67 Mon Sep 17 00:00:00 2001 From: Gideon Romm Date: Wed, 6 May 2020 22:59:03 +0300 Subject: [PATCH 53/53] example files ids and type fixes --- ...SecureScoreControlDefinitions_example.json | 32 +++---------------- ...ntrolDefinitions_subscription_example.json | 12 +++---- ...rolsForNameWithExpand_builtin_example.json | 24 +++++++------- ...eScoreControlsForName_builtin_example.json | 12 +++---- .../ListSecureScoreControls_example.json | 12 +++---- 5 files changed, 34 insertions(+), 58 deletions(-) diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScoreControlDefinitions/ListSecureScoreControlDefinitions_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScoreControlDefinitions/ListSecureScoreControlDefinitions_example.json index d6a4a2abc5ab..d80f8690a49c 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScoreControlDefinitions/ListSecureScoreControlDefinitions_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScoreControlDefinitions/ListSecureScoreControlDefinitions_example.json @@ -7,9 +7,9 @@ "body": { "value": [ { - "id": "/providers/Microsoft.Security/secureScoreControlsDefinition/a9909064-42b4-4d34-8143-275477afe18b", + "id": "/providers/Microsoft.Security/SecureScoreControlDefinitions/a9909064-42b4-4d34-8143-275477afe18b", "name": "a9909064-42b4-4d34-8143-275477afe18b", - "type": "Microsoft.Security/SecureScoresControlDefinitions", + "type": "Microsoft.Security/SecureScoreControlDefinitions", "properties": { "source": { "sourceType": "BuiltIn" @@ -25,33 +25,9 @@ } }, { - "id": "/providers/Microsoft.Security/secureScoreControlsDefinition/34a42fb3-e6db-409c-b56b-7b1db6b8aee0", - "name": "34a42fb3-e6db-409c-b56b-7b1db6b8aee0", - "type": "Microsoft.Security/SecureScoresControlDefinitions", - "properties": { - "source": { - "sourceType": "BuiltIn" - }, - "displayName": "Enable MFA", - "description": "This control contains recommendations regarding MFA", - "maxScore": 10, - "assessmentDefinitions": [ - { - "id": "/providers/Microsoft.Security/assessmentMetadata/151e82c5-5341-a74b-1eb0-bc38d2c84bb5" - }, - { - "id": "/providers/Microsoft.Security/assessmentMetadata/57e98606-6b1e-6193-0e3d-fe621387c16b" - }, - { - "id": "/providers/Microsoft.Security/assessmentMetadata/94290b00-4d0c-d7b4-7cea-064a9554e681" - } - ] - } - }, - { - "id": "/providers/Microsoft.Security/secureScoreControlsDefinition/a000c66f-6da2-4f9d-826d-2364347d2588", + "id": "/providers/Microsoft.Security/SecureScoreControlDefinitions/a000c66f-6da2-4f9d-826d-2364347d2588", "name": "a000c66f-6da2-4f9d-826d-2364347d2588", - "type": "Microsoft.Security/SecureScoresControlDefinitions", + "type": "Microsoft.Security/SecureScoreControlDefinitions", "properties": { "source": { "sourceType": "BuiltIn" diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScoreControlDefinitions/ListSecureScoreControlDefinitions_subscription_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScoreControlDefinitions/ListSecureScoreControlDefinitions_subscription_example.json index 73efe3e75b85..bd7565f01793 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScoreControlDefinitions/ListSecureScoreControlDefinitions_subscription_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScoreControlDefinitions/ListSecureScoreControlDefinitions_subscription_example.json @@ -8,9 +8,9 @@ "body": { "value": [ { - "id": "/providers/Microsoft.Security/secureScoreControlsDefinition/a9909064-42b4-4d34-8143-275477afe18b", + "id": "/providers/Microsoft.Security/SecureScoreControlDefinitions/a9909064-42b4-4d34-8143-275477afe18b", "name": "a9909064-42b4-4d34-8143-275477afe18b", - "type": "Microsoft.Security/SecureScoresControlDefinitions", + "type": "Microsoft.Security/SecureScoreControlDefinitions", "properties": { "source": { "sourceType": "BuiltIn" @@ -26,9 +26,9 @@ } }, { - "id": "/providers/Microsoft.Security/secureScoreControlsDefinition/34a42fb3-e6db-409c-b56b-7b1db6b8aee0", + "id": "/providers/Microsoft.Security/SecureScoreControlDefinitions/34a42fb3-e6db-409c-b56b-7b1db6b8aee0", "name": "34a42fb3-e6db-409c-b56b-7b1db6b8aee0", - "type": "Microsoft.Security/SecureScoresControlDefinitions", + "type": "Microsoft.Security/SecureScoreControlDefinitions", "properties": { "source": { "sourceType": "BuiltIn" @@ -50,9 +50,9 @@ } }, { - "id": "/providers/Microsoft.Security/secureScoreControlsDefinition/a000c66f-6da2-4f9d-826d-2364347d2588", + "id": "/providers/Microsoft.Security/SecureScoreControlDefinitions/a000c66f-6da2-4f9d-826d-2364347d2588", "name": "a000c66f-6da2-4f9d-826d-2364347d2588", - "type": "Microsoft.Security/SecureScoresControlDefinitions", + "type": "Microsoft.Security/SecureScoreControlDefinitions", "properties": { "source": { "sourceType": "BuiltIn" diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_builtin_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_builtin_example.json index b616008cedeb..aec26c1a6e20 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_builtin_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForNameWithExpand_builtin_example.json @@ -13,9 +13,9 @@ "body": { "value": [ { - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScoresControls/a9909064-42b4-4d34-8143-275477afe18b", + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/SecureScoreControls/a9909064-42b4-4d34-8143-275477afe18b", "name": "a9909064-42b4-4d34-8143-275477afe18b", - "type": "Microsoft.Security/secureScoresControls", + "type": "Microsoft.Security/secureScoreControls", "properties": { "displayName": "Protect applications against DDoS attacks", "healthyResourceCount": 0, @@ -26,9 +26,9 @@ "current": 0 }, "definition": { - "id": "/providers/Microsoft.Security/secureScoreControlsDefinition/a9909064-42b4-4d34-8143-275477afe18b", + "id": "/providers/Microsoft.Security/SecureScoreControlDefinitions/a9909064-42b4-4d34-8143-275477afe18b", "name": "a9909064-42b4-4d34-8143-275477afe18b", - "type": "Microsoft.Security/SecureScoresControlDefinitions", + "type": "Microsoft.Security/SecureScoreControlDefinitions", "properties": { "source": { "sourceType": "BuiltIn" @@ -46,9 +46,9 @@ } }, { - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScoresControls/34a42fb3-e6db-409c-b56b-7b1db6b8aee0", + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/SecureScoreControls/34a42fb3-e6db-409c-b56b-7b1db6b8aee0", "name": "34a42fb3-e6db-409c-b56b-7b1db6b8aee0", - "type": "Microsoft.Security/secureScoresControls", + "type": "Microsoft.Security/SecureScoreControls", "properties": { "displayName": "Enable MFA", "healthyResourceCount": 0, @@ -59,9 +59,9 @@ "current": 0 }, "definition": { - "id": "/providers/Microsoft.Security/secureScoreControlsDefinition/34a42fb3-e6db-409c-b56b-7b1db6b8aee0", + "id": "/providers/Microsoft.Security/SecureScoreControlDefinitions/34a42fb3-e6db-409c-b56b-7b1db6b8aee0", "name": "34a42fb3-e6db-409c-b56b-7b1db6b8aee0", - "type": "Microsoft.Security/SecureScoresControlDefinitions", + "type": "Microsoft.Security/SecureScoreControlDefinitions", "properties": { "source": { "sourceType": "BuiltIn" @@ -85,9 +85,9 @@ } }, { - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScoresControls/a000c66f-6da2-4f9d-826d-2364347d2588", + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/SecureScoreControls/a000c66f-6da2-4f9d-826d-2364347d2588", "name": "a000c66f-6da2-4f9d-826d-2364347d2588", - "type": "Microsoft.Security/secureScoresControls", + "type": "Microsoft.Security/SecureScoreControls", "properties": { "displayName": "Apply adaptive application control", "healthyResourceCount": 20, @@ -98,9 +98,9 @@ "current": 3 }, "definition": { - "id": "/providers/Microsoft.Security/secureScoreControlsDefinition/a000c66f-6da2-4f9d-826d-2364347d2588", + "id": "/providers/Microsoft.Security/SecureScoreControlDefinitions/a000c66f-6da2-4f9d-826d-2364347d2588", "name": "a000c66f-6da2-4f9d-826d-2364347d2588", - "type": "Microsoft.Security/SecureScoresControlDefinitions", + "type": "Microsoft.Security/SecureScoreControlDefinitions", "properties": { "source": { "sourceType": "BuiltIn" diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_builtin_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_builtin_example.json index 9b02071b5f46..aae8856966ea 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_builtin_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControlsForName_builtin_example.json @@ -9,9 +9,9 @@ "body": { "value": [ { - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScoresControls/a9909064-42b4-4d34-8143-275477afe18b", + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/SecureScoreControls/a9909064-42b4-4d34-8143-275477afe18b", "name": "a9909064-42b4-4d34-8143-275477afe18b", - "type": "Microsoft.Security/secureScoresControls", + "type": "Microsoft.Security/SecureScoreControls", "properties": { "displayName": "Protect applications against DDoS attacks", "healthyResourceCount": 0, @@ -24,9 +24,9 @@ } }, { - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScoresControls/34a42fb3-e6db-409c-b56b-7b1db6b8aee0", + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/SecureScoreControls/34a42fb3-e6db-409c-b56b-7b1db6b8aee0", "name": "34a42fb3-e6db-409c-b56b-7b1db6b8aee0", - "type": "Microsoft.Security/secureScoresControls", + "type": "Microsoft.Security/SecureScoreControls", "properties": { "displayName": "Enable MFA", "healthyResourceCount": 0, @@ -39,9 +39,9 @@ } }, { - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScoresControls/a000c66f-6da2-4f9d-826d-2364347d2588", + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/SecureScoreControls/a000c66f-6da2-4f9d-826d-2364347d2588", "name": "a000c66f-6da2-4f9d-826d-2364347d2588", - "type": "Microsoft.Security/secureScoresControls", + "type": "Microsoft.Security/SecureScoreControls", "properties": { "displayName": "Apply adaptive application control", "healthyResourceCount": 20, diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControls_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControls_example.json index 53f2fbc09c89..c3c4542a72f3 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControls_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-01-01-preview/examples/secureScores/ListSecureScoreControls_example.json @@ -8,9 +8,9 @@ "body": { "value": [ { - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScoresControls/a9909064-42b4-4d34-8143-275477afe18b", + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/SecureScoreControls/a9909064-42b4-4d34-8143-275477afe18b", "name": "a9909064-42b4-4d34-8143-275477afe18b", - "type": "Microsoft.Security/secureScoresControls", + "type": "Microsoft.Security/SecureScoreControls", "properties": { "displayName": "Protect applications against DDoS attacks", "healthyResourceCount": 0, @@ -23,9 +23,9 @@ } }, { - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScoresControls/34a42fb3-e6db-409c-b56b-7b1db6b8aee0", + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/SecureScoreControls/34a42fb3-e6db-409c-b56b-7b1db6b8aee0", "name": "34a42fb3-e6db-409c-b56b-7b1db6b8aee0", - "type": "Microsoft.Security/secureScoresControls", + "type": "Microsoft.Security/SecureScoreControls", "properties": { "displayName": "Enable MFA", "healthyResourceCount": 0, @@ -38,9 +38,9 @@ } }, { - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/secureScoresControls/a000c66f-6da2-4f9d-826d-2364347d2588", + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/SecureScoreControls/a000c66f-6da2-4f9d-826d-2364347d2588", "name": "a000c66f-6da2-4f9d-826d-2364347d2588", - "type": "Microsoft.Security/secureScoresControls", + "type": "Microsoft.Security/SecureScoreControls", "properties": { "displayName": "Apply adaptive application control", "healthyResourceCount": 20,