Skip to content

Commit 12a7eed

Browse files
oravital7oravital7
authored
[Hub Generated] Publish private branch 'oravital-update--dev-security-Microsoft.Security-2022-01-01-preview' (#21988)
* Update governance operation result * Fix Model Validation * Fix comment * Fix comment
1 parent 40354d0 commit 12a7eed

File tree

5 files changed

+54
-93
lines changed

5 files changed

+54
-93
lines changed

‎specification/security/resource-manager/Microsoft.Security/preview/2022-01-01-preview/examples/GovernanceRules/GetGovernanceRuleExecuteStatus_example.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
},
1212
"200": {
1313
"body": {
14-
"operationId": "58b33f4f-c8c7-4b01-99cc-d437db4d40dd"
14+
"status": "Succeeded"
1515
}
1616
}
1717
}

‎specification/security/resource-manager/Microsoft.Security/preview/2022-01-01-preview/examples/GovernanceRules/GetManagementGroupGovernanceRuleDeleteStatus_example.json‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎specification/security/resource-manager/Microsoft.Security/preview/2022-01-01-preview/examples/GovernanceRules/GetManagementGroupGovernanceRuleExecuteStatus_example.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
},
88
"responses": {
99
"202": {
10-
"location": "https://management.azure.com/providers/Microsoft.Management/managementGroups/contoso/providers/Microsoft.Security/governanceRules/ad9a8e26-29d9-4829-bb30-e597a58cdbb8/execute/operationResults/58b33f4f-c8c7-4b01-99cc-d437db4d40dd?api-version=2022-01-01-preview"
10+
"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"
1111
},
1212
"200": {
1313
"body": {
14-
"operationId": "58b33f4f-c8c7-4b01-99cc-d437db4d40dd"
14+
"status": "Succeeded"
1515
}
1616
}
1717
}

‎specification/security/resource-manager/Microsoft.Security/preview/2022-01-01-preview/examples/GovernanceRules/GetSecurityConnectorGovernanceRuleExecuteStatus_example.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
},
1414
"200": {
1515
"body": {
16-
"operationId": "58b33f4f-c8c7-4b01-99cc-d437db4d40dd"
16+
"status": "Succeeded"
1717
}
1818
}
1919
}

‎specification/security/resource-manager/Microsoft.Security/preview/2022-01-01-preview/governanceRules.json‎

