From 96e5cc2bf8767ce226782eb78180c8d82f03415a Mon Sep 17 00:00:00 2001 From: Sapir Elmakayes <32778998+SapirElmakayes@users.noreply.github.com> Date: Tue, 13 Jul 2021 12:36:12 +0300 Subject: [PATCH 01/26] Adds base for updating Microsoft.Security from version preview/2021-05-01-preview to version 2021-07-01-preview --- .../GetSoftware_example.json | 30 ++ ...edResourceSoftwareInventories_example.json | 48 +++ ...bscriptionSoftwareInventories_example.json | 44 +++ .../softwareInventories.json | 307 ++++++++++++++++++ 4 files changed, 429 insertions(+) create mode 100644 specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SoftwareInventories/GetSoftware_example.json create mode 100644 specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SoftwareInventories/ListByExtendedResourceSoftwareInventories_example.json create mode 100644 specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SoftwareInventories/ListBySubscriptionSoftwareInventories_example.json create mode 100644 specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/softwareInventories.json diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SoftwareInventories/GetSoftware_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SoftwareInventories/GetSoftware_example.json new file mode 100644 index 000000000000..7fa8e0a868d6 --- /dev/null +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SoftwareInventories/GetSoftware_example.json @@ -0,0 +1,30 @@ +{ + "parameters": { + "api-version": "2021-05-01-preview", + "subscriptionId": "e5d1b86c-3051-44d5-8802-aa65d45a279b", + "resourceGroupName": "EITAN-TESTS", + "resourceNamespace": "Microsoft.Compute", + "resourceType": "virtualMachines", + "resourceName": "Eitan-Test1", + "softwareName": "outlook_16.0.10371.20060" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/e5d1b86c-3051-44d5-8802-aa65d45a279b/resourcegroups/EITAN-TESTS/providers/Microsoft.Compute/virtualMachines/Eitan-Test1/providers/Microsoft.Security/softwareInventories/outlook_16.0.10371.20060", + "name": "outlook_16.0.10371.20060", + "type": "Microsoft.Security/softwareInventories", + "properties": { + "deviceId": "7bd19ed6b07553e52a2844451bcec68d25963a53", + "osPlatform": "Windows10", + "vendor": "microsoft", + "softwareName": "outlook", + "version": "16.0.10371.20060", + "endOfSupportStatus": "None", + "numberOfKnownVulnerabilities": 0, + "firstSeenAt": "2021-01-26 15:48:56" + } + } + } + } +} diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SoftwareInventories/ListByExtendedResourceSoftwareInventories_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SoftwareInventories/ListByExtendedResourceSoftwareInventories_example.json new file mode 100644 index 000000000000..7e0496860960 --- /dev/null +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SoftwareInventories/ListByExtendedResourceSoftwareInventories_example.json @@ -0,0 +1,48 @@ +{ + "parameters": { + "api-version": "2021-05-01-preview", + "subscriptionId": "e5d1b86c-3051-44d5-8802-aa65d45a279b", + "resourceGroupName": "EITAN-TESTS", + "resourceNamespace": "Microsoft.Compute", + "resourceType": "virtualMachines", + "resourceName": "Eitan-Test1" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/e5d1b86c-3051-44d5-8802-aa65d45a279b/resourcegroups/EITAN-TESTS/providers/Microsoft.Compute/virtualMachines/Eitan-Test1/providers/Microsoft.Security/softwareInventories/outlook_16.0.10371.20060", + "name": "outlook_16.0.10371.20060", + "type": "Microsoft.Security/softwareInventories", + "properties": { + "deviceId": "7bd19ed6b07553e52a2844451bcec68d25963a53", + "osPlatform": "Windows10", + "vendor": "microsoft", + "softwareName": "outlook", + "version": "16.0.10371.20060", + "endOfSupportStatus": "None", + "numberOfKnownVulnerabilities": 0, + "firstSeenAt": "2021-01-26 15:48:56" + } + }, + { + "id": "/subscriptions/e5d1b86c-3051-44d5-8802-aa65d45a279b/resourcegroups/EITAN-TESTS/providers/Microsoft.Compute/virtualMachines/Eitan-Test1/providers/Microsoft.Security/softwareInventories/windows_10_10.0.19042.746", + "name": "windows_10_10.0.19042.746", + "type": "Microsoft.Security/softwareInventories", + "properties": { + "deviceId": "7bd19ed6b07553e52a2844451bcec68d25963a53", + "osPlatform": "Windows10", + "vendor": "microsoft", + "softwareName": "windows_10", + "version": "10.0.19042.746", + "endOfSupportStatus": "None", + "numberOfKnownVulnerabilities": 26, + "firstSeenAt": "2021-01-26 15:51:19" + } + } + ] + } + } + } +} diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SoftwareInventories/ListBySubscriptionSoftwareInventories_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SoftwareInventories/ListBySubscriptionSoftwareInventories_example.json new file mode 100644 index 000000000000..207deda61a4b --- /dev/null +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SoftwareInventories/ListBySubscriptionSoftwareInventories_example.json @@ -0,0 +1,44 @@ +{ + "parameters": { + "api-version": "2021-05-01-preview", + "subscriptionId": "e5d1b86c-3051-44d5-8802-aa65d45a279b" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/e5d1b86c-3051-44d5-8802-aa65d45a279b/resourcegroups/EITAN-TESTS/providers/Microsoft.Compute/virtualMachines/Eitan-Test1/providers/Microsoft.Security/softwareInventories/outlook_16.0.10371.20060", + "name": "outlook_16.0.10371.20060", + "type": "Microsoft.Security/softwareInventories", + "properties": { + "deviceId": "7bd19ed6b07553e52a2844451bcec68d25963a53", + "osPlatform": "Windows10", + "vendor": "microsoft", + "softwareName": "outlook", + "version": "16.0.10371.20060", + "endOfSupportStatus": "None", + "numberOfKnownVulnerabilities": 0, + "firstSeenAt": "2021-01-26 15:48:56" + } + }, + { + "id": "/subscriptions/e5d1b86c-3051-44d5-8802-aa65d45a279b/resourcegroups/EITAN-TESTS/providers/Microsoft.Compute/virtualMachines/Eitan-Test2/providers/Microsoft.Security/softwareInventories/windows_10_10.0.19042.746", + "name": "windows_10_10.0.19042.746", + "type": "Microsoft.Security/softwareInventories", + "properties": { + "deviceId": "7bd19ed6b07553e52a2844451bcec68d25963a53", + "osPlatform": "Windows10", + "vendor": "microsoft", + "softwareName": "windows_10", + "version": "10.0.19042.746", + "endOfSupportStatus": "None", + "numberOfKnownVulnerabilities": 26, + "firstSeenAt": "2021-01-26 15:51:19" + } + } + ] + } + } + } +} diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/softwareInventories.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/softwareInventories.json new file mode 100644 index 000000000000..1af50949c5b3 --- /dev/null +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/softwareInventories.json @@ -0,0 +1,307 @@ +{ + "swagger": "2.0", + "info": { + "title": "Security Center", + "description": "API spec for Microsoft.Security (Azure Security Center) resource provider", + "version": "2021-05-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/{resourceNamespace}/{resourceType}/{resourceName}/providers/Microsoft.Security/softwareInventories": { + "get": { + "description": "Gets the software inventory of the virtual machine.", + "operationId": "SoftwareInventories_ListByExtendedResource", + "x-ms-examples": { + "Gets the software inventory of the virtual machine": { + "$ref": "./examples/SoftwareInventories/ListByExtendedResourceSoftwareInventories_example.json" + } + }, + "tags": [ + "softwareInventories" + ], + "produces": [ + "application/json" + ], + "parameters": [ + { + "$ref": "../../../common/v1/types.json#/parameters/SubscriptionId" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/ResourceGroupName" + }, + { + "name": "resourceNamespace", + "in": "path", + "description": "The namespace of the resource.", + "required": true, + "type": "string" + }, + { + "name": "resourceType", + "in": "path", + "description": "The type of the resource.", + "required": true, + "type": "string" + }, + { + "name": "resourceName", + "in": "path", + "description": "Name of the resource.", + "required": true, + "type": "string" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/SoftwaresList" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "../../../common/v1/types.json#/definitions/CloudError" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.Security/softwareInventories": { + "get": { + "description": "Gets the software inventory of all virtual machines in the subscriptions.", + "operationId": "SoftwareInventories_ListBySubscription", + "x-ms-examples": { + "Gets the software inventory of all virtual machines in the subscriptions": { + "$ref": "./examples/SoftwareInventories/ListBySubscriptionSoftwareInventories_example.json" + } + }, + "tags": [ + "softwareInventories" + ], + "produces": [ + "application/json" + ], + "parameters": [ + { + "$ref": "../../../common/v1/types.json#/parameters/SubscriptionId" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/SoftwaresList" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "../../../common/v1/types.json#/definitions/CloudError" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceNamespace}/{resourceType}/{resourceName}/providers/Microsoft.Security/softwareInventories/{softwareName}": { + "get": { + "description": "Gets a single software data of the virtual machine.", + "operationId": "SoftwareInventories_Get", + "x-ms-examples": { + "Gets a single software data of the virtual machine": { + "$ref": "./examples/SoftwareInventories/GetSoftware_example.json" + } + }, + "tags": [ + "softwareInventories" + ], + "produces": [ + "application/json" + ], + "parameters": [ + { + "$ref": "../../../common/v1/types.json#/parameters/SubscriptionId" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/ResourceGroupName" + }, + { + "name": "resourceNamespace", + "in": "path", + "description": "The namespace of the resource.", + "required": true, + "type": "string" + }, + { + "name": "resourceType", + "in": "path", + "description": "The type of the resource.", + "required": true, + "type": "string" + }, + { + "name": "resourceName", + "in": "path", + "description": "Name of the resource.", + "required": true, + "type": "string" + }, + { + "name": "softwareName", + "in": "path", + "description": "Name of the installed software.", + "required": true, + "type": "string" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/Software" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "../../../common/v1/types.json#/definitions/CloudError" + } + } + } + } + } + }, + "definitions": { + "SoftwaresList": { + "type": "object", + "description": "Represents the software inventory of the virtual machine.", + "properties": { + "value": { + "type": "array", + "items": { + "$ref": "#/definitions/Software" + } + }, + "nextLink": { + "readOnly": true, + "type": "string", + "description": "The URI to fetch the next page." + } + } + }, + "Software": { + "type": "object", + "description": "Represents a software data", + "required": [ + "properties" + ], + "properties": { + "properties": { + "description": "Properties of the Software Inventory resource", + "x-ms-client-flatten": true, + "$ref": "#/definitions/SoftwareProperties" + } + }, + "allOf": [ + { + "$ref": "../../../common/v1/types.json#/definitions/Resource" + } + ] + }, + "SoftwareProperties": { + "description": "Software Inventory resource properties", + "properties": { + "deviceId": { + "type": "string", + "description": "Unique identifier for the virtual machine in the service." + }, + "osPlatform": { + "type": "string", + "description": "Platform of the operating system running on the device." + }, + "vendor": { + "type": "string", + "description": "Name of the software vendor." + }, + "softwareName": { + "type": "string", + "description": "Name of the software product." + }, + "version": { + "type": "string", + "description": "Version number of the software product." + }, + "endOfSupportStatus": { + "type": "string", + "description": "End of support status.", + "enum": [ + "None", + "noLongerSupported", + "versionNoLongerSupported", + "upcomingNoLongerSupported", + "upcomingVersionNoLongerSupported" + ], + "x-ms-enum": { + "name": "EndOfSupportStatus", + "modelAsString": true + } + }, + "endOfSupportDate": { + "type": "string", + "description": "The end of support date in case the product is upcoming end of support." + }, + "numberOfKnownVulnerabilities": { + "type": "integer", + "format": "int32", + "description": "Number of weaknesses." + }, + "firstSeenAt": { + "type": "string", + "description": "First time that the software was seen in the device." + } + } + } + } +} From 4bba82d5e29b08151bbc147889f041e71ac3ba2d Mon Sep 17 00:00:00 2001 From: Sapir Elmakayes <32778998+SapirElmakayes@users.noreply.github.com> Date: Tue, 13 Jul 2021 12:36:33 +0300 Subject: [PATCH 02/26] Updates readme --- specification/security/resource-manager/readme.md | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/specification/security/resource-manager/readme.md b/specification/security/resource-manager/readme.md index e09afccdb3ca..96a41b45379b 100644 --- a/specification/security/resource-manager/readme.md +++ b/specification/security/resource-manager/readme.md @@ -78,7 +78,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-composite-v3 +tag: package-preview-2021-07 ``` ### Composite packages @@ -86,6 +86,14 @@ tag: package-composite-v3 The following packages may be composed from multiple api-versions. +### Tag: package-preview-2021-07 + +These settings apply only when `--tag=package-preview-2021-07` is specified on the command line. + +```yaml $(tag) == 'package-preview-2021-07' +input-file: + - Microsoft.Security/preview/2021-07-01-preview/softwareInventories.json +``` ### Tag: package-composite-v1 These settings apply only when `--tag=package-composite-v1` is specified on the command line. @@ -511,5 +519,3 @@ See configuration in [readme.typescript.md](./readme.typescript.md) ## Ruby See configuration in [readme.ruby.md](./readme.ruby.md) - - From 8b47a94ab148e7b86045a6d0d39217fedd9ad921 Mon Sep 17 00:00:00 2001 From: Sapir Elmakayes <32778998+SapirElmakayes@users.noreply.github.com> Date: Tue, 13 Jul 2021 12:36:35 +0300 Subject: [PATCH 03/26] Updates API version in new specs and examples --- .../examples/SoftwareInventories/GetSoftware_example.json | 2 +- .../ListByExtendedResourceSoftwareInventories_example.json | 2 +- .../ListBySubscriptionSoftwareInventories_example.json | 2 +- .../preview/2021-07-01-preview/softwareInventories.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SoftwareInventories/GetSoftware_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SoftwareInventories/GetSoftware_example.json index 7fa8e0a868d6..69566966c3b1 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SoftwareInventories/GetSoftware_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SoftwareInventories/GetSoftware_example.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2021-05-01-preview", + "api-version": "2021-07-01-preview", "subscriptionId": "e5d1b86c-3051-44d5-8802-aa65d45a279b", "resourceGroupName": "EITAN-TESTS", "resourceNamespace": "Microsoft.Compute", diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SoftwareInventories/ListByExtendedResourceSoftwareInventories_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SoftwareInventories/ListByExtendedResourceSoftwareInventories_example.json index 7e0496860960..419d7250b5b7 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SoftwareInventories/ListByExtendedResourceSoftwareInventories_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SoftwareInventories/ListByExtendedResourceSoftwareInventories_example.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2021-05-01-preview", + "api-version": "2021-07-01-preview", "subscriptionId": "e5d1b86c-3051-44d5-8802-aa65d45a279b", "resourceGroupName": "EITAN-TESTS", "resourceNamespace": "Microsoft.Compute", diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SoftwareInventories/ListBySubscriptionSoftwareInventories_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SoftwareInventories/ListBySubscriptionSoftwareInventories_example.json index 207deda61a4b..2b45de7383b2 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SoftwareInventories/ListBySubscriptionSoftwareInventories_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SoftwareInventories/ListBySubscriptionSoftwareInventories_example.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2021-05-01-preview", + "api-version": "2021-07-01-preview", "subscriptionId": "e5d1b86c-3051-44d5-8802-aa65d45a279b" }, "responses": { diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/softwareInventories.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/softwareInventories.json index 1af50949c5b3..b1f4d682c039 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/softwareInventories.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/softwareInventories.json @@ -3,7 +3,7 @@ "info": { "title": "Security Center", "description": "API spec for Microsoft.Security (Azure Security Center) resource provider", - "version": "2021-05-01-preview" + "version": "2021-07-01-preview" }, "host": "management.azure.com", "schemes": [ From 449def7c6ab945b560df9e17d32def11d0e746e6 Mon Sep 17 00:00:00 2001 From: Sapir Elmakayes Date: Tue, 13 Jul 2021 19:22:33 +0300 Subject: [PATCH 04/26] Create Multi cloud API --- .../DeleteMultiCloudConnector_example.json | 11 + ...tiCloudConnectorResourceGroup_example.json | 42 ++ ...iCloudConnectorsResourceGroup_example.json | 45 ++ ...tiCloudConnectorsSubscription_example.json | 44 ++ .../PutMultiCloudConnector_example.json | 93 +++++ .../multiCloudConnector.json | 388 ++++++++++++++++++ 6 files changed, 623 insertions(+) create mode 100644 specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/DeleteMultiCloudConnector_example.json create mode 100644 specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/GetMultiCloudConnectorResourceGroup_example.json create mode 100644 specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/GetMultiCloudConnectorsResourceGroup_example.json create mode 100644 specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/GetMultiCloudConnectorsSubscription_example.json create mode 100644 specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/PutMultiCloudConnector_example.json create mode 100644 specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/multiCloudConnector.json diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/DeleteMultiCloudConnector_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/DeleteMultiCloudConnector_example.json new file mode 100644 index 000000000000..358075cd438b --- /dev/null +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/DeleteMultiCloudConnector_example.json @@ -0,0 +1,11 @@ +{ + "parameters": { + "api-version": "2021-07-01-preview", + "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23", + "resourceGroupName": "myRg", + "automationName": "myMultiCloudConnectorName" + }, + "responses": { + "204": {} + } +} diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/GetMultiCloudConnectorResourceGroup_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/GetMultiCloudConnectorResourceGroup_example.json new file mode 100644 index 000000000000..66f163bf6cb9 --- /dev/null +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/GetMultiCloudConnectorResourceGroup_example.json @@ -0,0 +1,42 @@ +{ + "parameters": { + "api-version": "2021-07-01-preview", + "subscriptionId": "a5caac9c-5c04-49af-b3d0-e204f40345d5", + "resourceGroupName": "exampleResourceGroup", + "multiCloudConnectorName": "exampleMultiCloudConnector" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/a5caac9c-5c04-49af-b3d0-e204f40345d5/resourceGroups/exampleResourceGroup/providers/Microsoft.Security/multiCloudConnector/exampleMultiCloudConnector", + "name": "exampleMultiCloudConnector", + "type": "Microsoft.Security/multiCloudConnector", + "etag": "etag value", + "location": "Central US", + "tags": {}, + "properties": { + "hierarchyId": "exampleHierarchyId", + "multiCloudName": "AWS", + "offerings": [ + { + "name": "monitoring", + "description": "Monitor your resources", + "offeringConfigurations": [ + { + "policies": [ + "readS3", + "write" + ], + "cloudRoleName": "arn:aws:iam::9843847875458:role/ASCMonitor", + "additionalData": { + "ARCResourceId": "/subscriptions/a5caac9c-5c04-49af-b3d0-e204f40345d5/resourceGroups/myTestRg/providers/Microsoft.Kubernetes/connectedClusters/myARCResource" + } + } + ] + } + ] + } + } + } + } +} diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/GetMultiCloudConnectorsResourceGroup_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/GetMultiCloudConnectorsResourceGroup_example.json new file mode 100644 index 000000000000..60fd6a14c125 --- /dev/null +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/GetMultiCloudConnectorsResourceGroup_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/multiCloudConnector/exampleMultiCloudConnector", + "name": "exampleMultiCloudConnector", + "type": "Microsoft.Security/multiCloudConnector", + "etag": "etag value", + "location": "Central US", + "tags": {}, + "properties": { + "hierarchyId": "exampleHierarchyId", + "multiCloudName": "AWS", + "offerings": [ + { + "name": "monitoring", + "description": "Monitor your resources", + "offeringConfigurations": [ + { + "policies": [ + "readS3", + "write" + ], + "cloudRoleName": "arn:aws:iam::9843847875458:role/ASCMonitor", + "additionalData": { + "ARCResourceId": "/subscriptions/a5caac9c-5c04-49af-b3d0-e204f40345d5/resourceGroups/myTestRg/providers/Microsoft.Kubernetes/connectedClusters/myARCResource" + } + } + ] + } + ] + } + } + ] + } + } + } +} diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/GetMultiCloudConnectorsSubscription_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/GetMultiCloudConnectorsSubscription_example.json new file mode 100644 index 000000000000..132fbd3e7893 --- /dev/null +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/GetMultiCloudConnectorsSubscription_example.json @@ -0,0 +1,44 @@ +{ + "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/multiCloudConnector/exampleMultiCloudConnector", + "name": "exampleMultiCloudConnector", + "type": "Microsoft.Security/multiCloudConnector", + "etag": "etag value", + "location": "Central US", + "tags": {}, + "properties": { + "hierarchyId": "exampleHierarchyId", + "multiCloudName": "AWS", + "offerings": [ + { + "name": "monitoring", + "description": "Monitor your resources", + "offeringConfigurations": [ + { + "policies": [ + "readS3", + "write" + ], + "cloudRoleName": "arn:aws:iam::9843847875458:role/ASCMonitor", + "additionalData": { + "ARCResourceId": "/subscriptions/a5caac9c-5c04-49af-b3d0-e204f40345d5/resourceGroups/myTestRg/providers/Microsoft.Kubernetes/connectedClusters/myARCResource" + } + } + ] + } + ] + } + } + ] + } + } + } +} diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/PutMultiCloudConnector_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/PutMultiCloudConnector_example.json new file mode 100644 index 000000000000..b9768647ce87 --- /dev/null +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/PutMultiCloudConnector_example.json @@ -0,0 +1,93 @@ +{ + "parameters": { + "api-version": "2021-07-01-preview", + "subscriptionId": "a5caac9c-5c04-49af-b3d0-e204f40345d5", + "MultiCloudConnectorName": "exampleMultiCloudConnector", + "resourceGroupName": "exampleResourceGroup", + "MultiCloudConnector": { + "location": "Central US", + "etag": "etag value (must be supplied for update)", + "tags": {}, + "properties": { + "hierarchyId": "exampleHierarchyId", + "multiCloudName": "AWS", + "offerings": [ + { + "name": "monitoring", + "offeringConfigurations": [ + { + "cloudRoleName": "arn:aws:iam::9843847875458:role/ASCMonitor" + } + ] + } + ] + } + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/a5caac9c-5c04-49af-b3d0-e204f40345d5/resourceGroups/exampleResourceGroup/providers/Microsoft.Security/multiCloudConnector/exampleMultiCloudConnector", + "name": "exampleMultiCloudConnector", + "type": "Microsoft.Security/multiCloudConnector", + "location": "Central US", + "etag": "new etag value", + "tags": {}, + "properties": { + "hierarchyId": "exampleHierarchyId", + "multiCloudName": "AWS", + "offerings": [ + { + "name": "monitoring", + "description": "Monitor your resources", + "offeringConfigurations": [ + { + "policies": [ + "readS3", + "write" + ], + "cloudRoleName": "arn:aws:iam::9843847875458:role/ASCMonitor", + "additionalData": { + "ARCResourceId": "/subscriptions/a5caac9c-5c04-49af-b3d0-e204f40345d5/resourceGroups/myTestRg/providers/Microsoft.Kubernetes/connectedClusters/myARCResource" + } + } + ] + } + ] + } + } + }, + "201": { + "body": { + "id": "/subscriptions/a5caac9c-5c04-49af-b3d0-e204f40345d5/resourceGroups/exampleResourceGroup/providers/Microsoft.Security/multiCloudConnector/exampleMultiCloudConnector", + "name": "exampleMultiCloudConnector", + "type": "Microsoft.Security/multiCloudConnector", + "location": "Central US", + "etag": "new etag value", + "tags": {}, + "properties": { + "hierarchyId": "exampleHierarchyId", + "multiCloudName": "AWS", + "offerings": [ + { + "name": "monitoring", + "description": "Monitor your resources", + "offeringConfigurations": [ + { + "policies": [ + "readS3", + "write" + ], + "cloudRoleName": "arn:aws:iam::9843847875458:role/ASCMonitor", + "additionalData": { + "ARCResourceId": "/subscriptions/a5caac9c-5c04-49af-b3d0-e204f40345d5/resourceGroups/myTestRg/providers/Microsoft.Kubernetes/connectedClusters/myARCResource" + } + } + ] + } + ] + } + } + } + } +} diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/multiCloudConnector.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/multiCloudConnector.json new file mode 100644 index 000000000000..404363e3f6c3 --- /dev/null +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/multiCloudConnector.json @@ -0,0 +1,388 @@ +{ + "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/multiCloudConnector": { + "get": { + "x-ms-examples": { + "List all security multi cloud connectors of a specified subscription": { + "$ref": "./examples/MultiCloudConnectors/GetMultiCloudConnectorsSubscription_example.json" + } + }, + "tags": [ + "MultiCloudConnector" + ], + "description": "Lists all the security multi cloud connectors in the specified subscription. Use the 'nextLink' property in the response to get the next page of security multi cloud connectors for the specified subscription.", + "operationId": "MultiCloudConnector_List", + "parameters": [ + { + "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/SubscriptionId" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/MultiCloudConnectorList" + } + }, + "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/multiCloudConnector": { + "get": { + "x-ms-examples": { + "List all security multi cloud connectors of a specified resource group": { + "$ref": "./examples/MultiCloudConnectors/GetMultiCloudConnectorsResourceGroup_example.json" + } + }, + "tags": [ + "MultiCloudConnector" + ], + "description": "Lists all the security multi cloud connectors in the specified resource group. Use the 'nextLink' property in the response to get the next page of security multi cloud connectors for the specified resource group.", + "operationId": "MultiCloudConnector_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/MultiCloudConnectorList" + } + }, + "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/multiCloudConnector/{multiCloudConnectorName}": { + "get": { + "x-ms-examples": { + "Retrieve a security multi cloud connector": { + "$ref": "./examples/MultiCloudConnectors/GetMultiCloudConnectorResourceGroup_example.json" + } + }, + "tags": [ + "MultiCloudConnector" + ], + "description": "Retrieves information about the model of a security multi cloud connectors.", + "operationId": "MultiCloudConnector_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/MultiCloudConnectorName" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/MultiCloudConnector" + } + }, + "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 multi cloud connector": { + "$ref": "./examples/MultiCloudConnectors/PutMultiCloudConnectors_example.json" + } + }, + "tags": [ + "MultiCloudConnector" + ], + "description": "Creates or updates a multi cloud connector. If a security multi cloud connector is already created and a subsequent request is issued for the same multi cloud connector id, then it will be updated.", + "operationId": "MultiCloudConnector_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/MultiCloudConnectorName" + }, + { + "$ref": "#/parameters/MultiCloudConnectorInBody" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/MultiCloudConnector" + } + }, + "201": { + "description": "Created", + "schema": { + "$ref": "#/definitions/MultiCloudConnector" + } + }, + "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 multi cloud connector": { + "$ref": "./examples/MultiCloudConnectors/DeleteMultiCloudConnector_example.json" + } + }, + "tags": [ + "MultiCloudConnector" + ], + "operationId": "MultiCloudConnector_Delete", + "description": "Deletes a security multi cloud 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/MultiCloudConnectorName" + } + ], + "responses": { + "204": { + "description": "NoContent" + }, + "default": { + "description": "Error response that describes why the operation failed.", + "schema": { + "$ref": "../../../common/v1/types.json#/definitions/CloudError" + } + } + } + } + } + }, + "definitions": { + "MultiCloudConnectorList": { + "description": "List of security multi cloud connectors response.", + "required": [ + "value" + ], + "properties": { + "value": { + "type": "array", + "description": "The list of security multi cloud connectors under the given scope.", + "items": { + "$ref": "#/definitions/MultiCloudConnector" + } + }, + "nextLink": { + "readOnly": true, + "type": "string", + "description": "The URI to fetch the next page." + } + } + }, + "MultiCloudConnector": { + "type": "object", + "description": "The security multi cloud connector resource.", + "properties": { + "properties": { + "x-ms-client-flatten": true, + "description": "Security multi cloud connector data", + "$ref": "#/definitions/MultiCloudConnectorProperties" + } + }, + "allOf": [ + { + "$ref": "../../../common/v1/types.json#/definitions/TrackedResource" + } + ] + }, + "MultiCloudConnectorProperties": { + "type": "object", + "description": "A set of properties that defines the multi cloud connector configuration.", + "properties": { + "hierarchyId": { + "type": "string", + "description": "The multi cloud resource identifier (account id in case of AWS connector)." + }, + "multiCloudName": { + "type": "string", + "description": "The multi cloud resource's cloud name.", + "enum": [ + "Azure", + "AWS", + "GCP" + ], + "x-ms-enum": { + "name": "cloudType", + "modelAsString": true + } + }, + "offerings": { + "type": "array", + "description": "A collection of offerings for the security multi cloud connector.", + "items": { + "$ref": "#/definitions/multiCloudOffering" + } + } + } + }, + "multiCloudOffering": { + "type": "object", + "description": "The security offering details", + "properties": { + "name": { + "type": "string", + "description": "The offering name.", + "readOnly": true + }, + "description": { + "type": "string", + "description": "The offering description.", + "readOnly": true + }, + "OfferingConfigurations": { + "type": "array", + "description": "A collection of offering configurations for the multi cloud offering.", + "items": { + "$ref": "#/definitions/multiCloudOfferingConfiguration" + } + } + } + }, + "multiCloudOfferingConfiguration": { + "type": "object", + "description": "The configuration of the offering", + "discriminator": "multiCloudName", + "required": [ + "multiCloudName" + ], + "properties": { + "policies": { + "type": "array", + "description": "The list of the required policies on the multi cloud roles for the offering.", + "items": { + "type": "string", + "description": "multi cloud role" + }, + "readOnly": true + }, + "CloudRoleName": { + "type": "string", + "description": "The multi cloud role name for the offering" + }, + "additionalData": { + "type": "object", + "description": "Additional data regarding the connector for the partners", + "additionalProperties": { + "type": "string" + } + } + } + } + }, + "parameters": { + "MultiCloudConnectorName": { + "name": "multiCloudConnectorName", + "in": "path", + "required": true, + "type": "string", + "description": "The security multi cloud connector name.", + "x-ms-parameter-location": "method" + }, + "MultiCloudConnectorInBody": { + "name": "MultiCloudConnector", + "in": "body", + "required": true, + "description": "The security multi cloud connector resource", + "schema": { + "$ref": "#/definitions/MultiCloudConnector" + }, + "x-ms-parameter-location": "method" + } + } +} \ No newline at end of file From 278f9547aa99e40f617caffa3d92089f2d57c1ec Mon Sep 17 00:00:00 2001 From: Sapir Elmakayes Date: Tue, 13 Jul 2021 21:42:20 +0300 Subject: [PATCH 05/26] Minor typo fix --- .../preview/2021-07-01-preview/multiCloudConnector.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/multiCloudConnector.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/multiCloudConnector.json index 404363e3f6c3..428e294a4fa1 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/multiCloudConnector.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/multiCloudConnector.json @@ -159,7 +159,7 @@ "put": { "x-ms-examples": { "Create or update a security multi cloud connector": { - "$ref": "./examples/MultiCloudConnectors/PutMultiCloudConnectors_example.json" + "$ref": "./examples/MultiCloudConnectors/PutMultiCloudConnector_example.json" } }, "tags": [ From c16e6b433b3781242016ca8fc3eb4fd616e0fdc4 Mon Sep 17 00:00:00 2001 From: Sapir Elmakayes Date: Wed, 14 Jul 2021 17:02:52 +0300 Subject: [PATCH 06/26] Schema change (offering type) --- .../DeleteMultiCloudConnector_example.json | 2 +- ...tiCloudConnectorResourceGroup_example.json | 9 +-- ...iCloudConnectorsResourceGroup_example.json | 9 +-- ...tiCloudConnectorsSubscription_example.json | 9 +-- .../PutMultiCloudConnector_example.json | 26 +++---- .../multiCloudConnector.json | 77 +++++++++++-------- 6 files changed, 63 insertions(+), 69 deletions(-) diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/DeleteMultiCloudConnector_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/DeleteMultiCloudConnector_example.json index 358075cd438b..5893497cd462 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/DeleteMultiCloudConnector_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/DeleteMultiCloudConnector_example.json @@ -3,7 +3,7 @@ "api-version": "2021-07-01-preview", "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23", "resourceGroupName": "myRg", - "automationName": "myMultiCloudConnectorName" + "multiCloudConnectorName": "myMultiCloudConnectorName" }, "responses": { "204": {} diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/GetMultiCloudConnectorResourceGroup_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/GetMultiCloudConnectorResourceGroup_example.json index 66f163bf6cb9..2a292a8fe528 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/GetMultiCloudConnectorResourceGroup_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/GetMultiCloudConnectorResourceGroup_example.json @@ -19,18 +19,15 @@ "multiCloudName": "AWS", "offerings": [ { - "name": "monitoring", + "offeringType": "monitoringAWS", "description": "Monitor your resources", - "offeringConfigurations": [ + "nativeCloudConnection": [ { "policies": [ "readS3", "write" ], - "cloudRoleName": "arn:aws:iam::9843847875458:role/ASCMonitor", - "additionalData": { - "ARCResourceId": "/subscriptions/a5caac9c-5c04-49af-b3d0-e204f40345d5/resourceGroups/myTestRg/providers/Microsoft.Kubernetes/connectedClusters/myARCResource" - } + "cloudRoleArn": "arn:aws:iam::9843847875458:role/ASCMonitor" } ] } diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/GetMultiCloudConnectorsResourceGroup_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/GetMultiCloudConnectorsResourceGroup_example.json index 60fd6a14c125..13d7f7391e0e 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/GetMultiCloudConnectorsResourceGroup_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/GetMultiCloudConnectorsResourceGroup_example.json @@ -20,18 +20,15 @@ "multiCloudName": "AWS", "offerings": [ { - "name": "monitoring", + "offeringType": "monitoringAWS", "description": "Monitor your resources", - "offeringConfigurations": [ + "nativeCloudConnection": [ { "policies": [ "readS3", "write" ], - "cloudRoleName": "arn:aws:iam::9843847875458:role/ASCMonitor", - "additionalData": { - "ARCResourceId": "/subscriptions/a5caac9c-5c04-49af-b3d0-e204f40345d5/resourceGroups/myTestRg/providers/Microsoft.Kubernetes/connectedClusters/myARCResource" - } + "cloudRoleArn": "arn:aws:iam::9843847875458:role/ASCMonitor" } ] } diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/GetMultiCloudConnectorsSubscription_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/GetMultiCloudConnectorsSubscription_example.json index 132fbd3e7893..9ec79d992869 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/GetMultiCloudConnectorsSubscription_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/GetMultiCloudConnectorsSubscription_example.json @@ -19,18 +19,15 @@ "multiCloudName": "AWS", "offerings": [ { - "name": "monitoring", + "offeringType": "monitoringAWS", "description": "Monitor your resources", - "offeringConfigurations": [ + "nativeCloudConnection": [ { "policies": [ "readS3", "write" ], - "cloudRoleName": "arn:aws:iam::9843847875458:role/ASCMonitor", - "additionalData": { - "ARCResourceId": "/subscriptions/a5caac9c-5c04-49af-b3d0-e204f40345d5/resourceGroups/myTestRg/providers/Microsoft.Kubernetes/connectedClusters/myARCResource" - } + "cloudRoleArn": "arn:aws:iam::9843847875458:role/ASCMonitor" } ] } diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/PutMultiCloudConnector_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/PutMultiCloudConnector_example.json index b9768647ce87..b40c927097c2 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/PutMultiCloudConnector_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/PutMultiCloudConnector_example.json @@ -13,10 +13,10 @@ "multiCloudName": "AWS", "offerings": [ { - "name": "monitoring", - "offeringConfigurations": [ + "offeringType": "monitoringAWS", + "nativeCloudConnection": [ { - "cloudRoleName": "arn:aws:iam::9843847875458:role/ASCMonitor" + "cloudRoleArn": "arn:aws:iam::9843847875458:role/ASCMonitor" } ] } @@ -38,18 +38,15 @@ "multiCloudName": "AWS", "offerings": [ { - "name": "monitoring", + "offeringType": "monitoringAWS", "description": "Monitor your resources", - "offeringConfigurations": [ + "nativeCloudConnection": [ { "policies": [ "readS3", "write" ], - "cloudRoleName": "arn:aws:iam::9843847875458:role/ASCMonitor", - "additionalData": { - "ARCResourceId": "/subscriptions/a5caac9c-5c04-49af-b3d0-e204f40345d5/resourceGroups/myTestRg/providers/Microsoft.Kubernetes/connectedClusters/myARCResource" - } + "cloudRoleArn": "arn:aws:iam::9843847875458:role/ASCMonitor" } ] } @@ -70,18 +67,15 @@ "multiCloudName": "AWS", "offerings": [ { - "name": "monitoring", + "offeringType": "monitoringAWS", "description": "Monitor your resources", - "offeringConfigurations": [ + "nativeCloudConnection": [ { "policies": [ "readS3", "write" ], - "cloudRoleName": "arn:aws:iam::9843847875458:role/ASCMonitor", - "additionalData": { - "ARCResourceId": "/subscriptions/a5caac9c-5c04-49af-b3d0-e204f40345d5/resourceGroups/myTestRg/providers/Microsoft.Kubernetes/connectedClusters/myARCResource" - } + "cloudRoleArn": "arn:aws:iam::9843847875458:role/ASCMonitor" } ] } @@ -90,4 +84,4 @@ } } } -} +} \ No newline at end of file diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/multiCloudConnector.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/multiCloudConnector.json index 428e294a4fa1..9810006c4aa5 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/multiCloudConnector.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/multiCloudConnector.json @@ -298,7 +298,7 @@ "GCP" ], "x-ms-enum": { - "name": "cloudType", + "name": "multiCloudName", "modelAsString": true } }, @@ -314,52 +314,61 @@ "multiCloudOffering": { "type": "object", "description": "The security offering details", + "discriminator": "offeringType", + "required": [ + "offeringType" + ], "properties": { - "name": { + "offeringType": { "type": "string", - "description": "The offering name.", - "readOnly": true + "description": "The type of the security offering.", + "enum": [ + "monitoringAWS" + ], + "x-ms-enum": { + "name": "offeringType", + "modelAsString": true, + "values": [ + { + "value": "monitoringAWS" + } + ] + } }, "description": { "type": "string", "description": "The offering description.", "readOnly": true - }, - "OfferingConfigurations": { - "type": "array", - "description": "A collection of offering configurations for the multi cloud offering.", - "items": { - "$ref": "#/definitions/multiCloudOfferingConfiguration" - } } } }, - "multiCloudOfferingConfiguration": { + "monitoringAWSOffering": { "type": "object", - "description": "The configuration of the offering", - "discriminator": "multiCloudName", - "required": [ - "multiCloudName" + "description": "The monitoring for AWS offering configurations", + "x-ms-discriminator-value": "monitoringAWS", + "allOf": [ + { + "$ref": "#/definitions/multiCloudOffering" + } ], "properties": { - "policies": { - "type": "array", - "description": "The list of the required policies on the multi cloud roles for the offering.", - "items": { - "type": "string", - "description": "multi cloud role" - }, - "readOnly": true - }, - "CloudRoleName": { - "type": "string", - "description": "The multi cloud role name for the offering" - }, - "additionalData": { - "type": "object", - "description": "Additional data regarding the connector for the partners", - "additionalProperties": { - "type": "string" + "nativeCloudConnection" : { + "type": "object", + "description": "The native cloud connection configuration", + "properties": { + "cloudRoleArn": { + "type": "string", + "description": "The cloud role ARN in AWS for this feature" + }, + "policies": { + "type": "array", + "description": "The list of the required policies on the multi cloud roles for the offering.", + "items": { + "type": "string", + "description": "multi cloud role" + }, + "readOnly": true + } } } } From e3625d4591374b5bbcc20819c46db8c9fd76b486 Mon Sep 17 00:00:00 2001 From: Sapir Elmakayes Date: Wed, 14 Jul 2021 17:14:06 +0300 Subject: [PATCH 07/26] Change array to object in the examples --- ...tiCloudConnectorResourceGroup_example.json | 16 +++---- ...iCloudConnectorsResourceGroup_example.json | 16 +++---- ...tiCloudConnectorsSubscription_example.json | 16 +++---- .../PutMultiCloudConnector_example.json | 44 ++++++++----------- 4 files changed, 40 insertions(+), 52 deletions(-) diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/GetMultiCloudConnectorResourceGroup_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/GetMultiCloudConnectorResourceGroup_example.json index 2a292a8fe528..d20c86c47cd1 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/GetMultiCloudConnectorResourceGroup_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/GetMultiCloudConnectorResourceGroup_example.json @@ -21,15 +21,13 @@ { "offeringType": "monitoringAWS", "description": "Monitor your resources", - "nativeCloudConnection": [ - { - "policies": [ - "readS3", - "write" - ], - "cloudRoleArn": "arn:aws:iam::9843847875458:role/ASCMonitor" - } - ] + "nativeCloudConnection": { + "policies": [ + "readS3", + "write" + ], + "cloudRoleArn": "arn:aws:iam::9843847875458:role/ASCMonitor" + } } ] } diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/GetMultiCloudConnectorsResourceGroup_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/GetMultiCloudConnectorsResourceGroup_example.json index 13d7f7391e0e..408eb2ca8606 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/GetMultiCloudConnectorsResourceGroup_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/GetMultiCloudConnectorsResourceGroup_example.json @@ -22,15 +22,13 @@ { "offeringType": "monitoringAWS", "description": "Monitor your resources", - "nativeCloudConnection": [ - { - "policies": [ - "readS3", - "write" - ], - "cloudRoleArn": "arn:aws:iam::9843847875458:role/ASCMonitor" - } - ] + "nativeCloudConnection": { + "policies": [ + "readS3", + "write" + ], + "cloudRoleArn": "arn:aws:iam::9843847875458:role/ASCMonitor" + } } ] } diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/GetMultiCloudConnectorsSubscription_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/GetMultiCloudConnectorsSubscription_example.json index 9ec79d992869..30798b6bb225 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/GetMultiCloudConnectorsSubscription_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/GetMultiCloudConnectorsSubscription_example.json @@ -21,15 +21,13 @@ { "offeringType": "monitoringAWS", "description": "Monitor your resources", - "nativeCloudConnection": [ - { - "policies": [ - "readS3", - "write" - ], - "cloudRoleArn": "arn:aws:iam::9843847875458:role/ASCMonitor" - } - ] + "nativeCloudConnection": { + "policies": [ + "readS3", + "write" + ], + "cloudRoleArn": "arn:aws:iam::9843847875458:role/ASCMonitor" + } } ] } diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/PutMultiCloudConnector_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/PutMultiCloudConnector_example.json index b40c927097c2..d2092b16592c 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/PutMultiCloudConnector_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/PutMultiCloudConnector_example.json @@ -2,9 +2,9 @@ "parameters": { "api-version": "2021-07-01-preview", "subscriptionId": "a5caac9c-5c04-49af-b3d0-e204f40345d5", - "MultiCloudConnectorName": "exampleMultiCloudConnector", + "multiCloudConnectorName": "exampleMultiCloudConnector", "resourceGroupName": "exampleResourceGroup", - "MultiCloudConnector": { + "multiCloudConnector": { "location": "Central US", "etag": "etag value (must be supplied for update)", "tags": {}, @@ -14,11 +14,9 @@ "offerings": [ { "offeringType": "monitoringAWS", - "nativeCloudConnection": [ - { - "cloudRoleArn": "arn:aws:iam::9843847875458:role/ASCMonitor" - } - ] + "nativeCloudConnection": { + "cloudRoleArn": "arn:aws:iam::9843847875458:role/ASCMonitor" + } } ] } @@ -40,15 +38,13 @@ { "offeringType": "monitoringAWS", "description": "Monitor your resources", - "nativeCloudConnection": [ - { - "policies": [ - "readS3", - "write" - ], - "cloudRoleArn": "arn:aws:iam::9843847875458:role/ASCMonitor" - } - ] + "nativeCloudConnection": { + "policies": [ + "readS3", + "write" + ], + "cloudRoleArn": "arn:aws:iam::9843847875458:role/ASCMonitor" + } } ] } @@ -69,15 +65,13 @@ { "offeringType": "monitoringAWS", "description": "Monitor your resources", - "nativeCloudConnection": [ - { - "policies": [ - "readS3", - "write" - ], - "cloudRoleArn": "arn:aws:iam::9843847875458:role/ASCMonitor" - } - ] + "nativeCloudConnection": { + "policies": [ + "readS3", + "write" + ], + "cloudRoleArn": "arn:aws:iam::9843847875458:role/ASCMonitor" + } } ] } From ab282ebef24e45f9c28c0d197688188ef4e7f952 Mon Sep 17 00:00:00 2001 From: Sapir Elmakayes Date: Wed, 14 Jul 2021 17:40:44 +0300 Subject: [PATCH 08/26] Rename to Security Connector --- ...n => DeleteSecurityConnector_example.json} | 2 +- ...curityConnectorResourceGroup_example.json} | 8 +- ...urityConnectorsResourceGroup_example.json} | 6 +- ...curityConnectorsSubscription_example.json} | 6 +- .../PutMultiCloudConnector_example.json | 16 +-- .../multiCloudConnector.json | 110 +++++++++--------- 6 files changed, 74 insertions(+), 74 deletions(-) rename specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/{DeleteMultiCloudConnector_example.json => DeleteSecurityConnector_example.json} (77%) rename specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/{GetMultiCloudConnectorResourceGroup_example.json => GetSecurityConnectorResourceGroup_example.json} (81%) rename specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/{GetMultiCloudConnectorsResourceGroup_example.json => GetSecurityConnectorsResourceGroup_example.json} (86%) rename specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/{GetMultiCloudConnectorsSubscription_example.json => GetSecurityConnectorsSubscription_example.json} (86%) diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/DeleteMultiCloudConnector_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/DeleteSecurityConnector_example.json similarity index 77% rename from specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/DeleteMultiCloudConnector_example.json rename to specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/DeleteSecurityConnector_example.json index 5893497cd462..97545784fe73 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/DeleteMultiCloudConnector_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/DeleteSecurityConnector_example.json @@ -3,7 +3,7 @@ "api-version": "2021-07-01-preview", "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23", "resourceGroupName": "myRg", - "multiCloudConnectorName": "myMultiCloudConnectorName" + "securityConnectorName": "mySecurityConnectorName" }, "responses": { "204": {} diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/GetMultiCloudConnectorResourceGroup_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/GetSecurityConnectorResourceGroup_example.json similarity index 81% rename from specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/GetMultiCloudConnectorResourceGroup_example.json rename to specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/GetSecurityConnectorResourceGroup_example.json index d20c86c47cd1..d5653d198934 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/GetMultiCloudConnectorResourceGroup_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/GetSecurityConnectorResourceGroup_example.json @@ -3,14 +3,14 @@ "api-version": "2021-07-01-preview", "subscriptionId": "a5caac9c-5c04-49af-b3d0-e204f40345d5", "resourceGroupName": "exampleResourceGroup", - "multiCloudConnectorName": "exampleMultiCloudConnector" + "securityConnectorName": "exampleSecurityConnectorName" }, "responses": { "200": { "body": { - "id": "/subscriptions/a5caac9c-5c04-49af-b3d0-e204f40345d5/resourceGroups/exampleResourceGroup/providers/Microsoft.Security/multiCloudConnector/exampleMultiCloudConnector", - "name": "exampleMultiCloudConnector", - "type": "Microsoft.Security/multiCloudConnector", + "id": "/subscriptions/a5caac9c-5c04-49af-b3d0-e204f40345d5/resourceGroups/exampleResourceGroup/providers/Microsoft.Security/securityConnector/exampleSecurityConnectorName", + "name": "exampleSecurityConnectorName", + "type": "Microsoft.Security/securityConnector", "etag": "etag value", "location": "Central US", "tags": {}, diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/GetMultiCloudConnectorsResourceGroup_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/GetSecurityConnectorsResourceGroup_example.json similarity index 86% rename from specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/GetMultiCloudConnectorsResourceGroup_example.json rename to specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/GetSecurityConnectorsResourceGroup_example.json index 408eb2ca8606..7814d33d2fef 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/GetMultiCloudConnectorsResourceGroup_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/GetSecurityConnectorsResourceGroup_example.json @@ -9,9 +9,9 @@ "body": { "value": [ { - "id": "/subscriptions/a5caac9c-5c04-49af-b3d0-e204f40345d5/resourceGroups/exampleResourceGroup/providers/Microsoft.Security/multiCloudConnector/exampleMultiCloudConnector", - "name": "exampleMultiCloudConnector", - "type": "Microsoft.Security/multiCloudConnector", + "id": "/subscriptions/a5caac9c-5c04-49af-b3d0-e204f40345d5/resourceGroups/exampleResourceGroup/providers/Microsoft.Security/securityConnector/exampleSecurityConnectorName", + "name": "exampleSecurityConnectorName", + "type": "Microsoft.Security/securityConnector", "etag": "etag value", "location": "Central US", "tags": {}, diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/GetMultiCloudConnectorsSubscription_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/GetSecurityConnectorsSubscription_example.json similarity index 86% rename from specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/GetMultiCloudConnectorsSubscription_example.json rename to specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/GetSecurityConnectorsSubscription_example.json index 30798b6bb225..5e854c67eb1c 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/GetMultiCloudConnectorsSubscription_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/GetSecurityConnectorsSubscription_example.json @@ -8,9 +8,9 @@ "body": { "value": [ { - "id": "/subscriptions/a5caac9c-5c04-49af-b3d0-e204f40345d5/resourceGroups/exampleResourceGroup/providers/Microsoft.Security/multiCloudConnector/exampleMultiCloudConnector", - "name": "exampleMultiCloudConnector", - "type": "Microsoft.Security/multiCloudConnector", + "id": "/subscriptions/a5caac9c-5c04-49af-b3d0-e204f40345d5/resourceGroups/exampleResourceGroup/providers/Microsoft.Security/securityConnector/exampleSecurityConnectorName", + "name": "exampleSecurityConnectorName", + "type": "Microsoft.Security/securityConnector", "etag": "etag value", "location": "Central US", "tags": {}, diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/PutMultiCloudConnector_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/PutMultiCloudConnector_example.json index d2092b16592c..d7a794645996 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/PutMultiCloudConnector_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/PutMultiCloudConnector_example.json @@ -2,9 +2,9 @@ "parameters": { "api-version": "2021-07-01-preview", "subscriptionId": "a5caac9c-5c04-49af-b3d0-e204f40345d5", - "multiCloudConnectorName": "exampleMultiCloudConnector", + "securityConnectorName": "exampleSecurityConnectorName", "resourceGroupName": "exampleResourceGroup", - "multiCloudConnector": { + "securityConnector": { "location": "Central US", "etag": "etag value (must be supplied for update)", "tags": {}, @@ -25,9 +25,9 @@ "responses": { "200": { "body": { - "id": "/subscriptions/a5caac9c-5c04-49af-b3d0-e204f40345d5/resourceGroups/exampleResourceGroup/providers/Microsoft.Security/multiCloudConnector/exampleMultiCloudConnector", - "name": "exampleMultiCloudConnector", - "type": "Microsoft.Security/multiCloudConnector", + "id": "/subscriptions/a5caac9c-5c04-49af-b3d0-e204f40345d5/resourceGroups/exampleResourceGroup/providers/Microsoft.Security/securityConnector/exampleSecurityConnectorName", + "name": "exampleSecurityConnectorName", + "type": "Microsoft.Security/securityConnector", "location": "Central US", "etag": "new etag value", "tags": {}, @@ -52,9 +52,9 @@ }, "201": { "body": { - "id": "/subscriptions/a5caac9c-5c04-49af-b3d0-e204f40345d5/resourceGroups/exampleResourceGroup/providers/Microsoft.Security/multiCloudConnector/exampleMultiCloudConnector", - "name": "exampleMultiCloudConnector", - "type": "Microsoft.Security/multiCloudConnector", + "id": "/subscriptions/a5caac9c-5c04-49af-b3d0-e204f40345d5/resourceGroups/exampleResourceGroup/providers/Microsoft.Security/securityConnector/exampleSecurityConnectorName", + "name": "exampleSecurityConnectorName", + "type": "Microsoft.Security/securityConnector", "location": "Central US", "etag": "new etag value", "tags": {}, diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/multiCloudConnector.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/multiCloudConnector.json index 9810006c4aa5..26dab013b2e5 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/multiCloudConnector.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/multiCloudConnector.json @@ -34,18 +34,18 @@ } }, "paths": { - "/subscriptions/{subscriptionId}/providers/Microsoft.Security/multiCloudConnector": { + "/subscriptions/{subscriptionId}/providers/Microsoft.Security/securityConnector": { "get": { "x-ms-examples": { - "List all security multi cloud connectors of a specified subscription": { - "$ref": "./examples/MultiCloudConnectors/GetMultiCloudConnectorsSubscription_example.json" + "List all security connectors of a specified subscription": { + "$ref": "./examples/SecurityConnectors/GetSecurityConnectorsSubscription_example.json" } }, "tags": [ - "MultiCloudConnector" + "SecurityConnector" ], - "description": "Lists all the security multi cloud connectors in the specified subscription. Use the 'nextLink' property in the response to get the next page of security multi cloud connectors for the specified subscription.", - "operationId": "MultiCloudConnector_List", + "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": "SecurityConnector_List", "parameters": [ { "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" @@ -58,7 +58,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/MultiCloudConnectorList" + "$ref": "#/definitions/securityConnectorList" } }, "default": { @@ -73,18 +73,18 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Security/multiCloudConnector": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Security/securityConnector": { "get": { "x-ms-examples": { - "List all security multi cloud connectors of a specified resource group": { - "$ref": "./examples/MultiCloudConnectors/GetMultiCloudConnectorsResourceGroup_example.json" + "List all security connectors of a specified resource group": { + "$ref": "./examples/SecurityConnectors/GetSecurityConnectorsResourceGroup_example.json" } }, "tags": [ - "MultiCloudConnector" + "SecurityConnector" ], - "description": "Lists all the security multi cloud connectors in the specified resource group. Use the 'nextLink' property in the response to get the next page of security multi cloud connectors for the specified resource group.", - "operationId": "MultiCloudConnector_ListByResourceGroup", + "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": "SecurityConnector_ListByResourceGroup", "parameters": [ { "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" @@ -100,7 +100,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/MultiCloudConnectorList" + "$ref": "#/definitions/securityConnectorList" } }, "default": { @@ -115,18 +115,18 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Security/multiCloudConnector/{multiCloudConnectorName}": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Security/securityConnector/{securityConnectorName}": { "get": { "x-ms-examples": { - "Retrieve a security multi cloud connector": { - "$ref": "./examples/MultiCloudConnectors/GetMultiCloudConnectorResourceGroup_example.json" + "Retrieve a security connector": { + "$ref": "./examples/SecurityConnectors/GetSecurityConnectorResourceGroup_example.json" } }, "tags": [ - "MultiCloudConnector" + "SecurityConnector" ], - "description": "Retrieves information about the model of a security multi cloud connectors.", - "operationId": "MultiCloudConnector_Get", + "description": "Retrieves information about the model of a security connectors.", + "operationId": "SecurityConnector_Get", "parameters": [ { "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" @@ -138,14 +138,14 @@ "$ref": "../../../common/v1/types.json#/parameters/ResourceGroupName" }, { - "$ref": "#/parameters/MultiCloudConnectorName" + "$ref": "#/parameters/securityConnectorName" } ], "responses": { "200": { "description": "OK", "schema": { - "$ref": "#/definitions/MultiCloudConnector" + "$ref": "#/definitions/securityConnector" } }, "default": { @@ -158,15 +158,15 @@ }, "put": { "x-ms-examples": { - "Create or update a security multi cloud connector": { - "$ref": "./examples/MultiCloudConnectors/PutMultiCloudConnector_example.json" + "Create or update a security connector": { + "$ref": "./examples/SecurityConnectors/PutSecurityConnector_example.json" } }, "tags": [ - "MultiCloudConnector" + "SecurityConnector" ], - "description": "Creates or updates a multi cloud connector. If a security multi cloud connector is already created and a subsequent request is issued for the same multi cloud connector id, then it will be updated.", - "operationId": "MultiCloudConnector_CreateOrUpdate", + "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": "SecurityConnector_CreateOrUpdate", "parameters": [ { "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" @@ -178,23 +178,23 @@ "$ref": "../../../common/v1/types.json#/parameters/ResourceGroupName" }, { - "$ref": "#/parameters/MultiCloudConnectorName" + "$ref": "#/parameters/securityConnectorName" }, { - "$ref": "#/parameters/MultiCloudConnectorInBody" + "$ref": "#/parameters/securityConnectorInBody" } ], "responses": { "200": { "description": "OK", "schema": { - "$ref": "#/definitions/MultiCloudConnector" + "$ref": "#/definitions/securityConnector" } }, "201": { "description": "Created", "schema": { - "$ref": "#/definitions/MultiCloudConnector" + "$ref": "#/definitions/securityConnector" } }, "default": { @@ -207,15 +207,15 @@ }, "delete": { "x-ms-examples": { - "Delete a security multi cloud connector": { - "$ref": "./examples/MultiCloudConnectors/DeleteMultiCloudConnector_example.json" + "Delete a security connector": { + "$ref": "./examples/SecurityConnectors/DeleteSecurityConnector_example.json" } }, "tags": [ - "MultiCloudConnector" + "SecurityConnector" ], - "operationId": "MultiCloudConnector_Delete", - "description": "Deletes a security multi cloud connector.", + "operationId": "SecurityConnector_Delete", + "description": "Deletes a security connector.", "parameters": [ { "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" @@ -227,7 +227,7 @@ "$ref": "../../../common/v1/types.json#/parameters/ResourceGroupName" }, { - "$ref": "#/parameters/MultiCloudConnectorName" + "$ref": "#/parameters/securityConnectorName" } ], "responses": { @@ -245,17 +245,17 @@ } }, "definitions": { - "MultiCloudConnectorList": { - "description": "List of security multi cloud connectors response.", + "securityConnectorList": { + "description": "List of security connectors response.", "required": [ "value" ], "properties": { "value": { "type": "array", - "description": "The list of security multi cloud connectors under the given scope.", + "description": "The list of security connectors under the given scope.", "items": { - "$ref": "#/definitions/MultiCloudConnector" + "$ref": "#/definitions/securityConnector" } }, "nextLink": { @@ -265,14 +265,14 @@ } } }, - "MultiCloudConnector": { + "securityConnector": { "type": "object", - "description": "The security multi cloud connector resource.", + "description": "The security connector resource.", "properties": { "properties": { "x-ms-client-flatten": true, - "description": "Security multi cloud connector data", - "$ref": "#/definitions/MultiCloudConnectorProperties" + "description": "Security connector data", + "$ref": "#/definitions/securityConnectorProperties" } }, "allOf": [ @@ -281,9 +281,9 @@ } ] }, - "MultiCloudConnectorProperties": { + "securityConnectorProperties": { "type": "object", - "description": "A set of properties that defines the multi cloud connector configuration.", + "description": "A set of properties that defines the security connector configuration.", "properties": { "hierarchyId": { "type": "string", @@ -304,7 +304,7 @@ }, "offerings": { "type": "array", - "description": "A collection of offerings for the security multi cloud connector.", + "description": "A collection of offerings for the security connector.", "items": { "$ref": "#/definitions/multiCloudOffering" } @@ -375,21 +375,21 @@ } }, "parameters": { - "MultiCloudConnectorName": { - "name": "multiCloudConnectorName", + "securityConnectorName": { + "name": "securityConnectorName", "in": "path", "required": true, "type": "string", - "description": "The security multi cloud connector name.", + "description": "The security connector name.", "x-ms-parameter-location": "method" }, - "MultiCloudConnectorInBody": { - "name": "MultiCloudConnector", + "securityConnectorInBody": { + "name": "securityConnector", "in": "body", "required": true, - "description": "The security multi cloud connector resource", + "description": "The security connector resource", "schema": { - "$ref": "#/definitions/MultiCloudConnector" + "$ref": "#/definitions/securityConnector" }, "x-ms-parameter-location": "method" } From eaf8845650ee7af85b0f41aace204a2b8d02924e Mon Sep 17 00:00:00 2001 From: Sapir Elmakayes Date: Wed, 14 Jul 2021 17:49:54 +0300 Subject: [PATCH 09/26] Fix files name errors --- .../DeleteSecurityConnector_example.json | 0 .../GetSecurityConnectorResourceGroup_example.json | 0 .../GetSecurityConnectorsResourceGroup_example.json | 0 .../GetSecurityConnectorsSubscription_example.json | 0 .../PutSecurityConnector_example.json} | 0 .../{multiCloudConnector.json => securityConnector.json} | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/{MultiCloudConnectors => SecurityConnectors}/DeleteSecurityConnector_example.json (100%) rename specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/{MultiCloudConnectors => SecurityConnectors}/GetSecurityConnectorResourceGroup_example.json (100%) rename specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/{MultiCloudConnectors => SecurityConnectors}/GetSecurityConnectorsResourceGroup_example.json (100%) rename specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/{MultiCloudConnectors => SecurityConnectors}/GetSecurityConnectorsSubscription_example.json (100%) rename specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/{MultiCloudConnectors/PutMultiCloudConnector_example.json => SecurityConnectors/PutSecurityConnector_example.json} (100%) rename specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/{multiCloudConnector.json => securityConnector.json} (100%) diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/DeleteSecurityConnector_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SecurityConnectors/DeleteSecurityConnector_example.json similarity index 100% rename from specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/DeleteSecurityConnector_example.json rename to specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SecurityConnectors/DeleteSecurityConnector_example.json diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/GetSecurityConnectorResourceGroup_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SecurityConnectors/GetSecurityConnectorResourceGroup_example.json similarity index 100% rename from specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/GetSecurityConnectorResourceGroup_example.json rename to specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SecurityConnectors/GetSecurityConnectorResourceGroup_example.json diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/GetSecurityConnectorsResourceGroup_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SecurityConnectors/GetSecurityConnectorsResourceGroup_example.json similarity index 100% rename from specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/GetSecurityConnectorsResourceGroup_example.json rename to specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SecurityConnectors/GetSecurityConnectorsResourceGroup_example.json diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/GetSecurityConnectorsSubscription_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SecurityConnectors/GetSecurityConnectorsSubscription_example.json similarity index 100% rename from specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/GetSecurityConnectorsSubscription_example.json rename to specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SecurityConnectors/GetSecurityConnectorsSubscription_example.json diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/PutMultiCloudConnector_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SecurityConnectors/PutSecurityConnector_example.json similarity index 100% rename from specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/MultiCloudConnectors/PutMultiCloudConnector_example.json rename to specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SecurityConnectors/PutSecurityConnector_example.json diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/multiCloudConnector.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/securityConnector.json similarity index 100% rename from specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/multiCloudConnector.json rename to specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/securityConnector.json From 850a1c4c49aa9381fd8160817e3dc9a9563b7504 Mon Sep 17 00:00:00 2001 From: Sapir Elmakayes Date: Wed, 14 Jul 2021 18:50:56 +0300 Subject: [PATCH 10/26] Remove softwareInventories (auto generated) --- .../GetSoftware_example.json | 30 -- ...edResourceSoftwareInventories_example.json | 48 --- ...bscriptionSoftwareInventories_example.json | 44 --- .../softwareInventories.json | 307 ------------------ 4 files changed, 429 deletions(-) delete mode 100644 specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SoftwareInventories/GetSoftware_example.json delete mode 100644 specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SoftwareInventories/ListByExtendedResourceSoftwareInventories_example.json delete mode 100644 specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SoftwareInventories/ListBySubscriptionSoftwareInventories_example.json delete mode 100644 specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/softwareInventories.json diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SoftwareInventories/GetSoftware_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SoftwareInventories/GetSoftware_example.json deleted file mode 100644 index 69566966c3b1..000000000000 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SoftwareInventories/GetSoftware_example.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "parameters": { - "api-version": "2021-07-01-preview", - "subscriptionId": "e5d1b86c-3051-44d5-8802-aa65d45a279b", - "resourceGroupName": "EITAN-TESTS", - "resourceNamespace": "Microsoft.Compute", - "resourceType": "virtualMachines", - "resourceName": "Eitan-Test1", - "softwareName": "outlook_16.0.10371.20060" - }, - "responses": { - "200": { - "body": { - "id": "/subscriptions/e5d1b86c-3051-44d5-8802-aa65d45a279b/resourcegroups/EITAN-TESTS/providers/Microsoft.Compute/virtualMachines/Eitan-Test1/providers/Microsoft.Security/softwareInventories/outlook_16.0.10371.20060", - "name": "outlook_16.0.10371.20060", - "type": "Microsoft.Security/softwareInventories", - "properties": { - "deviceId": "7bd19ed6b07553e52a2844451bcec68d25963a53", - "osPlatform": "Windows10", - "vendor": "microsoft", - "softwareName": "outlook", - "version": "16.0.10371.20060", - "endOfSupportStatus": "None", - "numberOfKnownVulnerabilities": 0, - "firstSeenAt": "2021-01-26 15:48:56" - } - } - } - } -} diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SoftwareInventories/ListByExtendedResourceSoftwareInventories_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SoftwareInventories/ListByExtendedResourceSoftwareInventories_example.json deleted file mode 100644 index 419d7250b5b7..000000000000 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SoftwareInventories/ListByExtendedResourceSoftwareInventories_example.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "parameters": { - "api-version": "2021-07-01-preview", - "subscriptionId": "e5d1b86c-3051-44d5-8802-aa65d45a279b", - "resourceGroupName": "EITAN-TESTS", - "resourceNamespace": "Microsoft.Compute", - "resourceType": "virtualMachines", - "resourceName": "Eitan-Test1" - }, - "responses": { - "200": { - "body": { - "value": [ - { - "id": "/subscriptions/e5d1b86c-3051-44d5-8802-aa65d45a279b/resourcegroups/EITAN-TESTS/providers/Microsoft.Compute/virtualMachines/Eitan-Test1/providers/Microsoft.Security/softwareInventories/outlook_16.0.10371.20060", - "name": "outlook_16.0.10371.20060", - "type": "Microsoft.Security/softwareInventories", - "properties": { - "deviceId": "7bd19ed6b07553e52a2844451bcec68d25963a53", - "osPlatform": "Windows10", - "vendor": "microsoft", - "softwareName": "outlook", - "version": "16.0.10371.20060", - "endOfSupportStatus": "None", - "numberOfKnownVulnerabilities": 0, - "firstSeenAt": "2021-01-26 15:48:56" - } - }, - { - "id": "/subscriptions/e5d1b86c-3051-44d5-8802-aa65d45a279b/resourcegroups/EITAN-TESTS/providers/Microsoft.Compute/virtualMachines/Eitan-Test1/providers/Microsoft.Security/softwareInventories/windows_10_10.0.19042.746", - "name": "windows_10_10.0.19042.746", - "type": "Microsoft.Security/softwareInventories", - "properties": { - "deviceId": "7bd19ed6b07553e52a2844451bcec68d25963a53", - "osPlatform": "Windows10", - "vendor": "microsoft", - "softwareName": "windows_10", - "version": "10.0.19042.746", - "endOfSupportStatus": "None", - "numberOfKnownVulnerabilities": 26, - "firstSeenAt": "2021-01-26 15:51:19" - } - } - ] - } - } - } -} diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SoftwareInventories/ListBySubscriptionSoftwareInventories_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SoftwareInventories/ListBySubscriptionSoftwareInventories_example.json deleted file mode 100644 index 2b45de7383b2..000000000000 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SoftwareInventories/ListBySubscriptionSoftwareInventories_example.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "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/EITAN-TESTS/providers/Microsoft.Compute/virtualMachines/Eitan-Test1/providers/Microsoft.Security/softwareInventories/outlook_16.0.10371.20060", - "name": "outlook_16.0.10371.20060", - "type": "Microsoft.Security/softwareInventories", - "properties": { - "deviceId": "7bd19ed6b07553e52a2844451bcec68d25963a53", - "osPlatform": "Windows10", - "vendor": "microsoft", - "softwareName": "outlook", - "version": "16.0.10371.20060", - "endOfSupportStatus": "None", - "numberOfKnownVulnerabilities": 0, - "firstSeenAt": "2021-01-26 15:48:56" - } - }, - { - "id": "/subscriptions/e5d1b86c-3051-44d5-8802-aa65d45a279b/resourcegroups/EITAN-TESTS/providers/Microsoft.Compute/virtualMachines/Eitan-Test2/providers/Microsoft.Security/softwareInventories/windows_10_10.0.19042.746", - "name": "windows_10_10.0.19042.746", - "type": "Microsoft.Security/softwareInventories", - "properties": { - "deviceId": "7bd19ed6b07553e52a2844451bcec68d25963a53", - "osPlatform": "Windows10", - "vendor": "microsoft", - "softwareName": "windows_10", - "version": "10.0.19042.746", - "endOfSupportStatus": "None", - "numberOfKnownVulnerabilities": 26, - "firstSeenAt": "2021-01-26 15:51:19" - } - } - ] - } - } - } -} diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/softwareInventories.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/softwareInventories.json deleted file mode 100644 index b1f4d682c039..000000000000 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/softwareInventories.json +++ /dev/null @@ -1,307 +0,0 @@ -{ - "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/{resourceNamespace}/{resourceType}/{resourceName}/providers/Microsoft.Security/softwareInventories": { - "get": { - "description": "Gets the software inventory of the virtual machine.", - "operationId": "SoftwareInventories_ListByExtendedResource", - "x-ms-examples": { - "Gets the software inventory of the virtual machine": { - "$ref": "./examples/SoftwareInventories/ListByExtendedResourceSoftwareInventories_example.json" - } - }, - "tags": [ - "softwareInventories" - ], - "produces": [ - "application/json" - ], - "parameters": [ - { - "$ref": "../../../common/v1/types.json#/parameters/SubscriptionId" - }, - { - "$ref": "../../../common/v1/types.json#/parameters/ResourceGroupName" - }, - { - "name": "resourceNamespace", - "in": "path", - "description": "The namespace of the resource.", - "required": true, - "type": "string" - }, - { - "name": "resourceType", - "in": "path", - "description": "The type of the resource.", - "required": true, - "type": "string" - }, - { - "name": "resourceName", - "in": "path", - "description": "Name of the resource.", - "required": true, - "type": "string" - }, - { - "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/SoftwaresList" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "../../../common/v1/types.json#/definitions/CloudError" - } - } - }, - "x-ms-pageable": { - "nextLinkName": "nextLink" - } - } - }, - "/subscriptions/{subscriptionId}/providers/Microsoft.Security/softwareInventories": { - "get": { - "description": "Gets the software inventory of all virtual machines in the subscriptions.", - "operationId": "SoftwareInventories_ListBySubscription", - "x-ms-examples": { - "Gets the software inventory of all virtual machines in the subscriptions": { - "$ref": "./examples/SoftwareInventories/ListBySubscriptionSoftwareInventories_example.json" - } - }, - "tags": [ - "softwareInventories" - ], - "produces": [ - "application/json" - ], - "parameters": [ - { - "$ref": "../../../common/v1/types.json#/parameters/SubscriptionId" - }, - { - "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/SoftwaresList" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "../../../common/v1/types.json#/definitions/CloudError" - } - } - }, - "x-ms-pageable": { - "nextLinkName": "nextLink" - } - } - }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceNamespace}/{resourceType}/{resourceName}/providers/Microsoft.Security/softwareInventories/{softwareName}": { - "get": { - "description": "Gets a single software data of the virtual machine.", - "operationId": "SoftwareInventories_Get", - "x-ms-examples": { - "Gets a single software data of the virtual machine": { - "$ref": "./examples/SoftwareInventories/GetSoftware_example.json" - } - }, - "tags": [ - "softwareInventories" - ], - "produces": [ - "application/json" - ], - "parameters": [ - { - "$ref": "../../../common/v1/types.json#/parameters/SubscriptionId" - }, - { - "$ref": "../../../common/v1/types.json#/parameters/ResourceGroupName" - }, - { - "name": "resourceNamespace", - "in": "path", - "description": "The namespace of the resource.", - "required": true, - "type": "string" - }, - { - "name": "resourceType", - "in": "path", - "description": "The type of the resource.", - "required": true, - "type": "string" - }, - { - "name": "resourceName", - "in": "path", - "description": "Name of the resource.", - "required": true, - "type": "string" - }, - { - "name": "softwareName", - "in": "path", - "description": "Name of the installed software.", - "required": true, - "type": "string" - }, - { - "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/Software" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "../../../common/v1/types.json#/definitions/CloudError" - } - } - } - } - } - }, - "definitions": { - "SoftwaresList": { - "type": "object", - "description": "Represents the software inventory of the virtual machine.", - "properties": { - "value": { - "type": "array", - "items": { - "$ref": "#/definitions/Software" - } - }, - "nextLink": { - "readOnly": true, - "type": "string", - "description": "The URI to fetch the next page." - } - } - }, - "Software": { - "type": "object", - "description": "Represents a software data", - "required": [ - "properties" - ], - "properties": { - "properties": { - "description": "Properties of the Software Inventory resource", - "x-ms-client-flatten": true, - "$ref": "#/definitions/SoftwareProperties" - } - }, - "allOf": [ - { - "$ref": "../../../common/v1/types.json#/definitions/Resource" - } - ] - }, - "SoftwareProperties": { - "description": "Software Inventory resource properties", - "properties": { - "deviceId": { - "type": "string", - "description": "Unique identifier for the virtual machine in the service." - }, - "osPlatform": { - "type": "string", - "description": "Platform of the operating system running on the device." - }, - "vendor": { - "type": "string", - "description": "Name of the software vendor." - }, - "softwareName": { - "type": "string", - "description": "Name of the software product." - }, - "version": { - "type": "string", - "description": "Version number of the software product." - }, - "endOfSupportStatus": { - "type": "string", - "description": "End of support status.", - "enum": [ - "None", - "noLongerSupported", - "versionNoLongerSupported", - "upcomingNoLongerSupported", - "upcomingVersionNoLongerSupported" - ], - "x-ms-enum": { - "name": "EndOfSupportStatus", - "modelAsString": true - } - }, - "endOfSupportDate": { - "type": "string", - "description": "The end of support date in case the product is upcoming end of support." - }, - "numberOfKnownVulnerabilities": { - "type": "integer", - "format": "int32", - "description": "Number of weaknesses." - }, - "firstSeenAt": { - "type": "string", - "description": "First time that the software was seen in the device." - } - } - } - } -} From 886610d11ebb0718e0b66e097b71f3ca79de5f89 Mon Sep 17 00:00:00 2001 From: Sapir Elmakayes Date: Thu, 15 Jul 2021 12:18:34 +0300 Subject: [PATCH 11/26] Update examples and naming --- ...ecurityConnectorResourceGroup_example.json | 5 +-- ...curityConnectorsResourceGroup_example.json | 5 +-- ...ecurityConnectorsSubscription_example.json | 5 +-- .../PutSecurityConnector_example.json | 12 +++-- .../2021-07-01-preview/securityConnector.json | 44 +++++++++---------- .../security/resource-manager/readme.md | 5 ++- 6 files changed, 37 insertions(+), 39 deletions(-) diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SecurityConnectors/GetSecurityConnectorResourceGroup_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SecurityConnectors/GetSecurityConnectorResourceGroup_example.json index d5653d198934..99f526ce6d64 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SecurityConnectors/GetSecurityConnectorResourceGroup_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SecurityConnectors/GetSecurityConnectorResourceGroup_example.json @@ -23,10 +23,9 @@ "description": "Monitor your resources", "nativeCloudConnection": { "policies": [ - "readS3", - "write" + "s3:ListBucket" ], - "cloudRoleArn": "arn:aws:iam::9843847875458:role/ASCMonitor" + "cloudRoleArn": "arn:aws:iam::00000000:role/ASCMonitor" } } ] diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SecurityConnectors/GetSecurityConnectorsResourceGroup_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SecurityConnectors/GetSecurityConnectorsResourceGroup_example.json index 7814d33d2fef..40213bbd4ea3 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SecurityConnectors/GetSecurityConnectorsResourceGroup_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SecurityConnectors/GetSecurityConnectorsResourceGroup_example.json @@ -24,10 +24,9 @@ "description": "Monitor your resources", "nativeCloudConnection": { "policies": [ - "readS3", - "write" + "s3:ListBucket" ], - "cloudRoleArn": "arn:aws:iam::9843847875458:role/ASCMonitor" + "cloudRoleArn": "arn:aws:iam::00000000:role/ASCMonitor" } } ] diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SecurityConnectors/GetSecurityConnectorsSubscription_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SecurityConnectors/GetSecurityConnectorsSubscription_example.json index 5e854c67eb1c..28af11d32758 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SecurityConnectors/GetSecurityConnectorsSubscription_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SecurityConnectors/GetSecurityConnectorsSubscription_example.json @@ -23,10 +23,9 @@ "description": "Monitor your resources", "nativeCloudConnection": { "policies": [ - "readS3", - "write" + "s3:ListBucket" ], - "cloudRoleArn": "arn:aws:iam::9843847875458:role/ASCMonitor" + "cloudRoleArn": "arn:aws:iam::00000000:role/ASCMonitor" } } ] diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SecurityConnectors/PutSecurityConnector_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SecurityConnectors/PutSecurityConnector_example.json index d7a794645996..4a5cd88b3070 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SecurityConnectors/PutSecurityConnector_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SecurityConnectors/PutSecurityConnector_example.json @@ -15,7 +15,7 @@ { "offeringType": "monitoringAWS", "nativeCloudConnection": { - "cloudRoleArn": "arn:aws:iam::9843847875458:role/ASCMonitor" + "cloudRoleArn": "arn:aws:iam::00000000:role/ASCMonitor" } } ] @@ -40,10 +40,9 @@ "description": "Monitor your resources", "nativeCloudConnection": { "policies": [ - "readS3", - "write" + "s3:ListBucket" ], - "cloudRoleArn": "arn:aws:iam::9843847875458:role/ASCMonitor" + "cloudRoleArn": "arn:aws:iam::00000000:role/ASCMonitor" } } ] @@ -67,10 +66,9 @@ "description": "Monitor your resources", "nativeCloudConnection": { "policies": [ - "readS3", - "write" + "s3:ListBucket" ], - "cloudRoleArn": "arn:aws:iam::9843847875458:role/ASCMonitor" + "cloudRoleArn": "arn:aws:iam::00000000:role/ASCMonitor" } } ] diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/securityConnector.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/securityConnector.json index 26dab013b2e5..ddba4844f9e2 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/securityConnector.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/securityConnector.json @@ -45,7 +45,7 @@ "SecurityConnector" ], "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": "SecurityConnector_List", + "operationId": "SecurityConnectors_List", "parameters": [ { "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" @@ -58,7 +58,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/securityConnectorList" + "$ref": "#/definitions/SecurityConnectorList" } }, "default": { @@ -84,7 +84,7 @@ "SecurityConnector" ], "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": "SecurityConnector_ListByResourceGroup", + "operationId": "SecurityConnectors_ListByResourceGroup", "parameters": [ { "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" @@ -100,7 +100,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/securityConnectorList" + "$ref": "#/definitions/SecurityConnectorList" } }, "default": { @@ -125,8 +125,8 @@ "tags": [ "SecurityConnector" ], - "description": "Retrieves information about the model of a security connectors.", - "operationId": "SecurityConnector_Get", + "description": "Retrieves details of a specific security connector", + "operationId": "SecurityConnectors_Get", "parameters": [ { "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" @@ -166,7 +166,7 @@ "SecurityConnector" ], "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": "SecurityConnector_CreateOrUpdate", + "operationId": "SecurityConnectors_CreateOrUpdate", "parameters": [ { "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" @@ -188,13 +188,13 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/securityConnector" + "$ref": "#/definitions/SecurityConnector" } }, "201": { "description": "Created", "schema": { - "$ref": "#/definitions/securityConnector" + "$ref": "#/definitions/SecurityConnector" } }, "default": { @@ -214,7 +214,7 @@ "tags": [ "SecurityConnector" ], - "operationId": "SecurityConnector_Delete", + "operationId": "SecurityConnectors_Delete", "description": "Deletes a security connector.", "parameters": [ { @@ -245,7 +245,7 @@ } }, "definitions": { - "securityConnectorList": { + "SecurityConnectorList": { "description": "List of security connectors response.", "required": [ "value" @@ -255,7 +255,7 @@ "type": "array", "description": "The list of security connectors under the given scope.", "items": { - "$ref": "#/definitions/securityConnector" + "$ref": "#/definitions/SecurityConnector" } }, "nextLink": { @@ -265,14 +265,14 @@ } } }, - "securityConnector": { + "SecurityConnector": { "type": "object", "description": "The security connector resource.", "properties": { "properties": { "x-ms-client-flatten": true, "description": "Security connector data", - "$ref": "#/definitions/securityConnectorProperties" + "$ref": "#/definitions/SecurityConnectorProperties" } }, "allOf": [ @@ -281,7 +281,7 @@ } ] }, - "securityConnectorProperties": { + "SecurityConnectorProperties": { "type": "object", "description": "A set of properties that defines the security connector configuration.", "properties": { @@ -306,12 +306,12 @@ "type": "array", "description": "A collection of offerings for the security connector.", "items": { - "$ref": "#/definitions/multiCloudOffering" + "$ref": "#/definitions/MultiCloudOffering" } } } }, - "multiCloudOffering": { + "MultiCloudOffering": { "type": "object", "description": "The security offering details", "discriminator": "offeringType", @@ -320,7 +320,7 @@ ], "properties": { "offeringType": { - "type": "string", + "type": "object", "description": "The type of the security offering.", "enum": [ "monitoringAWS" @@ -342,13 +342,13 @@ } } }, - "monitoringAWSOffering": { + "MonitoringAWSOffering": { "type": "object", "description": "The monitoring for AWS offering configurations", "x-ms-discriminator-value": "monitoringAWS", "allOf": [ { - "$ref": "#/definitions/multiCloudOffering" + "$ref": "#/definitions/MultiCloudOffering" } ], "properties": { @@ -362,7 +362,7 @@ }, "policies": { "type": "array", - "description": "The list of the required policies on the multi cloud roles for the offering.", + "description": "The read-only list of the required policies of the multi cloud roles for the offering.", "items": { "type": "string", "description": "multi cloud role" @@ -389,7 +389,7 @@ "required": true, "description": "The security connector resource", "schema": { - "$ref": "#/definitions/securityConnector" + "$ref": "#/definitions/SecurityConnector" }, "x-ms-parameter-location": "method" } diff --git a/specification/security/resource-manager/readme.md b/specification/security/resource-manager/readme.md index 96a41b45379b..7c9ae86b1643 100644 --- a/specification/security/resource-manager/readme.md +++ b/specification/security/resource-manager/readme.md @@ -92,7 +92,7 @@ These settings apply only when `--tag=package-preview-2021-07` is specified on t ```yaml $(tag) == 'package-preview-2021-07' input-file: - - Microsoft.Security/preview/2021-07-01-preview/softwareInventories.json + - Microsoft.Security/preview/2021-07-01-preview/securityConnector.json ``` ### Tag: package-composite-v1 @@ -100,6 +100,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/securityConnector.json - Microsoft.Security/preview/2021-05-01-preview/softwareInventories.json - Microsoft.Security/preview/2020-07-01-preview/sqlVulnerabilityAssessmentsScanOperations.json - Microsoft.Security/preview/2020-07-01-preview/sqlVulnerabilityAssessmentsScanResultsOperations.json @@ -143,6 +144,7 @@ These settings apply only when `--tag=package-composite-v2` is specified on the ``` yaml $(tag) == 'package-composite-v2' input-file: +- Microsoft.Security/preview/2021-07-01-preview/securityConnector.json - Microsoft.Security/preview/2021-05-01-preview/softwareInventories.json - Microsoft.Security/preview/2020-07-01-preview/sqlVulnerabilityAssessmentsScanOperations.json - Microsoft.Security/preview/2020-07-01-preview/sqlVulnerabilityAssessmentsScanResultsOperations.json @@ -188,6 +190,7 @@ These settings apply only when `--tag=package-composite-v3` is specified on the ``` yaml $(tag) == 'package-composite-v3' input-file: +- Microsoft.Security/preview/2021-07-01-preview/securityConnector.json - Microsoft.Security/stable/2017-08-01/complianceResults.json - Microsoft.Security/stable/2018-06-01/pricings.json - Microsoft.Security/stable/2019-01-01/advancedThreatProtectionSettings.json From 658894a105dd7efd861c93bfd885eb935561f3ef Mon Sep 17 00:00:00 2001 From: Sapir Elmakayes Date: Thu, 15 Jul 2021 12:28:19 +0300 Subject: [PATCH 12/26] Update the enum type to string --- .../GetSecurityConnectorResourceGroup_example.json | 2 +- .../GetSecurityConnectorsResourceGroup_example.json | 2 +- .../GetSecurityConnectorsSubscription_example.json | 2 +- .../PutSecurityConnector_example.json | 6 +++--- .../preview/2021-07-01-preview/securityConnector.json | 10 +++++----- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SecurityConnectors/GetSecurityConnectorResourceGroup_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SecurityConnectors/GetSecurityConnectorResourceGroup_example.json index 99f526ce6d64..b752d1ff3f2e 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SecurityConnectors/GetSecurityConnectorResourceGroup_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SecurityConnectors/GetSecurityConnectorResourceGroup_example.json @@ -19,7 +19,7 @@ "multiCloudName": "AWS", "offerings": [ { - "offeringType": "monitoringAWS", + "offeringType": "MonitoringAWS", "description": "Monitor your resources", "nativeCloudConnection": { "policies": [ diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SecurityConnectors/GetSecurityConnectorsResourceGroup_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SecurityConnectors/GetSecurityConnectorsResourceGroup_example.json index 40213bbd4ea3..8e899e86cac4 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SecurityConnectors/GetSecurityConnectorsResourceGroup_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SecurityConnectors/GetSecurityConnectorsResourceGroup_example.json @@ -20,7 +20,7 @@ "multiCloudName": "AWS", "offerings": [ { - "offeringType": "monitoringAWS", + "offeringType": "MonitoringAWS", "description": "Monitor your resources", "nativeCloudConnection": { "policies": [ diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SecurityConnectors/GetSecurityConnectorsSubscription_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SecurityConnectors/GetSecurityConnectorsSubscription_example.json index 28af11d32758..16508cbe9272 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SecurityConnectors/GetSecurityConnectorsSubscription_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SecurityConnectors/GetSecurityConnectorsSubscription_example.json @@ -19,7 +19,7 @@ "multiCloudName": "AWS", "offerings": [ { - "offeringType": "monitoringAWS", + "offeringType": "MonitoringAWS", "description": "Monitor your resources", "nativeCloudConnection": { "policies": [ diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SecurityConnectors/PutSecurityConnector_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SecurityConnectors/PutSecurityConnector_example.json index 4a5cd88b3070..bd7bfc18fd18 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SecurityConnectors/PutSecurityConnector_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SecurityConnectors/PutSecurityConnector_example.json @@ -13,7 +13,7 @@ "multiCloudName": "AWS", "offerings": [ { - "offeringType": "monitoringAWS", + "offeringType": "MonitoringAWS", "nativeCloudConnection": { "cloudRoleArn": "arn:aws:iam::00000000:role/ASCMonitor" } @@ -36,7 +36,7 @@ "multiCloudName": "AWS", "offerings": [ { - "offeringType": "monitoringAWS", + "offeringType": "MonitoringAWS", "description": "Monitor your resources", "nativeCloudConnection": { "policies": [ @@ -62,7 +62,7 @@ "multiCloudName": "AWS", "offerings": [ { - "offeringType": "monitoringAWS", + "offeringType": "MonitoringAWS", "description": "Monitor your resources", "nativeCloudConnection": { "policies": [ diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/securityConnector.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/securityConnector.json index ddba4844f9e2..febd640f6d53 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/securityConnector.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/securityConnector.json @@ -320,17 +320,17 @@ ], "properties": { "offeringType": { - "type": "object", + "type": "string", "description": "The type of the security offering.", "enum": [ - "monitoringAWS" + "MonitoringAWS" ], "x-ms-enum": { - "name": "offeringType", + "name": "OfferingType", "modelAsString": true, "values": [ { - "value": "monitoringAWS" + "value": "MonitoringAWS" } ] } @@ -345,7 +345,7 @@ "MonitoringAWSOffering": { "type": "object", "description": "The monitoring for AWS offering configurations", - "x-ms-discriminator-value": "monitoringAWS", + "x-ms-discriminator-value": "MonitoringAWS", "allOf": [ { "$ref": "#/definitions/MultiCloudOffering" From 339c010603413e95adf92f44a9f583e1e819b39f Mon Sep 17 00:00:00 2001 From: Sapir Elmakayes <32778998+SapirElmakayes@users.noreply.github.com> Date: Thu, 15 Jul 2021 12:42:39 +0300 Subject: [PATCH 13/26] Adds suppression to readme --- specification/security/resource-manager/readme.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/specification/security/resource-manager/readme.md b/specification/security/resource-manager/readme.md index 7c9ae86b1643..083dbe685272 100644 --- a/specification/security/resource-manager/readme.md +++ b/specification/security/resource-manager/readme.md @@ -68,6 +68,10 @@ directive: from: ingestionSettings.json where: $.definitions.IngestionConnectionString.properties.value reason: Secrets are OK to return in a POST response. + - suppress: LongRunningResponseStatusCode + where: '$.paths["/subscriptions/{subscriptionId}/providers/Microsoft.Security/locations/{ascLocation}/alerts/default/simulate"].post["x-ms-long-running-operation"]' + from: alerts.json + reason: This validation error cannot be removed due to technical constraints on your service side. ``` ### Basic Information @@ -85,15 +89,15 @@ tag: package-preview-2021-07 The following packages may be composed from multiple api-versions. - ### Tag: package-preview-2021-07 These settings apply only when `--tag=package-preview-2021-07` is specified on the command line. -```yaml $(tag) == 'package-preview-2021-07' +``` yaml $(tag) == 'package-preview-2021-07' input-file: - Microsoft.Security/preview/2021-07-01-preview/securityConnector.json ``` + ### Tag: package-composite-v1 These settings apply only when `--tag=package-composite-v1` is specified on the command line. From 6bcc69ce5cf605cf3fef58c71e04c598403a9760 Mon Sep 17 00:00:00 2001 From: Sapir Elmakayes Date: Thu, 15 Jul 2021 12:51:08 +0300 Subject: [PATCH 14/26] Rever the readme.md basic information --- specification/security/resource-manager/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/security/resource-manager/readme.md b/specification/security/resource-manager/readme.md index 7c9ae86b1643..46c002a1e8af 100644 --- a/specification/security/resource-manager/readme.md +++ b/specification/security/resource-manager/readme.md @@ -78,7 +78,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-07 +tag: package-composite-v3 ``` ### Composite packages From 95ab58ddeb35dd77e4881ce272231c1e517eab08 Mon Sep 17 00:00:00 2001 From: Sapir Elmakayes Date: Thu, 15 Jul 2021 13:01:19 +0300 Subject: [PATCH 15/26] Fix SecurityConnetor defenition link --- .../preview/2021-07-01-preview/securityConnector.json | 2 +- specification/security/resource-manager/readme.md | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/securityConnector.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/securityConnector.json index febd640f6d53..c2ed0053ee96 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/securityConnector.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/securityConnector.json @@ -145,7 +145,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/securityConnector" + "$ref": "#/definitions/SecurityConnector" } }, "default": { diff --git a/specification/security/resource-manager/readme.md b/specification/security/resource-manager/readme.md index 7d03d3b7ec58..3b22126e6bd9 100644 --- a/specification/security/resource-manager/readme.md +++ b/specification/security/resource-manager/readme.md @@ -68,10 +68,6 @@ directive: from: ingestionSettings.json where: $.definitions.IngestionConnectionString.properties.value reason: Secrets are OK to return in a POST response. - - suppress: LongRunningResponseStatusCode - where: '$.paths["/subscriptions/{subscriptionId}/providers/Microsoft.Security/locations/{ascLocation}/alerts/default/simulate"].post["x-ms-long-running-operation"]' - from: alerts.json - reason: This validation error cannot be removed due to technical constraints on your service side. ``` ### Basic Information From ca3e049b329773fb9507ddfdf9d6d13fc0fb3f9f Mon Sep 17 00:00:00 2001 From: Sapir Elmakayes Date: Thu, 15 Jul 2021 13:38:11 +0300 Subject: [PATCH 16/26] Policy description update --- .../preview/2021-07-01-preview/securityConnector.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/securityConnector.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/securityConnector.json index c2ed0053ee96..9452c7fbe408 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/securityConnector.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/securityConnector.json @@ -362,7 +362,7 @@ }, "policies": { "type": "array", - "description": "The read-only list of the required policies of the multi cloud roles for the offering.", + "description": "The list of the required policies of the multi cloud roles for the offering. [READ ONLY]", "items": { "type": "string", "description": "multi cloud role" From 78960e74e52242fdb24ab80a18c367bc6fcf7818 Mon Sep 17 00:00:00 2001 From: Sapir Elmakayes Date: Thu, 15 Jul 2021 13:44:08 +0300 Subject: [PATCH 17/26] Prettier file --- .../preview/2021-07-01-preview/securityConnector.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/securityConnector.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/securityConnector.json index 9452c7fbe408..e44308952f54 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/securityConnector.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/securityConnector.json @@ -1,3 +1,4 @@ + { "swagger": "2.0", "info": { @@ -352,14 +353,14 @@ } ], "properties": { - "nativeCloudConnection" : { - "type": "object", + "nativeCloudConnection": { + "type": "object", "description": "The native cloud connection configuration", "properties": { "cloudRoleArn": { "type": "string", "description": "The cloud role ARN in AWS for this feature" - }, + }, "policies": { "type": "array", "description": "The list of the required policies of the multi cloud roles for the offering. [READ ONLY]", From 3534989232a2d48059496c7ab4259369216e317e Mon Sep 17 00:00:00 2001 From: Sapir Elmakayes Date: Thu, 15 Jul 2021 15:28:26 +0300 Subject: [PATCH 18/26] Rename the minitor offering type --- .../GetSecurityConnectorResourceGroup_example.json | 2 +- .../GetSecurityConnectorsResourceGroup_example.json | 2 +- .../GetSecurityConnectorsSubscription_example.json | 2 +- .../PutSecurityConnector_example.json | 4 ++-- .../2021-07-01-preview/securityConnector.json | 12 ++++++------ 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SecurityConnectors/GetSecurityConnectorResourceGroup_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SecurityConnectors/GetSecurityConnectorResourceGroup_example.json index b752d1ff3f2e..9da448dc4ef9 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SecurityConnectors/GetSecurityConnectorResourceGroup_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SecurityConnectors/GetSecurityConnectorResourceGroup_example.json @@ -19,7 +19,7 @@ "multiCloudName": "AWS", "offerings": [ { - "offeringType": "MonitoringAWS", + "offeringType": "CSPMMonitorAWS", "description": "Monitor your resources", "nativeCloudConnection": { "policies": [ diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SecurityConnectors/GetSecurityConnectorsResourceGroup_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SecurityConnectors/GetSecurityConnectorsResourceGroup_example.json index 8e899e86cac4..8c25ea41bfbf 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SecurityConnectors/GetSecurityConnectorsResourceGroup_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SecurityConnectors/GetSecurityConnectorsResourceGroup_example.json @@ -20,7 +20,7 @@ "multiCloudName": "AWS", "offerings": [ { - "offeringType": "MonitoringAWS", + "offeringType": "CSPMMonitorAWS", "description": "Monitor your resources", "nativeCloudConnection": { "policies": [ diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SecurityConnectors/GetSecurityConnectorsSubscription_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SecurityConnectors/GetSecurityConnectorsSubscription_example.json index 16508cbe9272..edcf868b427c 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SecurityConnectors/GetSecurityConnectorsSubscription_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SecurityConnectors/GetSecurityConnectorsSubscription_example.json @@ -19,7 +19,7 @@ "multiCloudName": "AWS", "offerings": [ { - "offeringType": "MonitoringAWS", + "offeringType": "CSPMMonitorAWS", "description": "Monitor your resources", "nativeCloudConnection": { "policies": [ diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SecurityConnectors/PutSecurityConnector_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SecurityConnectors/PutSecurityConnector_example.json index bd7bfc18fd18..7d35d80c6766 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SecurityConnectors/PutSecurityConnector_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SecurityConnectors/PutSecurityConnector_example.json @@ -13,7 +13,7 @@ "multiCloudName": "AWS", "offerings": [ { - "offeringType": "MonitoringAWS", + "offeringType": "CSPMMonitorAWS", "nativeCloudConnection": { "cloudRoleArn": "arn:aws:iam::00000000:role/ASCMonitor" } @@ -36,7 +36,7 @@ "multiCloudName": "AWS", "offerings": [ { - "offeringType": "MonitoringAWS", + "offeringType": "CSPMMonitorAWS", "description": "Monitor your resources", "nativeCloudConnection": { "policies": [ diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/securityConnector.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/securityConnector.json index e44308952f54..5e6a58601c17 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/securityConnector.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/securityConnector.json @@ -299,7 +299,7 @@ "GCP" ], "x-ms-enum": { - "name": "multiCloudName", + "name": "MultiCloudName", "modelAsString": true } }, @@ -324,14 +324,14 @@ "type": "string", "description": "The type of the security offering.", "enum": [ - "MonitoringAWS" + "CSPMMonitorAWS" ], "x-ms-enum": { "name": "OfferingType", "modelAsString": true, "values": [ { - "value": "MonitoringAWS" + "value": "CSPMMonitorAWS" } ] } @@ -343,10 +343,10 @@ } } }, - "MonitoringAWSOffering": { + "CSPMMonitorAWSOffering": { "type": "object", - "description": "The monitoring for AWS offering configurations", - "x-ms-discriminator-value": "MonitoringAWS", + "description": "The CSPM monitoring for AWS offering configurations", + "x-ms-discriminator-value": "CSPMMonitorAWS", "allOf": [ { "$ref": "#/definitions/MultiCloudOffering" From 2dd78bc3ce6d0e87a7476fbd51a243b681e5df71 Mon Sep 17 00:00:00 2001 From: Sapir Elmakayes Date: Thu, 15 Jul 2021 15:32:25 +0300 Subject: [PATCH 19/26] Fix typo in the put example --- .../SecurityConnectors/PutSecurityConnector_example.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SecurityConnectors/PutSecurityConnector_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SecurityConnectors/PutSecurityConnector_example.json index 7d35d80c6766..a437807dc542 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SecurityConnectors/PutSecurityConnector_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SecurityConnectors/PutSecurityConnector_example.json @@ -62,7 +62,7 @@ "multiCloudName": "AWS", "offerings": [ { - "offeringType": "MonitoringAWS", + "offeringType": "CSPMMonitorAWS", "description": "Monitor your resources", "nativeCloudConnection": { "policies": [ From 5bc22da36647dfba999b68f2e6b22183ebd2d828 Mon Sep 17 00:00:00 2001 From: Sapir Elmakayes <32778998+SapirElmakayes@users.noreply.github.com> Date: Thu, 15 Jul 2021 17:35:53 +0300 Subject: [PATCH 20/26] Fix conflict --- 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 3b22126e6bd9..5efeace23be2 100644 --- a/specification/security/resource-manager/readme.md +++ b/specification/security/resource-manager/readme.md @@ -522,3 +522,7 @@ See configuration in [readme.typescript.md](./readme.typescript.md) ## Ruby See configuration in [readme.ruby.md](./readme.ruby.md) + +## Java + +See configuration in [readme.java.md](./readme.java.md) From 85fd47f29d0db928f150e185c6e336dba9100b9e Mon Sep 17 00:00:00 2001 From: Sapir Elmakayes Date: Thu, 15 Jul 2021 17:39:12 +0300 Subject: [PATCH 21/26] Add CSPM as custom word --- custom-words.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/custom-words.txt b/custom-words.txt index 7435ffdece6a..b4a5bd90dc9b 100644 --- a/custom-words.txt +++ b/custom-words.txt @@ -2235,3 +2235,4 @@ XLSM DOCM multislot Tebibytes +CSPM From 2303f0d17f06ee3ad7917658b902161908c9c4b1 Mon Sep 17 00:00:00 2001 From: Sapir Elmakayes Date: Thu, 15 Jul 2021 17:59:09 +0300 Subject: [PATCH 22/26] prettier files --- custom-words.txt | 2 +- .../SecurityConnectors/PutSecurityConnector_example.json | 2 +- .../preview/2021-07-01-preview/securityConnector.json | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/custom-words.txt b/custom-words.txt index b4a5bd90dc9b..26df67055d6f 100644 --- a/custom-words.txt +++ b/custom-words.txt @@ -2235,4 +2235,4 @@ XLSM DOCM multislot Tebibytes -CSPM +CSPM \ No newline at end of file diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SecurityConnectors/PutSecurityConnector_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SecurityConnectors/PutSecurityConnector_example.json index a437807dc542..8642a8f12533 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SecurityConnectors/PutSecurityConnector_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SecurityConnectors/PutSecurityConnector_example.json @@ -76,4 +76,4 @@ } } } -} \ No newline at end of file +} diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/securityConnector.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/securityConnector.json index 5e6a58601c17..82b0c1c6801b 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/securityConnector.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/securityConnector.json @@ -1,4 +1,3 @@ - { "swagger": "2.0", "info": { @@ -395,4 +394,4 @@ "x-ms-parameter-location": "method" } } -} \ No newline at end of file +} From ac6868ca1d4f959aa73181399d6775a84151e609 Mon Sep 17 00:00:00 2001 From: Sapir Elmakayes Date: Sun, 18 Jul 2021 10:48:12 +0300 Subject: [PATCH 23/26] Fix lint error - adding 200OK for delete --- .../SecurityConnectors/DeleteSecurityConnector_example.json | 1 + .../preview/2021-07-01-preview/securityConnector.json | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SecurityConnectors/DeleteSecurityConnector_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SecurityConnectors/DeleteSecurityConnector_example.json index 97545784fe73..238efa15c67c 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SecurityConnectors/DeleteSecurityConnector_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SecurityConnectors/DeleteSecurityConnector_example.json @@ -6,6 +6,7 @@ "securityConnectorName": "mySecurityConnectorName" }, "responses": { + "200": {}, "204": {} } } diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/securityConnector.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/securityConnector.json index 82b0c1c6801b..d46d569a18a0 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/securityConnector.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/securityConnector.json @@ -231,6 +231,9 @@ } ], "responses": { + "200": { + "description": "The resource was deleted successfully" + }, "204": { "description": "NoContent" }, @@ -246,6 +249,7 @@ }, "definitions": { "SecurityConnectorList": { + "type": "object", "description": "List of security connectors response.", "required": [ "value" From 66d6c955cb3eb9998116cf58ea39a250a6f29675 Mon Sep 17 00:00:00 2001 From: Sapir Elmakayes <32778998+SapirElmakayes@users.noreply.github.com> Date: Sun, 18 Jul 2021 11:45:40 +0300 Subject: [PATCH 24/26] Update readme.md Add JAVA to swagger-to-sdk --- specification/security/resource-manager/readme.md | 1 + 1 file changed, 1 insertion(+) diff --git a/specification/security/resource-manager/readme.md b/specification/security/resource-manager/readme.md index 5efeace23be2..e3efa8e4295e 100644 --- a/specification/security/resource-manager/readme.md +++ b/specification/security/resource-manager/readme.md @@ -496,6 +496,7 @@ swagger-to-sdk: - repo: azure-sdk-for-python-track2 - repo: azure-sdk-for-js - repo: azure-sdk-for-node + - repo: azure-sdk-for-java - repo: azure-resource-manager-schemas ``` From a5e2d9e994e334ee2a7d69141327bb3334abda61 Mon Sep 17 00:00:00 2001 From: Sapir Elmakayes <32778998+SapirElmakayes@users.noreply.github.com> Date: Sun, 18 Jul 2021 17:09:42 +0300 Subject: [PATCH 25/26] Update the preview tag location --- .../security/resource-manager/readme.md | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/specification/security/resource-manager/readme.md b/specification/security/resource-manager/readme.md index e3efa8e4295e..db8df31e3169 100644 --- a/specification/security/resource-manager/readme.md +++ b/specification/security/resource-manager/readme.md @@ -85,15 +85,6 @@ tag: package-composite-v3 The following packages may be composed from multiple api-versions. -### Tag: package-preview-2021-07 - -These settings apply only when `--tag=package-preview-2021-07` is specified on the command line. - -``` yaml $(tag) == 'package-preview-2021-07' -input-file: - - Microsoft.Security/preview/2021-07-01-preview/securityConnector.json -``` - ### Tag: package-composite-v1 These settings apply only when `--tag=package-composite-v1` is specified on the command line. @@ -479,6 +470,18 @@ override-info: title: SecurityCenter ``` +### Tag: package-2021-07-preview-only + +These settings apply only when `--tag=package-2021-07-preview-only` is specified on the command line. This tag is used for Ruby SDK. + +``` yaml $(tag) == 'package-2021-07-preview-only' +input-file: + - Microsoft.Security/preview/2021-07-01-preview/securityConnector.json +# Needed when there is more than one input file +override-info: + title: SecurityCenter +``` + --- # Code Generation From 09df5740a1d9a05d72a1a3638d0c4d11212861bd Mon Sep 17 00:00:00 2001 From: Sapir Elmakayes Date: Tue, 20 Jul 2021 19:40:15 +0300 Subject: [PATCH 26/26] Rename the resource to SecurityConnectors --- ...ecurityConnectorResourceGroup_example.json | 4 ++-- ...curityConnectorsResourceGroup_example.json | 4 ++-- ...ecurityConnectorsSubscription_example.json | 4 ++-- .../PutSecurityConnector_example.json | 8 +++---- ...Connector.json => securityConnectors.json} | 22 +++++++++---------- .../security/resource-manager/readme.md | 10 ++++----- 6 files changed, 26 insertions(+), 26 deletions(-) rename specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/{securityConnector.json => securityConnectors.json} (96%) diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SecurityConnectors/GetSecurityConnectorResourceGroup_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SecurityConnectors/GetSecurityConnectorResourceGroup_example.json index 9da448dc4ef9..ed0d542919c9 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SecurityConnectors/GetSecurityConnectorResourceGroup_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SecurityConnectors/GetSecurityConnectorResourceGroup_example.json @@ -8,9 +8,9 @@ "responses": { "200": { "body": { - "id": "/subscriptions/a5caac9c-5c04-49af-b3d0-e204f40345d5/resourceGroups/exampleResourceGroup/providers/Microsoft.Security/securityConnector/exampleSecurityConnectorName", + "id": "/subscriptions/a5caac9c-5c04-49af-b3d0-e204f40345d5/resourceGroups/exampleResourceGroup/providers/Microsoft.Security/securityConnectors/exampleSecurityConnectorName", "name": "exampleSecurityConnectorName", - "type": "Microsoft.Security/securityConnector", + "type": "Microsoft.Security/securityConnectors", "etag": "etag value", "location": "Central US", "tags": {}, diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SecurityConnectors/GetSecurityConnectorsResourceGroup_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SecurityConnectors/GetSecurityConnectorsResourceGroup_example.json index 8c25ea41bfbf..31ce3a2abaf7 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SecurityConnectors/GetSecurityConnectorsResourceGroup_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SecurityConnectors/GetSecurityConnectorsResourceGroup_example.json @@ -9,9 +9,9 @@ "body": { "value": [ { - "id": "/subscriptions/a5caac9c-5c04-49af-b3d0-e204f40345d5/resourceGroups/exampleResourceGroup/providers/Microsoft.Security/securityConnector/exampleSecurityConnectorName", + "id": "/subscriptions/a5caac9c-5c04-49af-b3d0-e204f40345d5/resourceGroups/exampleResourceGroup/providers/Microsoft.Security/securityConnectors/exampleSecurityConnectorName", "name": "exampleSecurityConnectorName", - "type": "Microsoft.Security/securityConnector", + "type": "Microsoft.Security/securityConnectors", "etag": "etag value", "location": "Central US", "tags": {}, diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SecurityConnectors/GetSecurityConnectorsSubscription_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SecurityConnectors/GetSecurityConnectorsSubscription_example.json index edcf868b427c..8169752f8bd7 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SecurityConnectors/GetSecurityConnectorsSubscription_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SecurityConnectors/GetSecurityConnectorsSubscription_example.json @@ -8,9 +8,9 @@ "body": { "value": [ { - "id": "/subscriptions/a5caac9c-5c04-49af-b3d0-e204f40345d5/resourceGroups/exampleResourceGroup/providers/Microsoft.Security/securityConnector/exampleSecurityConnectorName", + "id": "/subscriptions/a5caac9c-5c04-49af-b3d0-e204f40345d5/resourceGroups/exampleResourceGroup/providers/Microsoft.Security/securityConnectors/exampleSecurityConnectorName", "name": "exampleSecurityConnectorName", - "type": "Microsoft.Security/securityConnector", + "type": "Microsoft.Security/securityConnectors", "etag": "etag value", "location": "Central US", "tags": {}, diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SecurityConnectors/PutSecurityConnector_example.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SecurityConnectors/PutSecurityConnector_example.json index 8642a8f12533..08e1a73d3276 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SecurityConnectors/PutSecurityConnector_example.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/examples/SecurityConnectors/PutSecurityConnector_example.json @@ -25,9 +25,9 @@ "responses": { "200": { "body": { - "id": "/subscriptions/a5caac9c-5c04-49af-b3d0-e204f40345d5/resourceGroups/exampleResourceGroup/providers/Microsoft.Security/securityConnector/exampleSecurityConnectorName", + "id": "/subscriptions/a5caac9c-5c04-49af-b3d0-e204f40345d5/resourceGroups/exampleResourceGroup/providers/Microsoft.Security/securityConnectors/exampleSecurityConnectorName", "name": "exampleSecurityConnectorName", - "type": "Microsoft.Security/securityConnector", + "type": "Microsoft.Security/securityConnectors", "location": "Central US", "etag": "new etag value", "tags": {}, @@ -51,9 +51,9 @@ }, "201": { "body": { - "id": "/subscriptions/a5caac9c-5c04-49af-b3d0-e204f40345d5/resourceGroups/exampleResourceGroup/providers/Microsoft.Security/securityConnector/exampleSecurityConnectorName", + "id": "/subscriptions/a5caac9c-5c04-49af-b3d0-e204f40345d5/resourceGroups/exampleResourceGroup/providers/Microsoft.Security/securityConnectors/exampleSecurityConnectorName", "name": "exampleSecurityConnectorName", - "type": "Microsoft.Security/securityConnector", + "type": "Microsoft.Security/securityConnectors", "location": "Central US", "etag": "new etag value", "tags": {}, diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/securityConnector.json b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/securityConnectors.json similarity index 96% rename from specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/securityConnector.json rename to specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/securityConnectors.json index d46d569a18a0..262ea56a4f1f 100644 --- a/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/securityConnector.json +++ b/specification/security/resource-manager/Microsoft.Security/preview/2021-07-01-preview/securityConnectors.json @@ -34,7 +34,7 @@ } }, "paths": { - "/subscriptions/{subscriptionId}/providers/Microsoft.Security/securityConnector": { + "/subscriptions/{subscriptionId}/providers/Microsoft.Security/securityConnectors": { "get": { "x-ms-examples": { "List all security connectors of a specified subscription": { @@ -42,7 +42,7 @@ } }, "tags": [ - "SecurityConnector" + "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", @@ -58,7 +58,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/SecurityConnectorList" + "$ref": "#/definitions/SecurityConnectorsList" } }, "default": { @@ -73,7 +73,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Security/securityConnector": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Security/securityConnectors": { "get": { "x-ms-examples": { "List all security connectors of a specified resource group": { @@ -81,7 +81,7 @@ } }, "tags": [ - "SecurityConnector" + "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", @@ -100,7 +100,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/SecurityConnectorList" + "$ref": "#/definitions/SecurityConnectorsList" } }, "default": { @@ -115,7 +115,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Security/securityConnector/{securityConnectorName}": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Security/securityConnectors/{securityConnectorName}": { "get": { "x-ms-examples": { "Retrieve a security connector": { @@ -123,7 +123,7 @@ } }, "tags": [ - "SecurityConnector" + "SecurityConnectors" ], "description": "Retrieves details of a specific security connector", "operationId": "SecurityConnectors_Get", @@ -163,7 +163,7 @@ } }, "tags": [ - "SecurityConnector" + "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", @@ -212,7 +212,7 @@ } }, "tags": [ - "SecurityConnector" + "SecurityConnectors" ], "operationId": "SecurityConnectors_Delete", "description": "Deletes a security connector.", @@ -248,7 +248,7 @@ } }, "definitions": { - "SecurityConnectorList": { + "SecurityConnectorsList": { "type": "object", "description": "List of security connectors response.", "required": [ diff --git a/specification/security/resource-manager/readme.md b/specification/security/resource-manager/readme.md index db8df31e3169..ea7dd11bbee4 100644 --- a/specification/security/resource-manager/readme.md +++ b/specification/security/resource-manager/readme.md @@ -91,7 +91,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/securityConnector.json +- Microsoft.Security/preview/2021-07-01-preview/securityConnectors.json - Microsoft.Security/preview/2021-05-01-preview/softwareInventories.json - Microsoft.Security/preview/2020-07-01-preview/sqlVulnerabilityAssessmentsScanOperations.json - Microsoft.Security/preview/2020-07-01-preview/sqlVulnerabilityAssessmentsScanResultsOperations.json @@ -135,7 +135,7 @@ These settings apply only when `--tag=package-composite-v2` is specified on the ``` yaml $(tag) == 'package-composite-v2' input-file: -- Microsoft.Security/preview/2021-07-01-preview/securityConnector.json +- Microsoft.Security/preview/2021-07-01-preview/securityConnectors.json - Microsoft.Security/preview/2021-05-01-preview/softwareInventories.json - Microsoft.Security/preview/2020-07-01-preview/sqlVulnerabilityAssessmentsScanOperations.json - Microsoft.Security/preview/2020-07-01-preview/sqlVulnerabilityAssessmentsScanResultsOperations.json @@ -181,7 +181,7 @@ These settings apply only when `--tag=package-composite-v3` is specified on the ``` yaml $(tag) == 'package-composite-v3' input-file: -- Microsoft.Security/preview/2021-07-01-preview/securityConnector.json +- Microsoft.Security/preview/2021-07-01-preview/securityConnectors.json - Microsoft.Security/stable/2017-08-01/complianceResults.json - Microsoft.Security/stable/2018-06-01/pricings.json - Microsoft.Security/stable/2019-01-01/advancedThreatProtectionSettings.json @@ -476,7 +476,7 @@ These settings apply only when `--tag=package-2021-07-preview-only` is specified ``` yaml $(tag) == 'package-2021-07-preview-only' input-file: - - Microsoft.Security/preview/2021-07-01-preview/securityConnector.json + - Microsoft.Security/preview/2021-07-01-preview/securityConnectors.json # Needed when there is more than one input file override-info: title: SecurityCenter @@ -529,4 +529,4 @@ See configuration in [readme.ruby.md](./readme.ruby.md) ## Java -See configuration in [readme.java.md](./readme.java.md) +See configuration in [readme.java.md](./readme.java.md) \ No newline at end of file