[Hub Generated] Publish private branch 'oravital-update--dev-security-Microsoft.Security-2022-01-01-preview' (#22288)

oravital7 · web-flow · commit 9eb9c45842ba · 2023-01-24T15:46:27.000+08:00
* Update governance operation result

* Fix Model Validation

* Fix comment

* Fix comment

* More readable docs

* Minor

* Fix description
diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2022-01-01-preview/examples/GovernanceRules/DeleteGovernanceRule_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2022-01-01-preview/examples/GovernanceRules/DeleteGovernanceRule_example.json
@@ -1,11 +1,16 @@
 {
   "parameters": {
     "api-version": "2022-01-01-preview",
-    "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23",
+    "scope": "subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23",
     "ruleId": "ad9a8e26-29d9-4829-bb30-e597a58cdbb8"
   },
   "responses": {
     "200": {},
+    "202": {
+      "headers": {
+        "location": "https://management.azure.com/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/governanceRules/ad9a8e26-29d9-4829-bb30-e597a58cdbb8/operationResults/58b33f4f-c8c7-4b01-99cc-d437db4d40dd?api-version=2022-01-01-preview"
+      }
+    },
     "204": {}
   }
 }
diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2022-01-01-preview/examples/GovernanceRules/DeleteManagementGroupGovernanceRule_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2022-01-01-preview/examples/GovernanceRules/DeleteManagementGroupGovernanceRule_example.json
@@ -1,10 +1,11 @@
 {
   "parameters": {
     "api-version": "2022-01-01-preview",
-    "managementGroupId": "contoso",
+    "scope": "providers/Microsoft.Management/managementGroups/contoso",
     "ruleId": "ad9a8e26-29d9-4829-bb30-e597a58cdbb8"
   },
   "responses": {
+    "200": {},
     "202": {
       "headers": {
         "location": "https://management.azure.com/providers/Microsoft.Management/managementGroups/contoso/providers/Microsoft.Security/governanceRules/ad9a8e26-29d9-4829-bb30-e597a58cdbb8/operationResults/58b33f4f-c8c7-4b01-99cc-d437db4d40dd?api-version=2022-01-01-preview"
diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2022-01-01-preview/examples/GovernanceRules/DeleteSecurityConnectorGovernanceRule_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2022-01-01-preview/examples/GovernanceRules/DeleteSecurityConnectorGovernanceRule_example.json
@@ -1,9 +1,7 @@
 {
   "parameters": {
     "api-version": "2022-01-01-preview",
-    "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23",
-    "resourceGroupName": "gcpResourceGroup",
-    "securityConnectorName": "gcpconnector",
+    "scope": "subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/resourceGroups/gcpResourceGroup/providers/Microsoft.Security/securityConnectors/gcpconnector",
     "ruleId": "ad9a8e26-29d9-4829-bb30-e597a58cdbb8"
   },
   "responses": {
diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2022-01-01-preview/examples/GovernanceRules/GetGovernanceRuleExecuteStatus_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2022-01-01-preview/examples/GovernanceRules/GetGovernanceRuleExecuteStatus_example.json
@@ -1,7 +1,7 @@
 {
   "parameters": {
     "api-version": "2022-01-01-preview",
-    "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23",
+    "scope": "subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23",
     "ruleId": "ad9a8e26-29d9-4829-bb30-e597a58cdbb8",
     "operationId": "58b33f4f-c8c7-4b01-99cc-d437db4d40dd"
   },
diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2022-01-01-preview/examples/GovernanceRules/GetGovernanceRule_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2022-01-01-preview/examples/GovernanceRules/GetGovernanceRule_example.json
@@ -1,7 +1,7 @@
 {
   "parameters": {
     "api-version": "2022-01-01-preview",
-    "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23",
+    "scope": "subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23",
     "ruleId": "ad9a8e26-29d9-4829-bb30-e597a58cdbb8"
   },
   "responses": {
diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2022-01-01-preview/examples/GovernanceRules/GetManagementGroupGovernanceRuleExecuteStatus_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2022-01-01-preview/examples/GovernanceRules/GetManagementGroupGovernanceRuleExecuteStatus_example.json
@@ -1,7 +1,7 @@
 {
   "parameters": {
     "api-version": "2022-01-01-preview",
-    "managementGroupId": "contoso",
+    "scope": "providers/Microsoft.Management/managementGroups/contoso",
     "ruleId": "ad9a8e26-29d9-4829-bb30-e597a58cdbb8",
     "operationId": "58b33f4f-c8c7-4b01-99cc-d437db4d40dd"
   },
diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2022-01-01-preview/examples/GovernanceRules/GetManagementGroupGovernanceRule_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2022-01-01-preview/examples/GovernanceRules/GetManagementGroupGovernanceRule_example.json
@@ -1,7 +1,7 @@
 {
   "parameters": {
     "api-version": "2022-01-01-preview",
-    "managementGroupId": "contoso",
+    "scope": "providers/Microsoft.Management/managementGroups/contoso",
     "ruleId": "ad9a8e26-29d9-4829-bb30-e597a58cdbb8"
   },
   "responses": {
diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2022-01-01-preview/examples/GovernanceRules/GetSecurityConnectorGovernanceRuleExecuteStatus_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2022-01-01-preview/examples/GovernanceRules/GetSecurityConnectorGovernanceRuleExecuteStatus_example.json
@@ -1,9 +1,7 @@
 {
   "parameters": {
     "api-version": "2022-01-01-preview",
-    "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23",
-    "resourceGroupName": "gcpResourceGroup",
-    "securityConnectorName": "gcpconnector",
+    "scope": "subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/resourceGroups/gcpResourceGroup/providers/Microsoft.Security/securityConnectors/gcpconnector",
     "ruleId": "ad9a8e26-29d9-4829-bb30-e597a58cdbb8",
     "operationId": "58b33f4f-c8c7-4b01-99cc-d437db4d40dd"
   },
diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2022-01-01-preview/examples/GovernanceRules/GetSecurityConnectorGovernanceRule_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2022-01-01-preview/examples/GovernanceRules/GetSecurityConnectorGovernanceRule_example.json
@@ -1,9 +1,7 @@
 {
   "parameters": {
     "api-version": "2022-01-01-preview",
-    "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23",
-    "resourceGroupName": "gcpResourceGroup",
-    "securityConnectorName": "gcpconnector",
+    "scope": "subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/resourceGroups/gcpResourceGroup/providers/Microsoft.Security/securityConnectors/gcpconnector",
     "ruleId": "ad9a8e26-29d9-4829-bb30-e597a58cdbb8"
   },
   "responses": {
diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2022-01-01-preview/examples/GovernanceRules/ListByManagementGroupGovernanceRules_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2022-01-01-preview/examples/GovernanceRules/ListByManagementGroupGovernanceRules_example.json
@@ -1,7 +1,7 @@
 {
   "parameters": {
     "api-version": "2022-01-01-preview",
-    "managementGroupId": "contoso",
+    "scope": "providers/Microsoft.Management/managementGroups/contoso",
     "ruleId": "ad9a8e26-29d9-4829-bb30-e597a58cdbb8"
   },
   "responses": {
diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2022-01-01-preview/examples/GovernanceRules/ListBySecurityConnectorGovernanceRules_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2022-01-01-preview/examples/GovernanceRules/ListBySecurityConnectorGovernanceRules_example.json
@@ -1,9 +1,7 @@
 {
   "parameters": {
     "api-version": "2022-01-01-preview",
-    "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23",
-    "resourceGroupName": "gcpResourceGroup",
-    "securityConnectorName": "gcpconnector"
+    "scope": "subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/resourceGroups/gcpResourceGroup/providers/Microsoft.Security/securityConnectors/gcpconnector"
   },
   "responses": {
     "200": {
diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2022-01-01-preview/examples/GovernanceRules/ListBySubscriptionGovernanceRules_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2022-01-01-preview/examples/GovernanceRules/ListBySubscriptionGovernanceRules_example.json
@@ -1,7 +1,7 @@
 {
   "parameters": {
     "api-version": "2022-01-01-preview",
-    "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23"
+    "scope": "subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23"
   },
   "responses": {
     "200": {
diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2022-01-01-preview/examples/GovernanceRules/PostGovernanceRule_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2022-01-01-preview/examples/GovernanceRules/PostGovernanceRule_example.json
@@ -1,7 +1,7 @@
 {
   "parameters": {
     "api-version": "2022-01-01-preview",
-    "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23",
+    "scope": "subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23",
     "ruleId": "ad9a8e26-29d9-4829-bb30-e597a58cdbb8",
     "ExecuteGovernanceRuleBody": {
       "override": false
diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2022-01-01-preview/examples/GovernanceRules/PostManagementGroupGovernanceRule_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2022-01-01-preview/examples/GovernanceRules/PostManagementGroupGovernanceRule_example.json
@@ -1,7 +1,7 @@
 {
   "parameters": {
     "api-version": "2022-01-01-preview",
-    "managementGroupId": "contoso",
+    "scope": "providers/Microsoft.Management/managementGroups/contoso",
     "ruleId": "ad9a8e26-29d9-4829-bb30-e597a58cdbb8",
     "ExecuteGovernanceRuleBody": {
       "override": false
diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2022-01-01-preview/examples/GovernanceRules/PostSecurityConnectorGovernanceRule_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2022-01-01-preview/examples/GovernanceRules/PostSecurityConnectorGovernanceRule_example.json
@@ -1,9 +1,7 @@
 {
   "parameters": {
     "api-version": "2022-01-01-preview",
-    "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23",
-    "resourceGroupName": "gcpResourceGroup",
-    "securityConnectorName": "gcpconnector",
+    "scope": "subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/resourceGroups/gcpResourceGroup/providers/Microsoft.Security/securityConnectors/gcpconnector",
     "ruleId": "ad9a8e26-29d9-4829-bb30-e597a58cdbb8",
     "ExecuteGovernanceRuleBody": {
       "override": false
diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2022-01-01-preview/examples/GovernanceRules/PutGovernanceRule_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2022-01-01-preview/examples/GovernanceRules/PutGovernanceRule_example.json
@@ -1,7 +1,7 @@
 {
   "parameters": {
     "api-version": "2022-01-01-preview",
-    "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23",
+    "scope": "subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23",
     "ruleId": "ad9a8e26-29d9-4829-bb30-e597a58cdbb8",
     "governanceRule": {
       "properties": {
diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2022-01-01-preview/examples/GovernanceRules/PutManagementGroupGovernanceRule_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2022-01-01-preview/examples/GovernanceRules/PutManagementGroupGovernanceRule_example.json
@@ -1,7 +1,7 @@
 {
   "parameters": {
     "api-version": "2022-01-01-preview",
-    "managementGroupId": "contoso",
+    "scope": "providers/Microsoft.Management/managementGroups/contoso",
     "ruleId": "ad9a8e26-29d9-4829-bb30-e597a58cdbb8",
     "governanceRule": {
       "properties": {
diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2022-01-01-preview/examples/GovernanceRules/PutSecurityConnectorGovernanceRule_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2022-01-01-preview/examples/GovernanceRules/PutSecurityConnectorGovernanceRule_example.json
@@ -1,9 +1,7 @@
 {
   "parameters": {
     "api-version": "2022-01-01-preview",
-    "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23",
-    "resourceGroupName": "gcpResourceGroup",
-    "securityConnectorName": "gcpconnector",
+    "scope": "subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/resourceGroups/gcpResourceGroup/providers/Microsoft.Security/securityConnectors/gcpconnector",
     "ruleId": "ad9a8e26-29d9-4829-bb30-e597a58cdbb8",
     "governanceRule": {
       "properties": {
diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2022-01-01-preview/governanceAssignments.json b/specification/security/resource-manager/Microsoft.Security/preview/2022-01-01-preview/governanceAssignments.json
@@ -1,7 +1,7 @@
 {
   "swagger": "2.0",
   "info": {
-    "title": "Security Center",
+    "title": "Microsoft Defender for Cloud",
     "description": "API spec for Microsoft.Security (Microsoft Defender for Cloud) resource provider",
     "version": "2022-01-01-preview"
   },
@@ -51,7 +51,7 @@
             "$ref": "../../../common/v1/types.json#/parameters/ApiVersion"
           },
           {
-            "$ref": "../../../common/v1/types.json#/parameters/Scope"
+            "$ref": "#/parameters/Scope"
           },
           {
             "$ref": "#/parameters/AssessmentName"
@@ -93,7 +93,7 @@
             "$ref": "../../../common/v1/types.json#/parameters/ApiVersion"
           },
           {
-            "$ref": "../../../common/v1/types.json#/parameters/Scope"
+            "$ref": "#/parameters/Scope"
           },
           {
             "$ref": "#/parameters/AssessmentName"
@@ -133,7 +133,7 @@
             "$ref": "../../../common/v1/types.json#/parameters/ApiVersion"
           },
           {
-            "$ref": "../../../common/v1/types.json#/parameters/Scope"
+            "$ref": "#/parameters/Scope"
           },
           {
             "$ref": "#/parameters/AssessmentName"
@@ -182,7 +182,7 @@
             "$ref": "../../../common/v1/types.json#/parameters/ApiVersion"
           },
           {
-            "$ref": "../../../common/v1/types.json#/parameters/Scope"
+            "$ref": "#/parameters/Scope"
           },
           {
             "$ref": "#/parameters/AssessmentName"
@@ -356,6 +356,14 @@
       },
       "description": "Governance assignment over a subscription scope",
       "x-ms-parameter-location": "method"
+    },
+    "Scope": {
+      "name": "scope",
+      "in": "path",
+      "required": true,
+      "type": "string",
+      "description": "The scope of the Governance assignments. Valid scopes are: subscription (format: 'subscriptions/{subscriptionId}'), or security connector (format: 'subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Security/securityConnectors/{securityConnectorName})'",
+      "x-ms-parameter-location": "method"
     }
   }
 }
diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2022-01-01-preview/governanceRules.json b/specification/security/resource-manager/Microsoft.Security/preview/2022-01-01-preview/governanceRules.json

Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,16 @@`
`1`	`1`	`{`
`2`	`2`	`"parameters": {`
`3`	`3`	`"api-version": "2022-01-01-preview",`
`4`		`- "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23",`
	`4`	`+ "scope": "subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23",`
`5`	`5`	`"ruleId": "ad9a8e26-29d9-4829-bb30-e597a58cdbb8"`
`6`	`6`	`},`
`7`	`7`	`"responses": {`
`8`	`8`	`"200": {},`
	`9`	`+ "202": {`
	`10`	`+ "headers": {`
	`11`	`+ "location": "https://management.azure.com/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/governanceRules/ad9a8e26-29d9-4829-bb30-e597a58cdbb8/operationResults/58b33f4f-c8c7-4b01-99cc-d437db4d40dd?api-version=2022-01-01-preview"`
	`12`	`+ }`
	`13`	`+ },`
`9`	`14`	`"204": {}`
`10`	`15`	`}`
`11`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"parameters": {`
`3`	`3`	`"api-version": "2022-01-01-preview",`
`4`		`- "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23",`
	`4`	`+ "scope": "subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23",`
`5`	`5`	`"ruleId": "ad9a8e26-29d9-4829-bb30-e597a58cdbb8",`
`6`	`6`	`"operationId": "58b33f4f-c8c7-4b01-99cc-d437db4d40dd"`
`7`	`7`	`},`