Lines changed: 50 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@
366366
"description": "OK - Governance rule was deleted"
367367
},
368368
"202": {
369-
"description": "Accepted - Governance rule deletion on management scope",
369+
"description": "Accepted - The operation still in progress",
370370
"headers": {
371371
"location": {
372372
"type": "string",
@@ -437,7 +437,7 @@
437437
"GovernanceRules"
438438
],
439439
"description": "Get a specific governance rule for the requested scope by ruleId",
440-
"operationId": "managementGroupGovernanceRules_Get",
440+
"operationId": "ManagementGroupGovernanceRules_Get",
441441
"parameters": [
442442
{
443443
"$ref": "../../../common/v1/types.json#/parameters/ApiVersion"
@@ -534,7 +534,7 @@
534534
],
535535
"responses": {
536536
"202": {
537-
"description": "Accepted - Governance rule deletion on management scope",
537+
"description": "Accepted - The operation still in progress",
538538
"headers": {
539539
"location": {
540540
"type": "string",
@@ -711,15 +711,15 @@
711711
"/subscriptions/{subscriptionId}/providers/Microsoft.Security/governanceRules/{ruleId}/operationResults/{operationId}": {
712712
"get": {
713713
"x-ms-examples": {
714-
"Get governance rules execution status by specific governanceRuleId": {
714+
"Get governance rules long run operation result by specific governance rule ID": {
715715
"$ref": "./examples/GovernanceRules/GetGovernanceRuleExecuteStatus_example.json"
716716
}
717717
},
718718
"tags": [
719719
"GovernanceRules"
720720
],
721-
"description": "Get a specific governance rule execution status for the requested scope by ruleId and operationId",
722-
"operationId": "SubscriptionGovernanceRulesExecuteStatus_Get",
721+
"description": "Get governance rules long run operation result for the requested scope by ruleId and operationId",
722+
"operationId": "SubscriptionGovernanceRulesOperationResult_Get",
723723
"parameters": [
724724
{
725725
"$ref": "../../../common/v1/types.json#/parameters/ApiVersion"
@@ -736,13 +736,13 @@
736736
],
737737
"responses": {
738738
"200": {
739-
"description": "OK",
739+
"description": "OK - The operation completed",
740740
"schema": {
741-
"$ref": "#/definitions/ExecuteRuleStatus"
741+
"$ref": "#/definitions/OperationResult"
742742
}
743743
},
744744
"202": {
745-
"description": "Accepted",
745+
"description": "Accepted - The operation still in progress",
746746
"headers": {
747747
"location": {
748748
"type": "string",
@@ -762,15 +762,15 @@
762762
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Security/securityConnectors/{securityConnectorName}/providers/Microsoft.Security/governanceRules/{ruleId}/operationResults/{operationId}": {
763763
"get": {
764764
"x-ms-examples": {
765-
"Get governance rules execution status by specific governanceRuleId": {
765+
"Get governance rules long run operation result by specific governance rule ID": {
766766
"$ref": "./examples/GovernanceRules/GetSecurityConnectorGovernanceRuleExecuteStatus_example.json"
767767
}
768768
},
769769
"tags": [
770770
"GovernanceRules"
771771
],
772-
"description": "Get a specific governance rule execution status for the requested scope by ruleId and operationId",
773-
"operationId": "SecurityConnectorGovernanceRulesExecuteStatus_Get",
772+
"description": "Get governance rule long run operation result for the requested scope by ruleId and operationId",
773+
"operationId": "SecurityConnectorGovernanceRulesOperationResult_Get",
774774
"parameters": [
775775
{
776776
"$ref": "../../../common/v1/types.json#/parameters/ApiVersion"
@@ -793,13 +793,13 @@
793793
],
794794
"responses": {
795795
"200": {
796-
"description": "OK",
796+
"description": "OK - The operation completed",
797797
"schema": {
798-
"$ref": "#/definitions/ExecuteRuleStatus"
798+
"$ref": "#/definitions/OperationResult"
799799
}
800800
},
801801
"202": {
802-
"description": "Accepted",
802+
"description": "Accepted - The operation still in progress",
803803
"headers": {
804804
"location": {
805805
"type": "string",
@@ -816,18 +816,18 @@
816816
}
817817
}
818818
},
819-
"/providers/Microsoft.Management/managementGroups/{managementGroupId}/providers/Microsoft.Security/governanceRules/{ruleId}/execute/operationResults/{operationId}": {
819+
"/providers/Microsoft.Management/managementGroups/{managementGroupId}/providers/Microsoft.Security/governanceRules/{ruleId}/operationResults/{operationId}": {
820820
"get": {
821821
"x-ms-examples": {
822-
"Get governance rules execution status by specific governance rule ID": {
822+
"Get governance rules long run operation result by specific governance rule ID": {
823823
"$ref": "./examples/GovernanceRules/GetManagementGroupGovernanceRuleExecuteStatus_example.json"
824824
}
825825
},
826826
"tags": [
827827
"GovernanceRules"
828828
],
829-
"description": "Get a specific governance rule execution status for the requested scope by ruleId and operationId",
830-
"operationId": "ManagementGroupGovernanceRulesExecuteStatus_Get",
829+
"description": "Get governance rules long run operation result for the requested scope by ruleId and operationId",
830+
"operationId": "ManagementGroupGovernanceRulesOperationResult_Get",
831831
"parameters": [
832832
{
833833
"$ref": "../../../common/v1/types.json#/parameters/ApiVersion"
@@ -844,13 +844,13 @@
844844
],
845845
"responses": {
846846
"200": {
847-
"description": "OK",
847+
"description": "OK - The operation completed",
848848
"schema": {
849-
"$ref": "#/definitions/ExecuteRuleStatus"
849+
"$ref": "#/definitions/OperationResult"
850850
}
851851
},
852852
"202": {
853-
"description": "Accepted",
853+
"description": "Accepted - The operation still in progress",
854854
"headers": {
855855
"location": {
856856
"type": "string",
@@ -866,54 +866,6 @@
866866
}
867867
}
868868
}
869-
},
870-
"/providers/Microsoft.Management/managementGroups/{managementGroupId}/providers/Microsoft.Security/governanceRules/{ruleId}/delete/operationResults/{operationId}": {
871-
"get": {
872-
"x-ms-examples": {
873-
"Get governance rules deletion status by specific governance rule ID": {
874-
"$ref": "./examples/GovernanceRules/GetManagementGroupGovernanceRuleDeleteStatus_example.json"
875-
}
876-
},
877-
"tags": [
878-
"GovernanceRules"
879-
],
880-
"description": "Get a specific governance rule deletion status for the requested scope by rule ID and operation ID",
881-
"operationId": "ManagementGroupGovernanceRulesDeleteStatus_Get",
882-
"parameters": [
883-
{
884-
"$ref": "../../../common/v1/types.json#/parameters/ApiVersion"
885-
},
886-
{
887-
"$ref": "../../../common/v1/types.json#/parameters/ManagementGroupId"
888-
},
889-
{
890-
"$ref": "#/parameters/RuleId"
891-
},
892-
{
893-
"$ref": "#/parameters/OperationId"
894-
}
895-
],
896-
"responses": {
897-
"204": {
898-
"description": "Delete succeeded"
899-
},
900-
"202": {
901-
"description": "Accepted",
902-
"headers": {
903-
"location": {
904-
"type": "string",
905-
"description": "Location URL for the deletion status"
906-
}
907-
}
908-
},
909-
"default": {
910-
"description": "Error response describing why the operation failed",
911-
"schema": {
912-
"$ref": "../../../common/v1/types.json#/definitions/CloudError"
913-
}
914-
}
915-
}
916-
}
917869
}
918870
},
919871
"definitions": {
@@ -1205,14 +1157,37 @@
12051157
}
12061158
}
12071159
},
1208-
"ExecuteRuleStatus": {
1160+
"OperationResult": {
12091161
"type": "object",
1210-
"description": "Execute status of governance rule over a given scope",
1162+
"description": "Long run operation status of governance rule over a given scope",
12111163
"properties": {
1212-
"operationId": {
1213-
"description": "Unique key for the execution of governance rule",
1164+
"status": {
12141165
"type": "string",
1215-
"readOnly": true
1166+
"description": "The status of the long run operation result of governance rule",
1167+
"readOnly": true,
1168+
"enum": [
1169+
"Succeeded",
1170+
"Failed",
1171+
"Canceled"
1172+
],
1173+
"x-ms-enum": {
1174+
"name": "OperationResult",
1175+
"modelAsString": true,
1176+
"values": [
1177+
{
1178+
"value": "Succeeded",
1179+
"description": "The operation succeeded"
1180+
},
1181+
{
1182+
"value": "Failed",
1183+
"description": "The operation failed"
1184+
},
1185+
{
1186+
"value": "Canceled",
1187+
"description": "The operation canceled"
1188+
}
1189+
]
1190+
}
12161191
}
12171192
}
12181193
}

0 commit comments

Comments
 (0)