Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Dec 26, 2022
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5bf8e98
Update governance operation result
oravital7 Dec 12, 2022
878051b
Fix Model Validation
oravital7 Dec 12, 2022
05dbbd0
Fix comment
oravital7 Dec 15, 2022
1ae8826
Fix comment
oravital7 Dec 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...w/2022-01-01-preview/examples/GovernanceRules/GetGovernanceRuleExecuteStatus_example.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
},
"200": {
"body": {
"operationId": "58b33f4f-c8c7-4b01-99cc-d437db4d40dd"
"status": "Succeeded"
}
}
}
Expand Down
14 changes: 0 additions & 14 deletions ...review/examples/GovernanceRules/GetManagementGroupGovernanceRuleDeleteStatus_example.json
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions ...eview/examples/GovernanceRules/GetManagementGroupGovernanceRuleExecuteStatus_example.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
},
"responses": {
"202": {
"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"
"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"
},
"200": {
"body": {
"operationId": "58b33f4f-c8c7-4b01-99cc-d437db4d40dd"
"status": "Succeeded"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...iew/examples/GovernanceRules/GetSecurityConnectorGovernanceRuleExecuteStatus_example.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
},
"200": {
"body": {
"operationId": "58b33f4f-c8c7-4b01-99cc-d437db4d40dd"
"status": "Succeeded"
}
}
}
Expand Down
125 changes: 50 additions & 75 deletions ...urity/resource-manager/Microsoft.Security/preview/2022-01-01-preview/governanceRules.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@
"description": "OK - Governance rule was deleted"
},
"202": {
"description": "Accepted - Governance rule deletion on management scope",
"description": "Accepted - The operation still in progress",
"headers": {
"location": {
"type": "string",
Expand Down Expand Up @@ -437,7 +437,7 @@
"GovernanceRules"
],
"description": "Get a specific governance rule for the requested scope by ruleId",
"operationId": "managementGroupGovernanceRules_Get",
"operationId": "ManagementGroupGovernanceRules_Get",
"parameters": [
{
"$ref": "../../../common/v1/types.json#/parameters/ApiVersion"
Expand Down Expand Up @@ -534,7 +534,7 @@
],
"responses": {
"202": {
"description": "Accepted - Governance rule deletion on management scope",
"description": "Accepted - The operation still in progress",
"headers": {
"location": {
"type": "string",
Expand Down Expand Up @@ -711,15 +711,15 @@
"/subscriptions/{subscriptionId}/providers/Microsoft.Security/governanceRules/{ruleId}/operationResults/{operationId}": {
"get": {
"x-ms-examples": {
"Get governance rules execution status by specific governanceRuleId": {
"Get governance rules long run operation result by specific governance rule ID": {
"$ref": "./examples/GovernanceRules/GetGovernanceRuleExecuteStatus_example.json"
}
},
"tags": [
"GovernanceRules"
],
"description": "Get a specific governance rule execution status for the requested scope by ruleId and operationId",
"operationId": "SubscriptionGovernanceRulesExecuteStatus_Get",
"description": "Get governance rules long run operation result for the requested scope by ruleId and operationId",
"operationId": "SubscriptionGovernanceRulesOperationResult_Get",
"parameters": [
{
"$ref": "../../../common/v1/types.json#/parameters/ApiVersion"
Expand All @@ -736,13 +736,13 @@
],
"responses": {
"200": {
"description": "OK",
"description": "OK - The operation completed",
"schema": {
"$ref": "#/definitions/ExecuteRuleStatus"
"$ref": "#/definitions/OperationResult"
}
},
"202": {
"description": "Accepted",
"description": "Accepted - The operation still in progress",
"headers": {
"location": {
"type": "string",
Expand All @@ -762,15 +762,15 @@
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Security/securityConnectors/{securityConnectorName}/providers/Microsoft.Security/governanceRules/{ruleId}/operationResults/{operationId}": {
"get": {
"x-ms-examples": {
"Get governance rules execution status by specific governanceRuleId": {
"Get governance rules long run operation result by specific governance rule ID": {
"$ref": "./examples/GovernanceRules/GetSecurityConnectorGovernanceRuleExecuteStatus_example.json"
}
},
"tags": [
"GovernanceRules"
],
"description": "Get a specific governance rule execution status for the requested scope by ruleId and operationId",
"operationId": "SecurityConnectorGovernanceRulesExecuteStatus_Get",
"description": "Get governance rule long run operation result for the requested scope by ruleId and operationId",
"operationId": "SecurityConnectorGovernanceRulesOperationResult_Get",
"parameters": [
{
"$ref": "../../../common/v1/types.json#/parameters/ApiVersion"
Expand All @@ -793,13 +793,13 @@
],
"responses": {
"200": {
"description": "OK",
"description": "OK - The operation completed",
"schema": {
"$ref": "#/definitions/ExecuteRuleStatus"
"$ref": "#/definitions/OperationResult"
}
},
"202": {
"description": "Accepted",
"description": "Accepted - The operation still in progress",
"headers": {
"location": {
"type": "string",
Expand All @@ -816,18 +816,18 @@
}
}
},
"/providers/Microsoft.Management/managementGroups/{managementGroupId}/providers/Microsoft.Security/governanceRules/{ruleId}/execute/operationResults/{operationId}": {
"/providers/Microsoft.Management/managementGroups/{managementGroupId}/providers/Microsoft.Security/governanceRules/{ruleId}/operationResults/{operationId}": {
"get": {
"x-ms-examples": {
"Get governance rules execution status by specific governance rule ID": {
"Get governance rules long run operation result by specific governance rule ID": {
"$ref": "./examples/GovernanceRules/GetManagementGroupGovernanceRuleExecuteStatus_example.json"
}
},
"tags": [
"GovernanceRules"
],
"description": "Get a specific governance rule execution status for the requested scope by ruleId and operationId",
"operationId": "ManagementGroupGovernanceRulesExecuteStatus_Get",
"description": "Get governance rules long run operation result for the requested scope by ruleId and operationId",
"operationId": "ManagementGroupGovernanceRulesOperationResult_Get",
"parameters": [
{
"$ref": "../../../common/v1/types.json#/parameters/ApiVersion"
Expand All @@ -844,13 +844,13 @@
],
"responses": {
"200": {
"description": "OK",
"description": "OK - The operation completed",
"schema": {
"$ref": "#/definitions/ExecuteRuleStatus"
"$ref": "#/definitions/OperationResult"
}
},
"202": {
"description": "Accepted",
"description": "Accepted - The operation still in progress",
"headers": {
"location": {
"type": "string",
Expand All @@ -866,54 +866,6 @@
}
}
}
},
"/providers/Microsoft.Management/managementGroups/{managementGroupId}/providers/Microsoft.Security/governanceRules/{ruleId}/delete/operationResults/{operationId}": {
"get": {
"x-ms-examples": {
"Get governance rules deletion status by specific governance rule ID": {
"$ref": "./examples/GovernanceRules/GetManagementGroupGovernanceRuleDeleteStatus_example.json"
}
},
"tags": [
"GovernanceRules"
],
"description": "Get a specific governance rule deletion status for the requested scope by rule ID and operation ID",
"operationId": "ManagementGroupGovernanceRulesDeleteStatus_Get",
"parameters": [
{
"$ref": "../../../common/v1/types.json#/parameters/ApiVersion"
},
{
"$ref": "../../../common/v1/types.json#/parameters/ManagementGroupId"
},
{
"$ref": "#/parameters/RuleId"
},
{
"$ref": "#/parameters/OperationId"
}
],
"responses": {
"204": {
"description": "Delete succeeded"
},
"202": {
"description": "Accepted",
"headers": {
"location": {
"type": "string",
"description": "Location URL for the deletion status"
}
}
},
"default": {
"description": "Error response describing why the operation failed",
"schema": {
"$ref": "../../../common/v1/types.json#/definitions/CloudError"
}
}
}
}
}
},
"definitions": {
Expand Down Expand Up @@ -1205,14 +1157,37 @@
}
}
},
"ExecuteRuleStatus": {
"OperationResult": {
"type": "object",
"description": "Execute status of governance rule over a given scope",
"description": "Long run operation status of governance rule over a given scope",
"properties": {
"operationId": {
"description": "Unique key for the execution of governance rule",
"status": {
"type": "string",
"readOnly": true
"description": "The status of the long run operation result of governance rule",
"readOnly": true,
"enum": [
"Succeeded",
"Failed",
"Canceled"
],
"x-ms-enum": {
"name": "OperationResult",
"modelAsString": true,
"values": [
{
"value": "Succeeded",
"description": "The operation succeeded"
},
{
"value": "Failed",
"description": "The operation failed"
},
{
"value": "Canceled",
"description": "The operation canceled"
}
]
}
}
}
}
Expand Down