From e461d119447f39165fedb8638e488a4d2bea4814 Mon Sep 17 00:00:00 2001 From: Sapir Elmakayes <32778998+SapirElmakayes@users.noreply.github.com> Date: Tue, 14 Dec 2021 17:17:02 +0200 Subject: [PATCH 01/36] Adds base for updating Microsoft.Security from version preview/2021-07-01-preview to version 2021-12-01-preview --- .../customAssessmentAutomation.json | 433 +++++++++++++ .../customEntityStoreAssignment.json | 351 +++++++++++ ...tomAssessmentAutomationCreate_example.json | 68 +++ ...tomAssessmentAutomationDelete_example.json | 12 + ...customAssessmentAutomationGet_example.json | 34 ++ ...AutomationListByResourceGroup_example.json | 60 ++ ...tAutomationListBySubscription_example.json | 59 ++ ...omEntityStoreAssignmentCreate_example.json | 53 ++ ...omEntityStoreAssignmentDelete_example.json | 12 + ...ustomEntityStoreAssignmentGet_example.json | 29 + ...AssignmentListByResourceGroup_example.json | 42 ++ ...eAssignmentListBySubscription_example.json | 49 ++ .../DeleteSecurityConnector_example.json | 12 + ...ecurityConnectorResourceGroup_example.json | 42 ++ ...curityConnectorsResourceGroup_example.json | 45 ++ ...ecurityConnectorsSubscription_example.json | 43 ++ .../PatchSecurityConnector_example.json | 59 ++ .../PutSecurityConnector_example.json | 91 +++ .../securityConnectors.json | 574 ++++++++++++++++++ 19 files changed, 2068 insertions(+) create mode 100644 specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/customAssessmentAutomation.json create mode 100644 specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/customEntityStoreAssignment.json create mode 100644 specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomAssessmentAutomations/customAssessmentAutomationCreate_example.json create mode 100644 specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomAssessmentAutomations/customAssessmentAutomationDelete_example.json create mode 100644 specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomAssessmentAutomations/customAssessmentAutomationGet_example.json create mode 100644 specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomAssessmentAutomations/customAssessmentAutomationListByResourceGroup_example.json create mode 100644 specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomAssessmentAutomations/customAssessmentAutomationListBySubscription_example.json create mode 100644 specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomEntityStoreAssignments/customEntityStoreAssignmentCreate_example.json create mode 100644 specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomEntityStoreAssignments/customEntityStoreAssignmentDelete_example.json create mode 100644 specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomEntityStoreAssignments/customEntityStoreAssignmentGet_example.json create mode 100644 specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomEntityStoreAssignments/customEntityStoreAssignmentListByResourceGroup_example.json create mode 100644 specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomEntityStoreAssignments/customEntityStoreAssignmentListBySubscription_example.json create mode 100644 specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/DeleteSecurityConnector_example.json create mode 100644 specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorResourceGroup_example.json create mode 100644 specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorsResourceGroup_example.json create mode 100644 specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorsSubscription_example.json create mode 100644 specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/PatchSecurityConnector_example.json create mode 100644 specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/PutSecurityConnector_example.json create mode 100644 specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/customAssessmentAutomation.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/customAssessmentAutomation.json new file mode 100644 index 000000000000..54d71c5a4386 --- /dev/null +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/customAssessmentAutomation.json @@ -0,0 +1,433 @@ +{ + "swagger": "2.0", + "info": { + "title": "Security Center", + "description": "API spec for Microsoft.Security (Azure Security Center) resource provider", + "version": "2021-07-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": { + "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Security/customAssessmentAutomations/{customAssessmentAutomationName}": { + "get": { + "summary": "Gets a custom assessment automation", + "description": "Gets a single custom assessment automation by name for the provided subscription and resource group.", + "tags": [ + "customAssessmentAutomations" + ], + "operationId": "CustomAssessmentAutomations_Get", + "parameters": [ + { + "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/SubscriptionId" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/ResourceGroupName" + }, + { + "$ref": "#/parameters/customAssessmentAutomationName" + } + ], + "x-ms-examples": { + "Get a Custom Assessment Automation": { + "$ref": "./examples/CustomAssessmentAutomations/customAssessmentAutomationGet_example.json" + } + }, + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/customAssessmentAutomation" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "../../../common/v1/types.json#/definitions/CloudError" + } + } + } + }, + "put": { + "summary": "Creates a custom assessment automation", + "description": "Creates or updates a custom assessment automation for the provided subscription. Please note that providing an existing custom assessment automation will replace the existing record.", + "tags": [ + "customAssessmentAutomations" + ], + "operationId": "CustomAssessmentAutomations_Create", + "parameters": [ + { + "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/SubscriptionId" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/ResourceGroupName" + }, + { + "$ref": "#/parameters/customAssessmentAutomationName" + }, + { + "$ref": "#/parameters/customAssessmentAutomationBody" + } + ], + "x-ms-examples": { + "Create a Custom Assessment Automation": { + "$ref": "./examples/CustomAssessmentAutomations/customAssessmentAutomationCreate_example.json" + } + }, + "responses": { + "201": { + "description": "Created", + "schema": { + "$ref": "#/definitions/customAssessmentAutomation" + } + }, + "200": { + "description": "OK - Updated", + "schema": { + "$ref": "#/definitions/customAssessmentAutomation" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "../../../common/v1/types.json#/definitions/CloudError" + } + } + } + }, + "delete": { + "summary": "Deletes a custom assessment automation", + "description": "Deletes a custom assessment automation by name for a provided subscription", + "tags": [ + "customAssessmentAutomations" + ], + "operationId": "CustomAssessmentAutomations_Delete", + "parameters": [ + { + "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/SubscriptionId" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/ResourceGroupName" + }, + { + "$ref": "#/parameters/customAssessmentAutomationName" + } + ], + "x-ms-examples": { + "Delete a Custom Assessment Automation": { + "$ref": "./examples/CustomAssessmentAutomations/customAssessmentAutomationDelete_example.json" + } + }, + "responses": { + "200": { + "description": "OK - Custom Assessment Automation was deleted" + }, + "204": { + "description": "No Content - Custom Assessment Automation does not exist" + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "../../../common/v1/types.json#/definitions/CloudError" + } + } + } + } + }, + "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Security/customAssessmentAutomations": { + "get": { + "summary": "List custom assessment automations in a subscription and a resource group", + "description": "List custom assessment automations by provided subscription and resource group", + "tags": [ + "customAssessmentAutomations" + ], + "operationId": "CustomAssessmentAutomations_ListByResourceGroup", + "parameters": [ + { + "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/SubscriptionId" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/ResourceGroupName" + } + ], + "x-ms-examples": { + "List Custom Assessment Automations in a subscription and a resource group": { + "$ref": "./examples/CustomAssessmentAutomations/customAssessmentAutomationListByResourceGroup_example.json" + } + }, + "responses": { + "200": { + "description": "OK - Returns a collection of Custom Assessment Automations", + "schema": { + "$ref": "#/definitions/customAssessmentAutomationsListResult" + } + }, + "default": { + "description": "Error response that describes why the operation failed.", + "schema": { + "$ref": "../../../common/v1/types.json#/definitions/CloudError" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.Security/customAssessmentAutomations": { + "get": { + "summary": "List custom assessment automations in a subscription", + "description": "List custom assessment automations by provided subscription", + "tags": [ + "customAssessmentAutomations" + ], + "operationId": "CustomAssessmentAutomations_ListBySubscription", + "parameters": [ + { + "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/SubscriptionId" + } + ], + "x-ms-examples": { + "List Custom Assessment Automations in a subscription": { + "$ref": "./examples/CustomAssessmentAutomations/customAssessmentAutomationListBySubscription_example.json" + } + }, + "responses": { + "200": { + "description": "OK - Returns a collection of Custom Assessment Automations", + "schema": { + "$ref": "#/definitions/customAssessmentAutomationsListResult" + } + }, + "default": { + "description": "Error response that describes why the operation failed.", + "schema": { + "$ref": "../../../common/v1/types.json#/definitions/CloudError" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + } + }, + "definitions": { + "customAssessmentAutomationsListResult": { + "type": "object", + "description": "A list of Custom Assessment Automations", + "properties": { + "value": { + "description": "Collection of Custom Assessment Automations", + "readOnly": true, + "type": "array", + "items": { + "$ref": "#/definitions/customAssessmentAutomation" + } + }, + "nextLink": { + "description": "The link used to get the next page of operations.", + "type": "string" + } + } + }, + "customAssessmentAutomation": { + "type": "object", + "description": "Custom Assessment Automation", + "properties": { + "systemData": { + "readOnly": true, + "type": "object", + "description": "Azure Resource Manager metadata containing createdBy and modifiedBy information.", + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData" + }, + "properties": { + "x-ms-client-flatten": true, + "description": "describes Custom Assessment Automation properties.", + "$ref": "#/definitions/customAssessmentAutomationProperties" + } + }, + "allOf": [ + { + "$ref": "../../../common/v1/types.json#/definitions/Resource" + } + ] + }, + "customAssessmentAutomationRequest": { + "type": "object", + "description": "Custom Assessment Automation request", + "properties": { + "properties": { + "x-ms-client-flatten": true, + "description": "describes Custom Assessment Automation request properties.", + "$ref": "#/definitions/customAssessmentAutomationRequestProperties" + } + }, + "allOf": [ + { + "$ref": "../../../common/v1/types.json#/definitions/Resource" + } + ] + }, + "customAssessmentAutomationProperties": { + "type": "object", + "description": "describes the Custom Assessment Automation properties", + "properties": { + "compressedQuery": { + "description": "GZip encoded KQL query representing the assessment automation results required.", + "type": "string" + }, + "supportedCloud": { + "description": "Relevant cloud for the custom assessment automation.", + "type": "string", + "enum": [ + "AWS" + ], + "x-ms-enum": { + "name": "supportedCloudEnum", + "modelAsString": true + }, + "x-ms-client-default": "AWS" + }, + "severity": { + "description": "The severity to relate to the assessments generated by this assessment automation.", + "type": "string", + "enum": [ + "High", + "Medium", + "Low" + ], + "x-ms-enum": { + "name": "severityEnum", + "modelAsString": true + }, + "x-ms-client-default": "Low" + }, + "displayName": { + "description": "The display name of the assessments generated by this assessment automation.", + "type": "string" + }, + "description": { + "description": "The description to relate to the assessments generated by this assessment automation.", + "type": "string" + }, + "remediationDescription": { + "description": "The remediation description to relate to the assessments generated by this assessment automation.", + "type": "string" + }, + "assessmentKey": { + "description": "The assessment metadata key used when an assessment is generated for this assessment automation.", + "type": "string" + } + } + }, + "customAssessmentAutomationRequestProperties": { + "type": "object", + "description": "describes the Custom Assessment Automation properties", + "properties": { + "compressedQuery": { + "description": "Base 64 encoded KQL query representing the assessment automation results required.", + "type": "string" + }, + "supportedCloud": { + "description": "Relevant cloud for the custom assessment automation.", + "type": "string", + "enum": [ + "AWS" + ], + "x-ms-enum": { + "name": "supportedCloudEnum", + "modelAsString": true + }, + "x-ms-client-default": "AWS" + }, + "severity": { + "description": "The severity to relate to the assessments generated by this assessment automation.", + "type": "string", + "enum": [ + "High", + "Medium", + "Low" + ], + "x-ms-enum": { + "name": "severityEnum", + "modelAsString": true + }, + "x-ms-client-default": "Low" + }, + "displayName": { + "description": "The display name of the assessments generated by this assessment automation.", + "type": "string" + }, + "description": { + "description": "The description to relate to the assessments generated by this assessment automation.", + "type": "string" + }, + "remediationDescription": { + "description": "The remediation description to relate to the assessments generated by this assessment automation.", + "type": "string" + } + } + } + }, + "parameters": { + "customAssessmentAutomationName": { + "name": "customAssessmentAutomationName", + "in": "path", + "required": true, + "type": "string", + "description": "Name of the Custom Assessment Automation.", + "x-ms-parameter-location": "method" + }, + "customAssessmentAutomationBody": { + "name": "customAssessmentAutomationBody", + "in": "body", + "description": "Custom Assessment Automation body", + "required": true, + "schema": { + "$ref": "#/definitions/customAssessmentAutomationRequest" + }, + "x-ms-parameter-location": "method" + } + } +} diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/customEntityStoreAssignment.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/customEntityStoreAssignment.json new file mode 100644 index 000000000000..5aedaab3a909 --- /dev/null +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/customEntityStoreAssignment.json @@ -0,0 +1,351 @@ +{ + "swagger": "2.0", + "info": { + "title": "Security Center", + "description": "API spec for Microsoft.Security (Azure Security Center) resource provider", + "version": "2021-07-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": { + "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Security/customEntityStoreAssignments/{customEntityStoreAssignmentName}": { + "get": { + "summary": "Gets a custom entity store assignment", + "description": "Gets a single custom entity store assignment by name for the provided subscription and resource group.", + "tags": [ + "customEntityStoreAssignments" + ], + "operationId": "CustomEntityStoreAssignments_Get", + "parameters": [ + { + "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/SubscriptionId" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/ResourceGroupName" + }, + { + "$ref": "#/parameters/customEntityStoreAssignmentName" + } + ], + "x-ms-examples": { + "Get a custom entity store assignment": { + "$ref": "./examples/CustomEntityStoreAssignments/customEntityStoreAssignmentGet_example.json" + } + }, + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/CustomEntityStoreAssignment" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "../../../common/v1/types.json#/definitions/CloudError" + } + } + } + }, + "put": { + "summary": "Creates a custom entity store assignment", + "description": "Creates a custom entity store assignment for the provided subscription, if not already exists.", + "tags": [ + "customEntityStoreAssignments" + ], + "operationId": "CustomEntityStoreAssignments_Create", + "parameters": [ + { + "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/SubscriptionId" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/ResourceGroupName" + }, + { + "$ref": "#/parameters/customEntityStoreAssignmentName" + }, + { + "$ref": "#/parameters/customEntityStoreAssignmentRequestBody" + } + ], + "x-ms-examples": { + "Create a custom entity store assignment": { + "$ref": "./examples/CustomEntityStoreAssignments/customEntityStoreAssignmentCreate_example.json" + } + }, + "responses": { + "201": { + "description": "Created", + "schema": { + "$ref": "#/definitions/CustomEntityStoreAssignment" + } + }, + "200": { + "description": "OK - Updated", + "schema": { + "$ref": "#/definitions/CustomEntityStoreAssignment" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "../../../common/v1/types.json#/definitions/CloudError" + } + } + } + }, + "delete": { + "summary": "Deleted a custom entity store assignment", + "description": "Delete a custom entity store assignment by name for a provided subscription", + "tags": [ + "customEntityStoreAssignments" + ], + "operationId": "CustomEntityStoreAssignments_Delete", + "parameters": [ + { + "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/SubscriptionId" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/ResourceGroupName" + }, + { + "$ref": "#/parameters/customEntityStoreAssignmentName" + } + ], + "x-ms-examples": { + "Delete a custom entity store assignment": { + "$ref": "./examples/CustomEntityStoreAssignments/customEntityStoreAssignmentDelete_example.json" + } + }, + "responses": { + "200": { + "description": "OK - Custom Entity Store Assignment was deleted" + }, + "204": { + "description": "No Content - Custom Entity Store Assignment does not exist" + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "../../../common/v1/types.json#/definitions/CloudError" + } + } + } + } + }, + "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Security/customEntityStoreAssignments": { + "get": { + "summary": "List custom entity store assignments in a subscription and a resource group", + "description": "List custom entity store assignments by a provided subscription and resource group", + "tags": [ + "customEntityStoreAssignments" + ], + "operationId": "CustomEntityStoreAssignments_ListByResourceGroup", + "parameters": [ + { + "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/SubscriptionId" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/ResourceGroupName" + } + ], + "x-ms-examples": { + "List custom entity store assignments in a subscription and a resource group": { + "$ref": "./examples/CustomEntityStoreAssignments/customEntityStoreAssignmentListByResourceGroup_example.json" + } + }, + "responses": { + "200": { + "description": "OK - Returns a collection of custom entity store assignments", + "schema": { + "$ref": "#/definitions/CustomEntityStoreAssignmentsListResult" + } + }, + "default": { + "description": "Error response that describes why the operation failed.", + "schema": { + "$ref": "../../../common/v1/types.json#/definitions/CloudError" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.Security/customEntityStoreAssignments": { + "get": { + "summary": "List custom entity store assignments in a subscription", + "description": "List custom entity store assignments by provided subscription", + "tags": [ + "customEntityStoreAssignments" + ], + "operationId": "CustomEntityStoreAssignments_ListBySubscription", + "parameters": [ + { + "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/SubscriptionId" + } + ], + "x-ms-examples": { + "List custom entity store assignments in a subscription": { + "$ref": "./examples/CustomEntityStoreAssignments/customEntityStoreAssignmentListBySubscription_example.json" + } + }, + "responses": { + "200": { + "description": "OK - Returns a collection of custom entity store assignments", + "schema": { + "$ref": "#/definitions/CustomEntityStoreAssignmentsListResult" + } + }, + "default": { + "description": "Error response that describes why the operation failed.", + "schema": { + "$ref": "../../../common/v1/types.json#/definitions/CloudError" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + } + }, + "definitions": { + "CustomEntityStoreAssignmentsListResult": { + "type": "object", + "description": "A list of custom entity store assignments", + "properties": { + "value": { + "description": "Collection of custom entity store assignments", + "readOnly": true, + "type": "array", + "items": { + "$ref": "#/definitions/CustomEntityStoreAssignment" + } + }, + "nextLink": { + "description": "The link used to get the next page of operations.", + "type": "string" + } + } + }, + "CustomEntityStoreAssignment": { + "type": "object", + "description": "Custom entity store assignment", + "properties": { + "systemData": { + "readOnly": true, + "type": "object", + "description": "Azure Resource Manager metadata containing createdBy and modifiedBy information.", + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData" + }, + "properties": { + "x-ms-client-flatten": true, + "description": "describes custom entity store assignment properties.", + "$ref": "#/definitions/CustomEntityStoreAssignmentProperties" + } + }, + "allOf": [ + { + "$ref": "../../../common/v1/types.json#/definitions/Resource" + } + ] + }, + "CustomEntityStoreAssignmentProperties": { + "type": "object", + "description": "describes the custom entity store assignment properties", + "properties": { + "principal": { + "description": "The principal assigned with entity store. Format of principal is: [AAD type]=[PrincipalObjectId];[TenantId]", + "type": "string" + }, + "entityStoreDatabaseLink": { + "description": "The link to entity store database.", + "type": "string" + } + } + }, + "CustomEntityStoreAssignmentRequest": { + "type": "object", + "description": "describes the custom entity store assignment request", + "properties": { + "properties": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/CustomEntityStoreAssignmentRequestProperties" + } + } + }, + "CustomEntityStoreAssignmentRequestProperties": { + "type": "object", + "description": "describes properties of custom entity store assignment request", + "properties": { + "principal": { + "description": "The principal assigned with entity store. If not provided, will use caller principal. Format of principal is: [AAD type]=[PrincipalObjectId];[TenantId]", + "type": "string" + } + } + } + }, + "parameters": { + "customEntityStoreAssignmentName": { + "name": "customEntityStoreAssignmentName", + "in": "path", + "required": true, + "type": "string", + "description": "Name of the custom entity store assignment. Generated name is GUID.", + "x-ms-parameter-location": "method" + }, + "customEntityStoreAssignmentRequestBody": { + "name": "customEntityStoreAssignmentRequestBody", + "in": "body", + "description": "Custom entity store assignment body", + "required": true, + "schema": { + "$ref": "#/definitions/CustomEntityStoreAssignmentRequest" + }, + "x-ms-parameter-location": "method" + } + } +} diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomAssessmentAutomations/customAssessmentAutomationCreate_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomAssessmentAutomations/customAssessmentAutomationCreate_example.json new file mode 100644 index 000000000000..322b0df8d380 --- /dev/null +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomAssessmentAutomations/customAssessmentAutomationCreate_example.json @@ -0,0 +1,68 @@ +{ + "parameters": { + "api-version": "2021-07-01-preview", + "subscriptionId": "e5d1b86c-3051-44d5-8802-aa65d45a279b", + "resourceGroupName": "TestResourceGroup", + "customAssessmentAutomationName": "MyCustomAssessmentAutomation", + "customAssessmentAutomationBody": { + "properties": { + "compressedQuery": "DQAKAEkAYQBtAF8ARwByAG8AdQBwAA0ACgB8ACAAZQB4AHQAZQBuAGQAIABIAGUAYQBsAHQAaABTAHQAYQB0AHUAcwAgAD0AIABpAGYAZgAoAHQAbwBzAHQAcgBpAG4AZwAoAFIAZQBjAG8AcgBkAC4AVQBzAGUAcgBOAGEAbQBlACkAIABjAG8AbgB0AGEAaQBuAHMAIAAnAHUAcwBlAHIAJwAsACAAJwBVAE4ASABFAEEATABUAEgAWQAnACwAIAAnAEgARQBBAEwAVABIAFkAJwApAA0ACgA=", + "supportedCloud": "AWS", + "severity": "Medium", + "displayName": "Password Policy", + "description": "Data should be encrypted", + "remediationDescription": "Encrypt store by..." + } + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/e5d1b86c-3051-44d5-8802-aa65d45a279b/resourcegroups/TestResourceGroup/providers/Microsoft.Security/customAssessmentAutomations/33e7cc6e-a139-4723-a0e5-76993aee0771", + "name": "33e7cc6e-a139-4723-a0e5-76993aee0771", + "type": "Microsoft.Security/customAssessmentAutomations", + "systemData": { + "createdBy": "user@contoso.com", + "createdByType": "User", + "createdAt": "2021-08-31T13:47:50.328Z", + "lastModifiedBy": "user@contoso.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2021-08-31T13:47:50.328Z" + }, + "properties": { + "compressedQuery": "DQAKAEkAYQBtAF8ARwByAG8AdQBwAA0ACgB8ACAAZQB4AHQAZQBuAGQAIABIAGUAYQBsAHQAaABTAHQAYQB0AHUAcwAgAD0AIABpAGYAZgAoAHQAbwBzAHQAcgBpAG4AZwAoAFIAZQBjAG8AcgBkAC4AVQBzAGUAcgBOAGEAbQBlACkAIABjAG8AbgB0AGEAaQBuAHMAIAAnAHUAcwBlAHIAJwAsACAAJwBVAE4ASABFAEEATABUAEgAWQAnACwAIAAnAEgARQBBAEwAVABIAFkAJwApAA0ACgA=", + "supportedCloud": "AWS", + "severity": "Medium", + "displayName": "Password Policy", + "description": "organization passwords policy", + "remediationDescription": "Change password policy to...", + "assessmentKey": "d5f442f7-7e77-4bcf-a450-a9c1b9a94eeb" + } + } + }, + "201": { + "body": { + "id": "/subscriptions/e5d1b86c-3051-44d5-8802-aa65d45a279b/resourcegroups/TestResourceGroup/providers/Microsoft.Security/customAssessmentAutomations/33e7cc6e-a139-4723-a0e5-76993aee0771", + "name": "33e7cc6e-a139-4723-a0e5-76993aee0771", + "type": "Microsoft.Security/customAssessmentAutomations", + "systemData": { + "createdBy": "user@contoso.com", + "createdByType": "User", + "createdAt": "2021-08-31T13:01:50.328Z", + "lastModifiedBy": "user@contoso.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2021-08-31T13:01:50.328Z" + }, + "properties": { + "compressedQuery": "DQAKAEkAYQBtAF8AUABhAHMAcwB3AG8AcgBkAFAAbwBsAGkAYwB5ACAADQAKAHwAIABlAHgAdABlAG4AZAAgAEgAZQBhAGwAdABoAFMAdABhAHQAdQBzACAAPQAgAGkAZgBmACgAdABvAGkAbgB0ACgAUgBlAGMAbwByAGQALgBNAGkAbgBpAG0AdQBtAFAAYQBzAHMAdwBvAHIAZABMAGUAbgBnAHQAaAApACAAPAAgADgALAAgACcAVQBOAEgARQBBAEwAVABIAFkAJwAsACAAJwBIAEUAQQBMAFQASABZACcAKQANAAoA", + "supportedCloud": "AWS", + "severity": "Medium", + "displayName": "Customized Encryption Rules", + "description": "Data should be encrypted", + "remediationDescription": "Encrypt store by...", + "assessmentKey": "fc1dbcd0-502c-4eab-9312-4014cfc8ea56" + } + } + } + } +} diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomAssessmentAutomations/customAssessmentAutomationDelete_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomAssessmentAutomations/customAssessmentAutomationDelete_example.json new file mode 100644 index 000000000000..b6939c3fe989 --- /dev/null +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomAssessmentAutomations/customAssessmentAutomationDelete_example.json @@ -0,0 +1,12 @@ +{ + "parameters": { + "api-version": "2021-07-01-preview", + "subscriptionId": "e5d1b86c-3051-44d5-8802-aa65d45a279b", + "resourceGroupName": "TestResourceGroup", + "customAssessmentAutomationName": "MyCustomAssessmentAutomation" + }, + "responses": { + "200": {}, + "204": {} + } +} diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomAssessmentAutomations/customAssessmentAutomationGet_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomAssessmentAutomations/customAssessmentAutomationGet_example.json new file mode 100644 index 000000000000..189b4c7b96ae --- /dev/null +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomAssessmentAutomations/customAssessmentAutomationGet_example.json @@ -0,0 +1,34 @@ +{ + "parameters": { + "api-version": "2021-07-01-preview", + "subscriptionId": "e5d1b86c-3051-44d5-8802-aa65d45a279b", + "resourceGroupName": "TestResourceGroup", + "customAssessmentAutomationName": "MyCustomAssessmentAutomation" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/e5d1b86c-3051-44d5-8802-aa65d45a279b/resourcegroups/TestResourceGroup/providers/Microsoft.Security/customAssessmentAutomations/MyCustomAssessmentAutomation", + "name": "MyCustomAssessmentAutomation", + "type": "Microsoft.Security/customAssessmentAutomations", + "systemData": { + "createdBy": "user@contoso.com", + "createdByType": "User", + "createdAt": "2021-08-31T13:47:50.328Z", + "lastModifiedBy": "user@contoso.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2021-08-31T13:47:50.328Z" + }, + "properties": { + "compressedQuery": "DQAKAEkAYQBtAF8ARwByAG8AdQBwAA0ACgB8ACAAZQB4AHQAZQBuAGQAIABIAGUAYQBsAHQAaABTAHQAYQB0AHUAcwAgAD0AIABpAGYAZgAoAHQAbwBzAHQAcgBpAG4AZwAoAFIAZQBjAG8AcgBkAC4AVQBzAGUAcgBOAGEAbQBlACkAIABjAG8AbgB0AGEAaQBuAHMAIAAnAHUAcwBlAHIAJwAsACAAJwBVAE4ASABFAEEATABUAEgAWQAnACwAIAAnAEgARQBBAEwAVABIAFkAJwApAA0ACgA=", + "supportedCloud": "AWS", + "severity": "Low", + "displayName": "Password Policy", + "description": "organization passwords policy", + "remediationDescription": "Change password policy to...", + "assessmentKey": "d5f442f7-7e77-4bcf-a450-a9c1b9a94eeb" + } + } + } + } +} diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomAssessmentAutomations/customAssessmentAutomationListByResourceGroup_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomAssessmentAutomations/customAssessmentAutomationListByResourceGroup_example.json new file mode 100644 index 000000000000..89aed1afb5df --- /dev/null +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomAssessmentAutomations/customAssessmentAutomationListByResourceGroup_example.json @@ -0,0 +1,60 @@ +{ + "parameters": { + "api-version": "2021-07-01-preview", + "subscriptionId": "e5d1b86c-3051-44d5-8802-aa65d45a279b", + "resourceGroupName": "TestResourceGroup" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/e5d1b86c-3051-44d5-8802-aa65d45a279b/resourcegroups/TestResourceGroup/providers/Microsoft.Security/customAssessmentAutomations/MyCustomAssessmentAutomation1", + "name": "MyCustomAssessmentAutomation1", + "type": "Microsoft.Security/customAssessmentAutomations", + "systemData": { + "createdBy": "user@contoso.com", + "createdByType": "User", + "createdAt": "2021-08-31T13:47:50.328Z", + "lastModifiedBy": "user@contoso.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2021-08-31T13:47:50.328Z" + }, + "properties": { + "compressedQuery": "DQAKAEkAYQBtAF8ARwByAG8AdQBwAA0ACgB8ACAAZQB4AHQAZQBuAGQAIABIAGUAYQBsAHQAaABTAHQAYQB0AHUAcwAgAD0AIABpAGYAZgAoAHQAbwBzAHQAcgBpAG4AZwAoAFIAZQBjAG8AcgBkAC4AVQBzAGUAcgBOAGEAbQBlACkAIABjAG8AbgB0AGEAaQBuAHMAIAAnAHUAcwBlAHIAJwAsACAAJwBVAE4ASABFAEEATABUAEgAWQAnACwAIAAnAEgARQBBAEwAVABIAFkAJwApAA0ACgA=", + "supportedCloud": "AWS", + "severity": "Medium", + "displayName": "Password Policy", + "description": "organization passwords policy", + "remediationDescription": "Change password policy to...", + "assessmentKey": "d5f442f7-7e77-4bcf-a450-a9c1b9a94eeb" + } + }, + { + "id": "/subscriptions/e5d1b86c-3051-44d5-8802-aa65d45a279b/resourcegroups/TestResourceGroup/providers/Microsoft.Security/customAssessmentAutomations/MyCustomAssessmentAutomation2", + "name": "MyCustomAssessmentAutomation2", + "type": "Microsoft.Security/customAssessmentAutomations", + "systemData": { + "createdBy": "user@contoso.com", + "createdByType": "User", + "createdAt": "2021-08-31T13:01:50.328Z", + "lastModifiedBy": "user@contoso.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2021-08-31T13:01:50.328Z" + }, + "properties": { + "compressedQuery": "DQAKAEkAYQBtAF8AUABhAHMAcwB3AG8AcgBkAFAAbwBsAGkAYwB5ACAADQAKAHwAIABlAHgAdABlAG4AZAAgAEgAZQBhAGwAdABoAFMAdABhAHQAdQBzACAAPQAgAGkAZgBmACgAdABvAGkAbgB0ACgAUgBlAGMAbwByAGQALgBNAGkAbgBpAG0AdQBtAFAAYQBzAHMAdwBvAHIAZABMAGUAbgBnAHQAaAApACAAPAAgADgALAAgACcAVQBOAEgARQBBAEwAVABIAFkAJwAsACAAJwBIAEUAQQBMAFQASABZACcAKQANAAoA", + "supportedCloud": "AWS", + "severity": "Low", + "displayName": "Password Policy", + "description": "organization passwords policy", + "remediationDescription": "Change password policy to...", + "assessmentKey": "fc1dbcd0-502c-4eab-9312-4014cfc8ea56" + } + } + ], + "nextLink": "link" + } + } + } +} diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomAssessmentAutomations/customAssessmentAutomationListBySubscription_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomAssessmentAutomations/customAssessmentAutomationListBySubscription_example.json new file mode 100644 index 000000000000..d0e70788c1e5 --- /dev/null +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomAssessmentAutomations/customAssessmentAutomationListBySubscription_example.json @@ -0,0 +1,59 @@ +{ + "parameters": { + "api-version": "2021-07-01-preview", + "subscriptionId": "e5d1b86c-3051-44d5-8802-aa65d45a279b" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/e5d1b86c-3051-44d5-8802-aa65d45a279b/resourcegroups/TestResourceGroup/providers/Microsoft.Security/customAssessmentAutomations/MyCustomAssessmentAutomation1", + "name": "MyCustomAssessmentAutomation1", + "type": "Microsoft.Security/customAssessmentAutomations", + "systemData": { + "createdBy": "user@contoso.com", + "createdByType": "User", + "createdAt": "2021-08-31T13:47:50.328Z", + "lastModifiedBy": "user@contoso.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2021-08-31T13:47:50.328Z" + }, + "properties": { + "compressedQuery": "DQAKAEkAYQBtAF8ARwByAG8AdQBwAA0ACgB8ACAAZQB4AHQAZQBuAGQAIABIAGUAYQBsAHQAaABTAHQAYQB0AHUAcwAgAD0AIABpAGYAZgAoAHQAbwBzAHQAcgBpAG4AZwAoAFIAZQBjAG8AcgBkAC4AVQBzAGUAcgBOAGEAbQBlACkAIABjAG8AbgB0AGEAaQBuAHMAIAAnAHUAcwBlAHIAJwAsACAAJwBVAE4ASABFAEEATABUAEgAWQAnACwAIAAnAEgARQBBAEwAVABIAFkAJwApAA0ACgA=", + "supportedCloud": "AWS", + "severity": "Medium", + "displayName": "Password Policy", + "description": "organization passwords policy", + "remediationDescription": "Change password policy to...", + "assessmentKey": "d5f442f7-7e77-4bcf-a450-a9c1b9a94eeb" + } + }, + { + "id": "/subscriptions/e5d1b86c-3051-44d5-8802-aa65d45a279b/resourcegroups/TestResourceGroup/providers/Microsoft.Security/customAssessmentAutomations/MyCustomAssessmentAutomation2", + "name": "MyCustomAssessmentAutomation2", + "type": "Microsoft.Security/customAssessmentAutomations", + "systemData": { + "createdBy": "user@contoso.com", + "createdByType": "User", + "createdAt": "2021-08-31T13:01:50.328Z", + "lastModifiedBy": "user@contoso.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2021-08-31T13:01:50.328Z" + }, + "properties": { + "compressedQuery": "DQAKAEkAYQBtAF8AUABhAHMAcwB3AG8AcgBkAFAAbwBsAGkAYwB5ACAADQAKAHwAIABlAHgAdABlAG4AZAAgAEgAZQBhAGwAdABoAFMAdABhAHQAdQBzACAAPQAgAGkAZgBmACgAdABvAGkAbgB0ACgAUgBlAGMAbwByAGQALgBNAGkAbgBpAG0AdQBtAFAAYQBzAHMAdwBvAHIAZABMAGUAbgBnAHQAaAApACAAPAAgADgALAAgACcAVQBOAEgARQBBAEwAVABIAFkAJwAsACAAJwBIAEUAQQBMAFQASABZACcAKQANAAoA", + "supportedCloud": "AWS", + "severity": "Low", + "displayName": "Password Policy", + "description": "organization passwords policy", + "remediationDescription": "Change password policy to...", + "assessmentKey": "fc1dbcd0-502c-4eab-9312-4014cfc8ea56" + } + } + ], + "nextLink": "link" + } + } + } +} diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomEntityStoreAssignments/customEntityStoreAssignmentCreate_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomEntityStoreAssignments/customEntityStoreAssignmentCreate_example.json new file mode 100644 index 000000000000..4cba8dc52cc9 --- /dev/null +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomEntityStoreAssignments/customEntityStoreAssignmentCreate_example.json @@ -0,0 +1,53 @@ +{ + "parameters": { + "api-version": "2021-07-01-preview", + "subscriptionId": "e5d1b86c-3051-44d5-8802-aa65d45a279b", + "resourceGroupName": "TestResourceGroup", + "customEntityStoreAssignmentName": "33e7cc6e-a139-4723-a0e5-76993aee0771", + "customEntityStoreAssignmentRequestBody": { + "properties": { + "principal": "aaduser=f3923a3e-ad57-4752-b1a9-fbf3c8e5e082;72f988bf-86f1-41af-91ab-2d7cd011db47" + } + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/e5d1b86c-3051-44d5-8802-aa65d45a279b/resourcegroups/TestResourceGroup/providers/Microsoft.Security/customEntityStoreAssignments/33e7cc6e-a139-4723-a0e5-76993aee0771", + "name": "33e7cc6e-a139-4723-a0e5-76993aee0771", + "type": "Microsoft.Security/customEntityStoreAssignments", + "systemData": { + "createdBy": "user@contoso.com", + "createdByType": "User", + "createdAt": "2021-08-31T13:47:50.328Z", + "lastModifiedBy": "user@contoso.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2021-08-31T13:47:50.328Z" + }, + "properties": { + "principal": "aaduser=f3923a3e-ad57-4752-b1a9-fbf3c8e5e082;72f988bf-86f1-41af-91ab-2d7cd011db47", + "entityStoreDatabaseLink": "https://dataexplorer.azure.com/clusters/securitydatastore.centralus/databases/DiscoveryAwsKedamari?query=H4sIAAAAAAAAAwtILC4uzy9KCcjPyUyu5OWqUShJzE5VMAQAlMJzABgAAAA=" + } + } + }, + "201": { + "body": { + "id": "/subscriptions/e5d1b86c-3051-44d5-8802-aa65d45a279b/resourcegroups/TestResourceGroup/providers/Microsoft.Security/customEntityStoreAssignments/33e7cc6e-a139-4723-a0e5-76993aee0771", + "name": "33e7cc6e-a139-4723-a0e5-76993aee0771", + "type": "Microsoft.Security/customEntityStoreAssignments", + "systemData": { + "createdBy": "user@contoso.com", + "createdByType": "User", + "createdAt": "2021-08-31T13:01:50.328Z", + "lastModifiedBy": "user@contoso.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2021-08-31T13:01:50.328Z" + }, + "properties": { + "principal": "aaduser=f3923a3e-ad57-4752-b1a9-fbf3c8e5e082;72f988bf-86f1-41af-91ab-2d7cd011db47", + "entityStoreDatabaseLink": "https://dataexplorer.azure.com/clusters/securitydatastore.centralus/databases/DiscoveryAwsKedamari?query=H4sIAAAAAAAAAwtILC4uzy9KCcjPyUyu5OWqUShJzE5VMAQAlMJzABgAAAA=" + } + } + } + } +} diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomEntityStoreAssignments/customEntityStoreAssignmentDelete_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomEntityStoreAssignments/customEntityStoreAssignmentDelete_example.json new file mode 100644 index 000000000000..bc98e0c7315a --- /dev/null +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomEntityStoreAssignments/customEntityStoreAssignmentDelete_example.json @@ -0,0 +1,12 @@ +{ + "parameters": { + "api-version": "2021-07-01-preview", + "subscriptionId": "e5d1b86c-3051-44d5-8802-aa65d45a279b", + "resourceGroupName": "TestResourceGroup", + "customEntityStoreAssignmentName": "33e7cc6e-a139-4723-a0e5-76993aee0771" + }, + "responses": { + "200": {}, + "204": {} + } +} diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomEntityStoreAssignments/customEntityStoreAssignmentGet_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomEntityStoreAssignments/customEntityStoreAssignmentGet_example.json new file mode 100644 index 000000000000..f9f50ea3620a --- /dev/null +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomEntityStoreAssignments/customEntityStoreAssignmentGet_example.json @@ -0,0 +1,29 @@ +{ + "parameters": { + "api-version": "2021-07-01-preview", + "subscriptionId": "e5d1b86c-3051-44d5-8802-aa65d45a279b", + "resourceGroupName": "TestResourceGroup", + "customEntityStoreAssignmentName": "33e7cc6e-a139-4723-a0e5-76993aee0771" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/e5d1b86c-3051-44d5-8802-aa65d45a279b/resourcegroups/TestResourceGroup/providers/Microsoft.Security/customEntityStoreAssignments/33e7cc6e-a139-4723-a0e5-76993aee0771", + "name": "33e7cc6e-a139-4723-a0e5-76993aee0771", + "type": "Microsoft.Security/customEntityStoreAssignments", + "systemData": { + "createdBy": "user@contoso.com", + "createdByType": "User", + "createdAt": "2021-08-31T13:47:50.328Z", + "lastModifiedBy": "user@contoso.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2021-08-31T13:47:50.328Z" + }, + "properties": { + "principal": "aaduser=f3923a3e-ad57-4752-b1a9-fbf3c8e5e082;72f988bf-86f1-41af-91ab-2d7cd011db47", + "entityStoreDatabaseLink": "https://dataexplorer.azure.com/clusters/securitydatastore.centralus/databases/DiscoveryAwsKedamari?query=H4sIAAAAAAAAAwtILC4uzy9KCcjPyUyu5OWqUShJzE5VMAQAlMJzABgAAAA=" + } + } + } + } +} diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomEntityStoreAssignments/customEntityStoreAssignmentListByResourceGroup_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomEntityStoreAssignments/customEntityStoreAssignmentListByResourceGroup_example.json new file mode 100644 index 000000000000..cfb735592f80 --- /dev/null +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomEntityStoreAssignments/customEntityStoreAssignmentListByResourceGroup_example.json @@ -0,0 +1,42 @@ +{ + "parameters": { + "api-version": "2021-07-01-preview", + "subscriptionId": "e5d1b86c-3051-44d5-8802-aa65d45a279b", + "resourceGroupName": "TestResourceGroup" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/e5d1b86c-3051-44d5-8802-aa65d45a279b/resourcegroups/TestResourceGroup/providers/Microsoft.Security/customEntityStoreAssignments/33e7cc6e-a139-4723-a0e5-76993aee0771", + "name": "33e7cc6e-a139-4723-a0e5-76993aee0771", + "type": "Microsoft.Security/customEntityStoreAssignments", + "systemData": { + "createdBy": "user@contoso.com", + "createdByType": "User", + "createdAt": "2021-08-31T13:47:50.328Z", + "lastModifiedBy": "user@contoso.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2021-08-31T13:47:50.328Z" + }, + "properties": { + "principal": "aaduser=f3923a3e-ad57-4752-b1a9-fbf3c8e5e082;72f988bf-86f1-41af-91ab-2d7cd011db47", + "entityStoreDatabaseLink": "https://dataexplorer.azure.com/clusters/securitydatastore.centralus/databases/DiscoveryAwsKedamari?query=H4sIAAAAAAAAAwtILC4uzy9KCcjPyUyu5OWqUShJzE5VMAQAlMJzABgAAAA=" + } + }, + { + "id": "/subscriptions/e5d1b86c-3051-44d5-8802-aa65d45a279b/resourcegroups/TestResourceGroup/providers/Microsoft.Security/customEntityStoreAssignments/a400695c-4728-d5cc-8e19-4b5a76f209df", + "name": "a400695c-4728-d5cc-8e19-4b5a76f209df", + "type": "Microsoft.Security/customEntityStoreAssignments", + "properties": { + "principal": "aaduser=f6e2564c-f34a-9b61-416c-5e5e7e521118;72f988bf-86f1-41af-91ab-2d7cd011db47", + "entityStoreDatabaseLink": "https://dataexplorer.azure.com/clusters/securitydatastore.centralus/databases/DiscoveryAwsKedamari?query=H4sIAAAAAAAAAwvIz8lMrgzKz0nlqlFIrShJzUtR8Cz2SE3MKcmoVLBVUE9LzClOVQcA1IFnficAAAA=" + } + } + ], + "nextLink": null + } + } + } +} diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomEntityStoreAssignments/customEntityStoreAssignmentListBySubscription_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomEntityStoreAssignments/customEntityStoreAssignmentListBySubscription_example.json new file mode 100644 index 000000000000..18bc9a3e319d --- /dev/null +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomEntityStoreAssignments/customEntityStoreAssignmentListBySubscription_example.json @@ -0,0 +1,49 @@ +{ + "parameters": { + "api-version": "2021-07-01-preview", + "subscriptionId": "e5d1b86c-3051-44d5-8802-aa65d45a279b" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/e5d1b86c-3051-44d5-8802-aa65d45a279b/resourcegroups/TestResourceGroup/providers/Microsoft.Security/customEntityStoreAssignments/33e7cc6e-a139-4723-a0e5-76993aee0771", + "name": "33e7cc6e-a139-4723-a0e5-76993aee0771", + "type": "Microsoft.Security/customEntityStoreAssignments", + "systemData": { + "createdBy": "user@contoso.com", + "createdByType": "User", + "createdAt": "2021-08-31T13:47:50.328Z", + "lastModifiedBy": "user@contoso.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2021-08-31T13:47:50.328Z" + }, + "properties": { + "principal": "aaduser=f3923a3e-ad57-4752-b1a9-fbf3c8e5e082;72f988bf-86f1-41af-91ab-2d7cd011db47", + "entityStoreDatabaseLink": "https://dataexplorer.azure.com/clusters/securitydatastore.centralus/databases/DiscoveryAwsKedamari?query=H4sIAAAAAAAAAwtILC4uzy9KCcjPyUyu5OWqUShJzE5VMAQAlMJzABgAAAA=" + } + }, + { + "id": "/subscriptions/e5d1b86c-3051-44d5-8802-aa65d45a279b/resourcegroups/TestResourceGroup/providers/Microsoft.Security/customEntityStoreAssignments/a400695c-4728-d5cc-8e19-4b5a76f209df", + "name": "a400695c-4728-d5cc-8e19-4b5a76f209df", + "type": "Microsoft.Security/customEntityStoreAssignments", + "systemData": { + "createdBy": "user@contoso.com", + "createdByType": "User", + "createdAt": "2021-08-31T13:01:50.328Z", + "lastModifiedBy": "user@contoso.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2021-08-31T13:01:50.328Z" + }, + "properties": { + "principal": "aaduser=f6e2564c-f34a-9b61-416c-5e5e7e521118;72f988bf-86f1-41af-91ab-2d7cd011db47", + "entityStoreDatabaseLink": "https://dataexplorer.azure.com/clusters/securitydatastore.centralus/databases/DiscoveryAwsKedamari?query=H4sIAAAAAAAAAwvIz8lMrgzKz0nlqlFIrShJzUtR8Cz2SE3MKcmoVLBVUE9LzClOVQcA1IFnficAAAA=" + } + } + ], + "nextLink": null + } + } + } +} diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/DeleteSecurityConnector_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/DeleteSecurityConnector_example.json new file mode 100644 index 000000000000..238efa15c67c --- /dev/null +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/DeleteSecurityConnector_example.json @@ -0,0 +1,12 @@ +{ + "parameters": { + "api-version": "2021-07-01-preview", + "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23", + "resourceGroupName": "myRg", + "securityConnectorName": "mySecurityConnectorName" + }, + "responses": { + "200": {}, + "204": {} + } +} diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorResourceGroup_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorResourceGroup_example.json new file mode 100644 index 000000000000..487e7959f1aa --- /dev/null +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorResourceGroup_example.json @@ -0,0 +1,42 @@ +{ + "parameters": { + "api-version": "2021-07-01-preview", + "subscriptionId": "a5caac9c-5c04-49af-b3d0-e204f40345d5", + "resourceGroupName": "exampleResourceGroup", + "securityConnectorName": "exampleSecurityConnectorName" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/a5caac9c-5c04-49af-b3d0-e204f40345d5/resourceGroups/exampleResourceGroup/providers/Microsoft.Security/securityConnectors/exampleSecurityConnectorName", + "name": "exampleSecurityConnectorName", + "type": "Microsoft.Security/securityConnectors", + "etag": "etag value", + "kind": "", + "location": "Central US", + "tags": {}, + "systemData": { + "createdBy": "user@contoso.com", + "createdByType": "User", + "createdAt": "2021-08-31T13:47:50.328Z", + "lastModifiedBy": "user@contoso.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2021-08-31T13:47:50.328Z" + }, + "properties": { + "organizationalData": null, + "hierarchyIdentifier": "exampleHierarchyId", + "cloudName": "AWS", + "offerings": [ + { + "offeringType": "CspmMonitorAws", + "nativeCloudConnection": { + "cloudRoleArn": "arn:aws:iam::00000000:role/ASCMonitor" + } + } + ] + } + } + } + } +} diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorsResourceGroup_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorsResourceGroup_example.json new file mode 100644 index 000000000000..63ef8a2e9880 --- /dev/null +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorsResourceGroup_example.json @@ -0,0 +1,45 @@ +{ + "parameters": { + "api-version": "2021-07-01-preview", + "subscriptionId": "a5caac9c-5c04-49af-b3d0-e204f40345d5", + "resourceGroupName": "exampleResourceGroup" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/a5caac9c-5c04-49af-b3d0-e204f40345d5/resourceGroups/exampleResourceGroup/providers/Microsoft.Security/securityConnectors/exampleSecurityConnectorName", + "name": "exampleSecurityConnectorName", + "type": "Microsoft.Security/securityConnectors", + "etag": "etag value", + "kind": "", + "location": "Central US", + "tags": {}, + "systemData": { + "createdBy": "user@contoso.com", + "createdByType": "User", + "createdAt": "2021-08-31T13:47:50.328Z", + "lastModifiedBy": "user@contoso.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2021-08-31T13:47:50.328Z" + }, + "properties": { + "hierarchyIdentifier": "exampleHierarchyId", + "organizationalData": null, + "cloudName": "AWS", + "offerings": [ + { + "offeringType": "CspmMonitorAws", + "nativeCloudConnection": { + "cloudRoleArn": "arn:aws:iam::00000000:role/ASCMonitor" + } + } + ] + } + } + ] + } + } + } +} diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorsSubscription_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorsSubscription_example.json new file mode 100644 index 000000000000..5f90b30f38fe --- /dev/null +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorsSubscription_example.json @@ -0,0 +1,43 @@ +{ + "parameters": { + "api-version": "2021-07-01-preview", + "subscriptionId": "a5caac9c-5c04-49af-b3d0-e204f40345d5" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/a5caac9c-5c04-49af-b3d0-e204f40345d5/resourceGroups/exampleResourceGroup/providers/Microsoft.Security/securityConnectors/exampleSecurityConnectorName", + "name": "exampleSecurityConnectorName", + "type": "Microsoft.Security/securityConnectors", + "etag": "etag value", + "location": "Central US", + "tags": {}, + "systemData": { + "createdBy": "user@contoso.com", + "createdByType": "User", + "createdAt": "2021-08-31T13:47:50.328Z", + "lastModifiedBy": "user@contoso.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2021-08-31T13:47:50.328Z" + }, + "properties": { + "hierarchyIdentifier": "exampleHierarchyId", + "organizationalData": null, + "cloudName": "AWS", + "offerings": [ + { + "offeringType": "CspmMonitorAws", + "nativeCloudConnection": { + "cloudRoleArn": "arn:aws:iam::00000000:role/ASCMonitor" + } + } + ] + } + } + ] + } + } + } +} diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/PatchSecurityConnector_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/PatchSecurityConnector_example.json new file mode 100644 index 000000000000..4f6ca41f222b --- /dev/null +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/PatchSecurityConnector_example.json @@ -0,0 +1,59 @@ +{ + "parameters": { + "api-version": "2021-07-01-preview", + "subscriptionId": "a5caac9c-5c04-49af-b3d0-e204f40345d5", + "securityConnectorName": "exampleSecurityConnectorName", + "resourceGroupName": "exampleResourceGroup", + "securityConnector": { + "location": "Central US", + "etag": "etag value (must be supplied for update)", + "tags": {}, + "properties": { + "hierarchyIdentifier": "exampleHierarchyId", + "cloudName": "AWS", + "offerings": [ + { + "offeringType": "CspmMonitorAws", + "nativeCloudConnection": { + "cloudRoleArn": "arn:aws:iam::00000000:role/ASCMonitor" + } + } + ] + } + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/a5caac9c-5c04-49af-b3d0-e204f40345d5/resourceGroups/exampleResourceGroup/providers/Microsoft.Security/securityConnectors/exampleSecurityConnectorName", + "name": "exampleSecurityConnectorName", + "type": "Microsoft.Security/securityConnectors", + "location": "Central US", + "kind": "", + "etag": "etag value", + "tags": {}, + "systemData": { + "createdBy": "user@contoso.com", + "createdByType": "User", + "createdAt": "2021-08-31T13:47:50.328Z", + "lastModifiedBy": "user@contoso.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2021-08-31T13:47:50.328Z" + }, + "properties": { + "hierarchyIdentifier": "exampleHierarchyId", + "organizationalData": null, + "cloudName": "AWS", + "offerings": [ + { + "offeringType": "CspmMonitorAws", + "nativeCloudConnection": { + "cloudRoleArn": "arn:aws:iam::00000000:role/ASCMonitor" + } + } + ] + } + } + } + } +} diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/PutSecurityConnector_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/PutSecurityConnector_example.json new file mode 100644 index 000000000000..1c82e395fab2 --- /dev/null +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/PutSecurityConnector_example.json @@ -0,0 +1,91 @@ +{ + "parameters": { + "api-version": "2021-07-01-preview", + "subscriptionId": "a5caac9c-5c04-49af-b3d0-e204f40345d5", + "securityConnectorName": "exampleSecurityConnectorName", + "resourceGroupName": "exampleResourceGroup", + "securityConnector": { + "location": "Central US", + "etag": "etag value (must be supplied for update)", + "tags": {}, + "properties": { + "hierarchyIdentifier": "exampleHierarchyId", + "cloudName": "AWS", + "offerings": [ + { + "offeringType": "CspmMonitorAws", + "nativeCloudConnection": { + "cloudRoleArn": "arn:aws:iam::00000000:role/ASCMonitor" + } + } + ] + } + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/a5caac9c-5c04-49af-b3d0-e204f40345d5/resourceGroups/exampleResourceGroup/providers/Microsoft.Security/securityConnectors/exampleSecurityConnectorName", + "name": "exampleSecurityConnectorName", + "type": "Microsoft.Security/securityConnectors", + "location": "Central US", + "kind": "", + "etag": "", + "tags": {}, + "systemData": { + "createdBy": "user@contoso.com", + "createdByType": "User", + "createdAt": "2021-08-31T13:47:50.328Z", + "lastModifiedBy": "user@contoso.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2021-08-31T13:47:50.328Z" + }, + "properties": { + "hierarchyIdentifier": "exampleHierarchyId", + "organizationalData": null, + "cloudName": "AWS", + "offerings": [ + { + "offeringType": "CspmMonitorAws", + "nativeCloudConnection": { + "cloudRoleArn": "arn:aws:iam::00000000:role/ASCMonitor" + } + } + ] + } + } + }, + "201": { + "body": { + "id": "/subscriptions/a5caac9c-5c04-49af-b3d0-e204f40345d5/resourceGroups/exampleResourceGroup/providers/Microsoft.Security/securityConnectors/exampleSecurityConnectorName", + "name": "exampleSecurityConnectorName", + "type": "Microsoft.Security/securityConnectors", + "location": "Central US", + "kind": "", + "etag": "", + "tags": {}, + "systemData": { + "createdBy": "user@contoso.com", + "createdByType": "User", + "createdAt": "2021-08-31T13:47:50.328Z", + "lastModifiedBy": "user@contoso.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2021-08-31T13:47:50.328Z" + }, + "properties": { + "hierarchyIdentifier": "exampleHierarchyId", + "organizationalData": null, + "cloudName": "AWS", + "offerings": [ + { + "offeringType": "CspmMonitorAws", + "nativeCloudConnection": { + "cloudRoleArn": "arn:aws:iam::00000000:role/ASCMonitor" + } + } + ] + } + } + } + } +} diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json new file mode 100644 index 000000000000..324ba5500bdc --- /dev/null +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json @@ -0,0 +1,574 @@ +{ + "swagger": "2.0", + "info": { + "title": "Security Center", + "description": "API spec for Microsoft.Security (Azure Security Center) resource provider", + "version": "2021-07-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": { + "/subscriptions/{subscriptionId}/providers/Microsoft.Security/securityConnectors": { + "get": { + "x-ms-examples": { + "List all security connectors of a specified subscription": { + "$ref": "./examples/SecurityConnectors/GetSecurityConnectorsSubscription_example.json" + } + }, + "tags": [ + "SecurityConnectors" + ], + "description": "Lists all the security connectors in the specified subscription. Use the 'nextLink' property in the response to get the next page of security connectors for the specified subscription.", + "operationId": "SecurityConnectors_List", + "parameters": [ + { + "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/SubscriptionId" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/SecurityConnectorsList" + } + }, + "default": { + "description": "Error response that describes why the operation failed.", + "schema": { + "$ref": "../../../common/v1/types.json#/definitions/CloudError" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Security/securityConnectors": { + "get": { + "x-ms-examples": { + "List all security connectors of a specified resource group": { + "$ref": "./examples/SecurityConnectors/GetSecurityConnectorsResourceGroup_example.json" + } + }, + "tags": [ + "SecurityConnectors" + ], + "description": "Lists all the security connectors in the specified resource group. Use the 'nextLink' property in the response to get the next page of security connectors for the specified resource group.", + "operationId": "SecurityConnectors_ListByResourceGroup", + "parameters": [ + { + "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/SubscriptionId" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/ResourceGroupName" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/SecurityConnectorsList" + } + }, + "default": { + "description": "Error response that describes why the operation failed.", + "schema": { + "$ref": "../../../common/v1/types.json#/definitions/CloudError" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Security/securityConnectors/{securityConnectorName}": { + "get": { + "x-ms-examples": { + "Retrieve a security connector": { + "$ref": "./examples/SecurityConnectors/GetSecurityConnectorResourceGroup_example.json" + } + }, + "tags": [ + "SecurityConnectors" + ], + "description": "Retrieves details of a specific security connector", + "operationId": "SecurityConnectors_Get", + "parameters": [ + { + "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/SubscriptionId" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/ResourceGroupName" + }, + { + "$ref": "#/parameters/securityConnectorName" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/SecurityConnector" + } + }, + "default": { + "description": "Error response that describes why the operation failed.", + "schema": { + "$ref": "../../../common/v1/types.json#/definitions/CloudError" + } + } + } + }, + "put": { + "x-ms-examples": { + "Create or update a security connector": { + "$ref": "./examples/SecurityConnectors/PutSecurityConnector_example.json" + } + }, + "tags": [ + "SecurityConnectors" + ], + "description": "Creates or updates a security connector. If a security connector is already created and a subsequent request is issued for the same security connector id, then it will be updated.", + "operationId": "SecurityConnectors_CreateOrUpdate", + "parameters": [ + { + "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/SubscriptionId" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/ResourceGroupName" + }, + { + "$ref": "#/parameters/securityConnectorName" + }, + { + "$ref": "#/parameters/securityConnectorInBody" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/SecurityConnector" + } + }, + "201": { + "description": "Created", + "schema": { + "$ref": "#/definitions/SecurityConnector" + } + }, + "default": { + "description": "Error response that describes why the operation failed.", + "schema": { + "$ref": "../../../common/v1/types.json#/definitions/CloudError" + } + } + } + }, + "patch": { + "x-ms-examples": { + "Update a security connector": { + "$ref": "./examples/SecurityConnectors/PatchSecurityConnector_example.json" + } + }, + "tags": [ + "SecurityConnectors" + ], + "description": "Updates a security connector", + "operationId": "SecurityConnectors_Update", + "parameters": [ + { + "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/SubscriptionId" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/ResourceGroupName" + }, + { + "$ref": "#/parameters/securityConnectorName" + }, + { + "$ref": "#/parameters/securityConnectorInBody" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/SecurityConnector" + } + }, + "default": { + "description": "Error response that describes why the operation failed.", + "schema": { + "$ref": "../../../common/v1/types.json#/definitions/CloudError" + } + } + } + }, + "delete": { + "x-ms-examples": { + "Delete a security connector": { + "$ref": "./examples/SecurityConnectors/DeleteSecurityConnector_example.json" + } + }, + "tags": [ + "SecurityConnectors" + ], + "operationId": "SecurityConnectors_Delete", + "description": "Deletes a security connector.", + "parameters": [ + { + "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/SubscriptionId" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/ResourceGroupName" + }, + { + "$ref": "#/parameters/securityConnectorName" + } + ], + "responses": { + "200": { + "description": "The resource was deleted successfully" + }, + "204": { + "description": "NoContent" + }, + "default": { + "description": "Error response that describes why the operation failed.", + "schema": { + "$ref": "../../../common/v1/types.json#/definitions/CloudError" + } + } + } + } + } + }, + "definitions": { + "SecurityConnectorsList": { + "type": "object", + "description": "List of security connectors response.", + "required": [ + "value" + ], + "properties": { + "value": { + "type": "array", + "description": "The list of security connectors under the given scope.", + "items": { + "$ref": "#/definitions/SecurityConnector" + } + }, + "nextLink": { + "readOnly": true, + "type": "string", + "description": "The URI to fetch the next page." + } + } + }, + "SecurityConnector": { + "type": "object", + "description": "The security connector resource.", + "properties": { + "systemData": { + "readOnly": true, + "type": "object", + "description": "Azure Resource Manager metadata containing createdBy and modifiedBy information.", + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData" + }, + "properties": { + "x-ms-client-flatten": true, + "description": "Security connector data", + "$ref": "#/definitions/SecurityConnectorProperties" + } + }, + "allOf": [ + { + "$ref": "../../../common/v1/types.json#/definitions/TrackedResource" + } + ] + }, + "SecurityConnectorProperties": { + "type": "object", + "description": "A set of properties that defines the security connector configuration.", + "properties": { + "hierarchyIdentifier": { + "type": "string", + "description": "The multi cloud resource identifier (account id in case of AWS connector)." + }, + "cloudName": { + "type": "string", + "description": "The multi cloud resource's cloud name.", + "enum": [ + "Azure", + "AWS", + "GCP" + ], + "x-ms-enum": { + "name": "cloudName", + "modelAsString": true + } + }, + "offerings": { + "type": "array", + "description": "A collection of offerings for the security connector.", + "items": { + "$ref": "#/definitions/cloudOffering" + } + }, + "organizationalData": { + "type": "object", + "description": "The multi cloud account's organizational data", + "properties": { + "organizationMembershipType": { + "type": "string", + "description": "The multi cloud account's membership type in the organization", + "enum": [ + "Member", + "Organization" + ], + "x-ms-enum": { + "name": "organizationMembershipType", + "modelAsString": true + } + }, + "parentHierarchyId": { + "type": "string", + "description": "If the multi cloud account is not of membership type organization, this will be the ID of the account's parent" + }, + "stacksetName": { + "type": "string", + "description": "If the multi cloud account is of membership type organization, this will be the name of the onboarding stackset" + }, + "excludedAccountIds": { + "type": "array", + "description": "If the multi cloud account is of membership type organization, list of accounts excluded from offering", + "items": { + "type": "string", + "description": "account IDs" + } + } + } + } + } + }, + "cloudOffering": { + "type": "object", + "description": "The security offering details", + "discriminator": "offeringType", + "required": [ + "offeringType" + ], + "properties": { + "offeringType": { + "type": "string", + "description": "The type of the security offering.", + "enum": [ + "CspmMonitorAws", + "DefenderForContainersAws", + "DefenderForServersAws" + ], + "x-ms-enum": { + "name": "OfferingType", + "modelAsString": true + } + }, + "description": { + "type": "string", + "description": "The offering description.", + "readOnly": true + } + } + }, + "cspmMonitorAwsOffering": { + "type": "object", + "description": "The CSPM monitoring for AWS offering configurations", + "x-ms-discriminator-value": "CspmMonitorAws", + "allOf": [ + { + "$ref": "#/definitions/cloudOffering" + } + ], + "properties": { + "nativeCloudConnection": { + "type": "object", + "description": "The native cloud connection configuration", + "properties": { + "cloudRoleArn": { + "type": "string", + "description": "The cloud role ARN in AWS for this feature" + } + } + } + } + }, + "defenderForContainersAwsOffering": { + "type": "object", + "description": "The Defender for Containers AWS offering configurations", + "x-ms-discriminator-value": "DefenderForContainersAws", + "allOf": [ + { + "$ref": "#/definitions/cloudOffering" + } + ], + "properties": { + "kubernetesService": { + "type": "object", + "description": "The kubernetes service connection configuration", + "properties": { + "cloudRoleArn": { + "type": "string", + "description": "The cloud role ARN in AWS for this feature" + } + } + }, + "kubernetesScubaReader": { + "type": "object", + "description": "The kubernetes to scuba connection configuration", + "properties": { + "cloudRoleArn": { + "type": "string", + "description": "The cloud role ARN in AWS for this feature" + } + } + }, + "cloudWatchToKinesis": { + "type": "object", + "description": "The cloudwatch to kinesis connection configuration", + "properties": { + "cloudRoleArn": { + "type": "string", + "description": "The cloud role ARN in AWS for this feature" + } + } + }, + "kinesisToS3": { + "type": "object", + "description": "The kinesis to s3 connection configuration", + "properties": { + "cloudRoleArn": { + "type": "string", + "description": "The cloud role ARN in AWS for this feature" + } + } + } + } + }, + "defenderForServersAwsOffering": { + "type": "object", + "description": "The Defender for Servers AWS offering configurations", + "x-ms-discriminator-value": "DefenderForServersAWS", + "allOf": [ + { + "$ref": "#/definitions/cloudOffering" + } + ], + "properties": { + "defenderForServers": { + "type": "object", + "description": "The Defender for servers connection configuration", + "properties": { + "cloudRoleArn": { + "type": "string", + "description": "The cloud role ARN in AWS for this feature" + } + } + }, + "arcAutoProvisioning": { + "type": "object", + "description": "The ARC autoprovisioning configuration", + "properties": { + "enabled": { + "type": "boolean", + "description": "Is arc auto provisioning enabled" + }, + "servicePrincipalSecretMetadata": { + "type": "object", + "description": "Metadata of Service Principal secret for autoprovisioning", + "properties": { + "expiryDate": { + "type": "string", + "description": "expiration date of service principal secret" + }, + "parameterStoreRegion": { + "type": "string", + "description": "region of parameter store where secret is kept" + }, + "parameterNameInStore": { + "type": "string", + "description": "name of secret resource in parameter store" + } + } + } + } + } + } + } + }, + "parameters": { + "securityConnectorName": { + "name": "securityConnectorName", + "in": "path", + "required": true, + "type": "string", + "description": "The security connector name.", + "x-ms-parameter-location": "method" + }, + "securityConnectorInBody": { + "name": "securityConnector", + "in": "body", + "required": true, + "description": "The security connector resource", + "schema": { + "$ref": "#/definitions/SecurityConnector" + }, + "x-ms-parameter-location": "method" + } + } +} From 5fe436ca975a45fddde12120788c2beefa6c3bc9 Mon Sep 17 00:00:00 2001 From: Sapir Elmakayes <32778998+SapirElmakayes@users.noreply.github.com> Date: Tue, 14 Dec 2021 17:17:09 +0200 Subject: [PATCH 02/36] Updates readme --- .../security/resource-manager/readme.md | 25 ++++++++++++++----- 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/specification/security/resource-manager/readme.md b/specification/security/resource-manager/readme.md index abd1373a9744..c33c26869034 100644 --- a/specification/security/resource-manager/readme.md +++ b/specification/security/resource-manager/readme.md @@ -66,13 +66,24 @@ These are the global settings for the Security API. title: SecurityCenter description: API spec for Microsoft.Security (Azure Security Center) resource provider openapi-type: arm -tag: package-composite-v3 +tag: package-preview-2021-12 ``` ### Composite packages The following packages may be composed from multiple api-versions. + +### Tag: package-preview-2021-12 + +These settings apply only when `--tag=package-preview-2021-12` is specified on the command line. + +```yaml $(tag) == 'package-preview-2021-12' +input-file: + - Microsoft.Security/preview/2021-12-01-preview/customAssessmentAutomation.json + - Microsoft.Security/preview/2021-12-01-preview/customEntityStoreAssignment.json + - Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json +``` ### Tag: package-preview-2021-08 These settings apply only when `--tag=package-preview-2021-08` is specified on the command line. @@ -84,7 +95,7 @@ input-file: override-info: title: SecurityCenter -``` +``` ### Tag: package-composite-v1 @@ -454,7 +465,7 @@ override-info: These settings apply only when `--tag=package-2021-07-preview-only` is specified on the command line. -```yaml $(tag) == 'package-2021-07-preview-only' +``` yaml $(tag) == 'package-2021-07-preview-only' input-file: - Microsoft.Security/preview/2021-07-01-preview/customAssessmentAutomation.json - Microsoft.Security/preview/2021-07-01-preview/customEntityStoreAssignment.json @@ -464,14 +475,16 @@ input-file: These settings apply only when `--tag=package-2021-10-preview-only` is specified on the command line. -```yaml $(tag) == 'package-2021-10-preview-only' +``` yaml $(tag) == 'package-2021-10-preview-only' input-file: - Microsoft.Security/preview/2021-10-01-preview/mdeOnboardings.json ``` # Needed when there is more than one input file + override-info: - title: SecurityCenter +title: SecurityCenter + ``` ### Tag: package-2021-06-only @@ -548,4 +561,4 @@ See configuration in [readme.ruby.md](./readme.ruby.md) ## Java -See configuration in [readme.java.md](./readme.java.md) \ No newline at end of file +See configuration in [readme.java.md](./readme.java.md) From 29faea13c2933c7e9fb41ccfee5f09f1147d37c8 Mon Sep 17 00:00:00 2001 From: Sapir Elmakayes <32778998+SapirElmakayes@users.noreply.github.com> Date: Tue, 14 Dec 2021 17:17:11 +0200 Subject: [PATCH 03/36] Updates API version in new specs and examples --- .../preview/2021-12-01-preview/customAssessmentAutomation.json | 2 +- .../preview/2021-12-01-preview/customEntityStoreAssignment.json | 2 +- .../customAssessmentAutomationCreate_example.json | 2 +- .../customAssessmentAutomationDelete_example.json | 2 +- .../customAssessmentAutomationGet_example.json | 2 +- .../customAssessmentAutomationListByResourceGroup_example.json | 2 +- .../customAssessmentAutomationListBySubscription_example.json | 2 +- .../customEntityStoreAssignmentCreate_example.json | 2 +- .../customEntityStoreAssignmentDelete_example.json | 2 +- .../customEntityStoreAssignmentGet_example.json | 2 +- .../customEntityStoreAssignmentListByResourceGroup_example.json | 2 +- .../customEntityStoreAssignmentListBySubscription_example.json | 2 +- .../SecurityConnectors/DeleteSecurityConnector_example.json | 2 +- .../GetSecurityConnectorResourceGroup_example.json | 2 +- .../GetSecurityConnectorsResourceGroup_example.json | 2 +- .../GetSecurityConnectorsSubscription_example.json | 2 +- .../SecurityConnectors/PatchSecurityConnector_example.json | 2 +- .../SecurityConnectors/PutSecurityConnector_example.json | 2 +- .../preview/2021-12-01-preview/securityConnectors.json | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/customAssessmentAutomation.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/customAssessmentAutomation.json index 54d71c5a4386..7e57d0352afc 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/customAssessmentAutomation.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/customAssessmentAutomation.json @@ -3,7 +3,7 @@ "info": { "title": "Security Center", "description": "API spec for Microsoft.Security (Azure Security Center) resource provider", - "version": "2021-07-01-preview" + "version": "2021-12-01-preview" }, "host": "management.azure.com", "schemes": [ diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/customEntityStoreAssignment.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/customEntityStoreAssignment.json index 5aedaab3a909..2cd6ec8e9bfe 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/customEntityStoreAssignment.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/customEntityStoreAssignment.json @@ -3,7 +3,7 @@ "info": { "title": "Security Center", "description": "API spec for Microsoft.Security (Azure Security Center) resource provider", - "version": "2021-07-01-preview" + "version": "2021-12-01-preview" }, "host": "management.azure.com", "schemes": [ diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomAssessmentAutomations/customAssessmentAutomationCreate_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomAssessmentAutomations/customAssessmentAutomationCreate_example.json index 322b0df8d380..37957edbf9de 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomAssessmentAutomations/customAssessmentAutomationCreate_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomAssessmentAutomations/customAssessmentAutomationCreate_example.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2021-07-01-preview", + "api-version": "2021-12-01-preview", "subscriptionId": "e5d1b86c-3051-44d5-8802-aa65d45a279b", "resourceGroupName": "TestResourceGroup", "customAssessmentAutomationName": "MyCustomAssessmentAutomation", diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomAssessmentAutomations/customAssessmentAutomationDelete_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomAssessmentAutomations/customAssessmentAutomationDelete_example.json index b6939c3fe989..e56a99d7ba7c 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomAssessmentAutomations/customAssessmentAutomationDelete_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomAssessmentAutomations/customAssessmentAutomationDelete_example.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2021-07-01-preview", + "api-version": "2021-12-01-preview", "subscriptionId": "e5d1b86c-3051-44d5-8802-aa65d45a279b", "resourceGroupName": "TestResourceGroup", "customAssessmentAutomationName": "MyCustomAssessmentAutomation" diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomAssessmentAutomations/customAssessmentAutomationGet_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomAssessmentAutomations/customAssessmentAutomationGet_example.json index 189b4c7b96ae..9ecd26e5fcda 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomAssessmentAutomations/customAssessmentAutomationGet_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomAssessmentAutomations/customAssessmentAutomationGet_example.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2021-07-01-preview", + "api-version": "2021-12-01-preview", "subscriptionId": "e5d1b86c-3051-44d5-8802-aa65d45a279b", "resourceGroupName": "TestResourceGroup", "customAssessmentAutomationName": "MyCustomAssessmentAutomation" diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomAssessmentAutomations/customAssessmentAutomationListByResourceGroup_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomAssessmentAutomations/customAssessmentAutomationListByResourceGroup_example.json index 89aed1afb5df..f1ea3925c515 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomAssessmentAutomations/customAssessmentAutomationListByResourceGroup_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomAssessmentAutomations/customAssessmentAutomationListByResourceGroup_example.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2021-07-01-preview", + "api-version": "2021-12-01-preview", "subscriptionId": "e5d1b86c-3051-44d5-8802-aa65d45a279b", "resourceGroupName": "TestResourceGroup" }, diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomAssessmentAutomations/customAssessmentAutomationListBySubscription_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomAssessmentAutomations/customAssessmentAutomationListBySubscription_example.json index d0e70788c1e5..33c80756d1a4 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomAssessmentAutomations/customAssessmentAutomationListBySubscription_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomAssessmentAutomations/customAssessmentAutomationListBySubscription_example.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2021-07-01-preview", + "api-version": "2021-12-01-preview", "subscriptionId": "e5d1b86c-3051-44d5-8802-aa65d45a279b" }, "responses": { diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomEntityStoreAssignments/customEntityStoreAssignmentCreate_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomEntityStoreAssignments/customEntityStoreAssignmentCreate_example.json index 4cba8dc52cc9..b7b091d106bb 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomEntityStoreAssignments/customEntityStoreAssignmentCreate_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomEntityStoreAssignments/customEntityStoreAssignmentCreate_example.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2021-07-01-preview", + "api-version": "2021-12-01-preview", "subscriptionId": "e5d1b86c-3051-44d5-8802-aa65d45a279b", "resourceGroupName": "TestResourceGroup", "customEntityStoreAssignmentName": "33e7cc6e-a139-4723-a0e5-76993aee0771", diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomEntityStoreAssignments/customEntityStoreAssignmentDelete_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomEntityStoreAssignments/customEntityStoreAssignmentDelete_example.json index bc98e0c7315a..8015575921cf 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomEntityStoreAssignments/customEntityStoreAssignmentDelete_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomEntityStoreAssignments/customEntityStoreAssignmentDelete_example.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2021-07-01-preview", + "api-version": "2021-12-01-preview", "subscriptionId": "e5d1b86c-3051-44d5-8802-aa65d45a279b", "resourceGroupName": "TestResourceGroup", "customEntityStoreAssignmentName": "33e7cc6e-a139-4723-a0e5-76993aee0771" diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomEntityStoreAssignments/customEntityStoreAssignmentGet_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomEntityStoreAssignments/customEntityStoreAssignmentGet_example.json index f9f50ea3620a..19bff704b3b8 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomEntityStoreAssignments/customEntityStoreAssignmentGet_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomEntityStoreAssignments/customEntityStoreAssignmentGet_example.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2021-07-01-preview", + "api-version": "2021-12-01-preview", "subscriptionId": "e5d1b86c-3051-44d5-8802-aa65d45a279b", "resourceGroupName": "TestResourceGroup", "customEntityStoreAssignmentName": "33e7cc6e-a139-4723-a0e5-76993aee0771" diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomEntityStoreAssignments/customEntityStoreAssignmentListByResourceGroup_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomEntityStoreAssignments/customEntityStoreAssignmentListByResourceGroup_example.json index cfb735592f80..18e2e4fa1912 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomEntityStoreAssignments/customEntityStoreAssignmentListByResourceGroup_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomEntityStoreAssignments/customEntityStoreAssignmentListByResourceGroup_example.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2021-07-01-preview", + "api-version": "2021-12-01-preview", "subscriptionId": "e5d1b86c-3051-44d5-8802-aa65d45a279b", "resourceGroupName": "TestResourceGroup" }, diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomEntityStoreAssignments/customEntityStoreAssignmentListBySubscription_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomEntityStoreAssignments/customEntityStoreAssignmentListBySubscription_example.json index 18bc9a3e319d..45d0e3581ef5 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomEntityStoreAssignments/customEntityStoreAssignmentListBySubscription_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomEntityStoreAssignments/customEntityStoreAssignmentListBySubscription_example.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2021-07-01-preview", + "api-version": "2021-12-01-preview", "subscriptionId": "e5d1b86c-3051-44d5-8802-aa65d45a279b" }, "responses": { diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/DeleteSecurityConnector_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/DeleteSecurityConnector_example.json index 238efa15c67c..26ffc085f5bc 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/DeleteSecurityConnector_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/DeleteSecurityConnector_example.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2021-07-01-preview", + "api-version": "2021-12-01-preview", "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23", "resourceGroupName": "myRg", "securityConnectorName": "mySecurityConnectorName" diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorResourceGroup_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorResourceGroup_example.json index 487e7959f1aa..a81cf20dfb5e 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorResourceGroup_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorResourceGroup_example.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2021-07-01-preview", + "api-version": "2021-12-01-preview", "subscriptionId": "a5caac9c-5c04-49af-b3d0-e204f40345d5", "resourceGroupName": "exampleResourceGroup", "securityConnectorName": "exampleSecurityConnectorName" diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorsResourceGroup_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorsResourceGroup_example.json index 63ef8a2e9880..4aac780ff185 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorsResourceGroup_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorsResourceGroup_example.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2021-07-01-preview", + "api-version": "2021-12-01-preview", "subscriptionId": "a5caac9c-5c04-49af-b3d0-e204f40345d5", "resourceGroupName": "exampleResourceGroup" }, diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorsSubscription_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorsSubscription_example.json index 5f90b30f38fe..ca7b00c851b5 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorsSubscription_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorsSubscription_example.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2021-07-01-preview", + "api-version": "2021-12-01-preview", "subscriptionId": "a5caac9c-5c04-49af-b3d0-e204f40345d5" }, "responses": { diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/PatchSecurityConnector_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/PatchSecurityConnector_example.json index 4f6ca41f222b..408f4e1f9c67 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/PatchSecurityConnector_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/PatchSecurityConnector_example.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2021-07-01-preview", + "api-version": "2021-12-01-preview", "subscriptionId": "a5caac9c-5c04-49af-b3d0-e204f40345d5", "securityConnectorName": "exampleSecurityConnectorName", "resourceGroupName": "exampleResourceGroup", diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/PutSecurityConnector_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/PutSecurityConnector_example.json index 1c82e395fab2..25cd5b71b99d 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/PutSecurityConnector_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/PutSecurityConnector_example.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2021-07-01-preview", + "api-version": "2021-12-01-preview", "subscriptionId": "a5caac9c-5c04-49af-b3d0-e204f40345d5", "securityConnectorName": "exampleSecurityConnectorName", "resourceGroupName": "exampleResourceGroup", diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json index 324ba5500bdc..473c8711d813 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json @@ -3,7 +3,7 @@ "info": { "title": "Security Center", "description": "API spec for Microsoft.Security (Azure Security Center) resource provider", - "version": "2021-07-01-preview" + "version": "2021-12-01-preview" }, "host": "management.azure.com", "schemes": [ From e5b4a2d44527bb653282ed216e1597c9aeb180dd Mon Sep 17 00:00:00 2001 From: Sapir Elmakayes Date: Tue, 14 Dec 2021 17:20:36 +0200 Subject: [PATCH 04/36] Keep only Securityconnectors in the API version --- .../customAssessmentAutomation.json | 433 ------------------ .../customEntityStoreAssignment.json | 351 -------------- ...tomAssessmentAutomationCreate_example.json | 68 --- ...tomAssessmentAutomationDelete_example.json | 12 - ...customAssessmentAutomationGet_example.json | 34 -- ...AutomationListByResourceGroup_example.json | 60 --- ...tAutomationListBySubscription_example.json | 59 --- ...omEntityStoreAssignmentCreate_example.json | 53 --- ...omEntityStoreAssignmentDelete_example.json | 12 - ...ustomEntityStoreAssignmentGet_example.json | 29 -- ...AssignmentListByResourceGroup_example.json | 42 -- ...eAssignmentListBySubscription_example.json | 49 -- .../security/resource-manager/readme.md | 2 - 13 files changed, 1204 deletions(-) delete mode 100644 specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/customAssessmentAutomation.json delete mode 100644 specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/customEntityStoreAssignment.json delete mode 100644 specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomAssessmentAutomations/customAssessmentAutomationCreate_example.json delete mode 100644 specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomAssessmentAutomations/customAssessmentAutomationDelete_example.json delete mode 100644 specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomAssessmentAutomations/customAssessmentAutomationGet_example.json delete mode 100644 specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomAssessmentAutomations/customAssessmentAutomationListByResourceGroup_example.json delete mode 100644 specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomAssessmentAutomations/customAssessmentAutomationListBySubscription_example.json delete mode 100644 specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomEntityStoreAssignments/customEntityStoreAssignmentCreate_example.json delete mode 100644 specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomEntityStoreAssignments/customEntityStoreAssignmentDelete_example.json delete mode 100644 specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomEntityStoreAssignments/customEntityStoreAssignmentGet_example.json delete mode 100644 specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomEntityStoreAssignments/customEntityStoreAssignmentListByResourceGroup_example.json delete mode 100644 specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomEntityStoreAssignments/customEntityStoreAssignmentListBySubscription_example.json diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/customAssessmentAutomation.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/customAssessmentAutomation.json deleted file mode 100644 index 7e57d0352afc..000000000000 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/customAssessmentAutomation.json +++ /dev/null @@ -1,433 +0,0 @@ -{ - "swagger": "2.0", - "info": { - "title": "Security Center", - "description": "API spec for Microsoft.Security (Azure Security Center) resource provider", - "version": "2021-12-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": { - "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Security/customAssessmentAutomations/{customAssessmentAutomationName}": { - "get": { - "summary": "Gets a custom assessment automation", - "description": "Gets a single custom assessment automation by name for the provided subscription and resource group.", - "tags": [ - "customAssessmentAutomations" - ], - "operationId": "CustomAssessmentAutomations_Get", - "parameters": [ - { - "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" - }, - { - "$ref": "../../../common/v1/types.json#/parameters/SubscriptionId" - }, - { - "$ref": "../../../common/v1/types.json#/parameters/ResourceGroupName" - }, - { - "$ref": "#/parameters/customAssessmentAutomationName" - } - ], - "x-ms-examples": { - "Get a Custom Assessment Automation": { - "$ref": "./examples/CustomAssessmentAutomations/customAssessmentAutomationGet_example.json" - } - }, - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/customAssessmentAutomation" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "../../../common/v1/types.json#/definitions/CloudError" - } - } - } - }, - "put": { - "summary": "Creates a custom assessment automation", - "description": "Creates or updates a custom assessment automation for the provided subscription. Please note that providing an existing custom assessment automation will replace the existing record.", - "tags": [ - "customAssessmentAutomations" - ], - "operationId": "CustomAssessmentAutomations_Create", - "parameters": [ - { - "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" - }, - { - "$ref": "../../../common/v1/types.json#/parameters/SubscriptionId" - }, - { - "$ref": "../../../common/v1/types.json#/parameters/ResourceGroupName" - }, - { - "$ref": "#/parameters/customAssessmentAutomationName" - }, - { - "$ref": "#/parameters/customAssessmentAutomationBody" - } - ], - "x-ms-examples": { - "Create a Custom Assessment Automation": { - "$ref": "./examples/CustomAssessmentAutomations/customAssessmentAutomationCreate_example.json" - } - }, - "responses": { - "201": { - "description": "Created", - "schema": { - "$ref": "#/definitions/customAssessmentAutomation" - } - }, - "200": { - "description": "OK - Updated", - "schema": { - "$ref": "#/definitions/customAssessmentAutomation" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "../../../common/v1/types.json#/definitions/CloudError" - } - } - } - }, - "delete": { - "summary": "Deletes a custom assessment automation", - "description": "Deletes a custom assessment automation by name for a provided subscription", - "tags": [ - "customAssessmentAutomations" - ], - "operationId": "CustomAssessmentAutomations_Delete", - "parameters": [ - { - "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" - }, - { - "$ref": "../../../common/v1/types.json#/parameters/SubscriptionId" - }, - { - "$ref": "../../../common/v1/types.json#/parameters/ResourceGroupName" - }, - { - "$ref": "#/parameters/customAssessmentAutomationName" - } - ], - "x-ms-examples": { - "Delete a Custom Assessment Automation": { - "$ref": "./examples/CustomAssessmentAutomations/customAssessmentAutomationDelete_example.json" - } - }, - "responses": { - "200": { - "description": "OK - Custom Assessment Automation was deleted" - }, - "204": { - "description": "No Content - Custom Assessment Automation does not exist" - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "../../../common/v1/types.json#/definitions/CloudError" - } - } - } - } - }, - "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Security/customAssessmentAutomations": { - "get": { - "summary": "List custom assessment automations in a subscription and a resource group", - "description": "List custom assessment automations by provided subscription and resource group", - "tags": [ - "customAssessmentAutomations" - ], - "operationId": "CustomAssessmentAutomations_ListByResourceGroup", - "parameters": [ - { - "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" - }, - { - "$ref": "../../../common/v1/types.json#/parameters/SubscriptionId" - }, - { - "$ref": "../../../common/v1/types.json#/parameters/ResourceGroupName" - } - ], - "x-ms-examples": { - "List Custom Assessment Automations in a subscription and a resource group": { - "$ref": "./examples/CustomAssessmentAutomations/customAssessmentAutomationListByResourceGroup_example.json" - } - }, - "responses": { - "200": { - "description": "OK - Returns a collection of Custom Assessment Automations", - "schema": { - "$ref": "#/definitions/customAssessmentAutomationsListResult" - } - }, - "default": { - "description": "Error response that describes why the operation failed.", - "schema": { - "$ref": "../../../common/v1/types.json#/definitions/CloudError" - } - } - }, - "x-ms-pageable": { - "nextLinkName": "nextLink" - } - } - }, - "/subscriptions/{subscriptionId}/providers/Microsoft.Security/customAssessmentAutomations": { - "get": { - "summary": "List custom assessment automations in a subscription", - "description": "List custom assessment automations by provided subscription", - "tags": [ - "customAssessmentAutomations" - ], - "operationId": "CustomAssessmentAutomations_ListBySubscription", - "parameters": [ - { - "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" - }, - { - "$ref": "../../../common/v1/types.json#/parameters/SubscriptionId" - } - ], - "x-ms-examples": { - "List Custom Assessment Automations in a subscription": { - "$ref": "./examples/CustomAssessmentAutomations/customAssessmentAutomationListBySubscription_example.json" - } - }, - "responses": { - "200": { - "description": "OK - Returns a collection of Custom Assessment Automations", - "schema": { - "$ref": "#/definitions/customAssessmentAutomationsListResult" - } - }, - "default": { - "description": "Error response that describes why the operation failed.", - "schema": { - "$ref": "../../../common/v1/types.json#/definitions/CloudError" - } - } - }, - "x-ms-pageable": { - "nextLinkName": "nextLink" - } - } - } - }, - "definitions": { - "customAssessmentAutomationsListResult": { - "type": "object", - "description": "A list of Custom Assessment Automations", - "properties": { - "value": { - "description": "Collection of Custom Assessment Automations", - "readOnly": true, - "type": "array", - "items": { - "$ref": "#/definitions/customAssessmentAutomation" - } - }, - "nextLink": { - "description": "The link used to get the next page of operations.", - "type": "string" - } - } - }, - "customAssessmentAutomation": { - "type": "object", - "description": "Custom Assessment Automation", - "properties": { - "systemData": { - "readOnly": true, - "type": "object", - "description": "Azure Resource Manager metadata containing createdBy and modifiedBy information.", - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData" - }, - "properties": { - "x-ms-client-flatten": true, - "description": "describes Custom Assessment Automation properties.", - "$ref": "#/definitions/customAssessmentAutomationProperties" - } - }, - "allOf": [ - { - "$ref": "../../../common/v1/types.json#/definitions/Resource" - } - ] - }, - "customAssessmentAutomationRequest": { - "type": "object", - "description": "Custom Assessment Automation request", - "properties": { - "properties": { - "x-ms-client-flatten": true, - "description": "describes Custom Assessment Automation request properties.", - "$ref": "#/definitions/customAssessmentAutomationRequestProperties" - } - }, - "allOf": [ - { - "$ref": "../../../common/v1/types.json#/definitions/Resource" - } - ] - }, - "customAssessmentAutomationProperties": { - "type": "object", - "description": "describes the Custom Assessment Automation properties", - "properties": { - "compressedQuery": { - "description": "GZip encoded KQL query representing the assessment automation results required.", - "type": "string" - }, - "supportedCloud": { - "description": "Relevant cloud for the custom assessment automation.", - "type": "string", - "enum": [ - "AWS" - ], - "x-ms-enum": { - "name": "supportedCloudEnum", - "modelAsString": true - }, - "x-ms-client-default": "AWS" - }, - "severity": { - "description": "The severity to relate to the assessments generated by this assessment automation.", - "type": "string", - "enum": [ - "High", - "Medium", - "Low" - ], - "x-ms-enum": { - "name": "severityEnum", - "modelAsString": true - }, - "x-ms-client-default": "Low" - }, - "displayName": { - "description": "The display name of the assessments generated by this assessment automation.", - "type": "string" - }, - "description": { - "description": "The description to relate to the assessments generated by this assessment automation.", - "type": "string" - }, - "remediationDescription": { - "description": "The remediation description to relate to the assessments generated by this assessment automation.", - "type": "string" - }, - "assessmentKey": { - "description": "The assessment metadata key used when an assessment is generated for this assessment automation.", - "type": "string" - } - } - }, - "customAssessmentAutomationRequestProperties": { - "type": "object", - "description": "describes the Custom Assessment Automation properties", - "properties": { - "compressedQuery": { - "description": "Base 64 encoded KQL query representing the assessment automation results required.", - "type": "string" - }, - "supportedCloud": { - "description": "Relevant cloud for the custom assessment automation.", - "type": "string", - "enum": [ - "AWS" - ], - "x-ms-enum": { - "name": "supportedCloudEnum", - "modelAsString": true - }, - "x-ms-client-default": "AWS" - }, - "severity": { - "description": "The severity to relate to the assessments generated by this assessment automation.", - "type": "string", - "enum": [ - "High", - "Medium", - "Low" - ], - "x-ms-enum": { - "name": "severityEnum", - "modelAsString": true - }, - "x-ms-client-default": "Low" - }, - "displayName": { - "description": "The display name of the assessments generated by this assessment automation.", - "type": "string" - }, - "description": { - "description": "The description to relate to the assessments generated by this assessment automation.", - "type": "string" - }, - "remediationDescription": { - "description": "The remediation description to relate to the assessments generated by this assessment automation.", - "type": "string" - } - } - } - }, - "parameters": { - "customAssessmentAutomationName": { - "name": "customAssessmentAutomationName", - "in": "path", - "required": true, - "type": "string", - "description": "Name of the Custom Assessment Automation.", - "x-ms-parameter-location": "method" - }, - "customAssessmentAutomationBody": { - "name": "customAssessmentAutomationBody", - "in": "body", - "description": "Custom Assessment Automation body", - "required": true, - "schema": { - "$ref": "#/definitions/customAssessmentAutomationRequest" - }, - "x-ms-parameter-location": "method" - } - } -} diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/customEntityStoreAssignment.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/customEntityStoreAssignment.json deleted file mode 100644 index 2cd6ec8e9bfe..000000000000 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/customEntityStoreAssignment.json +++ /dev/null @@ -1,351 +0,0 @@ -{ - "swagger": "2.0", - "info": { - "title": "Security Center", - "description": "API spec for Microsoft.Security (Azure Security Center) resource provider", - "version": "2021-12-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": { - "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Security/customEntityStoreAssignments/{customEntityStoreAssignmentName}": { - "get": { - "summary": "Gets a custom entity store assignment", - "description": "Gets a single custom entity store assignment by name for the provided subscription and resource group.", - "tags": [ - "customEntityStoreAssignments" - ], - "operationId": "CustomEntityStoreAssignments_Get", - "parameters": [ - { - "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" - }, - { - "$ref": "../../../common/v1/types.json#/parameters/SubscriptionId" - }, - { - "$ref": "../../../common/v1/types.json#/parameters/ResourceGroupName" - }, - { - "$ref": "#/parameters/customEntityStoreAssignmentName" - } - ], - "x-ms-examples": { - "Get a custom entity store assignment": { - "$ref": "./examples/CustomEntityStoreAssignments/customEntityStoreAssignmentGet_example.json" - } - }, - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/CustomEntityStoreAssignment" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "../../../common/v1/types.json#/definitions/CloudError" - } - } - } - }, - "put": { - "summary": "Creates a custom entity store assignment", - "description": "Creates a custom entity store assignment for the provided subscription, if not already exists.", - "tags": [ - "customEntityStoreAssignments" - ], - "operationId": "CustomEntityStoreAssignments_Create", - "parameters": [ - { - "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" - }, - { - "$ref": "../../../common/v1/types.json#/parameters/SubscriptionId" - }, - { - "$ref": "../../../common/v1/types.json#/parameters/ResourceGroupName" - }, - { - "$ref": "#/parameters/customEntityStoreAssignmentName" - }, - { - "$ref": "#/parameters/customEntityStoreAssignmentRequestBody" - } - ], - "x-ms-examples": { - "Create a custom entity store assignment": { - "$ref": "./examples/CustomEntityStoreAssignments/customEntityStoreAssignmentCreate_example.json" - } - }, - "responses": { - "201": { - "description": "Created", - "schema": { - "$ref": "#/definitions/CustomEntityStoreAssignment" - } - }, - "200": { - "description": "OK - Updated", - "schema": { - "$ref": "#/definitions/CustomEntityStoreAssignment" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "../../../common/v1/types.json#/definitions/CloudError" - } - } - } - }, - "delete": { - "summary": "Deleted a custom entity store assignment", - "description": "Delete a custom entity store assignment by name for a provided subscription", - "tags": [ - "customEntityStoreAssignments" - ], - "operationId": "CustomEntityStoreAssignments_Delete", - "parameters": [ - { - "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" - }, - { - "$ref": "../../../common/v1/types.json#/parameters/SubscriptionId" - }, - { - "$ref": "../../../common/v1/types.json#/parameters/ResourceGroupName" - }, - { - "$ref": "#/parameters/customEntityStoreAssignmentName" - } - ], - "x-ms-examples": { - "Delete a custom entity store assignment": { - "$ref": "./examples/CustomEntityStoreAssignments/customEntityStoreAssignmentDelete_example.json" - } - }, - "responses": { - "200": { - "description": "OK - Custom Entity Store Assignment was deleted" - }, - "204": { - "description": "No Content - Custom Entity Store Assignment does not exist" - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "../../../common/v1/types.json#/definitions/CloudError" - } - } - } - } - }, - "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Security/customEntityStoreAssignments": { - "get": { - "summary": "List custom entity store assignments in a subscription and a resource group", - "description": "List custom entity store assignments by a provided subscription and resource group", - "tags": [ - "customEntityStoreAssignments" - ], - "operationId": "CustomEntityStoreAssignments_ListByResourceGroup", - "parameters": [ - { - "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" - }, - { - "$ref": "../../../common/v1/types.json#/parameters/SubscriptionId" - }, - { - "$ref": "../../../common/v1/types.json#/parameters/ResourceGroupName" - } - ], - "x-ms-examples": { - "List custom entity store assignments in a subscription and a resource group": { - "$ref": "./examples/CustomEntityStoreAssignments/customEntityStoreAssignmentListByResourceGroup_example.json" - } - }, - "responses": { - "200": { - "description": "OK - Returns a collection of custom entity store assignments", - "schema": { - "$ref": "#/definitions/CustomEntityStoreAssignmentsListResult" - } - }, - "default": { - "description": "Error response that describes why the operation failed.", - "schema": { - "$ref": "../../../common/v1/types.json#/definitions/CloudError" - } - } - }, - "x-ms-pageable": { - "nextLinkName": "nextLink" - } - } - }, - "/subscriptions/{subscriptionId}/providers/Microsoft.Security/customEntityStoreAssignments": { - "get": { - "summary": "List custom entity store assignments in a subscription", - "description": "List custom entity store assignments by provided subscription", - "tags": [ - "customEntityStoreAssignments" - ], - "operationId": "CustomEntityStoreAssignments_ListBySubscription", - "parameters": [ - { - "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" - }, - { - "$ref": "../../../common/v1/types.json#/parameters/SubscriptionId" - } - ], - "x-ms-examples": { - "List custom entity store assignments in a subscription": { - "$ref": "./examples/CustomEntityStoreAssignments/customEntityStoreAssignmentListBySubscription_example.json" - } - }, - "responses": { - "200": { - "description": "OK - Returns a collection of custom entity store assignments", - "schema": { - "$ref": "#/definitions/CustomEntityStoreAssignmentsListResult" - } - }, - "default": { - "description": "Error response that describes why the operation failed.", - "schema": { - "$ref": "../../../common/v1/types.json#/definitions/CloudError" - } - } - }, - "x-ms-pageable": { - "nextLinkName": "nextLink" - } - } - } - }, - "definitions": { - "CustomEntityStoreAssignmentsListResult": { - "type": "object", - "description": "A list of custom entity store assignments", - "properties": { - "value": { - "description": "Collection of custom entity store assignments", - "readOnly": true, - "type": "array", - "items": { - "$ref": "#/definitions/CustomEntityStoreAssignment" - } - }, - "nextLink": { - "description": "The link used to get the next page of operations.", - "type": "string" - } - } - }, - "CustomEntityStoreAssignment": { - "type": "object", - "description": "Custom entity store assignment", - "properties": { - "systemData": { - "readOnly": true, - "type": "object", - "description": "Azure Resource Manager metadata containing createdBy and modifiedBy information.", - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData" - }, - "properties": { - "x-ms-client-flatten": true, - "description": "describes custom entity store assignment properties.", - "$ref": "#/definitions/CustomEntityStoreAssignmentProperties" - } - }, - "allOf": [ - { - "$ref": "../../../common/v1/types.json#/definitions/Resource" - } - ] - }, - "CustomEntityStoreAssignmentProperties": { - "type": "object", - "description": "describes the custom entity store assignment properties", - "properties": { - "principal": { - "description": "The principal assigned with entity store. Format of principal is: [AAD type]=[PrincipalObjectId];[TenantId]", - "type": "string" - }, - "entityStoreDatabaseLink": { - "description": "The link to entity store database.", - "type": "string" - } - } - }, - "CustomEntityStoreAssignmentRequest": { - "type": "object", - "description": "describes the custom entity store assignment request", - "properties": { - "properties": { - "x-ms-client-flatten": true, - "$ref": "#/definitions/CustomEntityStoreAssignmentRequestProperties" - } - } - }, - "CustomEntityStoreAssignmentRequestProperties": { - "type": "object", - "description": "describes properties of custom entity store assignment request", - "properties": { - "principal": { - "description": "The principal assigned with entity store. If not provided, will use caller principal. Format of principal is: [AAD type]=[PrincipalObjectId];[TenantId]", - "type": "string" - } - } - } - }, - "parameters": { - "customEntityStoreAssignmentName": { - "name": "customEntityStoreAssignmentName", - "in": "path", - "required": true, - "type": "string", - "description": "Name of the custom entity store assignment. Generated name is GUID.", - "x-ms-parameter-location": "method" - }, - "customEntityStoreAssignmentRequestBody": { - "name": "customEntityStoreAssignmentRequestBody", - "in": "body", - "description": "Custom entity store assignment body", - "required": true, - "schema": { - "$ref": "#/definitions/CustomEntityStoreAssignmentRequest" - }, - "x-ms-parameter-location": "method" - } - } -} diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomAssessmentAutomations/customAssessmentAutomationCreate_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomAssessmentAutomations/customAssessmentAutomationCreate_example.json deleted file mode 100644 index 37957edbf9de..000000000000 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomAssessmentAutomations/customAssessmentAutomationCreate_example.json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "parameters": { - "api-version": "2021-12-01-preview", - "subscriptionId": "e5d1b86c-3051-44d5-8802-aa65d45a279b", - "resourceGroupName": "TestResourceGroup", - "customAssessmentAutomationName": "MyCustomAssessmentAutomation", - "customAssessmentAutomationBody": { - "properties": { - "compressedQuery": "DQAKAEkAYQBtAF8ARwByAG8AdQBwAA0ACgB8ACAAZQB4AHQAZQBuAGQAIABIAGUAYQBsAHQAaABTAHQAYQB0AHUAcwAgAD0AIABpAGYAZgAoAHQAbwBzAHQAcgBpAG4AZwAoAFIAZQBjAG8AcgBkAC4AVQBzAGUAcgBOAGEAbQBlACkAIABjAG8AbgB0AGEAaQBuAHMAIAAnAHUAcwBlAHIAJwAsACAAJwBVAE4ASABFAEEATABUAEgAWQAnACwAIAAnAEgARQBBAEwAVABIAFkAJwApAA0ACgA=", - "supportedCloud": "AWS", - "severity": "Medium", - "displayName": "Password Policy", - "description": "Data should be encrypted", - "remediationDescription": "Encrypt store by..." - } - } - }, - "responses": { - "200": { - "body": { - "id": "/subscriptions/e5d1b86c-3051-44d5-8802-aa65d45a279b/resourcegroups/TestResourceGroup/providers/Microsoft.Security/customAssessmentAutomations/33e7cc6e-a139-4723-a0e5-76993aee0771", - "name": "33e7cc6e-a139-4723-a0e5-76993aee0771", - "type": "Microsoft.Security/customAssessmentAutomations", - "systemData": { - "createdBy": "user@contoso.com", - "createdByType": "User", - "createdAt": "2021-08-31T13:47:50.328Z", - "lastModifiedBy": "user@contoso.com", - "lastModifiedByType": "User", - "lastModifiedAt": "2021-08-31T13:47:50.328Z" - }, - "properties": { - "compressedQuery": "DQAKAEkAYQBtAF8ARwByAG8AdQBwAA0ACgB8ACAAZQB4AHQAZQBuAGQAIABIAGUAYQBsAHQAaABTAHQAYQB0AHUAcwAgAD0AIABpAGYAZgAoAHQAbwBzAHQAcgBpAG4AZwAoAFIAZQBjAG8AcgBkAC4AVQBzAGUAcgBOAGEAbQBlACkAIABjAG8AbgB0AGEAaQBuAHMAIAAnAHUAcwBlAHIAJwAsACAAJwBVAE4ASABFAEEATABUAEgAWQAnACwAIAAnAEgARQBBAEwAVABIAFkAJwApAA0ACgA=", - "supportedCloud": "AWS", - "severity": "Medium", - "displayName": "Password Policy", - "description": "organization passwords policy", - "remediationDescription": "Change password policy to...", - "assessmentKey": "d5f442f7-7e77-4bcf-a450-a9c1b9a94eeb" - } - } - }, - "201": { - "body": { - "id": "/subscriptions/e5d1b86c-3051-44d5-8802-aa65d45a279b/resourcegroups/TestResourceGroup/providers/Microsoft.Security/customAssessmentAutomations/33e7cc6e-a139-4723-a0e5-76993aee0771", - "name": "33e7cc6e-a139-4723-a0e5-76993aee0771", - "type": "Microsoft.Security/customAssessmentAutomations", - "systemData": { - "createdBy": "user@contoso.com", - "createdByType": "User", - "createdAt": "2021-08-31T13:01:50.328Z", - "lastModifiedBy": "user@contoso.com", - "lastModifiedByType": "User", - "lastModifiedAt": "2021-08-31T13:01:50.328Z" - }, - "properties": { - "compressedQuery": "DQAKAEkAYQBtAF8AUABhAHMAcwB3AG8AcgBkAFAAbwBsAGkAYwB5ACAADQAKAHwAIABlAHgAdABlAG4AZAAgAEgAZQBhAGwAdABoAFMAdABhAHQAdQBzACAAPQAgAGkAZgBmACgAdABvAGkAbgB0ACgAUgBlAGMAbwByAGQALgBNAGkAbgBpAG0AdQBtAFAAYQBzAHMAdwBvAHIAZABMAGUAbgBnAHQAaAApACAAPAAgADgALAAgACcAVQBOAEgARQBBAEwAVABIAFkAJwAsACAAJwBIAEUAQQBMAFQASABZACcAKQANAAoA", - "supportedCloud": "AWS", - "severity": "Medium", - "displayName": "Customized Encryption Rules", - "description": "Data should be encrypted", - "remediationDescription": "Encrypt store by...", - "assessmentKey": "fc1dbcd0-502c-4eab-9312-4014cfc8ea56" - } - } - } - } -} diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomAssessmentAutomations/customAssessmentAutomationDelete_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomAssessmentAutomations/customAssessmentAutomationDelete_example.json deleted file mode 100644 index e56a99d7ba7c..000000000000 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomAssessmentAutomations/customAssessmentAutomationDelete_example.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parameters": { - "api-version": "2021-12-01-preview", - "subscriptionId": "e5d1b86c-3051-44d5-8802-aa65d45a279b", - "resourceGroupName": "TestResourceGroup", - "customAssessmentAutomationName": "MyCustomAssessmentAutomation" - }, - "responses": { - "200": {}, - "204": {} - } -} diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomAssessmentAutomations/customAssessmentAutomationGet_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomAssessmentAutomations/customAssessmentAutomationGet_example.json deleted file mode 100644 index 9ecd26e5fcda..000000000000 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomAssessmentAutomations/customAssessmentAutomationGet_example.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "parameters": { - "api-version": "2021-12-01-preview", - "subscriptionId": "e5d1b86c-3051-44d5-8802-aa65d45a279b", - "resourceGroupName": "TestResourceGroup", - "customAssessmentAutomationName": "MyCustomAssessmentAutomation" - }, - "responses": { - "200": { - "body": { - "id": "/subscriptions/e5d1b86c-3051-44d5-8802-aa65d45a279b/resourcegroups/TestResourceGroup/providers/Microsoft.Security/customAssessmentAutomations/MyCustomAssessmentAutomation", - "name": "MyCustomAssessmentAutomation", - "type": "Microsoft.Security/customAssessmentAutomations", - "systemData": { - "createdBy": "user@contoso.com", - "createdByType": "User", - "createdAt": "2021-08-31T13:47:50.328Z", - "lastModifiedBy": "user@contoso.com", - "lastModifiedByType": "User", - "lastModifiedAt": "2021-08-31T13:47:50.328Z" - }, - "properties": { - "compressedQuery": "DQAKAEkAYQBtAF8ARwByAG8AdQBwAA0ACgB8ACAAZQB4AHQAZQBuAGQAIABIAGUAYQBsAHQAaABTAHQAYQB0AHUAcwAgAD0AIABpAGYAZgAoAHQAbwBzAHQAcgBpAG4AZwAoAFIAZQBjAG8AcgBkAC4AVQBzAGUAcgBOAGEAbQBlACkAIABjAG8AbgB0AGEAaQBuAHMAIAAnAHUAcwBlAHIAJwAsACAAJwBVAE4ASABFAEEATABUAEgAWQAnACwAIAAnAEgARQBBAEwAVABIAFkAJwApAA0ACgA=", - "supportedCloud": "AWS", - "severity": "Low", - "displayName": "Password Policy", - "description": "organization passwords policy", - "remediationDescription": "Change password policy to...", - "assessmentKey": "d5f442f7-7e77-4bcf-a450-a9c1b9a94eeb" - } - } - } - } -} diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomAssessmentAutomations/customAssessmentAutomationListByResourceGroup_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomAssessmentAutomations/customAssessmentAutomationListByResourceGroup_example.json deleted file mode 100644 index f1ea3925c515..000000000000 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomAssessmentAutomations/customAssessmentAutomationListByResourceGroup_example.json +++ /dev/null @@ -1,60 +0,0 @@ -{ - "parameters": { - "api-version": "2021-12-01-preview", - "subscriptionId": "e5d1b86c-3051-44d5-8802-aa65d45a279b", - "resourceGroupName": "TestResourceGroup" - }, - "responses": { - "200": { - "body": { - "value": [ - { - "id": "/subscriptions/e5d1b86c-3051-44d5-8802-aa65d45a279b/resourcegroups/TestResourceGroup/providers/Microsoft.Security/customAssessmentAutomations/MyCustomAssessmentAutomation1", - "name": "MyCustomAssessmentAutomation1", - "type": "Microsoft.Security/customAssessmentAutomations", - "systemData": { - "createdBy": "user@contoso.com", - "createdByType": "User", - "createdAt": "2021-08-31T13:47:50.328Z", - "lastModifiedBy": "user@contoso.com", - "lastModifiedByType": "User", - "lastModifiedAt": "2021-08-31T13:47:50.328Z" - }, - "properties": { - "compressedQuery": "DQAKAEkAYQBtAF8ARwByAG8AdQBwAA0ACgB8ACAAZQB4AHQAZQBuAGQAIABIAGUAYQBsAHQAaABTAHQAYQB0AHUAcwAgAD0AIABpAGYAZgAoAHQAbwBzAHQAcgBpAG4AZwAoAFIAZQBjAG8AcgBkAC4AVQBzAGUAcgBOAGEAbQBlACkAIABjAG8AbgB0AGEAaQBuAHMAIAAnAHUAcwBlAHIAJwAsACAAJwBVAE4ASABFAEEATABUAEgAWQAnACwAIAAnAEgARQBBAEwAVABIAFkAJwApAA0ACgA=", - "supportedCloud": "AWS", - "severity": "Medium", - "displayName": "Password Policy", - "description": "organization passwords policy", - "remediationDescription": "Change password policy to...", - "assessmentKey": "d5f442f7-7e77-4bcf-a450-a9c1b9a94eeb" - } - }, - { - "id": "/subscriptions/e5d1b86c-3051-44d5-8802-aa65d45a279b/resourcegroups/TestResourceGroup/providers/Microsoft.Security/customAssessmentAutomations/MyCustomAssessmentAutomation2", - "name": "MyCustomAssessmentAutomation2", - "type": "Microsoft.Security/customAssessmentAutomations", - "systemData": { - "createdBy": "user@contoso.com", - "createdByType": "User", - "createdAt": "2021-08-31T13:01:50.328Z", - "lastModifiedBy": "user@contoso.com", - "lastModifiedByType": "User", - "lastModifiedAt": "2021-08-31T13:01:50.328Z" - }, - "properties": { - "compressedQuery": "DQAKAEkAYQBtAF8AUABhAHMAcwB3AG8AcgBkAFAAbwBsAGkAYwB5ACAADQAKAHwAIABlAHgAdABlAG4AZAAgAEgAZQBhAGwAdABoAFMAdABhAHQAdQBzACAAPQAgAGkAZgBmACgAdABvAGkAbgB0ACgAUgBlAGMAbwByAGQALgBNAGkAbgBpAG0AdQBtAFAAYQBzAHMAdwBvAHIAZABMAGUAbgBnAHQAaAApACAAPAAgADgALAAgACcAVQBOAEgARQBBAEwAVABIAFkAJwAsACAAJwBIAEUAQQBMAFQASABZACcAKQANAAoA", - "supportedCloud": "AWS", - "severity": "Low", - "displayName": "Password Policy", - "description": "organization passwords policy", - "remediationDescription": "Change password policy to...", - "assessmentKey": "fc1dbcd0-502c-4eab-9312-4014cfc8ea56" - } - } - ], - "nextLink": "link" - } - } - } -} diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomAssessmentAutomations/customAssessmentAutomationListBySubscription_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomAssessmentAutomations/customAssessmentAutomationListBySubscription_example.json deleted file mode 100644 index 33c80756d1a4..000000000000 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomAssessmentAutomations/customAssessmentAutomationListBySubscription_example.json +++ /dev/null @@ -1,59 +0,0 @@ -{ - "parameters": { - "api-version": "2021-12-01-preview", - "subscriptionId": "e5d1b86c-3051-44d5-8802-aa65d45a279b" - }, - "responses": { - "200": { - "body": { - "value": [ - { - "id": "/subscriptions/e5d1b86c-3051-44d5-8802-aa65d45a279b/resourcegroups/TestResourceGroup/providers/Microsoft.Security/customAssessmentAutomations/MyCustomAssessmentAutomation1", - "name": "MyCustomAssessmentAutomation1", - "type": "Microsoft.Security/customAssessmentAutomations", - "systemData": { - "createdBy": "user@contoso.com", - "createdByType": "User", - "createdAt": "2021-08-31T13:47:50.328Z", - "lastModifiedBy": "user@contoso.com", - "lastModifiedByType": "User", - "lastModifiedAt": "2021-08-31T13:47:50.328Z" - }, - "properties": { - "compressedQuery": "DQAKAEkAYQBtAF8ARwByAG8AdQBwAA0ACgB8ACAAZQB4AHQAZQBuAGQAIABIAGUAYQBsAHQAaABTAHQAYQB0AHUAcwAgAD0AIABpAGYAZgAoAHQAbwBzAHQAcgBpAG4AZwAoAFIAZQBjAG8AcgBkAC4AVQBzAGUAcgBOAGEAbQBlACkAIABjAG8AbgB0AGEAaQBuAHMAIAAnAHUAcwBlAHIAJwAsACAAJwBVAE4ASABFAEEATABUAEgAWQAnACwAIAAnAEgARQBBAEwAVABIAFkAJwApAA0ACgA=", - "supportedCloud": "AWS", - "severity": "Medium", - "displayName": "Password Policy", - "description": "organization passwords policy", - "remediationDescription": "Change password policy to...", - "assessmentKey": "d5f442f7-7e77-4bcf-a450-a9c1b9a94eeb" - } - }, - { - "id": "/subscriptions/e5d1b86c-3051-44d5-8802-aa65d45a279b/resourcegroups/TestResourceGroup/providers/Microsoft.Security/customAssessmentAutomations/MyCustomAssessmentAutomation2", - "name": "MyCustomAssessmentAutomation2", - "type": "Microsoft.Security/customAssessmentAutomations", - "systemData": { - "createdBy": "user@contoso.com", - "createdByType": "User", - "createdAt": "2021-08-31T13:01:50.328Z", - "lastModifiedBy": "user@contoso.com", - "lastModifiedByType": "User", - "lastModifiedAt": "2021-08-31T13:01:50.328Z" - }, - "properties": { - "compressedQuery": "DQAKAEkAYQBtAF8AUABhAHMAcwB3AG8AcgBkAFAAbwBsAGkAYwB5ACAADQAKAHwAIABlAHgAdABlAG4AZAAgAEgAZQBhAGwAdABoAFMAdABhAHQAdQBzACAAPQAgAGkAZgBmACgAdABvAGkAbgB0ACgAUgBlAGMAbwByAGQALgBNAGkAbgBpAG0AdQBtAFAAYQBzAHMAdwBvAHIAZABMAGUAbgBnAHQAaAApACAAPAAgADgALAAgACcAVQBOAEgARQBBAEwAVABIAFkAJwAsACAAJwBIAEUAQQBMAFQASABZACcAKQANAAoA", - "supportedCloud": "AWS", - "severity": "Low", - "displayName": "Password Policy", - "description": "organization passwords policy", - "remediationDescription": "Change password policy to...", - "assessmentKey": "fc1dbcd0-502c-4eab-9312-4014cfc8ea56" - } - } - ], - "nextLink": "link" - } - } - } -} diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomEntityStoreAssignments/customEntityStoreAssignmentCreate_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomEntityStoreAssignments/customEntityStoreAssignmentCreate_example.json deleted file mode 100644 index b7b091d106bb..000000000000 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomEntityStoreAssignments/customEntityStoreAssignmentCreate_example.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "parameters": { - "api-version": "2021-12-01-preview", - "subscriptionId": "e5d1b86c-3051-44d5-8802-aa65d45a279b", - "resourceGroupName": "TestResourceGroup", - "customEntityStoreAssignmentName": "33e7cc6e-a139-4723-a0e5-76993aee0771", - "customEntityStoreAssignmentRequestBody": { - "properties": { - "principal": "aaduser=f3923a3e-ad57-4752-b1a9-fbf3c8e5e082;72f988bf-86f1-41af-91ab-2d7cd011db47" - } - } - }, - "responses": { - "200": { - "body": { - "id": "/subscriptions/e5d1b86c-3051-44d5-8802-aa65d45a279b/resourcegroups/TestResourceGroup/providers/Microsoft.Security/customEntityStoreAssignments/33e7cc6e-a139-4723-a0e5-76993aee0771", - "name": "33e7cc6e-a139-4723-a0e5-76993aee0771", - "type": "Microsoft.Security/customEntityStoreAssignments", - "systemData": { - "createdBy": "user@contoso.com", - "createdByType": "User", - "createdAt": "2021-08-31T13:47:50.328Z", - "lastModifiedBy": "user@contoso.com", - "lastModifiedByType": "User", - "lastModifiedAt": "2021-08-31T13:47:50.328Z" - }, - "properties": { - "principal": "aaduser=f3923a3e-ad57-4752-b1a9-fbf3c8e5e082;72f988bf-86f1-41af-91ab-2d7cd011db47", - "entityStoreDatabaseLink": "https://dataexplorer.azure.com/clusters/securitydatastore.centralus/databases/DiscoveryAwsKedamari?query=H4sIAAAAAAAAAwtILC4uzy9KCcjPyUyu5OWqUShJzE5VMAQAlMJzABgAAAA=" - } - } - }, - "201": { - "body": { - "id": "/subscriptions/e5d1b86c-3051-44d5-8802-aa65d45a279b/resourcegroups/TestResourceGroup/providers/Microsoft.Security/customEntityStoreAssignments/33e7cc6e-a139-4723-a0e5-76993aee0771", - "name": "33e7cc6e-a139-4723-a0e5-76993aee0771", - "type": "Microsoft.Security/customEntityStoreAssignments", - "systemData": { - "createdBy": "user@contoso.com", - "createdByType": "User", - "createdAt": "2021-08-31T13:01:50.328Z", - "lastModifiedBy": "user@contoso.com", - "lastModifiedByType": "User", - "lastModifiedAt": "2021-08-31T13:01:50.328Z" - }, - "properties": { - "principal": "aaduser=f3923a3e-ad57-4752-b1a9-fbf3c8e5e082;72f988bf-86f1-41af-91ab-2d7cd011db47", - "entityStoreDatabaseLink": "https://dataexplorer.azure.com/clusters/securitydatastore.centralus/databases/DiscoveryAwsKedamari?query=H4sIAAAAAAAAAwtILC4uzy9KCcjPyUyu5OWqUShJzE5VMAQAlMJzABgAAAA=" - } - } - } - } -} diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomEntityStoreAssignments/customEntityStoreAssignmentDelete_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomEntityStoreAssignments/customEntityStoreAssignmentDelete_example.json deleted file mode 100644 index 8015575921cf..000000000000 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomEntityStoreAssignments/customEntityStoreAssignmentDelete_example.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parameters": { - "api-version": "2021-12-01-preview", - "subscriptionId": "e5d1b86c-3051-44d5-8802-aa65d45a279b", - "resourceGroupName": "TestResourceGroup", - "customEntityStoreAssignmentName": "33e7cc6e-a139-4723-a0e5-76993aee0771" - }, - "responses": { - "200": {}, - "204": {} - } -} diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomEntityStoreAssignments/customEntityStoreAssignmentGet_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomEntityStoreAssignments/customEntityStoreAssignmentGet_example.json deleted file mode 100644 index 19bff704b3b8..000000000000 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomEntityStoreAssignments/customEntityStoreAssignmentGet_example.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "parameters": { - "api-version": "2021-12-01-preview", - "subscriptionId": "e5d1b86c-3051-44d5-8802-aa65d45a279b", - "resourceGroupName": "TestResourceGroup", - "customEntityStoreAssignmentName": "33e7cc6e-a139-4723-a0e5-76993aee0771" - }, - "responses": { - "200": { - "body": { - "id": "/subscriptions/e5d1b86c-3051-44d5-8802-aa65d45a279b/resourcegroups/TestResourceGroup/providers/Microsoft.Security/customEntityStoreAssignments/33e7cc6e-a139-4723-a0e5-76993aee0771", - "name": "33e7cc6e-a139-4723-a0e5-76993aee0771", - "type": "Microsoft.Security/customEntityStoreAssignments", - "systemData": { - "createdBy": "user@contoso.com", - "createdByType": "User", - "createdAt": "2021-08-31T13:47:50.328Z", - "lastModifiedBy": "user@contoso.com", - "lastModifiedByType": "User", - "lastModifiedAt": "2021-08-31T13:47:50.328Z" - }, - "properties": { - "principal": "aaduser=f3923a3e-ad57-4752-b1a9-fbf3c8e5e082;72f988bf-86f1-41af-91ab-2d7cd011db47", - "entityStoreDatabaseLink": "https://dataexplorer.azure.com/clusters/securitydatastore.centralus/databases/DiscoveryAwsKedamari?query=H4sIAAAAAAAAAwtILC4uzy9KCcjPyUyu5OWqUShJzE5VMAQAlMJzABgAAAA=" - } - } - } - } -} diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomEntityStoreAssignments/customEntityStoreAssignmentListByResourceGroup_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomEntityStoreAssignments/customEntityStoreAssignmentListByResourceGroup_example.json deleted file mode 100644 index 18e2e4fa1912..000000000000 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomEntityStoreAssignments/customEntityStoreAssignmentListByResourceGroup_example.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "parameters": { - "api-version": "2021-12-01-preview", - "subscriptionId": "e5d1b86c-3051-44d5-8802-aa65d45a279b", - "resourceGroupName": "TestResourceGroup" - }, - "responses": { - "200": { - "body": { - "value": [ - { - "id": "/subscriptions/e5d1b86c-3051-44d5-8802-aa65d45a279b/resourcegroups/TestResourceGroup/providers/Microsoft.Security/customEntityStoreAssignments/33e7cc6e-a139-4723-a0e5-76993aee0771", - "name": "33e7cc6e-a139-4723-a0e5-76993aee0771", - "type": "Microsoft.Security/customEntityStoreAssignments", - "systemData": { - "createdBy": "user@contoso.com", - "createdByType": "User", - "createdAt": "2021-08-31T13:47:50.328Z", - "lastModifiedBy": "user@contoso.com", - "lastModifiedByType": "User", - "lastModifiedAt": "2021-08-31T13:47:50.328Z" - }, - "properties": { - "principal": "aaduser=f3923a3e-ad57-4752-b1a9-fbf3c8e5e082;72f988bf-86f1-41af-91ab-2d7cd011db47", - "entityStoreDatabaseLink": "https://dataexplorer.azure.com/clusters/securitydatastore.centralus/databases/DiscoveryAwsKedamari?query=H4sIAAAAAAAAAwtILC4uzy9KCcjPyUyu5OWqUShJzE5VMAQAlMJzABgAAAA=" - } - }, - { - "id": "/subscriptions/e5d1b86c-3051-44d5-8802-aa65d45a279b/resourcegroups/TestResourceGroup/providers/Microsoft.Security/customEntityStoreAssignments/a400695c-4728-d5cc-8e19-4b5a76f209df", - "name": "a400695c-4728-d5cc-8e19-4b5a76f209df", - "type": "Microsoft.Security/customEntityStoreAssignments", - "properties": { - "principal": "aaduser=f6e2564c-f34a-9b61-416c-5e5e7e521118;72f988bf-86f1-41af-91ab-2d7cd011db47", - "entityStoreDatabaseLink": "https://dataexplorer.azure.com/clusters/securitydatastore.centralus/databases/DiscoveryAwsKedamari?query=H4sIAAAAAAAAAwvIz8lMrgzKz0nlqlFIrShJzUtR8Cz2SE3MKcmoVLBVUE9LzClOVQcA1IFnficAAAA=" - } - } - ], - "nextLink": null - } - } - } -} diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomEntityStoreAssignments/customEntityStoreAssignmentListBySubscription_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomEntityStoreAssignments/customEntityStoreAssignmentListBySubscription_example.json deleted file mode 100644 index 45d0e3581ef5..000000000000 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/CustomEntityStoreAssignments/customEntityStoreAssignmentListBySubscription_example.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "parameters": { - "api-version": "2021-12-01-preview", - "subscriptionId": "e5d1b86c-3051-44d5-8802-aa65d45a279b" - }, - "responses": { - "200": { - "body": { - "value": [ - { - "id": "/subscriptions/e5d1b86c-3051-44d5-8802-aa65d45a279b/resourcegroups/TestResourceGroup/providers/Microsoft.Security/customEntityStoreAssignments/33e7cc6e-a139-4723-a0e5-76993aee0771", - "name": "33e7cc6e-a139-4723-a0e5-76993aee0771", - "type": "Microsoft.Security/customEntityStoreAssignments", - "systemData": { - "createdBy": "user@contoso.com", - "createdByType": "User", - "createdAt": "2021-08-31T13:47:50.328Z", - "lastModifiedBy": "user@contoso.com", - "lastModifiedByType": "User", - "lastModifiedAt": "2021-08-31T13:47:50.328Z" - }, - "properties": { - "principal": "aaduser=f3923a3e-ad57-4752-b1a9-fbf3c8e5e082;72f988bf-86f1-41af-91ab-2d7cd011db47", - "entityStoreDatabaseLink": "https://dataexplorer.azure.com/clusters/securitydatastore.centralus/databases/DiscoveryAwsKedamari?query=H4sIAAAAAAAAAwtILC4uzy9KCcjPyUyu5OWqUShJzE5VMAQAlMJzABgAAAA=" - } - }, - { - "id": "/subscriptions/e5d1b86c-3051-44d5-8802-aa65d45a279b/resourcegroups/TestResourceGroup/providers/Microsoft.Security/customEntityStoreAssignments/a400695c-4728-d5cc-8e19-4b5a76f209df", - "name": "a400695c-4728-d5cc-8e19-4b5a76f209df", - "type": "Microsoft.Security/customEntityStoreAssignments", - "systemData": { - "createdBy": "user@contoso.com", - "createdByType": "User", - "createdAt": "2021-08-31T13:01:50.328Z", - "lastModifiedBy": "user@contoso.com", - "lastModifiedByType": "User", - "lastModifiedAt": "2021-08-31T13:01:50.328Z" - }, - "properties": { - "principal": "aaduser=f6e2564c-f34a-9b61-416c-5e5e7e521118;72f988bf-86f1-41af-91ab-2d7cd011db47", - "entityStoreDatabaseLink": "https://dataexplorer.azure.com/clusters/securitydatastore.centralus/databases/DiscoveryAwsKedamari?query=H4sIAAAAAAAAAwvIz8lMrgzKz0nlqlFIrShJzUtR8Cz2SE3MKcmoVLBVUE9LzClOVQcA1IFnficAAAA=" - } - } - ], - "nextLink": null - } - } - } -} diff --git a/specification/security/resource-manager/readme.md b/specification/security/resource-manager/readme.md index c33c26869034..d4349eddf7c5 100644 --- a/specification/security/resource-manager/readme.md +++ b/specification/security/resource-manager/readme.md @@ -80,8 +80,6 @@ These settings apply only when `--tag=package-preview-2021-12` is specified on t ```yaml $(tag) == 'package-preview-2021-12' input-file: - - Microsoft.Security/preview/2021-12-01-preview/customAssessmentAutomation.json - - Microsoft.Security/preview/2021-12-01-preview/customEntityStoreAssignment.json - Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json ``` ### Tag: package-preview-2021-08 From a8d597b09fb56b8f27109419c67563b569f7035e Mon Sep 17 00:00:00 2001 From: Sapir Elmakayes Date: Tue, 14 Dec 2021 17:28:34 +0200 Subject: [PATCH 05/36] Adding CspmMonitorGcp offering --- .../securityConnectors.json | 31 +++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json index 473c8711d813..0ad46f2ce6e2 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json @@ -340,7 +340,7 @@ "properties": { "hierarchyIdentifier": { "type": "string", - "description": "The multi cloud resource identifier (account id in case of AWS connector)." + "description": "The multi cloud resource identifier (account id in case of AWS connector, project number in case of GCP connector)." }, "cloudName": { "type": "string", @@ -412,7 +412,8 @@ "enum": [ "CspmMonitorAws", "DefenderForContainersAws", - "DefenderForServersAws" + "DefenderForServersAws", + "CspmMonitorGcp" ], "x-ms-enum": { "name": "OfferingType", @@ -549,6 +550,32 @@ } } } + }, + "cspmMonitorGcpOffering": { + "type": "object", + "description": "The CSPM monitoring for GCP offering configurations", + "x-ms-discriminator-value": "CspmMonitorGcp", + "allOf": [ + { + "$ref": "#/definitions/cloudOffering" + } + ], + "properties": { + "workloadIdentityProviderId": { + "type": "string", + "description": "The GCP workload identity provider id for the offering" + }, + "nativeCloudConnection": { + "type": "object", + "description": "The native cloud connection configuration", + "properties": { + "serviceAccountEmailAddress": { + "type": "string", + "description": "The service account email address in GCP for this offering" + } + } + } + } } }, "parameters": { From 49f4f1f3ea546b211b9d9b8048e95344bf369cf5 Mon Sep 17 00:00:00 2001 From: Sapir Elmakayes Date: Tue, 14 Dec 2021 17:42:09 +0200 Subject: [PATCH 06/36] minors --- specification/security/resource-manager/readme.md | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/specification/security/resource-manager/readme.md b/specification/security/resource-manager/readme.md index d4349eddf7c5..a3af6674f3b5 100644 --- a/specification/security/resource-manager/readme.md +++ b/specification/security/resource-manager/readme.md @@ -66,7 +66,7 @@ These are the global settings for the Security API. title: SecurityCenter description: API spec for Microsoft.Security (Azure Security Center) resource provider openapi-type: arm -tag: package-preview-2021-12 +tag: package-composite-v3 ``` ### Composite packages @@ -93,7 +93,7 @@ input-file: override-info: title: SecurityCenter -``` +``` ### Tag: package-composite-v1 @@ -463,7 +463,7 @@ override-info: These settings apply only when `--tag=package-2021-07-preview-only` is specified on the command line. -``` yaml $(tag) == 'package-2021-07-preview-only' +```yaml $(tag) == 'package-2021-07-preview-only' input-file: - Microsoft.Security/preview/2021-07-01-preview/customAssessmentAutomation.json - Microsoft.Security/preview/2021-07-01-preview/customEntityStoreAssignment.json @@ -473,7 +473,7 @@ input-file: These settings apply only when `--tag=package-2021-10-preview-only` is specified on the command line. -``` yaml $(tag) == 'package-2021-10-preview-only' +```yaml $(tag) == 'package-2021-10-preview-only' input-file: - Microsoft.Security/preview/2021-10-01-preview/mdeOnboardings.json ``` @@ -481,8 +481,7 @@ input-file: # Needed when there is more than one input file override-info: -title: SecurityCenter - + title: SecurityCenter ``` ### Tag: package-2021-06-only From 7b35f8bf1b413b9f6513cbb7bed5d3ce0335ab58 Mon Sep 17 00:00:00 2001 From: Sapir Elmakayes Date: Thu, 16 Dec 2021 16:09:23 +0200 Subject: [PATCH 07/36] Adding Security connector --- ...ecurityConnectorResourceGroup_example.json | 7 +- ...curityConnectorsResourceGroup_example.json | 85 ++++++++++++++++++- ...ecurityConnectorsSubscription_example.json | 7 +- .../PatchSecurityConnector_example.json | 12 ++- .../PutSecurityConnector_example.json | 20 +++-- .../securityConnectors.json | 69 ++++++++++++++- 6 files changed, 182 insertions(+), 18 deletions(-) diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorResourceGroup_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorResourceGroup_example.json index a81cf20dfb5e..72b02eefe10b 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorResourceGroup_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorResourceGroup_example.json @@ -24,9 +24,12 @@ "lastModifiedAt": "2021-08-31T13:47:50.328Z" }, "properties": { - "organizationalData": null, + "environmentData": { + "environmentType": "AWS", + "organizationalData": null + }, "hierarchyIdentifier": "exampleHierarchyId", - "cloudName": "AWS", + "environmentName": "AWS", "offerings": [ { "offeringType": "CspmMonitorAws", diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorsResourceGroup_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorsResourceGroup_example.json index 4aac780ff185..ace5035ca300 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorsResourceGroup_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorsResourceGroup_example.json @@ -9,8 +9,8 @@ "body": { "value": [ { - "id": "/subscriptions/a5caac9c-5c04-49af-b3d0-e204f40345d5/resourceGroups/exampleResourceGroup/providers/Microsoft.Security/securityConnectors/exampleSecurityConnectorName", - "name": "exampleSecurityConnectorName", + "id": "/subscriptions/a5caac9c-5c04-49af-b3d0-e204f40345d5/resourceGroups/exampleResourceGroup/providers/Microsoft.Security/securityConnectors/exampleSecurityConnectorAws", + "name": "exampleSecurityConnectorAws", "type": "Microsoft.Security/securityConnectors", "etag": "etag value", "kind": "", @@ -26,8 +26,11 @@ }, "properties": { "hierarchyIdentifier": "exampleHierarchyId", - "organizationalData": null, - "cloudName": "AWS", + "environmentData": { + "environmentType": "AWS", + "organizationalData": null + }, + "environmentName": "AWS", "offerings": [ { "offeringType": "CspmMonitorAws", @@ -37,6 +40,80 @@ } ] } + }, + { + "id": "/subscriptions/a5caac9c-5c04-49af-b3d0-e204f40345d5/resourceGroups/exampleResourceGroup/providers/Microsoft.Security/securityConnectors/exampleSecurityConnectorAwsOrganization", + "name": "exampleSecurityConnectorAwsOrganization", + "type": "Microsoft.Security/securityConnectors", + "etag": "etag value", + "kind": "", + "location": "Central US", + "tags": {}, + "systemData": { + "createdBy": "user@contoso.com", + "createdByType": "User", + "createdAt": "2021-12-15T13:47:50.328Z", + "lastModifiedBy": "user@contoso.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2021-12-15T13:47:50.328Z" + }, + "properties": { + "hierarchyIdentifier": "exampleHierarchyId", + "environmentData": { + "environmentType": "AWS", + "organizationalData": { + "organizationMembershipType": "Organization", + "stacksetName": "myStackSetName", + "excludedAccountIds": [ + "excludedAccountIdExample" + ] + } + }, + "environmentName": "AWS", + "offerings": [ + { + "offeringType": "CspmMonitorAws", + "nativeCloudConnection": { + "cloudRoleArn": "arn:aws:iam::00000000:role/ASCMonitor" + } + } + ] + } + }, + { + "id": "/subscriptions/a5caac9c-5c04-49af-b3d0-e204f40345d5/resourceGroups/exampleResourceGroup/providers/Microsoft.Security/securityConnectors/exampleSecurityConnectorGcp", + "name": "exampleSecurityConnectorGcp", + "type": "Microsoft.Security/securityConnectors", + "etag": "etag value", + "kind": "", + "location": "Central US", + "tags": {}, + "systemData": { + "createdBy": "user@contoso.com", + "createdByType": "User", + "createdAt": "2021-12-15T13:47:50.328Z", + "lastModifiedBy": "user@contoso.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2021-12-15T13:47:50.328Z" + }, + "properties": { + "hierarchyIdentifier": "exampleHierarchyId", + "environmentData": { + "environmentType": "GcpProject", + "projectName": "My GCP Project", + "workloadIdentityFederationPoolId": "My workload identity federation id" + }, + "environmentName": "GCP", + "offerings": [ + { + "offeringType": "CspmMonitorGcp", + "workloadIdentityProviderId": "My workload identity provider Id", + "nativeCloudConnection": { + "serviceAccountEmailAddress": "capm@projectName.com" + } + } + ] + } } ] } diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorsSubscription_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorsSubscription_example.json index ca7b00c851b5..5cf2d06f2b94 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorsSubscription_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorsSubscription_example.json @@ -24,8 +24,11 @@ }, "properties": { "hierarchyIdentifier": "exampleHierarchyId", - "organizationalData": null, - "cloudName": "AWS", + "environmentData": { + "environmentType": "AWS", + "organizationalData": null + }, + "environmentName": "AWS", "offerings": [ { "offeringType": "CspmMonitorAws", diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/PatchSecurityConnector_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/PatchSecurityConnector_example.json index 408f4e1f9c67..4968cb72cc14 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/PatchSecurityConnector_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/PatchSecurityConnector_example.json @@ -10,7 +10,10 @@ "tags": {}, "properties": { "hierarchyIdentifier": "exampleHierarchyId", - "cloudName": "AWS", + "environmentData": { + "environmentType": "AWS" + }, + "environmentName": "AWS", "offerings": [ { "offeringType": "CspmMonitorAws", @@ -42,8 +45,11 @@ }, "properties": { "hierarchyIdentifier": "exampleHierarchyId", - "organizationalData": null, - "cloudName": "AWS", + "environmentData": { + "environmentType": "AWS", + "organizationalData": null + }, + "environmentName": "AWS", "offerings": [ { "offeringType": "CspmMonitorAws", diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/PutSecurityConnector_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/PutSecurityConnector_example.json index 25cd5b71b99d..555847c64186 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/PutSecurityConnector_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/PutSecurityConnector_example.json @@ -10,7 +10,11 @@ "tags": {}, "properties": { "hierarchyIdentifier": "exampleHierarchyId", - "cloudName": "AWS", + "environmentName": "AWS", + "environmentData": { + "environmentType": "AWS", + "organizationalData": null + }, "offerings": [ { "offeringType": "CspmMonitorAws", @@ -42,8 +46,11 @@ }, "properties": { "hierarchyIdentifier": "exampleHierarchyId", - "organizationalData": null, - "cloudName": "AWS", + "environmentData": { + "environmentType": "AWS", + "organizationalData": null + }, + "environmentName": "AWS", "offerings": [ { "offeringType": "CspmMonitorAws", @@ -74,8 +81,11 @@ }, "properties": { "hierarchyIdentifier": "exampleHierarchyId", - "organizationalData": null, - "cloudName": "AWS", + "environmentData": { + "environmentType": "AWS", + "organizationalData": null + }, + "environmentName": "AWS", "offerings": [ { "offeringType": "CspmMonitorAws", diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json index 0ad46f2ce6e2..b59ee40f153c 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json @@ -342,7 +342,7 @@ "type": "string", "description": "The multi cloud resource identifier (account id in case of AWS connector, project number in case of GCP connector)." }, - "cloudName": { + "environmentName": { "type": "string", "description": "The multi cloud resource's cloud name.", "enum": [ @@ -362,6 +362,48 @@ "$ref": "#/definitions/cloudOffering" } }, + "environmentData": { + "type": "object", + "description": "The security connector environment data.", + "$ref": "#/definitions/EnvironmentData" + } + } + }, + "EnvironmentData": { + "type": "object", + "description": "The security connector environment data.", + "discriminator": "environmentType", + "required": [ + "environmentType" + ], + "properties": { + "environmentType": { + "type": "string", + "description": "The type of the environment data.", + "enum": [ + "AwsEnvironmentData", + "GcpProjectEnvironmentData" + ], + "x-ms-enum": { + "name": "environmentType", + "modelAsString": true + } + } + } + }, + "AWS": { + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/EnvironmentData" + } + ], + "properties": { + "environmentType": { + "type": "string", + "description": "The environment type", + "x-ms-discriminator-value": "AwsEnvironmentData" + }, "organizationalData": { "type": "object", "description": "The multi cloud account's organizational data", @@ -398,6 +440,29 @@ } } }, + "GcpProject": { + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/EnvironmentData" + } + ], + "properties": { + "environmentType": { + "type": "string", + "description": "The environment type", + "x-ms-discriminator-value": "GcpProjectEnvironmentData" + }, + "projectName": { + "type": "string", + "description": "The GCP Project name" + }, + "workloadIdentityFederationPoolId": { + "type": "string", + "description": "The GCP workload identity federation pool id" + } + } + }, "cloudOffering": { "type": "object", "description": "The security offering details", @@ -504,7 +569,7 @@ "defenderForServersAwsOffering": { "type": "object", "description": "The Defender for Servers AWS offering configurations", - "x-ms-discriminator-value": "DefenderForServersAWS", + "x-ms-discriminator-value": "DefenderForServersAws", "allOf": [ { "$ref": "#/definitions/cloudOffering" From bee66741cc16e97b65b261b65bb62e60c26d89ff Mon Sep 17 00:00:00 2001 From: Sapir Elmakayes Date: Thu, 16 Dec 2021 16:56:36 +0200 Subject: [PATCH 08/36] Fix prettier issue --- .../GetSecurityConnectorsResourceGroup_example.json | 2 +- .../preview/2021-12-01-preview/securityConnectors.json | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorsResourceGroup_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorsResourceGroup_example.json index ace5035ca300..31d5cae8ed91 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorsResourceGroup_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorsResourceGroup_example.json @@ -65,7 +65,7 @@ "organizationMembershipType": "Organization", "stacksetName": "myStackSetName", "excludedAccountIds": [ - "excludedAccountIdExample" + "excludedAccountIdExample" ] } }, diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json index b59ee40f153c..d4abf8b6520a 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json @@ -393,6 +393,7 @@ }, "AWS": { "type": "object", + "description": "The aws connector environment data", "allOf": [ { "$ref": "#/definitions/EnvironmentData" @@ -442,6 +443,7 @@ }, "GcpProject": { "type": "object", + "description": "The GCP project connector environment data", "allOf": [ { "$ref": "#/definitions/EnvironmentData" From 480e272aa164b9acbf5b7457482b41b4be756049 Mon Sep 17 00:00:00 2001 From: Sapir Elmakayes Date: Tue, 21 Dec 2021 10:19:35 +0200 Subject: [PATCH 09/36] Adding information protection offering --- .../securityConnectors.json | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json index d4abf8b6520a..e275a6ac3064 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json @@ -480,6 +480,7 @@ "CspmMonitorAws", "DefenderForContainersAws", "DefenderForServersAws", + "InformationProtectionAws", "CspmMonitorGcp" ], "x-ms-enum": { @@ -618,6 +619,28 @@ } } }, + "informationProtectionAwsOffering": { + "type": "object", + "description": "The information protection for AWS offering configurations", + "x-ms-discriminator-value": "InformationProtectionAws", + "allOf": [ + { + "$ref": "#/definitions/cloudOffering" + } + ], + "properties": { + "informationProtection": { + "type": "object", + "description": "The native cloud connection configuration", + "properties": { + "cloudRoleArn": { + "type": "string", + "description": "The cloud role ARN in AWS for this feature" + } + } + } + } + }, "cspmMonitorGcpOffering": { "type": "object", "description": "The CSPM monitoring for GCP offering configurations", From e203f516f3585ed05b2724ca1fee26739c42703d Mon Sep 17 00:00:00 2001 From: Sapir Elmakayes Date: Wed, 22 Dec 2021 10:31:09 +0200 Subject: [PATCH 10/36] Adding suppression rule --- specification/security/resource-manager/readme.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/specification/security/resource-manager/readme.md b/specification/security/resource-manager/readme.md index a3af6674f3b5..73a1015c255b 100644 --- a/specification/security/resource-manager/readme.md +++ b/specification/security/resource-manager/readme.md @@ -56,6 +56,10 @@ directive: where: $.paths from: standards.json reason: Suppression of OperationsAPI as it doesn't apply to this specific file. + - suppress: OperationsAPIImplementation + where: $.paths + from: securityConnectors.json + reason: Suppression of OperationsAPI as it doesn't apply to this specific file ``` ### Basic Information From 0f1c6ac35a840f2e509e5814f459bb904f6352ee Mon Sep 17 00:00:00 2001 From: chemishumacher Date: Wed, 26 Jan 2022 11:26:29 +0200 Subject: [PATCH 11/36] added github configuration, fixed bugs --- .../securityConnectors.json | 72 ++++++++----------- 1 file changed, 29 insertions(+), 43 deletions(-) diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json index e275a6ac3064..3898b2dc5c70 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json @@ -348,7 +348,8 @@ "enum": [ "Azure", "AWS", - "GCP" + "GCP", + "Github" ], "x-ms-enum": { "name": "cloudName", @@ -382,7 +383,8 @@ "description": "The type of the environment data.", "enum": [ "AwsEnvironmentData", - "GcpProjectEnvironmentData" + "GcpProjectEnvironmentData", + "GithubScopeEnvironmentData" ], "x-ms-enum": { "name": "environmentType", @@ -394,11 +396,6 @@ "AWS": { "type": "object", "description": "The aws connector environment data", - "allOf": [ - { - "$ref": "#/definitions/EnvironmentData" - } - ], "properties": { "environmentType": { "type": "string", @@ -444,11 +441,6 @@ "GcpProject": { "type": "object", "description": "The GCP project connector environment data", - "allOf": [ - { - "$ref": "#/definitions/EnvironmentData" - } - ], "properties": { "environmentType": { "type": "string", @@ -465,6 +457,17 @@ } } }, + "GithubScope": { + "type": "object", + "description": "The github scope connector's environment data", + "properties": { + "environmentType": { + "type": "string", + "description": "The environment type", + "x-ms-discriminator-value": "GithubScopeEnvironmentData" + } + } + }, "cloudOffering": { "type": "object", "description": "The security offering details", @@ -481,7 +484,8 @@ "DefenderForContainersAws", "DefenderForServersAws", "InformationProtectionAws", - "CspmMonitorGcp" + "CspmMonitorGcp", + "CspmMonitorGithub" ], "x-ms-enum": { "name": "OfferingType", @@ -497,13 +501,8 @@ }, "cspmMonitorAwsOffering": { "type": "object", - "description": "The CSPM monitoring for AWS offering configurations", + "description": "The CSPM monitoring for AWS offering", "x-ms-discriminator-value": "CspmMonitorAws", - "allOf": [ - { - "$ref": "#/definitions/cloudOffering" - } - ], "properties": { "nativeCloudConnection": { "type": "object", @@ -519,13 +518,8 @@ }, "defenderForContainersAwsOffering": { "type": "object", - "description": "The Defender for Containers AWS offering configurations", + "description": "The Defender for Containers AWS offering", "x-ms-discriminator-value": "DefenderForContainersAws", - "allOf": [ - { - "$ref": "#/definitions/cloudOffering" - } - ], "properties": { "kubernetesService": { "type": "object", @@ -571,13 +565,8 @@ }, "defenderForServersAwsOffering": { "type": "object", - "description": "The Defender for Servers AWS offering configurations", + "description": "The Defender for Servers AWS offering", "x-ms-discriminator-value": "DefenderForServersAws", - "allOf": [ - { - "$ref": "#/definitions/cloudOffering" - } - ], "properties": { "defenderForServers": { "type": "object", @@ -621,13 +610,8 @@ }, "informationProtectionAwsOffering": { "type": "object", - "description": "The information protection for AWS offering configurations", + "description": "The information protection for AWS offering", "x-ms-discriminator-value": "InformationProtectionAws", - "allOf": [ - { - "$ref": "#/definitions/cloudOffering" - } - ], "properties": { "informationProtection": { "type": "object", @@ -643,13 +627,8 @@ }, "cspmMonitorGcpOffering": { "type": "object", - "description": "The CSPM monitoring for GCP offering configurations", + "description": "The CSPM monitoring for GCP offering", "x-ms-discriminator-value": "CspmMonitorGcp", - "allOf": [ - { - "$ref": "#/definitions/cloudOffering" - } - ], "properties": { "workloadIdentityProviderId": { "type": "string", @@ -666,6 +645,13 @@ } } } + }, + "cspmMonitorGithubOffering": { + "type": "object", + "description": "The CSPM monitoring for github offering", + "x-ms-discriminator-value": "CspmMonitorGithub", + "properties": { + } } }, "parameters": { From 29ed3520bf3fc2c5408c7bcdad0eec0b51b98c37 Mon Sep 17 00:00:00 2001 From: chemishumacher Date: Thu, 27 Jan 2022 00:11:37 +0200 Subject: [PATCH 12/36] updated examples --- ...urityConnectorSingleResource_example.json} | 0 ...ecurityConnectorsSubscription_example.json | 79 ++++++++++++++++++- .../securityConnectors.json | 8 +- 3 files changed, 81 insertions(+), 6 deletions(-) rename specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/{GetSecurityConnectorResourceGroup_example.json => GetSecurityConnectorSingleResource_example.json} (100%) diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorResourceGroup_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorSingleResource_example.json similarity index 100% rename from specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorResourceGroup_example.json rename to specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorSingleResource_example.json diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorsSubscription_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorsSubscription_example.json index 5cf2d06f2b94..1aeecf1b4084 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorsSubscription_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorsSubscription_example.json @@ -8,10 +8,11 @@ "body": { "value": [ { - "id": "/subscriptions/a5caac9c-5c04-49af-b3d0-e204f40345d5/resourceGroups/exampleResourceGroup/providers/Microsoft.Security/securityConnectors/exampleSecurityConnectorName", - "name": "exampleSecurityConnectorName", + "id": "/subscriptions/a5caac9c-5c04-49af-b3d0-e204f40345d5/resourceGroups/exampleResourceGroup1/providers/Microsoft.Security/securityConnectors/exampleSecurityConnectorAws", + "name": "exampleSecurityConnectorAws", "type": "Microsoft.Security/securityConnectors", "etag": "etag value", + "kind": "", "location": "Central US", "tags": {}, "systemData": { @@ -38,6 +39,80 @@ } ] } + }, + { + "id": "/subscriptions/a5caac9c-5c04-49af-b3d0-e204f40345d5/resourceGroups/exampleResourceGroup2/providers/Microsoft.Security/securityConnectors/exampleSecurityConnectorAwsOrganization", + "name": "exampleSecurityConnectorAwsOrganization", + "type": "Microsoft.Security/securityConnectors", + "etag": "etag value", + "kind": "", + "location": "Central US", + "tags": {}, + "systemData": { + "createdBy": "user@contoso.com", + "createdByType": "User", + "createdAt": "2021-12-15T13:47:50.328Z", + "lastModifiedBy": "user@contoso.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2021-12-15T13:47:50.328Z" + }, + "properties": { + "hierarchyIdentifier": "exampleHierarchyId", + "environmentData": { + "environmentType": "AWS", + "organizationalData": { + "organizationMembershipType": "Organization", + "stacksetName": "myStackSetName", + "excludedAccountIds": [ + "excludedAccountIdExample" + ] + } + }, + "environmentName": "AWS", + "offerings": [ + { + "offeringType": "CspmMonitorAws", + "nativeCloudConnection": { + "cloudRoleArn": "arn:aws:iam::00000000:role/ASCMonitor" + } + } + ] + } + }, + { + "id": "/subscriptions/a5caac9c-5c04-49af-b3d0-e204f40345d5/resourceGroups/exampleResourceGroup3/providers/Microsoft.Security/securityConnectors/exampleSecurityConnectorGcp", + "name": "exampleSecurityConnectorGcp", + "type": "Microsoft.Security/securityConnectors", + "etag": "etag value", + "kind": "", + "location": "Central US", + "tags": {}, + "systemData": { + "createdBy": "user@contoso.com", + "createdByType": "User", + "createdAt": "2021-12-15T13:47:50.328Z", + "lastModifiedBy": "user@contoso.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2021-12-15T13:47:50.328Z" + }, + "properties": { + "hierarchyIdentifier": "exampleHierarchyId", + "environmentData": { + "environmentType": "GcpProject", + "projectName": "My GCP Project", + "workloadIdentityFederationPoolId": "My workload identity federation id" + }, + "environmentName": "GCP", + "offerings": [ + { + "offeringType": "CspmMonitorGcp", + "workloadIdentityProviderId": "My workload identity provider Id", + "nativeCloudConnection": { + "serviceAccountEmailAddress": "capm@projectName.com" + } + } + ] + } } ] } diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json index 3898b2dc5c70..ba44dc3528e3 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json @@ -119,7 +119,7 @@ "get": { "x-ms-examples": { "Retrieve a security connector": { - "$ref": "./examples/SecurityConnectors/GetSecurityConnectorResourceGroup_example.json" + "$ref": "./examples/SecurityConnectors/GetSecurityConnectorSingleResource_example.json" } }, "tags": [ @@ -393,7 +393,7 @@ } } }, - "AWS": { + "AWSEnvironmentData": { "type": "object", "description": "The aws connector environment data", "properties": { @@ -438,7 +438,7 @@ } } }, - "GcpProject": { + "GcpProjectEnvironmentData": { "type": "object", "description": "The GCP project connector environment data", "properties": { @@ -457,7 +457,7 @@ } } }, - "GithubScope": { + "GithubScopeEnvironmentData": { "type": "object", "description": "The github scope connector's environment data", "properties": { From 0b0e5f96c7c5af02cae0181c900e2fd76f563a6c Mon Sep 17 00:00:00 2001 From: chemishumacher Date: Thu, 27 Jan 2022 00:47:11 +0200 Subject: [PATCH 13/36] added example --- ...ecurityConnectorsSubscription_example.json | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorsSubscription_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorsSubscription_example.json index 1aeecf1b4084..8f59dd311ee1 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorsSubscription_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorsSubscription_example.json @@ -79,6 +79,36 @@ ] } }, + { + "id": "/subscriptions/a5caac9c-5c04-49af-b3d0-e204f40345d5/resourceGroups/exampleResourceGroup3/providers/Microsoft.Security/securityConnectors/exampleSecurityConnectorGithub", + "name": "githubTest", + "etag": "etag value", + "type": "Microsoft.Security/securityconnectors", + "location": "centralus", + "kind": "", + "tags": { + }, + "systemData": { + "createdBy": "user@contoso.com", + "createdByType": "User", + "createdAt": "2021-12-15T13:47:50.328Z", + "lastModifiedBy": "user@contoso.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2021-12-15T13:47:50.328Z" + }, + "properties": { + "hierarchyIdentifier": "/subscriptions/a5caac9c-5c04-49af-b3d0-e204f40345d5/resourceGroups/exampleResourceGroup3/providers/Microsoft.SecurityDevops/githubConnectors/exampleGithubConnector", + "environmentName": "Github", + "environmentData": { + "environmentType": "GithubScope" + }, + "offerings": [ + { + "offeringType": "CspmMonitorGithub" + } + ] + } + }, { "id": "/subscriptions/a5caac9c-5c04-49af-b3d0-e204f40345d5/resourceGroups/exampleResourceGroup3/providers/Microsoft.Security/securityConnectors/exampleSecurityConnectorGcp", "name": "exampleSecurityConnectorGcp", From 17274ee7832b06b482400c7a3b355b759af40f58 Mon Sep 17 00:00:00 2001 From: chemishumacher Date: Tue, 1 Feb 2022 17:29:45 +0200 Subject: [PATCH 14/36] fixed bugs in offering inheritnece, added org data for aws/gcp objects, updated discriminators --- .../securityConnectors.json | 214 ++++++++++++++---- 1 file changed, 175 insertions(+), 39 deletions(-) diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json index ba44dc3528e3..23c3daf1358f 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json @@ -404,40 +404,64 @@ }, "organizationalData": { "type": "object", - "description": "The multi cloud account's organizational data", - "properties": { - "organizationMembershipType": { - "type": "string", - "description": "The multi cloud account's membership type in the organization", - "enum": [ - "Member", - "Organization" - ], - "x-ms-enum": { - "name": "organizationMembershipType", - "modelAsString": true - } - }, - "parentHierarchyId": { - "type": "string", - "description": "If the multi cloud account is not of membership type organization, this will be the ID of the account's parent" - }, - "stacksetName": { - "type": "string", - "description": "If the multi cloud account is of membership type organization, this will be the name of the onboarding stackset" - }, - "excludedAccountIds": { - "type": "array", - "description": "If the multi cloud account is of membership type organization, list of accounts excluded from offering", - "items": { - "type": "string", - "description": "account IDs" - } - } + "description": "The AWS account's organizational data", + "$ref": "#/definitions/AwsOrganizationData" + } + } + }, + "AwsOrganizationData":{ + "required": [ + "organizationMembershipType" + ], + "properties": { + "organizationMembershipType": { + "type": "string", + "description": "The multi cloud account's membership type in the organization", + "enum": [ + "Member", + "Organization" + ], + "x-ms-enum": { + "name": "organizationMembershipType", + "modelAsString": true } } } }, + "AwsOrganizationDataParent":{ + "properties": { + "organizationMembershipType": { + "type": "string", + "description": "The environment type", + "x-ms-discriminator-value": "Organization" + }, + "stacksetName": { + "type": "string", + "description": "If the multi cloud account is of membership type organization, this will be the name of the onboarding stackset" + }, + "excludedAccountIds": { + "type": "array", + "description": "If the multi cloud account is of membership type organization, list of accounts excluded from offering", + "items": { + "type": "string", + "description": "account IDs" + } + } + } + }, + "AwsOrganizationDataMember":{ + "properties": { + "organizationMembershipType": { + "type": "string", + "description": "The environment type", + "x-ms-discriminator-value": "Member" + }, + "parentHierarchyId": { + "type": "string", + "description": "If the multi cloud account is not of membership type organization, this will be the ID of the account's parent" + } + } + }, "GcpProjectEnvironmentData": { "type": "object", "description": "The GCP project connector environment data", @@ -447,9 +471,28 @@ "description": "The environment type", "x-ms-discriminator-value": "GcpProjectEnvironmentData" }, - "projectName": { + "organizationalData": { + "type": "object", + "description": "The Gcp project's organizational data", + "$ref": "#/definitions/GcpOrganizationData" + }, + "ProjectDetails": { + "type": "object", + "description": "The Gcp project's details", + "$ref": "#/definitions/GcpProjectDetails" + } + } + }, + "GcpProjectDetails": { + "properties": { + "projectNumber": { "type": "string", - "description": "The GCP Project name" + "description": "The unique GCP Project number", + "readOnly": true + }, + "projectId": { + "type": "string", + "description": "The GCP Project id" }, "workloadIdentityFederationPoolId": { "type": "string", @@ -457,6 +500,75 @@ } } }, + "GcpOrganizationData": { + "required": [ + "organizationMembershipType" + ], + "properties": { + "organizationMembershipType": { + "type": "string", + "description": "The multi cloud account's membership type in the organization", + "enum": [ + "Member", + "Organization" + ], + "x-ms-enum": { + "name": "organizationMembershipType", + "modelAsString": true + } + } + } + }, + "GcpOrganizationDataParent": { + "properties": { + "organizationMembershipType": { + "type": "string", + "description": "The organization data for parent security connector", + "x-ms-discriminator-value": "Organization" + }, + "excludedProjectNumbers": { + "type": "array", + "description": "If the multi cloud account is of membership type organization, list of accounts excluded from offering", + "items": { + "type": "string", + "description": "account IDs" + } + }, + "serviceAccountEmailAddress": { + "type": "string", + "description": "The service account email address which represents the organization level permissions container." + }, + "workloadIdentityProviderId": { + "type": "string", + "description": "The GCP workload identity provider id which represents the permissions required to auto provision security connectors" + } + } + }, + "GcpOrganizationDataMember": { + "properties": { + "organizationMembershipType": { + "type": "string", + "description": "The organization data for parent security connector", + "x-ms-discriminator-value": "Memberdd" + }, + "excludedProjectNumbers": { + "type": "array", + "description": "If the multi cloud account is of membership type organization, list of accounts excluded from offering", + "items": { + "type": "string", + "description": "account IDs" + } + }, + "serviceAccountEmailAddress": { + "type": "string", + "description": "The service account email address which represents the organization level permissions container." + }, + "workloadIdentityProviderId": { + "type": "string", + "description": "The GCP workload identity provider id which represents the permissions required to auto provision security connectors" + } + } + }, "GithubScopeEnvironmentData": { "type": "object", "description": "The github scope connector's environment data", @@ -488,7 +600,7 @@ "CspmMonitorGithub" ], "x-ms-enum": { - "name": "OfferingType", + "name": "offeringType", "modelAsString": true } }, @@ -502,8 +614,12 @@ "cspmMonitorAwsOffering": { "type": "object", "description": "The CSPM monitoring for AWS offering", - "x-ms-discriminator-value": "CspmMonitorAws", "properties": { + "offeringType": { + "type": "string", + "description": "The security offering details", + "x-ms-discriminator-value": "CspmMonitorAws" + }, "nativeCloudConnection": { "type": "object", "description": "The native cloud connection configuration", @@ -519,8 +635,12 @@ "defenderForContainersAwsOffering": { "type": "object", "description": "The Defender for Containers AWS offering", - "x-ms-discriminator-value": "DefenderForContainersAws", "properties": { + "offeringType": { + "type": "string", + "description": "The security offering details", + "x-ms-discriminator-value": "DefenderForContainersAws" + }, "kubernetesService": { "type": "object", "description": "The kubernetes service connection configuration", @@ -566,8 +686,12 @@ "defenderForServersAwsOffering": { "type": "object", "description": "The Defender for Servers AWS offering", - "x-ms-discriminator-value": "DefenderForServersAws", "properties": { + "offeringType": { + "type": "string", + "description": "The security offering details", + "x-ms-discriminator-value": "DefenderForServersAws" + }, "defenderForServers": { "type": "object", "description": "The Defender for servers connection configuration", @@ -611,8 +735,12 @@ "informationProtectionAwsOffering": { "type": "object", "description": "The information protection for AWS offering", - "x-ms-discriminator-value": "InformationProtectionAws", "properties": { + "offeringType": { + "type": "string", + "description": "The security offering details", + "x-ms-discriminator-value": "InformationProtectionAws" + }, "informationProtection": { "type": "object", "description": "The native cloud connection configuration", @@ -628,8 +756,12 @@ "cspmMonitorGcpOffering": { "type": "object", "description": "The CSPM monitoring for GCP offering", - "x-ms-discriminator-value": "CspmMonitorGcp", "properties": { + "offeringType": { + "type": "string", + "description": "The security offering details", + "x-ms-discriminator-value": "CspmMonitorGcp" + }, "workloadIdentityProviderId": { "type": "string", "description": "The GCP workload identity provider id for the offering" @@ -649,8 +781,12 @@ "cspmMonitorGithubOffering": { "type": "object", "description": "The CSPM monitoring for github offering", - "x-ms-discriminator-value": "CspmMonitorGithub", "properties": { + "offeringType": { + "type": "string", + "description": "The security offering details", + "x-ms-discriminator-value": "CspmMonitorGithub" + } } } }, From c24ec5871a28db1dfb98395cedca3f84ccf96ca6 Mon Sep 17 00:00:00 2001 From: chemishumacher Date: Tue, 1 Feb 2022 17:44:56 +0200 Subject: [PATCH 15/36] added discriminator for orgmembershipType on environmentData object, updated aws to awsAccount on examples for aws env data --- .../GetSecurityConnectorSingleResource_example.json | 2 +- .../GetSecurityConnectorsResourceGroup_example.json | 4 ++-- .../GetSecurityConnectorsSubscription_example.json | 4 ++-- .../SecurityConnectors/PatchSecurityConnector_example.json | 4 ++-- .../SecurityConnectors/PutSecurityConnector_example.json | 6 +++--- .../preview/2021-12-01-preview/securityConnectors.json | 6 ++++-- 6 files changed, 14 insertions(+), 12 deletions(-) diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorSingleResource_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorSingleResource_example.json index 72b02eefe10b..57ce260b8a1d 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorSingleResource_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorSingleResource_example.json @@ -25,7 +25,7 @@ }, "properties": { "environmentData": { - "environmentType": "AWS", + "environmentType": "AwsAccount", "organizationalData": null }, "hierarchyIdentifier": "exampleHierarchyId", diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorsResourceGroup_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorsResourceGroup_example.json index 31d5cae8ed91..7b8b2e1808ef 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorsResourceGroup_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorsResourceGroup_example.json @@ -27,7 +27,7 @@ "properties": { "hierarchyIdentifier": "exampleHierarchyId", "environmentData": { - "environmentType": "AWS", + "environmentType": "AwsAccount", "organizationalData": null }, "environmentName": "AWS", @@ -60,7 +60,7 @@ "properties": { "hierarchyIdentifier": "exampleHierarchyId", "environmentData": { - "environmentType": "AWS", + "environmentType": "AwsAccount", "organizationalData": { "organizationMembershipType": "Organization", "stacksetName": "myStackSetName", diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorsSubscription_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorsSubscription_example.json index 8f59dd311ee1..627338ee2aaa 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorsSubscription_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorsSubscription_example.json @@ -26,7 +26,7 @@ "properties": { "hierarchyIdentifier": "exampleHierarchyId", "environmentData": { - "environmentType": "AWS", + "environmentType": "AwsAccount", "organizationalData": null }, "environmentName": "AWS", @@ -59,7 +59,7 @@ "properties": { "hierarchyIdentifier": "exampleHierarchyId", "environmentData": { - "environmentType": "AWS", + "environmentType": "AwsAccount", "organizationalData": { "organizationMembershipType": "Organization", "stacksetName": "myStackSetName", diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/PatchSecurityConnector_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/PatchSecurityConnector_example.json index 4968cb72cc14..5f78e07ee884 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/PatchSecurityConnector_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/PatchSecurityConnector_example.json @@ -11,7 +11,7 @@ "properties": { "hierarchyIdentifier": "exampleHierarchyId", "environmentData": { - "environmentType": "AWS" + "environmentType": "AwsAccount" }, "environmentName": "AWS", "offerings": [ @@ -46,7 +46,7 @@ "properties": { "hierarchyIdentifier": "exampleHierarchyId", "environmentData": { - "environmentType": "AWS", + "environmentType": "AwsAccount", "organizationalData": null }, "environmentName": "AWS", diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/PutSecurityConnector_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/PutSecurityConnector_example.json index 555847c64186..c75cb275acd6 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/PutSecurityConnector_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/PutSecurityConnector_example.json @@ -12,7 +12,7 @@ "hierarchyIdentifier": "exampleHierarchyId", "environmentName": "AWS", "environmentData": { - "environmentType": "AWS", + "environmentType": "AwsAccount", "organizationalData": null }, "offerings": [ @@ -47,7 +47,7 @@ "properties": { "hierarchyIdentifier": "exampleHierarchyId", "environmentData": { - "environmentType": "AWS", + "environmentType": "AwsAccount", "organizationalData": null }, "environmentName": "AWS", @@ -82,7 +82,7 @@ "properties": { "hierarchyIdentifier": "exampleHierarchyId", "environmentData": { - "environmentType": "AWS", + "environmentType": "AwsAccount", "organizationalData": null }, "environmentName": "AWS", diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json index 23c3daf1358f..56eb458bd013 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json @@ -382,7 +382,7 @@ "type": "string", "description": "The type of the environment data.", "enum": [ - "AwsEnvironmentData", + "AwsAccount", "GcpProjectEnvironmentData", "GithubScopeEnvironmentData" ], @@ -400,7 +400,7 @@ "environmentType": { "type": "string", "description": "The environment type", - "x-ms-discriminator-value": "AwsEnvironmentData" + "x-ms-discriminator-value": "AwsAccount" }, "organizationalData": { "type": "object", @@ -410,6 +410,7 @@ } }, "AwsOrganizationData":{ + "discriminator": "organizationMembershipType", "required": [ "organizationMembershipType" ], @@ -501,6 +502,7 @@ } }, "GcpOrganizationData": { + "discriminator": "organizationMembershipType", "required": [ "organizationMembershipType" ], From 2f0c7b21d4a90b9cf7415f97f945a0e87466c0d9 Mon Sep 17 00:00:00 2001 From: chemishumacher Date: Tue, 1 Feb 2022 18:01:48 +0200 Subject: [PATCH 16/36] fixed discriminator position --- .../securityConnectors.json | 135 +++++++++--------- 1 file changed, 68 insertions(+), 67 deletions(-) diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json index 56eb458bd013..4c4426abf81e 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json @@ -383,8 +383,8 @@ "description": "The type of the environment data.", "enum": [ "AwsAccount", - "GcpProjectEnvironmentData", - "GithubScopeEnvironmentData" + "GcpProject", + "GithubScope" ], "x-ms-enum": { "name": "environmentType", @@ -396,12 +396,11 @@ "AWSEnvironmentData": { "type": "object", "description": "The aws connector environment data", + "x-ms-discriminator-value": "AwsAccount", + "allOf": [{ + "$ref": "#/definitions/EnvironmentData" + }], "properties": { - "environmentType": { - "type": "string", - "description": "The environment type", - "x-ms-discriminator-value": "AwsAccount" - }, "organizationalData": { "type": "object", "description": "The AWS account's organizational data", @@ -410,6 +409,8 @@ } }, "AwsOrganizationData":{ + "type": "object", + "description": "The awsOrganization data ", "discriminator": "organizationMembershipType", "required": [ "organizationMembershipType" @@ -430,12 +431,13 @@ } }, "AwsOrganizationDataParent":{ + "type": "object", + "description": "The awsOrganization data for the parent account", + "x-ms-discriminator-value": "Organization", + "allOf": [{ + "$ref": "#/definitions/AwsOrganizationData" + }], "properties": { - "organizationMembershipType": { - "type": "string", - "description": "The environment type", - "x-ms-discriminator-value": "Organization" - }, "stacksetName": { "type": "string", "description": "If the multi cloud account is of membership type organization, this will be the name of the onboarding stackset" @@ -451,12 +453,13 @@ } }, "AwsOrganizationDataMember":{ + "type": "object", + "description": "The awsOrganization data for the member account", + "x-ms-discriminator-value": "Member", + "allOf": [{ + "$ref": "#/definitions/AwsOrganizationData" + }], "properties": { - "organizationMembershipType": { - "type": "string", - "description": "The environment type", - "x-ms-discriminator-value": "Member" - }, "parentHierarchyId": { "type": "string", "description": "If the multi cloud account is not of membership type organization, this will be the ID of the account's parent" @@ -466,12 +469,11 @@ "GcpProjectEnvironmentData": { "type": "object", "description": "The GCP project connector environment data", + "x-ms-discriminator-value": "GcpProject", + "allOf": [{ + "$ref": "#/definitions/EnvironmentData" + }], "properties": { - "environmentType": { - "type": "string", - "description": "The environment type", - "x-ms-discriminator-value": "GcpProjectEnvironmentData" - }, "organizationalData": { "type": "object", "description": "The Gcp project's organizational data", @@ -485,6 +487,8 @@ } }, "GcpProjectDetails": { + "type": "object", + "description": "The details about the project represented by the security connector", "properties": { "projectNumber": { "type": "string", @@ -502,6 +506,8 @@ } }, "GcpOrganizationData": { + "type": "object", + "description": "The gcpOrganization data", "discriminator": "organizationMembershipType", "required": [ "organizationMembershipType" @@ -522,12 +528,13 @@ } }, "GcpOrganizationDataParent": { + "type": "object", + "description": "The gcpOrganization data for the parent account", + "x-ms-discriminator-value": "Organization", + "allOf": [{ + "$ref": "#/definitions/GcpOrganizationData" + }], "properties": { - "organizationMembershipType": { - "type": "string", - "description": "The organization data for parent security connector", - "x-ms-discriminator-value": "Organization" - }, "excludedProjectNumbers": { "type": "array", "description": "If the multi cloud account is of membership type organization, list of accounts excluded from offering", @@ -547,12 +554,13 @@ } }, "GcpOrganizationDataMember": { + "type": "object", + "description": "The gcpOrganization data for the member account", + "x-ms-discriminator-value": "Member", + "allOf": [{ + "$ref": "#/definitions/GcpOrganizationData" + }], "properties": { - "organizationMembershipType": { - "type": "string", - "description": "The organization data for parent security connector", - "x-ms-discriminator-value": "Memberdd" - }, "excludedProjectNumbers": { "type": "array", "description": "If the multi cloud account is of membership type organization, list of accounts excluded from offering", @@ -574,12 +582,11 @@ "GithubScopeEnvironmentData": { "type": "object", "description": "The github scope connector's environment data", + "x-ms-discriminator-value": "GithubScope", + "allOf": [{ + "$ref": "#/definitions/EnvironmentData" + }], "properties": { - "environmentType": { - "type": "string", - "description": "The environment type", - "x-ms-discriminator-value": "GithubScopeEnvironmentData" - } } }, "cloudOffering": { @@ -616,12 +623,11 @@ "cspmMonitorAwsOffering": { "type": "object", "description": "The CSPM monitoring for AWS offering", + "x-ms-discriminator-value": "CspmMonitorAws", + "allOf": [{ + "$ref": "#/definitions/cloudOffering" + }], "properties": { - "offeringType": { - "type": "string", - "description": "The security offering details", - "x-ms-discriminator-value": "CspmMonitorAws" - }, "nativeCloudConnection": { "type": "object", "description": "The native cloud connection configuration", @@ -637,12 +643,11 @@ "defenderForContainersAwsOffering": { "type": "object", "description": "The Defender for Containers AWS offering", + "x-ms-discriminator-value": "DefenderForContainersAws", + "allOf": [{ + "$ref": "#/definitions/cloudOffering" + }], "properties": { - "offeringType": { - "type": "string", - "description": "The security offering details", - "x-ms-discriminator-value": "DefenderForContainersAws" - }, "kubernetesService": { "type": "object", "description": "The kubernetes service connection configuration", @@ -688,12 +693,11 @@ "defenderForServersAwsOffering": { "type": "object", "description": "The Defender for Servers AWS offering", + "x-ms-discriminator-value": "DefenderForServersAws", + "allOf": [{ + "$ref": "#/definitions/cloudOffering" + }], "properties": { - "offeringType": { - "type": "string", - "description": "The security offering details", - "x-ms-discriminator-value": "DefenderForServersAws" - }, "defenderForServers": { "type": "object", "description": "The Defender for servers connection configuration", @@ -737,12 +741,11 @@ "informationProtectionAwsOffering": { "type": "object", "description": "The information protection for AWS offering", + "x-ms-discriminator-value": "InformationProtectionAws", + "allOf": [{ + "$ref": "#/definitions/cloudOffering" + }], "properties": { - "offeringType": { - "type": "string", - "description": "The security offering details", - "x-ms-discriminator-value": "InformationProtectionAws" - }, "informationProtection": { "type": "object", "description": "The native cloud connection configuration", @@ -758,12 +761,11 @@ "cspmMonitorGcpOffering": { "type": "object", "description": "The CSPM monitoring for GCP offering", + "x-ms-discriminator-value": "CspmMonitorGcp", + "allOf": [{ + "$ref": "#/definitions/cloudOffering" + }], "properties": { - "offeringType": { - "type": "string", - "description": "The security offering details", - "x-ms-discriminator-value": "CspmMonitorGcp" - }, "workloadIdentityProviderId": { "type": "string", "description": "The GCP workload identity provider id for the offering" @@ -783,12 +785,11 @@ "cspmMonitorGithubOffering": { "type": "object", "description": "The CSPM monitoring for github offering", + "x-ms-discriminator-value": "CspmMonitorGithub", + "allOf": [{ + "$ref": "#/definitions/cloudOffering" + }], "properties": { - "offeringType": { - "type": "string", - "description": "The security offering details", - "x-ms-discriminator-value": "CspmMonitorGithub" - } } } }, From 90ee35d1013504b646d56187e6d1a43d8a6b1c0a Mon Sep 17 00:00:00 2001 From: chemishumacher Date: Tue, 1 Feb 2022 18:08:02 +0200 Subject: [PATCH 17/36] all example validations + schema validations pass, BEFORE adding updated examples --- .../GetSecurityConnectorsResourceGroup_example.json | 7 +++++-- .../GetSecurityConnectorsSubscription_example.json | 7 +++++-- .../preview/2021-12-01-preview/securityConnectors.json | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorsResourceGroup_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorsResourceGroup_example.json index 7b8b2e1808ef..f36e5e5cbf4c 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorsResourceGroup_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorsResourceGroup_example.json @@ -100,8 +100,11 @@ "hierarchyIdentifier": "exampleHierarchyId", "environmentData": { "environmentType": "GcpProject", - "projectName": "My GCP Project", - "workloadIdentityFederationPoolId": "My workload identity federation id" + "projectDetails": { + "projectNumber": "exampleHierarchyId", + "projectId": "My-0GCP-Project", + "workloadIdentityFederationPoolId": "My-workload-identity-federation-pool-id" + } }, "environmentName": "GCP", "offerings": [ diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorsSubscription_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorsSubscription_example.json index 627338ee2aaa..8c98fe857aa3 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorsSubscription_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorsSubscription_example.json @@ -129,8 +129,11 @@ "hierarchyIdentifier": "exampleHierarchyId", "environmentData": { "environmentType": "GcpProject", - "projectName": "My GCP Project", - "workloadIdentityFederationPoolId": "My workload identity federation id" + "projectDetails": { + "projectNumber": "exampleHierarchyId", + "projectId": "My-0GCP-Project", + "workloadIdentityFederationPoolId": "My-workload-identity-federation-pool-id" + } }, "environmentName": "GCP", "offerings": [ diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json index 4c4426abf81e..764bf6383770 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json @@ -479,7 +479,7 @@ "description": "The Gcp project's organizational data", "$ref": "#/definitions/GcpOrganizationData" }, - "ProjectDetails": { + "projectDetails": { "type": "object", "description": "The Gcp project's details", "$ref": "#/definitions/GcpProjectDetails" From 0ab8679f39441251e71d9d460afac50e5c146503 Mon Sep 17 00:00:00 2001 From: chemishumacher Date: Tue, 1 Feb 2022 18:24:05 +0200 Subject: [PATCH 18/36] fixed null aws env data property --- ...curityConnectorSingleResource_example.json | 3 +- ...curityConnectorsResourceGroup_example.json | 3 +- ...ecurityConnectorsSubscription_example.json | 3 +- .../PatchSecurityConnector_example.json | 3 +- .../PutSecurityConnector_example.json | 9 +- .../securityConnectors.json | 118 +++++++++++------- 6 files changed, 78 insertions(+), 61 deletions(-) diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorSingleResource_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorSingleResource_example.json index 57ce260b8a1d..f7b92bf380b2 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorSingleResource_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorSingleResource_example.json @@ -25,8 +25,7 @@ }, "properties": { "environmentData": { - "environmentType": "AwsAccount", - "organizationalData": null + "environmentType": "AwsAccount" }, "hierarchyIdentifier": "exampleHierarchyId", "environmentName": "AWS", diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorsResourceGroup_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorsResourceGroup_example.json index f36e5e5cbf4c..99bd83f0a941 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorsResourceGroup_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorsResourceGroup_example.json @@ -27,8 +27,7 @@ "properties": { "hierarchyIdentifier": "exampleHierarchyId", "environmentData": { - "environmentType": "AwsAccount", - "organizationalData": null + "environmentType": "AwsAccount" }, "environmentName": "AWS", "offerings": [ diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorsSubscription_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorsSubscription_example.json index 8c98fe857aa3..4e66a8397ff4 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorsSubscription_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorsSubscription_example.json @@ -26,8 +26,7 @@ "properties": { "hierarchyIdentifier": "exampleHierarchyId", "environmentData": { - "environmentType": "AwsAccount", - "organizationalData": null + "environmentType": "AwsAccount" }, "environmentName": "AWS", "offerings": [ diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/PatchSecurityConnector_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/PatchSecurityConnector_example.json index 5f78e07ee884..b340b663b38a 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/PatchSecurityConnector_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/PatchSecurityConnector_example.json @@ -46,8 +46,7 @@ "properties": { "hierarchyIdentifier": "exampleHierarchyId", "environmentData": { - "environmentType": "AwsAccount", - "organizationalData": null + "environmentType": "AwsAccount" }, "environmentName": "AWS", "offerings": [ diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/PutSecurityConnector_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/PutSecurityConnector_example.json index c75cb275acd6..4cd1d314616b 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/PutSecurityConnector_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/PutSecurityConnector_example.json @@ -12,8 +12,7 @@ "hierarchyIdentifier": "exampleHierarchyId", "environmentName": "AWS", "environmentData": { - "environmentType": "AwsAccount", - "organizationalData": null + "environmentType": "AwsAccount" }, "offerings": [ { @@ -47,8 +46,7 @@ "properties": { "hierarchyIdentifier": "exampleHierarchyId", "environmentData": { - "environmentType": "AwsAccount", - "organizationalData": null + "environmentType": "AwsAccount" }, "environmentName": "AWS", "offerings": [ @@ -82,8 +80,7 @@ "properties": { "hierarchyIdentifier": "exampleHierarchyId", "environmentData": { - "environmentType": "AwsAccount", - "organizationalData": null + "environmentType": "AwsAccount" }, "environmentName": "AWS", "offerings": [ diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json index 764bf6383770..6481facee364 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json @@ -397,9 +397,11 @@ "type": "object", "description": "The aws connector environment data", "x-ms-discriminator-value": "AwsAccount", - "allOf": [{ - "$ref": "#/definitions/EnvironmentData" - }], + "allOf": [ + { + "$ref": "#/definitions/EnvironmentData" + } + ], "properties": { "organizationalData": { "type": "object", @@ -408,7 +410,7 @@ } } }, - "AwsOrganizationData":{ + "AwsOrganizationData": { "type": "object", "description": "The awsOrganization data ", "discriminator": "organizationMembershipType", @@ -430,13 +432,15 @@ } } }, - "AwsOrganizationDataParent":{ + "AwsOrganizationDataParent": { "type": "object", "description": "The awsOrganization data for the parent account", "x-ms-discriminator-value": "Organization", - "allOf": [{ - "$ref": "#/definitions/AwsOrganizationData" - }], + "allOf": [ + { + "$ref": "#/definitions/AwsOrganizationData" + } + ], "properties": { "stacksetName": { "type": "string", @@ -452,13 +456,15 @@ } } }, - "AwsOrganizationDataMember":{ + "AwsOrganizationDataMember": { "type": "object", "description": "The awsOrganization data for the member account", "x-ms-discriminator-value": "Member", - "allOf": [{ - "$ref": "#/definitions/AwsOrganizationData" - }], + "allOf": [ + { + "$ref": "#/definitions/AwsOrganizationData" + } + ], "properties": { "parentHierarchyId": { "type": "string", @@ -470,9 +476,11 @@ "type": "object", "description": "The GCP project connector environment data", "x-ms-discriminator-value": "GcpProject", - "allOf": [{ - "$ref": "#/definitions/EnvironmentData" - }], + "allOf": [ + { + "$ref": "#/definitions/EnvironmentData" + } + ], "properties": { "organizationalData": { "type": "object", @@ -531,9 +539,11 @@ "type": "object", "description": "The gcpOrganization data for the parent account", "x-ms-discriminator-value": "Organization", - "allOf": [{ - "$ref": "#/definitions/GcpOrganizationData" - }], + "allOf": [ + { + "$ref": "#/definitions/GcpOrganizationData" + } + ], "properties": { "excludedProjectNumbers": { "type": "array", @@ -557,9 +567,11 @@ "type": "object", "description": "The gcpOrganization data for the member account", "x-ms-discriminator-value": "Member", - "allOf": [{ - "$ref": "#/definitions/GcpOrganizationData" - }], + "allOf": [ + { + "$ref": "#/definitions/GcpOrganizationData" + } + ], "properties": { "excludedProjectNumbers": { "type": "array", @@ -583,11 +595,12 @@ "type": "object", "description": "The github scope connector's environment data", "x-ms-discriminator-value": "GithubScope", - "allOf": [{ - "$ref": "#/definitions/EnvironmentData" - }], - "properties": { - } + "allOf": [ + { + "$ref": "#/definitions/EnvironmentData" + } + ], + "properties": {} }, "cloudOffering": { "type": "object", @@ -624,9 +637,11 @@ "type": "object", "description": "The CSPM monitoring for AWS offering", "x-ms-discriminator-value": "CspmMonitorAws", - "allOf": [{ - "$ref": "#/definitions/cloudOffering" - }], + "allOf": [ + { + "$ref": "#/definitions/cloudOffering" + } + ], "properties": { "nativeCloudConnection": { "type": "object", @@ -644,9 +659,11 @@ "type": "object", "description": "The Defender for Containers AWS offering", "x-ms-discriminator-value": "DefenderForContainersAws", - "allOf": [{ - "$ref": "#/definitions/cloudOffering" - }], + "allOf": [ + { + "$ref": "#/definitions/cloudOffering" + } + ], "properties": { "kubernetesService": { "type": "object", @@ -694,9 +711,11 @@ "type": "object", "description": "The Defender for Servers AWS offering", "x-ms-discriminator-value": "DefenderForServersAws", - "allOf": [{ - "$ref": "#/definitions/cloudOffering" - }], + "allOf": [ + { + "$ref": "#/definitions/cloudOffering" + } + ], "properties": { "defenderForServers": { "type": "object", @@ -742,9 +761,11 @@ "type": "object", "description": "The information protection for AWS offering", "x-ms-discriminator-value": "InformationProtectionAws", - "allOf": [{ - "$ref": "#/definitions/cloudOffering" - }], + "allOf": [ + { + "$ref": "#/definitions/cloudOffering" + } + ], "properties": { "informationProtection": { "type": "object", @@ -762,9 +783,11 @@ "type": "object", "description": "The CSPM monitoring for GCP offering", "x-ms-discriminator-value": "CspmMonitorGcp", - "allOf": [{ - "$ref": "#/definitions/cloudOffering" - }], + "allOf": [ + { + "$ref": "#/definitions/cloudOffering" + } + ], "properties": { "workloadIdentityProviderId": { "type": "string", @@ -786,11 +809,12 @@ "type": "object", "description": "The CSPM monitoring for github offering", "x-ms-discriminator-value": "CspmMonitorGithub", - "allOf": [{ - "$ref": "#/definitions/cloudOffering" - }], - "properties": { - } + "allOf": [ + { + "$ref": "#/definitions/cloudOffering" + } + ], + "properties": {} } }, "parameters": { @@ -813,4 +837,4 @@ "x-ms-parameter-location": "method" } } -} +} \ No newline at end of file From 44949b45b5f8e1c2dc389b6bb5aa702b4a0aae58 Mon Sep 17 00:00:00 2001 From: Sapir Elmakayes Date: Tue, 1 Feb 2022 19:34:39 +0200 Subject: [PATCH 19/36] Adding DefenderForDatabases --- ...curityConnectorSingleResource_example.json | 6 +++ .../securityConnectors.json | 46 +++++++++++++++++++ 2 files changed, 52 insertions(+) diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorSingleResource_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorSingleResource_example.json index f7b92bf380b2..bcb155f6f3ca 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorSingleResource_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorSingleResource_example.json @@ -35,6 +35,12 @@ "nativeCloudConnection": { "cloudRoleArn": "arn:aws:iam::00000000:role/ASCMonitor" } + }, + { + "offeringType": "DefenderForDatabasesAws", + "databasesOnVirtualMachines": { + "enabled": true + } } ] } diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json index 6481facee364..271e10577667 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json @@ -618,7 +618,9 @@ "DefenderForContainersAws", "DefenderForServersAws", "InformationProtectionAws", + "DefenderForDatabasesAws", "CspmMonitorGcp", + "DefenderForDatabasesGcp", "CspmMonitorGithub" ], "x-ms-enum": { @@ -779,6 +781,28 @@ } } }, + "defenderForDatabasesAwsOffering": { + "type": "object", + "description": "The defender for databases for AWS offering", + "x-ms-discriminator-value": "DefenderForDatabasesAws", + "allOf": [ + { + "$ref": "#/definitions/cloudOffering" + } + ], + "properties": { + "databasesOnVirtualMachines": { + "type": "object", + "description": "The base configuration for databases offering", + "properties": { + "enabled": { + "type": "boolean", + "description": "is databases on virtual machines enabled" + } + } + } + } + }, "cspmMonitorGcpOffering": { "type": "object", "description": "The CSPM monitoring for GCP offering", @@ -805,6 +829,28 @@ } } }, + "defenderForDatabasesGcpOffering": { + "type": "object", + "description": "The defender for databases for GCP offering", + "x-ms-discriminator-value": "DefenderForDatabasesGcp", + "allOf": [ + { + "$ref": "#/definitions/cloudOffering" + } + ], + "properties": { + "databasesOnVirtualMachines": { + "type": "object", + "description": "The base configuration for databases offering", + "properties": { + "enabled": { + "type": "boolean", + "description": "is databases on virtual machines enabled" + } + } + } + } + }, "cspmMonitorGithubOffering": { "type": "object", "description": "The CSPM monitoring for github offering", From 2f5cc08f3c6502d9630e294b49c6a2a37267fb6b Mon Sep 17 00:00:00 2001 From: Sapir Elmakayes Date: Tue, 1 Feb 2022 19:35:47 +0200 Subject: [PATCH 20/36] Run prettier --- .../GetSecurityConnectorsSubscription_example.json | 9 ++++----- .../preview/2021-12-01-preview/securityConnectors.json | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorsSubscription_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorsSubscription_example.json index 4e66a8397ff4..dd9272db8255 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorsSubscription_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorsSubscription_example.json @@ -85,8 +85,7 @@ "type": "Microsoft.Security/securityconnectors", "location": "centralus", "kind": "", - "tags": { - }, + "tags": {}, "systemData": { "createdBy": "user@contoso.com", "createdByType": "User", @@ -102,9 +101,9 @@ "environmentType": "GithubScope" }, "offerings": [ - { - "offeringType": "CspmMonitorGithub" - } + { + "offeringType": "CspmMonitorGithub" + } ] } }, diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json index 271e10577667..2ab5bf35069c 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json @@ -883,4 +883,4 @@ "x-ms-parameter-location": "method" } } -} \ No newline at end of file +} From bbe04f05abd66adfe0776e560f84cc4b2541bfff Mon Sep 17 00:00:00 2001 From: Sapir Elmakayes Date: Wed, 2 Feb 2022 13:15:58 +0200 Subject: [PATCH 21/36] Small renamings --- .../securityConnectors.json | 45 +++++++------------ 1 file changed, 16 insertions(+), 29 deletions(-) diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json index 2ab5bf35069c..e899d8c99f1c 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json @@ -406,11 +406,11 @@ "organizationalData": { "type": "object", "description": "The AWS account's organizational data", - "$ref": "#/definitions/AwsOrganizationData" + "$ref": "#/definitions/AwsOrganizationalData" } } }, - "AwsOrganizationData": { + "AwsOrganizationalData": { "type": "object", "description": "The awsOrganization data ", "discriminator": "organizationMembershipType", @@ -432,13 +432,13 @@ } } }, - "AwsOrganizationDataParent": { + "AwsOrganizationalDataMaster": { "type": "object", - "description": "The awsOrganization data for the parent account", + "description": "The awsOrganization data for the master account", "x-ms-discriminator-value": "Organization", "allOf": [ { - "$ref": "#/definitions/AwsOrganizationData" + "$ref": "#/definitions/AwsOrganizationalData" } ], "properties": { @@ -456,13 +456,13 @@ } } }, - "AwsOrganizationDataMember": { + "AwsOrganizationalDataMember": { "type": "object", "description": "The awsOrganization data for the member account", "x-ms-discriminator-value": "Member", "allOf": [ { - "$ref": "#/definitions/AwsOrganizationData" + "$ref": "#/definitions/AwsOrganizationalData" } ], "properties": { @@ -485,7 +485,7 @@ "organizationalData": { "type": "object", "description": "The Gcp project's organizational data", - "$ref": "#/definitions/GcpOrganizationData" + "$ref": "#/definitions/GcpOrganizationalData" }, "projectDetails": { "type": "object", @@ -500,8 +500,7 @@ "properties": { "projectNumber": { "type": "string", - "description": "The unique GCP Project number", - "readOnly": true + "description": "The unique GCP Project number" }, "projectId": { "type": "string", @@ -513,7 +512,7 @@ } } }, - "GcpOrganizationData": { + "GcpOrganizationalData": { "type": "object", "description": "The gcpOrganization data", "discriminator": "organizationMembershipType", @@ -535,13 +534,13 @@ } } }, - "GcpOrganizationDataParent": { + "GcpOrganizationalDataOrganization": { "type": "object", "description": "The gcpOrganization data for the parent account", "x-ms-discriminator-value": "Organization", "allOf": [ { - "$ref": "#/definitions/GcpOrganizationData" + "$ref": "#/definitions/GcpOrganizationalData" } ], "properties": { @@ -563,31 +562,19 @@ } } }, - "GcpOrganizationDataMember": { + "GcpOrganizationalDataMember": { "type": "object", "description": "The gcpOrganization data for the member account", "x-ms-discriminator-value": "Member", "allOf": [ { - "$ref": "#/definitions/GcpOrganizationData" + "$ref": "#/definitions/GcpOrganizationalData" } ], "properties": { - "excludedProjectNumbers": { - "type": "array", - "description": "If the multi cloud account is of membership type organization, list of accounts excluded from offering", - "items": { - "type": "string", - "description": "account IDs" - } - }, - "serviceAccountEmailAddress": { - "type": "string", - "description": "The service account email address which represents the organization level permissions container." - }, - "workloadIdentityProviderId": { + "parentHierarchyId": { "type": "string", - "description": "The GCP workload identity provider id which represents the permissions required to auto provision security connectors" + "description": "If the multi cloud account is not of membership type organization, this will be the ID of the project's parent" } } }, From 7beaf80c49f5010db3e9d56de103cc8edceef6e9 Mon Sep 17 00:00:00 2001 From: Sapir Elmakayes Date: Thu, 3 Feb 2022 17:44:07 +0200 Subject: [PATCH 22/36] Fix native cloud conection --- .../GetSecurityConnectorsResourceGroup_example.json | 4 ++-- .../GetSecurityConnectorsSubscription_example.json | 4 ++-- .../preview/2021-12-01-preview/securityConnectors.json | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorsResourceGroup_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorsResourceGroup_example.json index 99bd83f0a941..eb7b5c398cbb 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorsResourceGroup_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorsResourceGroup_example.json @@ -102,15 +102,15 @@ "projectDetails": { "projectNumber": "exampleHierarchyId", "projectId": "My-0GCP-Project", - "workloadIdentityFederationPoolId": "My-workload-identity-federation-pool-id" + "workloadIdentityPoolId": "My-workload-identity-federation-pool-id" } }, "environmentName": "GCP", "offerings": [ { "offeringType": "CspmMonitorGcp", - "workloadIdentityProviderId": "My workload identity provider Id", "nativeCloudConnection": { + "workloadIdentityProviderId": "My workload identity provider Id", "serviceAccountEmailAddress": "capm@projectName.com" } } diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorsSubscription_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorsSubscription_example.json index dd9272db8255..5970bd3bc640 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorsSubscription_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorsSubscription_example.json @@ -130,15 +130,15 @@ "projectDetails": { "projectNumber": "exampleHierarchyId", "projectId": "My-0GCP-Project", - "workloadIdentityFederationPoolId": "My-workload-identity-federation-pool-id" + "workloadIdentityPoolId": "My-workload-identity-federation-pool-id" } }, "environmentName": "GCP", "offerings": [ { "offeringType": "CspmMonitorGcp", - "workloadIdentityProviderId": "My workload identity provider Id", "nativeCloudConnection": { + "workloadIdentityProviderId": "My workload identity provider Id", "serviceAccountEmailAddress": "capm@projectName.com" } } diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json index e899d8c99f1c..48d73e9ccff1 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json @@ -506,7 +506,7 @@ "type": "string", "description": "The GCP Project id" }, - "workloadIdentityFederationPoolId": { + "workloadIdentityPoolId": { "type": "string", "description": "The GCP workload identity federation pool id" } @@ -800,14 +800,14 @@ } ], "properties": { - "workloadIdentityProviderId": { - "type": "string", - "description": "The GCP workload identity provider id for the offering" - }, "nativeCloudConnection": { "type": "object", "description": "The native cloud connection configuration", "properties": { + "workloadIdentityProviderId": { + "type": "string", + "description": "The GCP workload identity provider id for the offering" + }, "serviceAccountEmailAddress": { "type": "string", "description": "The service account email address in GCP for this offering" From 41732e5d2e9c0c48544dc94c7e104ae1b5f9af2b Mon Sep 17 00:00:00 2001 From: Sapir Elmakayes Date: Thu, 3 Feb 2022 17:54:42 +0200 Subject: [PATCH 23/36] update servers offerings --- .../securityConnectors.json | 123 +++++++++++++++++- 1 file changed, 122 insertions(+), 1 deletion(-) diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json index 48d73e9ccff1..f4af530a1bd7 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json @@ -608,7 +608,8 @@ "DefenderForDatabasesAws", "CspmMonitorGcp", "DefenderForDatabasesGcp", - "CspmMonitorGithub" + "CspmMonitorGithub", + "DefenderForServersGcp" ], "x-ms-enum": { "name": "offeringType", @@ -743,6 +744,41 @@ } } } + }, + "vaAutoProvisioning": { + "type": "object", + "description": "The Vulnerability Assessment autoprovisioning configuration", + "properties": { + "enabled": { + "type": "boolean", + "description": "Is Vulnerability Assessment auto provisioning enabled" + }, + "configuration": { + "type": "object", + "description": "configuration for Vulnerability Assessment autoprovisioning", + "properties": { + "vaType": { + "type": "string", + "description": "The Vulnerability Assessment solution to be provisioned. Can be either 'TVM' or 'Qualys'" + } + } + } + } + }, + "mdeAutoProvisioning": { + "type": "object", + "description": "The Microsoft Defender for Endpoint autoprovisioning configuration", + "properties": { + "enabled": { + "type": "boolean", + "description": "Is Microsoft Defender for Endpoint auto provisioning enabled" + }, + "configuration": { + "type": "object", + "description": "configuration for Microsoft Defender for Endpoint autoprovisioning", + "properties": {} + } + } } } }, @@ -838,6 +874,91 @@ } } }, + "defenderForServersGcpOffering": { + "type": "object", + "description": "The Defender for Servers GCP offering configurations", + "x-ms-discriminator-value": "DefenderForServersGcp", + "allOf": [ + { + "$ref": "#/definitions/cloudOffering" + } + ], + "properties": { + "defenderForServers": { + "type": "object", + "description": "The Defender for servers connection configuration", + "properties": { + "workloadIdentityProviderId": { + "type": "string", + "description": "The workload identity provider id in GCP for this feature" + }, + "serviceAccountEmailAddress": { + "type": "string", + "description": "The service account email address in GCP for this feature" + } + } + }, + "arcAutoProvisioning": { + "type": "object", + "description": "The ARC autoprovisioning configuration", + "properties": { + "enabled": { + "type": "boolean", + "description": "Is arc auto provisioning enabled" + }, + "configuration": { + "type": "object", + "description": "Configuration for ARC autoprovisioning", + "properties": { + "clientId": { + "type": "string", + "description": "The agent onboarding service account client id" + }, + "agentOnboardingServiceAccountNumericId": { + "type": "string", + "description": "The agent onboarding service account numeric id" + } + } + } + } + }, + "vaAutoProvisioning": { + "type": "object", + "description": "The Vulnerability Assessment autoprovisioning configuration", + "properties": { + "enabled": { + "type": "boolean", + "description": "Is Vulnerability Assessment auto provisioning enabled" + }, + "configuration": { + "type": "object", + "description": "configuration for Vulnerability Assessment autoprovisioning", + "properties": { + "vaType": { + "type": "string", + "description": "The Vulnerability Assessment solution to be provisioned. Can be either 'TVM' or 'Qualys'" + } + } + } + } + }, + "mdeAutoProvisioning": { + "type": "object", + "description": "The Microsoft Defender for Endpoint autoprovisioning configuration", + "properties": { + "enabled": { + "type": "boolean", + "description": "Is Microsoft Defender for Endpoint auto provisioning enabled" + }, + "configuration": { + "type": "object", + "description": "configuration for Microsoft Defender for Endpoint autoprovisioning", + "properties": {} + } + } + } + } + }, "cspmMonitorGithubOffering": { "type": "object", "description": "The CSPM monitoring for github offering", From 2b96ee17be1860f67bbf08e4c2e6aa1cf5042059 Mon Sep 17 00:00:00 2001 From: Sapir Elmakayes Date: Thu, 3 Feb 2022 19:19:04 +0200 Subject: [PATCH 24/36] adding containers --- .../securityConnectors.json | 55 ++++++++++++++++++- 1 file changed, 54 insertions(+), 1 deletion(-) diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json index f4af530a1bd7..857134714698 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json @@ -609,7 +609,8 @@ "CspmMonitorGcp", "DefenderForDatabasesGcp", "CspmMonitorGithub", - "DefenderForServersGcp" + "DefenderForServersGcp", + "DefenderForContainersGcp" ], "x-ms-enum": { "name": "offeringType", @@ -959,6 +960,58 @@ } } }, + "defenderForContainersGcpOffering": { + "type": "object", + "description": "The containers GCP offering", + "x-ms-discriminator-value": "DefenderForContainersGcp", + "allOf": [ + { + "$ref": "#/definitions/cloudOffering" + } + ], + "properties": { + "nativeCloudConnection": { + "type": "object", + "description": "The native cloud connection configuration", + "properties": { + "serviceAccountEmailAddress": { + "type": "string", + "description": "The service account email address in GCP for this offering" + }, + "workloadIdentityProviderId": { + "type": "string", + "description": "The GCP workload identity provider id for this offering" + } + } + }, + "dataPipelineNativeCloudConnection": { + "type": "object", + "description": "The native cloud connection configuration", + "properties": { + "serviceAccountEmailAddress": { + "type": "string", + "description": "The data collection service account email address in GCP for this offering" + }, + "workloadIdentityProviderId": { + "type": "string", + "description": "The data collection GCP workload identity provider id for this offering" + } + } + }, + "auditLogsAutoProvisioningFlag": { + "type": "boolean", + "description": "Is audit logs data collection enabled" + }, + "defenderAgentAutoProvisioningFlag": { + "type": "boolean", + "description": "Is Microsoft Defender for Cloud Kubernetes agent auto provisioning enabled" + }, + "policyAgentAutoProvisioningFlag": { + "type": "boolean", + "description": "Is Policy Kubernetes agent auto provisioning enabled" + } + } + }, "cspmMonitorGithubOffering": { "type": "object", "description": "The CSPM monitoring for github offering", From 44e832bbdf352e8776f23e174842675570cb9b8b Mon Sep 17 00:00:00 2001 From: Sapir Elmakayes Date: Sun, 6 Feb 2022 18:37:52 +0200 Subject: [PATCH 25/36] Remove DefenderForDatabases offerings --- ...curityConnectorSingleResource_example.json | 6 --- .../securityConnectors.json | 46 ------------------- 2 files changed, 52 deletions(-) diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorSingleResource_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorSingleResource_example.json index bcb155f6f3ca..f7b92bf380b2 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorSingleResource_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorSingleResource_example.json @@ -35,12 +35,6 @@ "nativeCloudConnection": { "cloudRoleArn": "arn:aws:iam::00000000:role/ASCMonitor" } - }, - { - "offeringType": "DefenderForDatabasesAws", - "databasesOnVirtualMachines": { - "enabled": true - } } ] } diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json index 857134714698..defeae5e4fa5 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json @@ -605,9 +605,7 @@ "DefenderForContainersAws", "DefenderForServersAws", "InformationProtectionAws", - "DefenderForDatabasesAws", "CspmMonitorGcp", - "DefenderForDatabasesGcp", "CspmMonitorGithub", "DefenderForServersGcp", "DefenderForContainersGcp" @@ -805,28 +803,6 @@ } } }, - "defenderForDatabasesAwsOffering": { - "type": "object", - "description": "The defender for databases for AWS offering", - "x-ms-discriminator-value": "DefenderForDatabasesAws", - "allOf": [ - { - "$ref": "#/definitions/cloudOffering" - } - ], - "properties": { - "databasesOnVirtualMachines": { - "type": "object", - "description": "The base configuration for databases offering", - "properties": { - "enabled": { - "type": "boolean", - "description": "is databases on virtual machines enabled" - } - } - } - } - }, "cspmMonitorGcpOffering": { "type": "object", "description": "The CSPM monitoring for GCP offering", @@ -853,28 +829,6 @@ } } }, - "defenderForDatabasesGcpOffering": { - "type": "object", - "description": "The defender for databases for GCP offering", - "x-ms-discriminator-value": "DefenderForDatabasesGcp", - "allOf": [ - { - "$ref": "#/definitions/cloudOffering" - } - ], - "properties": { - "databasesOnVirtualMachines": { - "type": "object", - "description": "The base configuration for databases offering", - "properties": { - "enabled": { - "type": "boolean", - "description": "is databases on virtual machines enabled" - } - } - } - } - }, "defenderForServersGcpOffering": { "type": "object", "description": "The Defender for Servers GCP offering configurations", From 9d44bc5ecc527ec69673c6c72d6dac573d3c99a0 Mon Sep 17 00:00:00 2001 From: Sapir Elmakayes Date: Sun, 6 Feb 2022 18:39:44 +0200 Subject: [PATCH 26/36] Adding Qualys as known word --- custom-words.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/custom-words.txt b/custom-words.txt index ac38338b9051..8cc137036ac1 100644 --- a/custom-words.txt +++ b/custom-words.txt @@ -2456,4 +2456,5 @@ testrun loadtest xvalue yvalue -servermetrics \ No newline at end of file +servermetrics +Qualys \ No newline at end of file From ebf1718c9e209c8adc5747695743072070806f00 Mon Sep 17 00:00:00 2001 From: Sapir Elmakayes Date: Wed, 9 Feb 2022 11:21:42 +0200 Subject: [PATCH 27/36] Update the VA type to enum --- .../preview/2021-12-01-preview/securityConnectors.json | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json index defeae5e4fa5..92c57d3b62e6 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json @@ -758,7 +758,15 @@ "properties": { "vaType": { "type": "string", - "description": "The Vulnerability Assessment solution to be provisioned. Can be either 'TVM' or 'Qualys'" + "description": "The Vulnerability Assessment solution to be provisioned. Can be either 'TVM' or 'Qualys'", + "enum": [ + "Qualys", + "TVM" + ], + "x-ms-enum": { + "name": "vaType", + "modelAsString": true + } } } } From 3f44200f44d2956974d84a47c4f020819159ab27 Mon Sep 17 00:00:00 2001 From: chemishumacher Date: Sun, 20 Feb 2022 14:42:45 +0200 Subject: [PATCH 28/36] small changes for servers offering and gcpproject properties --- .../GetSecurityConnectorsSubscription_example.json | 2 +- .../preview/2021-12-01-preview/securityConnectors.json | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorsSubscription_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorsSubscription_example.json index 5970bd3bc640..6af93efd2380 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorsSubscription_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/examples/SecurityConnectors/GetSecurityConnectorsSubscription_example.json @@ -130,7 +130,7 @@ "projectDetails": { "projectNumber": "exampleHierarchyId", "projectId": "My-0GCP-Project", - "workloadIdentityPoolId": "My-workload-identity-federation-pool-id" + "workloadIdentityPoolId": "6c78da41157548d3b1d8b3c72effdf8c" } }, "environmentName": "GCP", diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json index 92c57d3b62e6..115423b10201 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json @@ -507,6 +507,7 @@ "description": "The GCP Project id" }, "workloadIdentityPoolId": { + "readOnly": true, "type": "string", "description": "The GCP workload identity federation pool id" } @@ -756,7 +757,7 @@ "type": "object", "description": "configuration for Vulnerability Assessment autoprovisioning", "properties": { - "vaType": { + "type": { "type": "string", "description": "The Vulnerability Assessment solution to be provisioned. Can be either 'TVM' or 'Qualys'", "enum": [ @@ -764,7 +765,7 @@ "TVM" ], "x-ms-enum": { - "name": "vaType", + "name": "type", "modelAsString": true } } @@ -875,7 +876,7 @@ "properties": { "clientId": { "type": "string", - "description": "The agent onboarding service account client id" + "description": "The Azure service principal client id for agent onboarding" }, "agentOnboardingServiceAccountNumericId": { "type": "string", @@ -897,7 +898,7 @@ "type": "object", "description": "configuration for Vulnerability Assessment autoprovisioning", "properties": { - "vaType": { + "type": { "type": "string", "description": "The Vulnerability Assessment solution to be provisioned. Can be either 'TVM' or 'Qualys'" } From 7eaef329d244514ae6f3be8190c4f4ff63bc78aa Mon Sep 17 00:00:00 2001 From: chemishumacher Date: Sun, 20 Feb 2022 14:50:24 +0200 Subject: [PATCH 29/36] added missing enum types --- .../preview/2021-12-01-preview/securityConnectors.json | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json index 115423b10201..668ae2e6b9e6 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json @@ -900,7 +900,15 @@ "properties": { "type": { "type": "string", - "description": "The Vulnerability Assessment solution to be provisioned. Can be either 'TVM' or 'Qualys'" + "description": "The Vulnerability Assessment solution to be provisioned. Can be either 'TVM' or 'Qualys'", + "enum": [ + "Qualys", + "TVM" + ], + "x-ms-enum": { + "name": "type", + "modelAsString": true + } } } } From 5be5d947aebf36d54cbf10371f9e4bcdda42097e Mon Sep 17 00:00:00 2001 From: Sapir Elmakayes Date: Thu, 10 Mar 2022 18:51:44 +0200 Subject: [PATCH 30/36] Servers P1P2 --- .../2021-12-01-preview/securityConnectors.json | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json index 668ae2e6b9e6..91964936bf8f 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json @@ -787,6 +787,24 @@ "properties": {} } } + }, + "subPlan": { + "type": "object", + "description": "configuration for the servers offering subPlan", + "properties": { + "type": { + "type": "string", + "description": "The avilable sub plans", + "enum": [ + "P1", + "P2" + ], + "x-ms-enum": { + "name": "type", + "modelAsString": true + } + } + } } } }, From c6f9fd9d0079881d6964bf2511d189ef34d069cb Mon Sep 17 00:00:00 2001 From: Sapir Elmakayes Date: Thu, 10 Mar 2022 19:22:06 +0200 Subject: [PATCH 31/36] Add P1P2 to servers GCP --- .../2021-12-01-preview/securityConnectors.json | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json index 91964936bf8f..18ee8bfb3a6f 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json @@ -946,6 +946,24 @@ "properties": {} } } + }, + "subPlan": { + "type": "object", + "description": "configuration for the servers offering subPlan", + "properties": { + "type": { + "type": "string", + "description": "The avilable sub plans", + "enum": [ + "P1", + "P2" + ], + "x-ms-enum": { + "name": "type", + "modelAsString": true + } + } + } } } }, From d1ddae25e63a01347346bf043d2efa6654745b12 Mon Sep 17 00:00:00 2001 From: Sapir Elmakayes Date: Sun, 13 Mar 2022 12:56:57 +0200 Subject: [PATCH 32/36] subPlan fixes --- .../preview/2021-12-01-preview/securityConnectors.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json index 18ee8bfb3a6f..eaf53e620273 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json @@ -794,13 +794,13 @@ "properties": { "type": { "type": "string", - "description": "The avilable sub plans", + "description": "The available sub plans", "enum": [ "P1", "P2" ], "x-ms-enum": { - "name": "type", + "name": "subPlan", "modelAsString": true } } @@ -953,13 +953,13 @@ "properties": { "type": { "type": "string", - "description": "The avilable sub plans", + "description": "The available sub plans", "enum": [ "P1", "P2" ], "x-ms-enum": { - "name": "type", + "name": "subPlan", "modelAsString": true } } From 9f17c87db94a4ebe65a4fbab652086dcd928a7e8 Mon Sep 17 00:00:00 2001 From: Sapir Elmakayes Date: Mon, 14 Mar 2022 12:34:42 +0200 Subject: [PATCH 33/36] Remove supression --- specification/security/resource-manager/readme.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/specification/security/resource-manager/readme.md b/specification/security/resource-manager/readme.md index 73a1015c255b..a3af6674f3b5 100644 --- a/specification/security/resource-manager/readme.md +++ b/specification/security/resource-manager/readme.md @@ -56,10 +56,6 @@ directive: where: $.paths from: standards.json reason: Suppression of OperationsAPI as it doesn't apply to this specific file. - - suppress: OperationsAPIImplementation - where: $.paths - from: securityConnectors.json - reason: Suppression of OperationsAPI as it doesn't apply to this specific file ``` ### Basic Information From cd801e18156246b3ebba2be99bd1ba0fd28e5708 Mon Sep 17 00:00:00 2001 From: Sapir Elmakayes Date: Mon, 14 Mar 2022 17:01:10 +0200 Subject: [PATCH 34/36] add suppression rule back --- specification/security/resource-manager/readme.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/specification/security/resource-manager/readme.md b/specification/security/resource-manager/readme.md index 593d2ca19cee..be2240a2e80d 100644 --- a/specification/security/resource-manager/readme.md +++ b/specification/security/resource-manager/readme.md @@ -56,6 +56,10 @@ directive: where: $.paths from: standards.json reason: Suppression of OperationsAPI as it doesn't apply to this specific file. + - suppress: OperationsAPIImplementation + where: $.paths + from: securityConnectors.json + reason: Suppression of OperationsAPI as it doesn't apply to this specific file ``` ### Basic Information From 5a95a78c58add6133efc2bf05f3c1c962752c9d2 Mon Sep 17 00:00:00 2001 From: Sapir Elmakayes Date: Tue, 15 Mar 2022 11:16:51 +0200 Subject: [PATCH 35/36] Adding operations to the default tag --- specification/security/resource-manager/readme.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/specification/security/resource-manager/readme.md b/specification/security/resource-manager/readme.md index be2240a2e80d..d179236ef611 100644 --- a/specification/security/resource-manager/readme.md +++ b/specification/security/resource-manager/readme.md @@ -56,10 +56,6 @@ directive: where: $.paths from: standards.json reason: Suppression of OperationsAPI as it doesn't apply to this specific file. - - suppress: OperationsAPIImplementation - where: $.paths - from: securityConnectors.json - reason: Suppression of OperationsAPI as it doesn't apply to this specific file ``` ### Basic Information @@ -93,6 +89,7 @@ These settings apply only when `--tag=package-preview-2021-12` is specified on t ```yaml $(tag) == 'package-preview-2021-12' input-file: - Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json + - Microsoft.Security/preview/2015-06-01-preview/operations.json ``` ### Tag: package-preview-2021-08 From e0548392abdd126c92f982c02cc065831ebab087 Mon Sep 17 00:00:00 2001 From: Sapir Elmakayes Date: Tue, 15 Mar 2022 11:45:47 +0200 Subject: [PATCH 36/36] Add x-ms-identifiers --- .../preview/2021-12-01-preview/securityConnectors.json | 3 ++- specification/security/resource-manager/readme.md | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json index eaf53e620273..ea532d2d8e3a 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json @@ -361,7 +361,8 @@ "description": "A collection of offerings for the security connector.", "items": { "$ref": "#/definitions/cloudOffering" - } + }, + "x-ms-identifiers": [] }, "environmentData": { "type": "object", diff --git a/specification/security/resource-manager/readme.md b/specification/security/resource-manager/readme.md index d179236ef611..1ba45aa1c6c4 100644 --- a/specification/security/resource-manager/readme.md +++ b/specification/security/resource-manager/readme.md @@ -84,7 +84,7 @@ input-file: ### Tag: package-preview-2021-12 -These settings apply only when `--tag=package-preview-2021-12` is specified on the command line. +These settings apply only when `--tag=package-preview-2021-12-only` is specified on the command line. ```yaml $(tag) == 'package-preview-2021-12' input-file: @@ -111,7 +111,7 @@ These settings apply only when `--tag=package-composite-v1` is specified on the ``` yaml $(tag) == 'package-composite-v1' input-file: -- Microsoft.Security/preview/2021-07-01-preview/securityConnectors.json +- Microsoft.Security/preview/2021-12-01-preview/securityConnectors.json - Microsoft.Security/preview/2021-10-01-preview/mdeOnboardings.json - Microsoft.Security/preview/2021-07-01-preview/customAssessmentAutomation.json - Microsoft.Security/preview/2021-07-01-preview/customEntityStoreAssignment.json