From 750b8e8c63a5937e555ee02de903012740f13696 Mon Sep 17 00:00:00 2001 From: Sivan Manor Date: Sun, 1 Jan 2023 18:30:54 +0200 Subject: [PATCH 01/20] Pricing new version 2023-01-01 --- .../GetPricingByNameCloudPosture_example.json | 38 ++ .../GetPricingByNameContainers_example.json | 26 ++ .../Pricings/GetPricingByNameDns_example.json | 20 ++ ...tPricingByNameStorageAccounts_example.json | 34 ++ ...tPricingByNameVirtualMachines_example.json | 27 ++ .../Pricings/ListPricings_example.json | 184 ++++++++++ .../Pricings/PutPricingByName_example.json | 33 ++ .../stable/2023-01-01/pricings.json | 340 ++++++++++++++++++ 8 files changed, 702 insertions(+) create mode 100644 specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/GetPricingByNameCloudPosture_example.json create mode 100644 specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/GetPricingByNameContainers_example.json create mode 100644 specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/GetPricingByNameDns_example.json create mode 100644 specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/GetPricingByNameStorageAccounts_example.json create mode 100644 specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/GetPricingByNameVirtualMachines_example.json create mode 100644 specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/ListPricings_example.json create mode 100644 specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/PutPricingByName_example.json create mode 100644 specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/pricings.json diff --git a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/GetPricingByNameCloudPosture_example.json b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/GetPricingByNameCloudPosture_example.json new file mode 100644 index 000000000000..efda1b48d0b8 --- /dev/null +++ b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/GetPricingByNameCloudPosture_example.json @@ -0,0 +1,38 @@ +{ + "parameters": { + "api-version": "2023-01-01", + "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23", + "pricingName": "CloudPosture" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/pricings/CloudPosture", + "name": "CloudPosture", + "type": "Microsoft.Security/pricings", + "properties": { + "pricingTier": "Standard", + "freeTrialRemainingTime": "PT0S", + "extensions": [ + { + "type": "AgentlessVmScanning", + "isEnabled": true + }, + { + "type": "KubernetesMonitoring", + "isEnabled": true + }, + { + "type": "DataSensitivityScanning", + "isEnabled": true + }, + { + "type": "ContainerRegistriesVulnerabilityAssessments", + "isEnabled": true + } + ] + } + } + } + } +} diff --git a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/GetPricingByNameContainers_example.json b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/GetPricingByNameContainers_example.json new file mode 100644 index 000000000000..2fa5d05ae141 --- /dev/null +++ b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/GetPricingByNameContainers_example.json @@ -0,0 +1,26 @@ +{ + "parameters": { + "api-version": "2023-01-01", + "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23", + "pricingName": "Containers" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/pricings/Containers", + "name": "Containers", + "type": "Microsoft.Security/pricings", + "properties": { + "pricingTier": "Standard", + "freeTrialRemainingTime": "PT0S", + "extensions": [ + { + "type": "ContainerRegistriesVulnerabilityAssessments", + "isEnabled": true + } + ] + } + } + } + } +} diff --git a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/GetPricingByNameDns_example.json b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/GetPricingByNameDns_example.json new file mode 100644 index 000000000000..cb14dd7ef253 --- /dev/null +++ b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/GetPricingByNameDns_example.json @@ -0,0 +1,20 @@ +{ + "parameters": { + "api-version": "2023-01-01", + "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23", + "pricingName": "Dns" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/pricings/Dns", + "name": "Dns", + "type": "Microsoft.Security/pricings", + "properties": { + "pricingTier": "Standard", + "freeTrialRemainingTime": "PT0S" + } + } + } + } +} diff --git a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/GetPricingByNameStorageAccounts_example.json b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/GetPricingByNameStorageAccounts_example.json new file mode 100644 index 000000000000..0175c83dbd27 --- /dev/null +++ b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/GetPricingByNameStorageAccounts_example.json @@ -0,0 +1,34 @@ +{ + "parameters": { + "api-version": "2023-01-01", + "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23", + "pricingName": "StorageAccounts" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/pricings/StorageAccounts", + "name": "StorageAccounts", + "type": "Microsoft.Security/pricings", + "properties": { + "pricingTier": "Standard", + "freeTrialRemainingTime": "PT0S", + "subPlan": "PerTransaction", + "extensions": [ + { + "type": "StorageAntiMalware", + "isEnabled": true, + "additionalProperties": { + "capGBPerMonth": 10 + } + }, + { + "type": "StorageSensitivityScanning", + "isEnabled": true + } + ] + } + } + } + } +} diff --git a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/GetPricingByNameVirtualMachines_example.json b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/GetPricingByNameVirtualMachines_example.json new file mode 100644 index 000000000000..4612d33bbf7e --- /dev/null +++ b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/GetPricingByNameVirtualMachines_example.json @@ -0,0 +1,27 @@ +{ + "parameters": { + "api-version": "2023-01-01", + "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23", + "pricingName": "VirtualMachines" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/pricings/VirtualMachines", + "name": "VirtualMachines", + "type": "Microsoft.Security/pricings", + "properties": { + "pricingTier": "Standard", + "freeTrialRemainingTime": "PT0S", + "subPlan": "P1", + "extensions": [ + { + "type": "AgentlessVmScanning", + "isEnabled": true + } + ] + } + } + } + } +} diff --git a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/ListPricings_example.json b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/ListPricings_example.json new file mode 100644 index 000000000000..dd326339c02d --- /dev/null +++ b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/ListPricings_example.json @@ -0,0 +1,184 @@ +{ + "parameters": { + "api-version": "2023-01-01", + "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/pricings/VirtualMachines", + "name": "VirtualMachines", + "type": "Microsoft.Security/pricings", + "properties": { + "pricingTier": "Standard", + "freeTrialRemainingTime": "PT0S", + "subPlan": "P2", + "extensions": [ + { + "type": "AgentlessVmScanning", + "isEnabled": true + } + ] + } + }, + { + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/pricings/SqlServers", + "name": "SqlServers", + "type": "Microsoft.Security/pricings", + "properties": { + "pricingTier": "Standard", + "freeTrialRemainingTime": "PT0S" + } + }, + { + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/pricings/AppServices", + "name": "AppServices", + "type": "Microsoft.Security/pricings", + "properties": { + "pricingTier": "Free", + "freeTrialRemainingTime": "PT0S" + } + }, + { + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/pricings/StorageAccounts", + "name": "StorageAccounts", + "type": "Microsoft.Security/pricings", + "properties": { + "pricingTier": "Standard", + "freeTrialRemainingTime": "PT0S", + "subPlan": "PerStorageAccount", + "extensions": [ + { + "type": "StorageAntiMalware", + "isEnabled": true, + "additionalProperties": { + "capGBPerMonth": 10 + } + }, + { + "type": "StorageSensitivityScanning", + "isEnabled": true + } + ] + } + }, + { + "id": "/subscriptions/d34fd44c-ebfa-4a9c-bceb-9eeafe72ac15/providers/Microsoft.Security/pricings/SqlServerVirtualMachines", + "name": "SqlServerVirtualMachines", + "type": "Microsoft.Security/pricings", + "properties": { + "pricingTier": "Standard", + "freeTrialRemainingTime": "PT0S" + } + }, + { + "id": "/subscriptions/d34fd44c-ebfa-4a9c-bceb-9eeafe72ac15/providers/Microsoft.Security/pricings/KubernetesService", + "name": "KubernetesService", + "type": "Microsoft.Security/pricings", + "properties": { + "pricingTier": "Free", + "freeTrialRemainingTime": "PT0S", + "deprecated": true, + "replacedBy": [ + "Containers" + ] + } + }, + { + "id": "/subscriptions/d34fd44c-ebfa-4a9c-bceb-9eeafe72ac15/providers/Microsoft.Security/pricings/ContainerRegistry", + "name": "ContainerRegistry", + "type": "Microsoft.Security/pricings", + "properties": { + "pricingTier": "Free", + "freeTrialRemainingTime": "PT0S", + "deprecated": true, + "replacedBy": [ + "Containers" + ] + } + }, + { + "id": "/subscriptions/d34fd44c-ebfa-4a9c-bceb-9eeafe72ac15/providers/Microsoft.Security/pricings/KeyVaults", + "name": "KeyVaults", + "type": "Microsoft.Security/pricings", + "properties": { + "pricingTier": "Standard", + "freeTrialRemainingTime": "PT0S" + } + }, + { + "id": "/subscriptions/d34fd44c-ebfa-4a9c-bceb-9eeafe72ac15/providers/Microsoft.Security/pricings/Dns", + "name": "Dns", + "type": "Microsoft.Security/pricings", + "properties": { + "pricingTier": "Standard", + "freeTrialRemainingTime": "PT0S" + } + }, + { + "id": "/subscriptions/d34fd44c-ebfa-4a9c-bceb-9eeafe72ac15/providers/Microsoft.Security/pricings/Arm", + "name": "Arm", + "type": "Microsoft.Security/pricings", + "properties": { + "pricingTier": "Standard", + "freeTrialRemainingTime": "PT0S" + } + }, + { + "id": "/subscriptions/d34fd44c-ebfa-4a9c-bceb-9eeafe72ac15/providers/Microsoft.Security/pricings/OpenSourceRelationalDatabases", + "name": "OpenSourceRelationalDatabases", + "type": "Microsoft.Security/pricings", + "properties": { + "pricingTier": "Free", + "freeTrialRemainingTime": "PT0S" + } + }, + { + "id": "/subscriptions/d34fd44c-ebfa-4a9c-bceb-9eeafe72ac15/providers/Microsoft.Security/pricings/Containers", + "name": "Containers", + "type": "Microsoft.Security/pricings", + "properties": { + "pricingTier": "Standard", + "freeTrialRemainingTime": "PT0S", + "extensions": [ + { + "type": "ContainerRegistriesVulnerabilityAssessments", + "isEnabled": true + } + ] + } + }, + { + "id": "/subscriptions/d34fd44c-ebfa-4a9c-bceb-9eeafe72ac15/providers/Microsoft.Security/pricings/CloudPosture", + "name": "CloudPosture", + "type": "Microsoft.Security/pricings", + "properties": { + "pricingTier": "Standard", + "freeTrialRemainingTime": "PT0S", + "extensions": [ + { + "type": "AgentlessVmScanning", + "isEnabled": true + }, + { + "type": "KubernetesMonitoring", + "isEnabled": true + }, + { + "type": "DataSensitivityScanning", + "isEnabled": true + }, + { + "type": "ContainerRegistriesVulnerabilityAssessments", + "isEnabled": true + } + ] + } + } + ] + } + } + } +} diff --git a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/PutPricingByName_example.json b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/PutPricingByName_example.json new file mode 100644 index 000000000000..49baf95b4ebc --- /dev/null +++ b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/PutPricingByName_example.json @@ -0,0 +1,33 @@ +{ + "parameters": { + "api-version": "2023-01-01", + "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23", + "pricingName": "VirtualMachines", + "pricing": { + "properties": { + "pricingTier": "Standard", + "subPlan": "P2" + } + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/pricings/VirtualMachines", + "name": "VirtualMachines", + "type": "Microsoft.Security/pricings", + "properties": { + "pricingTier": "Standard", + "freeTrialRemainingTime": "PT0S", + "subPlan": "P2", + "extensions": [ + { + "type": "AgentlessVmScanning", + "isEnabled": true + } + ] + } + } + } + } +} diff --git a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/pricings.json b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/pricings.json new file mode 100644 index 000000000000..dfa813434dd4 --- /dev/null +++ b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/pricings.json @@ -0,0 +1,340 @@ +{ + "swagger": "2.0", + "info": { + "title": "Microsoft Defender for Cloud", + "description": "API spec for Microsoft.Security (Microsoft Defender for Cloud) resource provider", + "version": "2023-01-01" + }, + "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/pricings": { + "get": { + "x-ms-examples": { + "Get pricings on subscription": { + "$ref": "./examples/Pricings/ListPricings_example.json" + } + }, + "tags": [ + "Pricings" + ], + "description": "Lists Microsoft Defender for Cloud pricing configurations in the subscription.", + "operationId": "Pricings_List", + "parameters": [ + { + "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/SubscriptionId" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/PricingList" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "../../../common/v1/types.json#/definitions/CloudError" + } + } + } + } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.Security/pricings/{pricingName}": { + "get": { + "x-ms-examples": { + "Get pricings on subscription - VirtualMachines plan": { + "$ref": "./examples/Pricings/GetPricingByNameVirtualMachines_example.json" + }, + "Get pricings on subscription - Dns plan": { + "$ref": "./examples/Pricings/GetPricingByNameDns_example.json" + }, + "Get pricings on subscription - StorageAccounts plan": { + "$ref": "./examples/Pricings/GetPricingByNameStorageAccounts_example.json" + }, + "Get pricings on subscription - Containers plan": { + "$ref": "./examples/Pricings/GetPricingByNameContainers_example.json" + }, + "Get pricings on subscription - CloudPosture plan": { + "$ref": "./examples/Pricings/GetPricingByNameCloudPosture_example.json" + } + }, + "tags": [ + "Pricings" + ], + "description": "Gets a provided Microsoft Defender for Cloud pricing configuration in the subscription.", + "operationId": "Pricings_Get", + "parameters": [ + { + "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/SubscriptionId" + }, + { + "$ref": "#/parameters/PricingName" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/Pricing" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "../../../common/v1/types.json#/definitions/CloudError" + } + } + } + }, + "put": { + "x-ms-examples": { + "Update pricing on subscription": { + "$ref": "./examples/Pricings/PutPricingByName_example.json" + } + }, + "tags": [ + "Pricings" + ], + "description": "Updates a provided Microsoft Defender for Cloud pricing configuration in the subscription.", + "operationId": "Pricings_Update", + "parameters": [ + { + "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/SubscriptionId" + }, + { + "$ref": "#/parameters/PricingName" + }, + { + "$ref": "#/parameters/Pricing" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/Pricing" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "../../../common/v1/types.json#/definitions/CloudError" + } + } + } + } + } + }, + "definitions": { + "PricingList": { + "description": "List of pricing configurations response.", + "required": [ + "value" + ], + "properties": { + "value": { + "type": "array", + "description": "List of pricing configurations", + "items": { + "$ref": "#/definitions/Pricing" + } + } + } + }, + "Pricing": { + "type": "object", + "description": "Microsoft Defender for Cloud is provided in two pricing tiers: free and standard, with the standard tier available with a trial period. The standard tier offers advanced security capabilities, while the free tier offers basic security features.", + "properties": { + "properties": { + "x-ms-client-flatten": true, + "description": "Pricing data", + "$ref": "#/definitions/PricingProperties" + } + }, + "allOf": [ + { + "$ref": "../../../common/v1/types.json#/definitions/Resource" + } + ] + }, + "PricingProperties": { + "type": "object", + "description": "Pricing properties for the relevant scope", + "properties": { + "pricingTier": { + "type": "string", + "description": "The pricing tier value. Microsoft Defender for Cloud is provided in two pricing tiers: free and standard, with the standard tier available with a trial period. The standard tier offers advanced security capabilities, while the free tier offers basic security features.", + "enum": [ + "Free", + "Standard" + ], + "x-ms-enum": { + "name": "pricingTier", + "modelAsString": true, + "values": [ + { + "value": "Free", + "description": "Get free Microsoft Defender for Cloud experience with basic security features" + }, + { + "value": "Standard", + "description": "Get the standard Microsoft Defender for Cloud experience with advanced security features" + } + ] + } + }, + "subPlan": { + "type": "string", + "description": "The sub-plan selected for a Standard pricing configuration, when more than one sub-plan is available. Each sub-plan enables a set of security features. When not specified, full plan is applied." + }, + "freeTrialRemainingTime": { + "type": "string", + "format": "duration", + "readOnly": true, + "description": "The duration left for the subscriptions free trial period - in ISO 8601 format (e.g. P3Y6M4DT12H30M5S)." + }, + "deprecated": { + "type": "boolean", + "readOnly": true, + "description": "Optional. True if the plan is deprecated. If there are replacing plans they will appear in `replacedBy` property" + }, + "replacedBy": { + "type": "array", + "items": { + "type": "string" + }, + "readOnly": true, + "description": "Optional. List of plans that replace this plan. This property exists only if this plan is deprecated." + }, + "extensions": { + "type": "array", + "items": { + "$ref": "#/definitions/Extension" + }, + "description": "Optional. List of extensions offered under a plan." + } + }, + "required": [ + "pricingTier" + ] + }, + "Extension": { + "type": "object", + "description": "A plan's extension properties", + "properties": { + "type": { + "type": "string", + "description": "The extension type name.", + "enum": [ + "AgentlessVmScanning", + "KubernetesMonitoring", + "DataSensitivityScanning", + "StorageAntiMalware", + "StorageSensitivityScanning", + "ContainerRegistriesVulnerabilityAssessments" + ], + "x-ms-enum": { + "name": "type", + "modelAsString": true, + "values": [ + { + "value": "AgentlessVmScanning", + "description": "Available for DCSPM and D4Servers P2 plans." + }, + { + "value": "KubernetesMonitoring", + "description": "Gathers information about Kubernetes cluster architecture, workload objects, and setup. Required for agentless discovery and monitoring of Kubernetes and containers estate, identity and network exposure detection, attack path analysis and risk hunting as part of the cloud security explorer.\r\nAvailable for DCSPM plan." + }, + { + "value": "DataSensitivityScanning", + "description": "Available for DCSPM plan." + }, + { + "value": "StorageAntiMalware", + "description": "Available for StorageAccounts plan." + }, + { + "value": "StorageSensitivityScanning", + "description": "Available for StorageAccounts plan." + }, + { + "value": "ContainerRegistriesVulnerabilityAssessments", + "description": "Provides vulnerability management for images stored in your container registries.\r\nAvailable for DCSPM and Containers plans." + } + ] + } + }, + "isEnabled": { + "type": "boolean", + "description": "Indicates whether the extension is enabled." + }, + "additionalProperties": { + "type": "object", + "description": "Property values associated with the extension.", + "additionalProperties": true + } + }, + "required": [ + "type", + "isEnabled" + ] + } + }, + "parameters": { + "PricingName": { + "name": "pricingName", + "in": "path", + "required": true, + "type": "string", + "description": "name of the pricing configuration", + "x-ms-parameter-location": "method" + }, + "Pricing": { + "name": "pricing", + "in": "body", + "required": true, + "description": "Pricing object", + "schema": { + "$ref": "#/definitions/Pricing" + }, + "x-ms-parameter-location": "method" + } + } +} From 6957b84c933dc14881911a1d6e129752f573c5e7 Mon Sep 17 00:00:00 2001 From: Sivan Manor Date: Mon, 2 Jan 2023 10:55:13 +0200 Subject: [PATCH 02/20] Rename additionalProperty --- custom-words.txt | 3 +++ .../GetPricingByNameStorageAccounts_example.json | 2 +- .../examples/Pricings/ListPricings_example.json | 2 +- .../stable/2023-01-01/pricings.json | 4 ++-- specification/security/resource-manager/readme.md | 11 ++++++++++- 5 files changed, 17 insertions(+), 5 deletions(-) diff --git a/custom-words.txt b/custom-words.txt index aa5c2731d668..8b614cf4c423 100644 --- a/custom-words.txt +++ b/custom-words.txt @@ -49,6 +49,8 @@ afdx affinitized AFRI AFRINIC +agentless +Agentless agentpool aggregatedcost Agri @@ -539,6 +541,7 @@ davinci Dbinstance DBFS DCOS +DCSPM ddagpu Ddos DDTHH diff --git a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/GetPricingByNameStorageAccounts_example.json b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/GetPricingByNameStorageAccounts_example.json index 0175c83dbd27..e8fb7cae3a9b 100644 --- a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/GetPricingByNameStorageAccounts_example.json +++ b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/GetPricingByNameStorageAccounts_example.json @@ -18,7 +18,7 @@ { "type": "StorageAntiMalware", "isEnabled": true, - "additionalProperties": { + "additionalExtensionProperties": { "capGBPerMonth": 10 } }, diff --git a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/ListPricings_example.json b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/ListPricings_example.json index dd326339c02d..825393dfc0a7 100644 --- a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/ListPricings_example.json +++ b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/ListPricings_example.json @@ -53,7 +53,7 @@ { "type": "StorageAntiMalware", "isEnabled": true, - "additionalProperties": { + "additionalExtensionProperties": { "capGBPerMonth": 10 } }, diff --git a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/pricings.json b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/pricings.json index dfa813434dd4..f3da07007f0e 100644 --- a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/pricings.json +++ b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/pricings.json @@ -305,10 +305,10 @@ "type": "boolean", "description": "Indicates whether the extension is enabled." }, - "additionalProperties": { + "additionalExtensionProperties": { "type": "object", "description": "Property values associated with the extension.", - "additionalProperties": true + "additionalProperties": {} } }, "required": [ diff --git a/specification/security/resource-manager/readme.md b/specification/security/resource-manager/readme.md index b066496780bb..22ca784ba48c 100644 --- a/specification/security/resource-manager/readme.md +++ b/specification/security/resource-manager/readme.md @@ -148,6 +148,15 @@ input-file: - Microsoft.Security/stable/2022-03-01/pricings.json ``` +### Tag: package-2023-01 + +These settings apply only when `--tag=package-2023-01` is specified on the command line. + +``` yaml $(tag) == 'package-2023-01' +input-file: + - Microsoft.Security/stable/2023-01-01/pricings.json +``` + ### Tag: package-preview-2021-12 These settings apply only when `--tag=package-preview-2021-12-only` is specified on the command line. @@ -277,7 +286,7 @@ input-file: - Microsoft.Security/preview/2021-07-01-preview/customAssessmentAutomation.json - Microsoft.Security/preview/2021-07-01-preview/customEntityStoreAssignment.json - Microsoft.Security/stable/2017-08-01/complianceResults.json -- Microsoft.Security/stable/2022-03-01/pricings.json +- Microsoft.Security/stable/2023-01-01/pricings.json - Microsoft.Security/stable/2019-01-01/advancedThreatProtectionSettings.json - Microsoft.Security/stable/2019-08-01/deviceSecurityGroups.json - Microsoft.Security/stable/2019-08-01/iotSecuritySolutions.json From 29cefe69ac323fe6424a80e032d7571980f8fa8a Mon Sep 17 00:00:00 2001 From: Sivan Manor Date: Mon, 2 Jan 2023 16:49:30 +0200 Subject: [PATCH 03/20] change to AgentlessDiscoveryForKubernetes --- .../GetPricingByNameCloudPosture_example.json | 2 +- .../Pricings/ListPricings_example.json | 2 +- .../Pricings/PutPricingByName_example.json | 48 +++++++++++++++++-- .../stable/2023-01-01/pricings.json | 14 ++++-- 4 files changed, 57 insertions(+), 9 deletions(-) diff --git a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/GetPricingByNameCloudPosture_example.json b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/GetPricingByNameCloudPosture_example.json index efda1b48d0b8..e32f58eeaedf 100644 --- a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/GetPricingByNameCloudPosture_example.json +++ b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/GetPricingByNameCloudPosture_example.json @@ -19,7 +19,7 @@ "isEnabled": true }, { - "type": "KubernetesMonitoring", + "type": "AgentlessDiscoveryForKubernetes", "isEnabled": true }, { diff --git a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/ListPricings_example.json b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/ListPricings_example.json index 825393dfc0a7..63d8402ee757 100644 --- a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/ListPricings_example.json +++ b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/ListPricings_example.json @@ -163,7 +163,7 @@ "isEnabled": true }, { - "type": "KubernetesMonitoring", + "type": "AgentlessDiscoveryForKubernetes", "isEnabled": true }, { diff --git a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/PutPricingByName_example.json b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/PutPricingByName_example.json index 49baf95b4ebc..79aefca3f2b8 100644 --- a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/PutPricingByName_example.json +++ b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/PutPricingByName_example.json @@ -2,7 +2,7 @@ "parameters": { "api-version": "2023-01-01", "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23", - "pricingName": "VirtualMachines", + "pricingName": "CloudPosture", "pricing": { "properties": { "pricingTier": "Standard", @@ -13,17 +13,57 @@ "responses": { "200": { "body": { - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/pricings/VirtualMachines", - "name": "VirtualMachines", + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/pricings/CloudPosture", + "name": "CloudPosture", "type": "Microsoft.Security/pricings", "properties": { "pricingTier": "Standard", "freeTrialRemainingTime": "PT0S", - "subPlan": "P2", "extensions": [ { "type": "AgentlessVmScanning", "isEnabled": true + }, + { + "type": "AgentlessDiscoveryForKubernetes", + "isEnabled": true + }, + { + "type": "DataSensitivityScanning", + "isEnabled": true + }, + { + "type": "ContainerRegistriesVulnerabilityAssessments", + "isEnabled": true + } + ] + } + } + }, + "207": { + "body": { + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/pricings/CloudPosture", + "name": "CloudPosture", + "type": "Microsoft.Security/pricings", + "properties": { + "pricingTier": "Standard", + "freeTrialRemainingTime": "PT0S", + "extensions": [ + { + "type": "AgentlessVmScanning", + "isEnabled": true + }, + { + "type": "AgentlessDiscoveryForKubernetes", + "isEnabled": false + }, + { + "type": "DataSensitivityScanning", + "isEnabled": false + }, + { + "type": "ContainerRegistriesVulnerabilityAssessments", + "isEnabled": false } ] } diff --git a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/pricings.json b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/pricings.json index f3da07007f0e..853442832455 100644 --- a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/pricings.json +++ b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/pricings.json @@ -152,6 +152,12 @@ "$ref": "#/definitions/Pricing" } }, + "207": { + "description": "Partial Success - Missing Permissions", + "schema": { + "$ref": "#/definitions/Pricing" + } + }, "default": { "description": "Error response describing why the operation failed.", "schema": { @@ -164,6 +170,7 @@ }, "definitions": { "PricingList": { + "type": "object", "description": "List of pricing configurations response.", "required": [ "value" @@ -264,7 +271,7 @@ "description": "The extension type name.", "enum": [ "AgentlessVmScanning", - "KubernetesMonitoring", + "AgentlessDiscoveryForKubernetes", "DataSensitivityScanning", "StorageAntiMalware", "StorageSensitivityScanning", @@ -279,8 +286,8 @@ "description": "Available for DCSPM and D4Servers P2 plans." }, { - "value": "KubernetesMonitoring", - "description": "Gathers information about Kubernetes cluster architecture, workload objects, and setup. Required for agentless discovery and monitoring of Kubernetes and containers estate, identity and network exposure detection, attack path analysis and risk hunting as part of the cloud security explorer.\r\nAvailable for DCSPM plan." + "value": "AgentlessDiscoveryForKubernetes", + "description": "API-based discovery of information about Kubernetes cluster architecture, workload objects, and setup. Required for Kubernetes inventory, identity and network exposure detection, attack path analysis and risk hunting as part of the cloud security explorer.\r\nAvailable for DCSPM plan." }, { "value": "DataSensitivityScanning", @@ -323,6 +330,7 @@ "in": "path", "required": true, "type": "string", + "pattern": "^[a-zA-Z][a-zA-Z0-9_]+$", "description": "name of the pricing configuration", "x-ms-parameter-location": "method" }, From 053db88b9e966733ac7cbb0843788de5c6e0684c Mon Sep 17 00:00:00 2001 From: Sivan Manor Date: Wed, 4 Jan 2023 17:33:16 +0200 Subject: [PATCH 04/20] code revirew --- .../Pricings/GetPricingByNameStorageAccounts_example.json | 2 +- .../Pricings/GetPricingByNameVirtualMachines_example.json | 2 +- .../Microsoft.Security/stable/2023-01-01/pricings.json | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/GetPricingByNameStorageAccounts_example.json b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/GetPricingByNameStorageAccounts_example.json index e8fb7cae3a9b..32149423a77a 100644 --- a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/GetPricingByNameStorageAccounts_example.json +++ b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/GetPricingByNameStorageAccounts_example.json @@ -13,7 +13,7 @@ "properties": { "pricingTier": "Standard", "freeTrialRemainingTime": "PT0S", - "subPlan": "PerTransaction", + "subPlan": "PerStorageAccount", "extensions": [ { "type": "StorageAntiMalware", diff --git a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/GetPricingByNameVirtualMachines_example.json b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/GetPricingByNameVirtualMachines_example.json index 4612d33bbf7e..7958b51c4bb4 100644 --- a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/GetPricingByNameVirtualMachines_example.json +++ b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/GetPricingByNameVirtualMachines_example.json @@ -13,7 +13,7 @@ "properties": { "pricingTier": "Standard", "freeTrialRemainingTime": "PT0S", - "subPlan": "P1", + "subPlan": "P2", "extensions": [ { "type": "AgentlessVmScanning", diff --git a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/pricings.json b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/pricings.json index 853442832455..9b5b89747e3a 100644 --- a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/pricings.json +++ b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/pricings.json @@ -153,7 +153,7 @@ } }, "207": { - "description": "Partial Success - Missing Permissions", + "description": "You do not have the required permissions to set some of the relevant extensions for this plan.", "schema": { "$ref": "#/definitions/Pricing" } @@ -187,7 +187,7 @@ }, "Pricing": { "type": "object", - "description": "Microsoft Defender for Cloud is provided in two pricing tiers: free and standard, with the standard tier available with a trial period. The standard tier offers advanced security capabilities, while the free tier offers basic security features.", + "description": "Microsoft Defender for Cloud is provided in two pricing tiers: free and standard. The standard tier offers advanced security capabilities, while the free tier offers basic security features.", "properties": { "properties": { "x-ms-client-flatten": true, @@ -207,7 +207,7 @@ "properties": { "pricingTier": { "type": "string", - "description": "The pricing tier value. Microsoft Defender for Cloud is provided in two pricing tiers: free and standard, with the standard tier available with a trial period. The standard tier offers advanced security capabilities, while the free tier offers basic security features.", + "description": "The pricing tier value. Microsoft Defender for Cloud is provided in two pricing tiers: free and standard. The standard tier offers advanced security capabilities, while the free tier offers basic security features.", "enum": [ "Free", "Standard" @@ -330,7 +330,7 @@ "in": "path", "required": true, "type": "string", - "pattern": "^[a-zA-Z][a-zA-Z0-9_]+$", + "pattern": "^[a-zA-Z]+$", "description": "name of the pricing configuration", "x-ms-parameter-location": "method" }, From 15f3cf365e24bc28d4b140b5a223159b49c2dadf Mon Sep 17 00:00:00 2001 From: Sivan Manor Date: Thu, 5 Jan 2023 12:43:22 +0200 Subject: [PATCH 05/20] Fix lint error --- .../Microsoft.Security/stable/2023-01-01/pricings.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/pricings.json b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/pricings.json index 9b5b89747e3a..2b83f79958ca 100644 --- a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/pricings.json +++ b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/pricings.json @@ -255,7 +255,8 @@ "items": { "$ref": "#/definitions/Extension" }, - "description": "Optional. List of extensions offered under a plan." + "description": "Optional. List of extensions offered under a plan.", + "x-ms-identifiers": [] } }, "required": [ From 75a66ba08e4f3565d61f6082328e72167cf37022 Mon Sep 17 00:00:00 2001 From: Sivan Manor Date: Thu, 5 Jan 2023 12:51:48 +0200 Subject: [PATCH 06/20] Rename Storage extensions --- .../GetPricingByNameStorageAccounts_example.json | 6 +++--- .../examples/Pricings/ListPricings_example.json | 6 +++--- .../stable/2023-01-01/pricings.json | 12 ++++++------ 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/GetPricingByNameStorageAccounts_example.json b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/GetPricingByNameStorageAccounts_example.json index 32149423a77a..aa99590fa7ef 100644 --- a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/GetPricingByNameStorageAccounts_example.json +++ b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/GetPricingByNameStorageAccounts_example.json @@ -16,14 +16,14 @@ "subPlan": "PerStorageAccount", "extensions": [ { - "type": "StorageAntiMalware", + "type": "OnUploadMalwareScanning", "isEnabled": true, "additionalExtensionProperties": { - "capGBPerMonth": 10 + "capGBPerMonthPerStorageAccount": 10 } }, { - "type": "StorageSensitivityScanning", + "type": "DataSensitivityDiscovery", "isEnabled": true } ] diff --git a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/ListPricings_example.json b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/ListPricings_example.json index 63d8402ee757..2d5c9a9c8096 100644 --- a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/ListPricings_example.json +++ b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/ListPricings_example.json @@ -51,14 +51,14 @@ "subPlan": "PerStorageAccount", "extensions": [ { - "type": "StorageAntiMalware", + "type": "OnUploadMalwareScanning", "isEnabled": true, "additionalExtensionProperties": { - "capGBPerMonth": 10 + "capGBPerMonthPerStorageAccount": 10 } }, { - "type": "StorageSensitivityScanning", + "type": "DataSensitivityDiscovery", "isEnabled": true } ] diff --git a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/pricings.json b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/pricings.json index 2b83f79958ca..90c78822576e 100644 --- a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/pricings.json +++ b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/pricings.json @@ -274,8 +274,8 @@ "AgentlessVmScanning", "AgentlessDiscoveryForKubernetes", "DataSensitivityScanning", - "StorageAntiMalware", - "StorageSensitivityScanning", + "OnUploadMalwareScanning", + "DataSensitivityDiscovery", "ContainerRegistriesVulnerabilityAssessments" ], "x-ms-enum": { @@ -295,12 +295,12 @@ "description": "Available for DCSPM plan." }, { - "value": "StorageAntiMalware", - "description": "Available for StorageAccounts plan." + "value": "OnUploadMalwareScanning", + "description": "Limits the GB to be scanned per month for each storage account within the subscription. Once this limit reached on a given storage account, Blobs won't be scanned during current calendar month.\r\nAvailable for StorageAccounts plan." }, { - "value": "StorageSensitivityScanning", - "description": "Available for StorageAccounts plan." + "value": "DataSensitivityDiscovery", + "description": "Data sensitivity discovery identifies Blob storage container with sensitive data such as credentials, credit cards, and more, to help prioritize and investigate security events.\r\nAvailable for StorageAccounts plan." }, { "value": "ContainerRegistriesVulnerabilityAssessments", From 5d63994af1bb30f31032a1d7273ff43eb280c716 Mon Sep 17 00:00:00 2001 From: Sivan Manor Date: Sun, 15 Jan 2023 18:17:28 +0200 Subject: [PATCH 07/20] Remove the 207 response code + add errorMessage --- .../Pricings/PutPricingByName_example.json | 24 +++++++------------ .../stable/2023-01-01/pricings.json | 11 ++++----- 2 files changed, 14 insertions(+), 21 deletions(-) diff --git a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/PutPricingByName_example.json b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/PutPricingByName_example.json index 79aefca3f2b8..1ceaf467d483 100644 --- a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/PutPricingByName_example.json +++ b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/PutPricingByName_example.json @@ -40,30 +40,24 @@ } } }, - "207": { + "200": { "body": { - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/pricings/CloudPosture", - "name": "CloudPosture", + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/pricings/StorageAccounts", + "name": "StorageAccounts", "type": "Microsoft.Security/pricings", "properties": { "pricingTier": "Standard", "freeTrialRemainingTime": "PT0S", + "subPlan": "PerStorageAccount", "extensions": [ { - "type": "AgentlessVmScanning", - "isEnabled": true + "type": "OnUploadMalwareScanning", + "isEnabled": false, + "errorMessage": "Last enablemment attempt failed due to missing permissions.", }, { - "type": "AgentlessDiscoveryForKubernetes", - "isEnabled": false - }, - { - "type": "DataSensitivityScanning", - "isEnabled": false - }, - { - "type": "ContainerRegistriesVulnerabilityAssessments", - "isEnabled": false + "type": "DataSensitivityDiscovery", + "isEnabled": true } ] } diff --git a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/pricings.json b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/pricings.json index 90c78822576e..98a850522d67 100644 --- a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/pricings.json +++ b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/pricings.json @@ -152,12 +152,6 @@ "$ref": "#/definitions/Pricing" } }, - "207": { - "description": "You do not have the required permissions to set some of the relevant extensions for this plan.", - "schema": { - "$ref": "#/definitions/Pricing" - } - }, "default": { "description": "Error response describing why the operation failed.", "schema": { @@ -317,6 +311,11 @@ "type": "object", "description": "Property values associated with the extension.", "additionalProperties": {} + }, + "errorMessage": { + "type": "string", + "readOnly": true, + "description": "Optional. A message describing the error occurred during enablement/disablement of the extension." } }, "required": [ From 2fa5c68f5dea3f33bdc7e5d0e371ab01308cb349 Mon Sep 17 00:00:00 2001 From: Sivan Manor Date: Thu, 19 Jan 2023 12:18:13 +0200 Subject: [PATCH 08/20] Adding operationStatus --- .../Pricings/PutPricingByName_example.json | 35 ++++++++++++++--- .../stable/2023-01-01/pricings.json | 39 +++++++++++++++++-- 2 files changed, 65 insertions(+), 9 deletions(-) diff --git a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/PutPricingByName_example.json b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/PutPricingByName_example.json index 1ceaf467d483..52ff4271277d 100644 --- a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/PutPricingByName_example.json +++ b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/PutPricingByName_example.json @@ -22,19 +22,35 @@ "extensions": [ { "type": "AgentlessVmScanning", - "isEnabled": true + "isEnabled": true, + "operationStatus": { + "code": "Succeeded", + "message": "" + } }, { "type": "AgentlessDiscoveryForKubernetes", - "isEnabled": true + "isEnabled": true, + "operationStatus": { + "code": "Succeeded", + "message": "" + } }, { "type": "DataSensitivityScanning", - "isEnabled": true + "isEnabled": true, + "operationStatus": { + "code": "Succeeded", + "message": "" + } }, { "type": "ContainerRegistriesVulnerabilityAssessments", - "isEnabled": true + "isEnabled": true, + "operationStatus": { + "code": "Succeeded", + "message": "" + } } ] } @@ -53,11 +69,18 @@ { "type": "OnUploadMalwareScanning", "isEnabled": false, - "errorMessage": "Last enablemment attempt failed due to missing permissions.", + "operationStatus": { + "code": "Failed", + "message": "Extension enablemment failed due to missing permissions." + } }, { "type": "DataSensitivityDiscovery", - "isEnabled": true + "isEnabled": true, + "operationStatus": { + "code": "Succeeded", + "message": "" + } } ] } diff --git a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/pricings.json b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/pricings.json index 98a850522d67..a9acf8c24a7f 100644 --- a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/pricings.json +++ b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/pricings.json @@ -312,16 +312,49 @@ "description": "Property values associated with the extension.", "additionalProperties": {} }, - "errorMessage": { - "type": "string", + "operationStatus": { + "type": "object", + "$ref": "#/definitions/OperationStatus", "readOnly": true, - "description": "Optional. A message describing the error occurred during enablement/disablement of the extension." + "description": "Optional. A status describing the success/failure of the extension's enablement/disablement operation." } }, "required": [ "type", "isEnabled" ] + }, + "OperationStatus": { + "type": "object", + "description": "A status describing the success/failure of the extension's enablement/disablement operation.", + "properties": { + "code": { + "type": "string", + "description": "The operation status code.", + "enum": [ + "Succeeded", + "Failed" + ], + "x-ms-enum": { + "name": "type", + "modelAsString": true, + "values": [ + { + "value": "Succeeded", + "description": "Extension was created/updated successfully." + }, + { + "value": "Failed", + "description": "Extension was not created/updated successfully. See operation status message for more details." + } + ] + } + }, + "message": { + "type": "boolean", + "description": "Additional information regarding the success/failure of the operation." + } + } } }, "parameters": { From e89673db2f6dc82ac5188a439bb91283184c2a75 Mon Sep 17 00:00:00 2001 From: Sivan Manor Date: Thu, 19 Jan 2023 12:24:42 +0200 Subject: [PATCH 09/20] Add previous API version files --- .../Pricings/ListPricings_example.json | 60 +------- .../Pricings/PutPricingByName_example.json | 73 +--------- .../stable/2023-01-01/pricings.json | 131 +----------------- 3 files changed, 14 insertions(+), 250 deletions(-) diff --git a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/ListPricings_example.json b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/ListPricings_example.json index 2d5c9a9c8096..544098abb760 100644 --- a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/ListPricings_example.json +++ b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/ListPricings_example.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2023-01-01", + "api-version": "2022-03-01", "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23" }, "responses": { @@ -14,13 +14,7 @@ "properties": { "pricingTier": "Standard", "freeTrialRemainingTime": "PT0S", - "subPlan": "P2", - "extensions": [ - { - "type": "AgentlessVmScanning", - "isEnabled": true - } - ] + "subPlan": "P2" } }, { @@ -48,20 +42,7 @@ "properties": { "pricingTier": "Standard", "freeTrialRemainingTime": "PT0S", - "subPlan": "PerStorageAccount", - "extensions": [ - { - "type": "OnUploadMalwareScanning", - "isEnabled": true, - "additionalExtensionProperties": { - "capGBPerMonthPerStorageAccount": 10 - } - }, - { - "type": "DataSensitivityDiscovery", - "isEnabled": true - } - ] + "subPlan": "PerStorageAccount" } }, { @@ -141,40 +122,7 @@ "type": "Microsoft.Security/pricings", "properties": { "pricingTier": "Standard", - "freeTrialRemainingTime": "PT0S", - "extensions": [ - { - "type": "ContainerRegistriesVulnerabilityAssessments", - "isEnabled": true - } - ] - } - }, - { - "id": "/subscriptions/d34fd44c-ebfa-4a9c-bceb-9eeafe72ac15/providers/Microsoft.Security/pricings/CloudPosture", - "name": "CloudPosture", - "type": "Microsoft.Security/pricings", - "properties": { - "pricingTier": "Standard", - "freeTrialRemainingTime": "PT0S", - "extensions": [ - { - "type": "AgentlessVmScanning", - "isEnabled": true - }, - { - "type": "AgentlessDiscoveryForKubernetes", - "isEnabled": true - }, - { - "type": "DataSensitivityScanning", - "isEnabled": true - }, - { - "type": "ContainerRegistriesVulnerabilityAssessments", - "isEnabled": true - } - ] + "freeTrialRemainingTime": "PT0S" } } ] diff --git a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/PutPricingByName_example.json b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/PutPricingByName_example.json index 52ff4271277d..d5d1fd40fef9 100644 --- a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/PutPricingByName_example.json +++ b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/PutPricingByName_example.json @@ -1,8 +1,8 @@ { "parameters": { - "api-version": "2023-01-01", + "api-version": "2022-03-01", "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23", - "pricingName": "CloudPosture", + "pricingName": "VirtualMachines", "pricing": { "properties": { "pricingTier": "Standard", @@ -13,76 +13,13 @@ "responses": { "200": { "body": { - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/pricings/CloudPosture", - "name": "CloudPosture", + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/pricings/VirtualMachines", + "name": "VirtualMachines", "type": "Microsoft.Security/pricings", "properties": { "pricingTier": "Standard", "freeTrialRemainingTime": "PT0S", - "extensions": [ - { - "type": "AgentlessVmScanning", - "isEnabled": true, - "operationStatus": { - "code": "Succeeded", - "message": "" - } - }, - { - "type": "AgentlessDiscoveryForKubernetes", - "isEnabled": true, - "operationStatus": { - "code": "Succeeded", - "message": "" - } - }, - { - "type": "DataSensitivityScanning", - "isEnabled": true, - "operationStatus": { - "code": "Succeeded", - "message": "" - } - }, - { - "type": "ContainerRegistriesVulnerabilityAssessments", - "isEnabled": true, - "operationStatus": { - "code": "Succeeded", - "message": "" - } - } - ] - } - } - }, - "200": { - "body": { - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/pricings/StorageAccounts", - "name": "StorageAccounts", - "type": "Microsoft.Security/pricings", - "properties": { - "pricingTier": "Standard", - "freeTrialRemainingTime": "PT0S", - "subPlan": "PerStorageAccount", - "extensions": [ - { - "type": "OnUploadMalwareScanning", - "isEnabled": false, - "operationStatus": { - "code": "Failed", - "message": "Extension enablemment failed due to missing permissions." - } - }, - { - "type": "DataSensitivityDiscovery", - "isEnabled": true, - "operationStatus": { - "code": "Succeeded", - "message": "" - } - } - ] + "subPlan": "P2" } } } diff --git a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/pricings.json b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/pricings.json index a9acf8c24a7f..7781987acca0 100644 --- a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/pricings.json +++ b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/pricings.json @@ -3,7 +3,7 @@ "info": { "title": "Microsoft Defender for Cloud", "description": "API spec for Microsoft.Security (Microsoft Defender for Cloud) resource provider", - "version": "2023-01-01" + "version": "2022-03-01" }, "host": "management.azure.com", "schemes": [ @@ -73,20 +73,8 @@ "/subscriptions/{subscriptionId}/providers/Microsoft.Security/pricings/{pricingName}": { "get": { "x-ms-examples": { - "Get pricings on subscription - VirtualMachines plan": { - "$ref": "./examples/Pricings/GetPricingByNameVirtualMachines_example.json" - }, - "Get pricings on subscription - Dns plan": { - "$ref": "./examples/Pricings/GetPricingByNameDns_example.json" - }, - "Get pricings on subscription - StorageAccounts plan": { - "$ref": "./examples/Pricings/GetPricingByNameStorageAccounts_example.json" - }, - "Get pricings on subscription - Containers plan": { - "$ref": "./examples/Pricings/GetPricingByNameContainers_example.json" - }, - "Get pricings on subscription - CloudPosture plan": { - "$ref": "./examples/Pricings/GetPricingByNameCloudPosture_example.json" + "Get pricings on subscription": { + "$ref": "./examples/Pricings/GetPricingByName_example.json" } }, "tags": [ @@ -164,7 +152,6 @@ }, "definitions": { "PricingList": { - "type": "object", "description": "List of pricing configurations response.", "required": [ "value" @@ -181,7 +168,7 @@ }, "Pricing": { "type": "object", - "description": "Microsoft Defender for Cloud is provided in two pricing tiers: free and standard. The standard tier offers advanced security capabilities, while the free tier offers basic security features.", + "description": "Microsoft Defender for Cloud is provided in two pricing tiers: free and standard, with the standard tier available with a trial period. The standard tier offers advanced security capabilities, while the free tier offers basic security features.", "properties": { "properties": { "x-ms-client-flatten": true, @@ -201,7 +188,7 @@ "properties": { "pricingTier": { "type": "string", - "description": "The pricing tier value. Microsoft Defender for Cloud is provided in two pricing tiers: free and standard. The standard tier offers advanced security capabilities, while the free tier offers basic security features.", + "description": "The pricing tier value. Microsoft Defender for Cloud is provided in two pricing tiers: free and standard, with the standard tier available with a trial period. The standard tier offers advanced security capabilities, while the free tier offers basic security features.", "enum": [ "Free", "Standard" @@ -243,118 +230,11 @@ }, "readOnly": true, "description": "Optional. List of plans that replace this plan. This property exists only if this plan is deprecated." - }, - "extensions": { - "type": "array", - "items": { - "$ref": "#/definitions/Extension" - }, - "description": "Optional. List of extensions offered under a plan.", - "x-ms-identifiers": [] } }, "required": [ "pricingTier" ] - }, - "Extension": { - "type": "object", - "description": "A plan's extension properties", - "properties": { - "type": { - "type": "string", - "description": "The extension type name.", - "enum": [ - "AgentlessVmScanning", - "AgentlessDiscoveryForKubernetes", - "DataSensitivityScanning", - "OnUploadMalwareScanning", - "DataSensitivityDiscovery", - "ContainerRegistriesVulnerabilityAssessments" - ], - "x-ms-enum": { - "name": "type", - "modelAsString": true, - "values": [ - { - "value": "AgentlessVmScanning", - "description": "Available for DCSPM and D4Servers P2 plans." - }, - { - "value": "AgentlessDiscoveryForKubernetes", - "description": "API-based discovery of information about Kubernetes cluster architecture, workload objects, and setup. Required for Kubernetes inventory, identity and network exposure detection, attack path analysis and risk hunting as part of the cloud security explorer.\r\nAvailable for DCSPM plan." - }, - { - "value": "DataSensitivityScanning", - "description": "Available for DCSPM plan." - }, - { - "value": "OnUploadMalwareScanning", - "description": "Limits the GB to be scanned per month for each storage account within the subscription. Once this limit reached on a given storage account, Blobs won't be scanned during current calendar month.\r\nAvailable for StorageAccounts plan." - }, - { - "value": "DataSensitivityDiscovery", - "description": "Data sensitivity discovery identifies Blob storage container with sensitive data such as credentials, credit cards, and more, to help prioritize and investigate security events.\r\nAvailable for StorageAccounts plan." - }, - { - "value": "ContainerRegistriesVulnerabilityAssessments", - "description": "Provides vulnerability management for images stored in your container registries.\r\nAvailable for DCSPM and Containers plans." - } - ] - } - }, - "isEnabled": { - "type": "boolean", - "description": "Indicates whether the extension is enabled." - }, - "additionalExtensionProperties": { - "type": "object", - "description": "Property values associated with the extension.", - "additionalProperties": {} - }, - "operationStatus": { - "type": "object", - "$ref": "#/definitions/OperationStatus", - "readOnly": true, - "description": "Optional. A status describing the success/failure of the extension's enablement/disablement operation." - } - }, - "required": [ - "type", - "isEnabled" - ] - }, - "OperationStatus": { - "type": "object", - "description": "A status describing the success/failure of the extension's enablement/disablement operation.", - "properties": { - "code": { - "type": "string", - "description": "The operation status code.", - "enum": [ - "Succeeded", - "Failed" - ], - "x-ms-enum": { - "name": "type", - "modelAsString": true, - "values": [ - { - "value": "Succeeded", - "description": "Extension was created/updated successfully." - }, - { - "value": "Failed", - "description": "Extension was not created/updated successfully. See operation status message for more details." - } - ] - } - }, - "message": { - "type": "boolean", - "description": "Additional information regarding the success/failure of the operation." - } - } } }, "parameters": { @@ -363,7 +243,6 @@ "in": "path", "required": true, "type": "string", - "pattern": "^[a-zA-Z]+$", "description": "name of the pricing configuration", "x-ms-parameter-location": "method" }, From 8451467dde0caf5ae31311309a7e5c48632d597e Mon Sep 17 00:00:00 2001 From: Sivan Manor Date: Thu, 19 Jan 2023 12:25:48 +0200 Subject: [PATCH 10/20] Override previous API version files --- .../Pricings/ListPricings_example.json | 60 +++++++- .../Pricings/PutPricingByName_example.json | 73 +++++++++- .../stable/2023-01-01/pricings.json | 131 +++++++++++++++++- 3 files changed, 250 insertions(+), 14 deletions(-) diff --git a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/ListPricings_example.json b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/ListPricings_example.json index 544098abb760..2d5c9a9c8096 100644 --- a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/ListPricings_example.json +++ b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/ListPricings_example.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2022-03-01", + "api-version": "2023-01-01", "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23" }, "responses": { @@ -14,7 +14,13 @@ "properties": { "pricingTier": "Standard", "freeTrialRemainingTime": "PT0S", - "subPlan": "P2" + "subPlan": "P2", + "extensions": [ + { + "type": "AgentlessVmScanning", + "isEnabled": true + } + ] } }, { @@ -42,7 +48,20 @@ "properties": { "pricingTier": "Standard", "freeTrialRemainingTime": "PT0S", - "subPlan": "PerStorageAccount" + "subPlan": "PerStorageAccount", + "extensions": [ + { + "type": "OnUploadMalwareScanning", + "isEnabled": true, + "additionalExtensionProperties": { + "capGBPerMonthPerStorageAccount": 10 + } + }, + { + "type": "DataSensitivityDiscovery", + "isEnabled": true + } + ] } }, { @@ -122,7 +141,40 @@ "type": "Microsoft.Security/pricings", "properties": { "pricingTier": "Standard", - "freeTrialRemainingTime": "PT0S" + "freeTrialRemainingTime": "PT0S", + "extensions": [ + { + "type": "ContainerRegistriesVulnerabilityAssessments", + "isEnabled": true + } + ] + } + }, + { + "id": "/subscriptions/d34fd44c-ebfa-4a9c-bceb-9eeafe72ac15/providers/Microsoft.Security/pricings/CloudPosture", + "name": "CloudPosture", + "type": "Microsoft.Security/pricings", + "properties": { + "pricingTier": "Standard", + "freeTrialRemainingTime": "PT0S", + "extensions": [ + { + "type": "AgentlessVmScanning", + "isEnabled": true + }, + { + "type": "AgentlessDiscoveryForKubernetes", + "isEnabled": true + }, + { + "type": "DataSensitivityScanning", + "isEnabled": true + }, + { + "type": "ContainerRegistriesVulnerabilityAssessments", + "isEnabled": true + } + ] } } ] diff --git a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/PutPricingByName_example.json b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/PutPricingByName_example.json index d5d1fd40fef9..52ff4271277d 100644 --- a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/PutPricingByName_example.json +++ b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/PutPricingByName_example.json @@ -1,8 +1,8 @@ { "parameters": { - "api-version": "2022-03-01", + "api-version": "2023-01-01", "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23", - "pricingName": "VirtualMachines", + "pricingName": "CloudPosture", "pricing": { "properties": { "pricingTier": "Standard", @@ -13,13 +13,76 @@ "responses": { "200": { "body": { - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/pricings/VirtualMachines", - "name": "VirtualMachines", + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/pricings/CloudPosture", + "name": "CloudPosture", "type": "Microsoft.Security/pricings", "properties": { "pricingTier": "Standard", "freeTrialRemainingTime": "PT0S", - "subPlan": "P2" + "extensions": [ + { + "type": "AgentlessVmScanning", + "isEnabled": true, + "operationStatus": { + "code": "Succeeded", + "message": "" + } + }, + { + "type": "AgentlessDiscoveryForKubernetes", + "isEnabled": true, + "operationStatus": { + "code": "Succeeded", + "message": "" + } + }, + { + "type": "DataSensitivityScanning", + "isEnabled": true, + "operationStatus": { + "code": "Succeeded", + "message": "" + } + }, + { + "type": "ContainerRegistriesVulnerabilityAssessments", + "isEnabled": true, + "operationStatus": { + "code": "Succeeded", + "message": "" + } + } + ] + } + } + }, + "200": { + "body": { + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/pricings/StorageAccounts", + "name": "StorageAccounts", + "type": "Microsoft.Security/pricings", + "properties": { + "pricingTier": "Standard", + "freeTrialRemainingTime": "PT0S", + "subPlan": "PerStorageAccount", + "extensions": [ + { + "type": "OnUploadMalwareScanning", + "isEnabled": false, + "operationStatus": { + "code": "Failed", + "message": "Extension enablemment failed due to missing permissions." + } + }, + { + "type": "DataSensitivityDiscovery", + "isEnabled": true, + "operationStatus": { + "code": "Succeeded", + "message": "" + } + } + ] } } } diff --git a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/pricings.json b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/pricings.json index 7781987acca0..a9acf8c24a7f 100644 --- a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/pricings.json +++ b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/pricings.json @@ -3,7 +3,7 @@ "info": { "title": "Microsoft Defender for Cloud", "description": "API spec for Microsoft.Security (Microsoft Defender for Cloud) resource provider", - "version": "2022-03-01" + "version": "2023-01-01" }, "host": "management.azure.com", "schemes": [ @@ -73,8 +73,20 @@ "/subscriptions/{subscriptionId}/providers/Microsoft.Security/pricings/{pricingName}": { "get": { "x-ms-examples": { - "Get pricings on subscription": { - "$ref": "./examples/Pricings/GetPricingByName_example.json" + "Get pricings on subscription - VirtualMachines plan": { + "$ref": "./examples/Pricings/GetPricingByNameVirtualMachines_example.json" + }, + "Get pricings on subscription - Dns plan": { + "$ref": "./examples/Pricings/GetPricingByNameDns_example.json" + }, + "Get pricings on subscription - StorageAccounts plan": { + "$ref": "./examples/Pricings/GetPricingByNameStorageAccounts_example.json" + }, + "Get pricings on subscription - Containers plan": { + "$ref": "./examples/Pricings/GetPricingByNameContainers_example.json" + }, + "Get pricings on subscription - CloudPosture plan": { + "$ref": "./examples/Pricings/GetPricingByNameCloudPosture_example.json" } }, "tags": [ @@ -152,6 +164,7 @@ }, "definitions": { "PricingList": { + "type": "object", "description": "List of pricing configurations response.", "required": [ "value" @@ -168,7 +181,7 @@ }, "Pricing": { "type": "object", - "description": "Microsoft Defender for Cloud is provided in two pricing tiers: free and standard, with the standard tier available with a trial period. The standard tier offers advanced security capabilities, while the free tier offers basic security features.", + "description": "Microsoft Defender for Cloud is provided in two pricing tiers: free and standard. The standard tier offers advanced security capabilities, while the free tier offers basic security features.", "properties": { "properties": { "x-ms-client-flatten": true, @@ -188,7 +201,7 @@ "properties": { "pricingTier": { "type": "string", - "description": "The pricing tier value. Microsoft Defender for Cloud is provided in two pricing tiers: free and standard, with the standard tier available with a trial period. The standard tier offers advanced security capabilities, while the free tier offers basic security features.", + "description": "The pricing tier value. Microsoft Defender for Cloud is provided in two pricing tiers: free and standard. The standard tier offers advanced security capabilities, while the free tier offers basic security features.", "enum": [ "Free", "Standard" @@ -230,11 +243,118 @@ }, "readOnly": true, "description": "Optional. List of plans that replace this plan. This property exists only if this plan is deprecated." + }, + "extensions": { + "type": "array", + "items": { + "$ref": "#/definitions/Extension" + }, + "description": "Optional. List of extensions offered under a plan.", + "x-ms-identifiers": [] } }, "required": [ "pricingTier" ] + }, + "Extension": { + "type": "object", + "description": "A plan's extension properties", + "properties": { + "type": { + "type": "string", + "description": "The extension type name.", + "enum": [ + "AgentlessVmScanning", + "AgentlessDiscoveryForKubernetes", + "DataSensitivityScanning", + "OnUploadMalwareScanning", + "DataSensitivityDiscovery", + "ContainerRegistriesVulnerabilityAssessments" + ], + "x-ms-enum": { + "name": "type", + "modelAsString": true, + "values": [ + { + "value": "AgentlessVmScanning", + "description": "Available for DCSPM and D4Servers P2 plans." + }, + { + "value": "AgentlessDiscoveryForKubernetes", + "description": "API-based discovery of information about Kubernetes cluster architecture, workload objects, and setup. Required for Kubernetes inventory, identity and network exposure detection, attack path analysis and risk hunting as part of the cloud security explorer.\r\nAvailable for DCSPM plan." + }, + { + "value": "DataSensitivityScanning", + "description": "Available for DCSPM plan." + }, + { + "value": "OnUploadMalwareScanning", + "description": "Limits the GB to be scanned per month for each storage account within the subscription. Once this limit reached on a given storage account, Blobs won't be scanned during current calendar month.\r\nAvailable for StorageAccounts plan." + }, + { + "value": "DataSensitivityDiscovery", + "description": "Data sensitivity discovery identifies Blob storage container with sensitive data such as credentials, credit cards, and more, to help prioritize and investigate security events.\r\nAvailable for StorageAccounts plan." + }, + { + "value": "ContainerRegistriesVulnerabilityAssessments", + "description": "Provides vulnerability management for images stored in your container registries.\r\nAvailable for DCSPM and Containers plans." + } + ] + } + }, + "isEnabled": { + "type": "boolean", + "description": "Indicates whether the extension is enabled." + }, + "additionalExtensionProperties": { + "type": "object", + "description": "Property values associated with the extension.", + "additionalProperties": {} + }, + "operationStatus": { + "type": "object", + "$ref": "#/definitions/OperationStatus", + "readOnly": true, + "description": "Optional. A status describing the success/failure of the extension's enablement/disablement operation." + } + }, + "required": [ + "type", + "isEnabled" + ] + }, + "OperationStatus": { + "type": "object", + "description": "A status describing the success/failure of the extension's enablement/disablement operation.", + "properties": { + "code": { + "type": "string", + "description": "The operation status code.", + "enum": [ + "Succeeded", + "Failed" + ], + "x-ms-enum": { + "name": "type", + "modelAsString": true, + "values": [ + { + "value": "Succeeded", + "description": "Extension was created/updated successfully." + }, + { + "value": "Failed", + "description": "Extension was not created/updated successfully. See operation status message for more details." + } + ] + } + }, + "message": { + "type": "boolean", + "description": "Additional information regarding the success/failure of the operation." + } + } } }, "parameters": { @@ -243,6 +363,7 @@ "in": "path", "required": true, "type": "string", + "pattern": "^[a-zA-Z]+$", "description": "name of the pricing configuration", "x-ms-parameter-location": "method" }, From b020fdde97f702a91c51747ba064fadb773d7588 Mon Sep 17 00:00:00 2001 From: Sivan Manor Date: Thu, 26 Jan 2023 10:23:38 +0200 Subject: [PATCH 11/20] Adding PUT partial success example --- ...utPricingByNamePartialSuccess_example.json | 60 +++++++++++++++++++ .../Pricings/PutPricingByName_example.json | 30 ---------- .../stable/2023-01-01/pricings.json | 3 + 3 files changed, 63 insertions(+), 30 deletions(-) create mode 100644 specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/PutPricingByNamePartialSuccess_example.json diff --git a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/PutPricingByNamePartialSuccess_example.json b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/PutPricingByNamePartialSuccess_example.json new file mode 100644 index 000000000000..37562cccb75a --- /dev/null +++ b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/PutPricingByNamePartialSuccess_example.json @@ -0,0 +1,60 @@ +{ + "parameters": { + "api-version": "2023-01-01", + "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23", + "pricingName": "CloudPosture", + "pricing": { + "properties": { + "pricingTier": "Standard", + "subPlan": "P2" + } + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/pricings/CloudPosture", + "name": "CloudPosture", + "type": "Microsoft.Security/pricings", + "properties": { + "pricingTier": "Standard", + "freeTrialRemainingTime": "PT0S", + "extensions": [ + { + "type": "AgentlessVmScanning", + "isEnabled": true, + "operationStatus": { + "code": "Succeeded", + "message": "" + } + }, + { + "type": "AgentlessDiscoveryForKubernetes", + "isEnabled": true, + "operationStatus": { + "code": "Succeeded", + "message": "" + } + }, + { + "type": "DataSensitivityScanning", + "isEnabled": true, + "operationStatus": { + "code": "Succeeded", + "message": "" + } + }, + { + "type": "ContainerRegistriesVulnerabilityAssessments", + "isEnabled": false, + "operationStatus": { + "code": "Failed", + "message": "Extension enablemment failed due to missing permissions." + } + } + ] + } + } + } + } +} diff --git a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/PutPricingByName_example.json b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/PutPricingByName_example.json index 52ff4271277d..84e343fe5b55 100644 --- a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/PutPricingByName_example.json +++ b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/PutPricingByName_example.json @@ -55,36 +55,6 @@ ] } } - }, - "200": { - "body": { - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/pricings/StorageAccounts", - "name": "StorageAccounts", - "type": "Microsoft.Security/pricings", - "properties": { - "pricingTier": "Standard", - "freeTrialRemainingTime": "PT0S", - "subPlan": "PerStorageAccount", - "extensions": [ - { - "type": "OnUploadMalwareScanning", - "isEnabled": false, - "operationStatus": { - "code": "Failed", - "message": "Extension enablemment failed due to missing permissions." - } - }, - { - "type": "DataSensitivityDiscovery", - "isEnabled": true, - "operationStatus": { - "code": "Succeeded", - "message": "" - } - } - ] - } - } } } } diff --git a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/pricings.json b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/pricings.json index a9acf8c24a7f..d3ddf6c4aca5 100644 --- a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/pricings.json +++ b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/pricings.json @@ -124,6 +124,9 @@ "x-ms-examples": { "Update pricing on subscription": { "$ref": "./examples/Pricings/PutPricingByName_example.json" + }, + "Update pricing on subscription - partial success": { + "$ref": "./examples/Pricings/PutPricingByNamePartialSuccess_example.json" } }, "tags": [ From 6f04e5d3d3b6b09eddd7a2f3763a5d9a269ee2f3 Mon Sep 17 00:00:00 2001 From: Sivan Manor Date: Thu, 26 Jan 2023 10:31:10 +0200 Subject: [PATCH 12/20] DataSensitivityDiscovery to SensitiveDataDiscovery --- .../GetPricingByNameCloudPosture_example.json | 2 +- ...GetPricingByNameStorageAccounts_example.json | 2 +- .../examples/Pricings/ListPricings_example.json | 4 ++-- .../PutPricingByNamePartialSuccess_example.json | 2 +- .../Pricings/PutPricingByName_example.json | 2 +- .../stable/2023-01-01/pricings.json | 17 ++++++----------- 6 files changed, 12 insertions(+), 17 deletions(-) diff --git a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/GetPricingByNameCloudPosture_example.json b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/GetPricingByNameCloudPosture_example.json index e32f58eeaedf..fed872ea6fb4 100644 --- a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/GetPricingByNameCloudPosture_example.json +++ b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/GetPricingByNameCloudPosture_example.json @@ -23,7 +23,7 @@ "isEnabled": true }, { - "type": "DataSensitivityScanning", + "type": "SensitiveDataDiscovery", "isEnabled": true }, { diff --git a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/GetPricingByNameStorageAccounts_example.json b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/GetPricingByNameStorageAccounts_example.json index aa99590fa7ef..c2b8933ff1df 100644 --- a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/GetPricingByNameStorageAccounts_example.json +++ b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/GetPricingByNameStorageAccounts_example.json @@ -23,7 +23,7 @@ } }, { - "type": "DataSensitivityDiscovery", + "type": "SensitiveDataDiscovery", "isEnabled": true } ] diff --git a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/ListPricings_example.json b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/ListPricings_example.json index 2d5c9a9c8096..300a87e2fe64 100644 --- a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/ListPricings_example.json +++ b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/ListPricings_example.json @@ -58,7 +58,7 @@ } }, { - "type": "DataSensitivityDiscovery", + "type": "SensitiveDataDiscovery", "isEnabled": true } ] @@ -167,7 +167,7 @@ "isEnabled": true }, { - "type": "DataSensitivityScanning", + "type": "SensitiveDataDiscovery", "isEnabled": true }, { diff --git a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/PutPricingByNamePartialSuccess_example.json b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/PutPricingByNamePartialSuccess_example.json index 37562cccb75a..ecf9f46f699e 100644 --- a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/PutPricingByNamePartialSuccess_example.json +++ b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/PutPricingByNamePartialSuccess_example.json @@ -37,7 +37,7 @@ } }, { - "type": "DataSensitivityScanning", + "type": "SensitiveDataDiscovery", "isEnabled": true, "operationStatus": { "code": "Succeeded", diff --git a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/PutPricingByName_example.json b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/PutPricingByName_example.json index 84e343fe5b55..91a4a8a812ba 100644 --- a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/PutPricingByName_example.json +++ b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/PutPricingByName_example.json @@ -37,7 +37,7 @@ } }, { - "type": "DataSensitivityScanning", + "type": "SensitiveDataDiscovery", "isEnabled": true, "operationStatus": { "code": "Succeeded", diff --git a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/pricings.json b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/pricings.json index d3ddf6c4aca5..55cfda5eac22 100644 --- a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/pricings.json +++ b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/pricings.json @@ -270,9 +270,8 @@ "enum": [ "AgentlessVmScanning", "AgentlessDiscoveryForKubernetes", - "DataSensitivityScanning", "OnUploadMalwareScanning", - "DataSensitivityDiscovery", + "SensitiveDataDiscovery", "ContainerRegistriesVulnerabilityAssessments" ], "x-ms-enum": { @@ -281,27 +280,23 @@ "values": [ { "value": "AgentlessVmScanning", - "description": "Available for DCSPM and D4Servers P2 plans." + "description": "Available for CloudPosture and VirtualMachines plans." }, { "value": "AgentlessDiscoveryForKubernetes", - "description": "API-based discovery of information about Kubernetes cluster architecture, workload objects, and setup. Required for Kubernetes inventory, identity and network exposure detection, attack path analysis and risk hunting as part of the cloud security explorer.\r\nAvailable for DCSPM plan." - }, - { - "value": "DataSensitivityScanning", - "description": "Available for DCSPM plan." + "description": "API-based discovery of information about Kubernetes cluster architecture, workload objects, and setup. Required for Kubernetes inventory, identity and network exposure detection, attack path analysis and risk hunting as part of the cloud security explorer.\r\nAvailable for CloudPosture plan." }, { "value": "OnUploadMalwareScanning", "description": "Limits the GB to be scanned per month for each storage account within the subscription. Once this limit reached on a given storage account, Blobs won't be scanned during current calendar month.\r\nAvailable for StorageAccounts plan." }, { - "value": "DataSensitivityDiscovery", - "description": "Data sensitivity discovery identifies Blob storage container with sensitive data such as credentials, credit cards, and more, to help prioritize and investigate security events.\r\nAvailable for StorageAccounts plan." + "value": "SensitiveDataDiscovery", + "description": "Sensitive data discovery identifies Blob storage container with sensitive data such as credentials, credit cards, and more, to help prioritize and investigate security events.\r\nAvailable for StorageAccounts and CloudPosture plans." }, { "value": "ContainerRegistriesVulnerabilityAssessments", - "description": "Provides vulnerability management for images stored in your container registries.\r\nAvailable for DCSPM and Containers plans." + "description": "Provides vulnerability management for images stored in your container registries.\r\nAvailable for CloudPosture and Containers plans." } ] } From 518571689e03326f98d130defcaa03d0efd76717 Mon Sep 17 00:00:00 2001 From: Keren Damari Date: Wed, 22 Feb 2023 02:37:21 +0200 Subject: [PATCH 13/20] Fix PR comments --- .../GetPricingByNameCloudPosture_example.json | 16 ++++---- .../GetPricingByNameContainers_example.json | 4 +- ...tPricingByNameStorageAccounts_example.json | 8 ++-- ...tPricingByNameVirtualMachines_example.json | 4 +- .../Pricings/ListPricings_example.json | 32 +++++++-------- ...utPricingByNamePartialSuccess_example.json | 14 +++---- .../Pricings/PutPricingByName_example.json | 16 ++++---- .../stable/2023-01-01/pricings.json | 40 ++++++++++++++----- 8 files changed, 76 insertions(+), 58 deletions(-) diff --git a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/GetPricingByNameCloudPosture_example.json b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/GetPricingByNameCloudPosture_example.json index fed872ea6fb4..76ec9aef21d6 100644 --- a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/GetPricingByNameCloudPosture_example.json +++ b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/GetPricingByNameCloudPosture_example.json @@ -15,20 +15,20 @@ "freeTrialRemainingTime": "PT0S", "extensions": [ { - "type": "AgentlessVmScanning", - "isEnabled": true + "name": "AgentlessVmScanning", + "isEnabled": "True" }, { - "type": "AgentlessDiscoveryForKubernetes", - "isEnabled": true + "name": "AgentlessDiscoveryForKubernetes", + "isEnabled": "True" }, { - "type": "SensitiveDataDiscovery", - "isEnabled": true + "name": "SensitiveDataDiscovery", + "isEnabled": "True" }, { - "type": "ContainerRegistriesVulnerabilityAssessments", - "isEnabled": true + "name": "ContainerRegistriesVulnerabilityAssessments", + "isEnabled": "True" } ] } diff --git a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/GetPricingByNameContainers_example.json b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/GetPricingByNameContainers_example.json index 2fa5d05ae141..17a00a807a9f 100644 --- a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/GetPricingByNameContainers_example.json +++ b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/GetPricingByNameContainers_example.json @@ -15,8 +15,8 @@ "freeTrialRemainingTime": "PT0S", "extensions": [ { - "type": "ContainerRegistriesVulnerabilityAssessments", - "isEnabled": true + "name": "ContainerRegistriesVulnerabilityAssessments", + "isEnabled": "True" } ] } diff --git a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/GetPricingByNameStorageAccounts_example.json b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/GetPricingByNameStorageAccounts_example.json index c2b8933ff1df..58e8705cfd23 100644 --- a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/GetPricingByNameStorageAccounts_example.json +++ b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/GetPricingByNameStorageAccounts_example.json @@ -16,15 +16,15 @@ "subPlan": "PerStorageAccount", "extensions": [ { - "type": "OnUploadMalwareScanning", - "isEnabled": true, + "name": "OnUploadMalwareScanning", + "isEnabled": "True", "additionalExtensionProperties": { "capGBPerMonthPerStorageAccount": 10 } }, { - "type": "SensitiveDataDiscovery", - "isEnabled": true + "name": "SensitiveDataDiscovery", + "isEnabled": "True" } ] } diff --git a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/GetPricingByNameVirtualMachines_example.json b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/GetPricingByNameVirtualMachines_example.json index 7958b51c4bb4..c72416a82552 100644 --- a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/GetPricingByNameVirtualMachines_example.json +++ b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/GetPricingByNameVirtualMachines_example.json @@ -16,8 +16,8 @@ "subPlan": "P2", "extensions": [ { - "type": "AgentlessVmScanning", - "isEnabled": true + "name": "AgentlessVmScanning", + "isEnabled": "True" } ] } diff --git a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/ListPricings_example.json b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/ListPricings_example.json index 300a87e2fe64..60a3f69fcef2 100644 --- a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/ListPricings_example.json +++ b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/ListPricings_example.json @@ -17,8 +17,8 @@ "subPlan": "P2", "extensions": [ { - "type": "AgentlessVmScanning", - "isEnabled": true + "name": "AgentlessVmScanning", + "isEnabled": "True" } ] } @@ -51,15 +51,15 @@ "subPlan": "PerStorageAccount", "extensions": [ { - "type": "OnUploadMalwareScanning", - "isEnabled": true, + "name": "OnUploadMalwareScanning", + "isEnabled": "True", "additionalExtensionProperties": { "capGBPerMonthPerStorageAccount": 10 } }, { - "type": "SensitiveDataDiscovery", - "isEnabled": true + "name": "SensitiveDataDiscovery", + "isEnabled": "True" } ] } @@ -144,8 +144,8 @@ "freeTrialRemainingTime": "PT0S", "extensions": [ { - "type": "ContainerRegistriesVulnerabilityAssessments", - "isEnabled": true + "name": "ContainerRegistriesVulnerabilityAssessments", + "isEnabled": "True" } ] } @@ -159,20 +159,20 @@ "freeTrialRemainingTime": "PT0S", "extensions": [ { - "type": "AgentlessVmScanning", - "isEnabled": true + "name": "AgentlessVmScanning", + "isEnabled": "True" }, { - "type": "AgentlessDiscoveryForKubernetes", - "isEnabled": true + "name": "AgentlessDiscoveryForKubernetes", + "isEnabled": "True" }, { - "type": "SensitiveDataDiscovery", - "isEnabled": true + "name": "SensitiveDataDiscovery", + "isEnabled": "True" }, { - "type": "ContainerRegistriesVulnerabilityAssessments", - "isEnabled": true + "name": "ContainerRegistriesVulnerabilityAssessments", + "isEnabled": "True" } ] } diff --git a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/PutPricingByNamePartialSuccess_example.json b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/PutPricingByNamePartialSuccess_example.json index ecf9f46f699e..b5f730d41cd9 100644 --- a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/PutPricingByNamePartialSuccess_example.json +++ b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/PutPricingByNamePartialSuccess_example.json @@ -21,16 +21,16 @@ "freeTrialRemainingTime": "PT0S", "extensions": [ { - "type": "AgentlessVmScanning", - "isEnabled": true, + "name": "AgentlessVmScanning", + "isEnabled": "True", "operationStatus": { "code": "Succeeded", "message": "" } }, { - "type": "AgentlessDiscoveryForKubernetes", - "isEnabled": true, + "name": "AgentlessDiscoveryForKubernetes", + "isEnabled": "True", "operationStatus": { "code": "Succeeded", "message": "" @@ -38,15 +38,15 @@ }, { "type": "SensitiveDataDiscovery", - "isEnabled": true, + "isEnabled": "True", "operationStatus": { "code": "Succeeded", "message": "" } }, { - "type": "ContainerRegistriesVulnerabilityAssessments", - "isEnabled": false, + "name": "ContainerRegistriesVulnerabilityAssessments", + "isEnabled": "True", "operationStatus": { "code": "Failed", "message": "Extension enablemment failed due to missing permissions." diff --git a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/PutPricingByName_example.json b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/PutPricingByName_example.json index 91a4a8a812ba..1b4f805cce02 100644 --- a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/PutPricingByName_example.json +++ b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/PutPricingByName_example.json @@ -21,32 +21,32 @@ "freeTrialRemainingTime": "PT0S", "extensions": [ { - "type": "AgentlessVmScanning", - "isEnabled": true, + "name": "AgentlessVmScanning", + "isEnabled": "True", "operationStatus": { "code": "Succeeded", "message": "" } }, { - "type": "AgentlessDiscoveryForKubernetes", - "isEnabled": true, + "name": "AgentlessDiscoveryForKubernetes", + "isEnabled": "True", "operationStatus": { "code": "Succeeded", "message": "" } }, { - "type": "SensitiveDataDiscovery", - "isEnabled": true, + "name": "SensitiveDataDiscovery", + "isEnabled": "True", "operationStatus": { "code": "Succeeded", "message": "" } }, { - "type": "ContainerRegistriesVulnerabilityAssessments", - "isEnabled": true, + "name": "ContainerRegistriesVulnerabilityAssessments", + "isEnabled": "True", "operationStatus": { "code": "Succeeded", "message": "" diff --git a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/pricings.json b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/pricings.json index 55cfda5eac22..b6181038a9a3 100644 --- a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/pricings.json +++ b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/pricings.json @@ -48,10 +48,10 @@ "operationId": "Pricings_List", "parameters": [ { - "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" + "$ref": "../../../common/v4/types.json#/parameters/ApiVersion" }, { - "$ref": "../../../common/v1/types.json#/parameters/SubscriptionId" + "$ref": "../../../common/v4/types.json#/parameters/SubscriptionId" } ], "responses": { @@ -264,9 +264,9 @@ "type": "object", "description": "A plan's extension properties", "properties": { - "type": { + "name": { "type": "string", - "description": "The extension type name.", + "description": "The extension name.", "enum": [ "AgentlessVmScanning", "AgentlessDiscoveryForKubernetes", @@ -275,7 +275,7 @@ "ContainerRegistriesVulnerabilityAssessments" ], "x-ms-enum": { - "name": "type", + "name": "name", "modelAsString": true, "values": [ { @@ -302,8 +302,26 @@ } }, "isEnabled": { - "type": "boolean", - "description": "Indicates whether the extension is enabled." + "type": "string", + "description": "Indicates whether the extension is enabled.", + "enum": [ + "True", + "False" + ], + "x-ms-enum": { + "name": "isEnabled", + "modelAsString": true, + "values": [ + { + "value": "True", + "description": "Indicates the extension is enabled" + }, + { + "value": "False", + "description": "Indicates the extension is disabled" + } + ] + } }, "additionalExtensionProperties": { "type": "object", @@ -318,11 +336,11 @@ } }, "required": [ - "type", + "name", "isEnabled" ] }, - "OperationStatus": { + "OperationStatus": { "type": "object", "description": "A status describing the success/failure of the extension's enablement/disablement operation.", "properties": { @@ -334,7 +352,7 @@ "Failed" ], "x-ms-enum": { - "name": "type", + "name": "code", "modelAsString": true, "values": [ { @@ -349,7 +367,7 @@ } }, "message": { - "type": "boolean", + "type": "string", "description": "Additional information regarding the success/failure of the operation." } } From a3b711d7759110ac018c6a36001d697380e7bb81 Mon Sep 17 00:00:00 2001 From: Keren Damari Date: Wed, 22 Feb 2023 09:47:23 +0200 Subject: [PATCH 14/20] PR comments fix --- .../Microsoft.Security/stable/2023-01-01/pricings.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/pricings.json b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/pricings.json index b6181038a9a3..862996047ec9 100644 --- a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/pricings.json +++ b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/pricings.json @@ -48,10 +48,10 @@ "operationId": "Pricings_List", "parameters": [ { - "$ref": "../../../common/v4/types.json#/parameters/ApiVersion" + "$ref": "../../../common/v1/types.json#/parameters/ApiVersion" }, { - "$ref": "../../../common/v4/types.json#/parameters/SubscriptionId" + "$ref": "../../../common/v1/types.json#/parameters/SubscriptionId" } ], "responses": { From 5b2d3281cbe8d68575e832851ce2b8825f94d091 Mon Sep 17 00:00:00 2001 From: Keren Damari Date: Wed, 22 Feb 2023 23:17:25 +0200 Subject: [PATCH 15/20] Fix PR comments --- .../Pricings/PutPricingByNamePartialSuccess_example.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/PutPricingByNamePartialSuccess_example.json b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/PutPricingByNamePartialSuccess_example.json index b5f730d41cd9..e9f001ed5dca 100644 --- a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/PutPricingByNamePartialSuccess_example.json +++ b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/PutPricingByNamePartialSuccess_example.json @@ -37,7 +37,7 @@ } }, { - "type": "SensitiveDataDiscovery", + "name": "SensitiveDataDiscovery", "isEnabled": "True", "operationStatus": { "code": "Succeeded", From 0c423cf1b2e0254229844a0cd75265551f5df876 Mon Sep 17 00:00:00 2001 From: Reem Joron Date: Mon, 27 Feb 2023 10:00:42 +0200 Subject: [PATCH 16/20] EnablementTime --- .../GetPricingByNameCloudPosture_example.json | 1 + .../GetPricingByNameContainers_example.json | 1 + .../Pricings/GetPricingByNameDns_example.json | 3 ++- ...tPricingByNameStorageAccounts_example.json | 1 + ...tPricingByNameVirtualMachines_example.json | 1 + .../Pricings/ListPricings_example.json | 19 ++++++++++++++----- ...utPricingByNamePartialSuccess_example.json | 1 + .../Pricings/PutPricingByName_example.json | 1 + .../stable/2023-01-01/pricings.json | 6 ++++++ 9 files changed, 28 insertions(+), 6 deletions(-) diff --git a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/GetPricingByNameCloudPosture_example.json b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/GetPricingByNameCloudPosture_example.json index 76ec9aef21d6..754dd42b6ff0 100644 --- a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/GetPricingByNameCloudPosture_example.json +++ b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/GetPricingByNameCloudPosture_example.json @@ -13,6 +13,7 @@ "properties": { "pricingTier": "Standard", "freeTrialRemainingTime": "PT0S", + "enablementTime": "2023-03-01T12:42:42.1921106Z", "extensions": [ { "name": "AgentlessVmScanning", diff --git a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/GetPricingByNameContainers_example.json b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/GetPricingByNameContainers_example.json index 17a00a807a9f..eb6670a6d89d 100644 --- a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/GetPricingByNameContainers_example.json +++ b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/GetPricingByNameContainers_example.json @@ -13,6 +13,7 @@ "properties": { "pricingTier": "Standard", "freeTrialRemainingTime": "PT0S", + "enablementTime": "2023-03-01T12:42:42.1921106Z", "extensions": [ { "name": "ContainerRegistriesVulnerabilityAssessments", diff --git a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/GetPricingByNameDns_example.json b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/GetPricingByNameDns_example.json index cb14dd7ef253..53984df252cb 100644 --- a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/GetPricingByNameDns_example.json +++ b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/GetPricingByNameDns_example.json @@ -12,7 +12,8 @@ "type": "Microsoft.Security/pricings", "properties": { "pricingTier": "Standard", - "freeTrialRemainingTime": "PT0S" + "freeTrialRemainingTime": "PT0S", + "enablementTime": "2023-03-01T12:42:42.1921106Z" } } } diff --git a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/GetPricingByNameStorageAccounts_example.json b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/GetPricingByNameStorageAccounts_example.json index 58e8705cfd23..472334cc4b90 100644 --- a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/GetPricingByNameStorageAccounts_example.json +++ b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/GetPricingByNameStorageAccounts_example.json @@ -13,6 +13,7 @@ "properties": { "pricingTier": "Standard", "freeTrialRemainingTime": "PT0S", + "enablementTime": "2023-03-01T12:42:42.1921106Z", "subPlan": "PerStorageAccount", "extensions": [ { diff --git a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/GetPricingByNameVirtualMachines_example.json b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/GetPricingByNameVirtualMachines_example.json index c72416a82552..31056ac7781f 100644 --- a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/GetPricingByNameVirtualMachines_example.json +++ b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/GetPricingByNameVirtualMachines_example.json @@ -13,6 +13,7 @@ "properties": { "pricingTier": "Standard", "freeTrialRemainingTime": "PT0S", + "enablementTime": "2023-03-01T12:42:42.1921106Z", "subPlan": "P2", "extensions": [ { diff --git a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/ListPricings_example.json b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/ListPricings_example.json index 60a3f69fcef2..fc14cd3bdd18 100644 --- a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/ListPricings_example.json +++ b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/ListPricings_example.json @@ -14,6 +14,7 @@ "properties": { "pricingTier": "Standard", "freeTrialRemainingTime": "PT0S", + "enablementTime": "2023-03-01T12:42:42.1921106Z", "subPlan": "P2", "extensions": [ { @@ -29,7 +30,8 @@ "type": "Microsoft.Security/pricings", "properties": { "pricingTier": "Standard", - "freeTrialRemainingTime": "PT0S" + "freeTrialRemainingTime": "PT0S", + "enablementTime": "2023-03-01T12:42:42.1921106Z" } }, { @@ -48,6 +50,7 @@ "properties": { "pricingTier": "Standard", "freeTrialRemainingTime": "PT0S", + "enablementTime": "2023-03-01T12:42:42.1921106Z", "subPlan": "PerStorageAccount", "extensions": [ { @@ -70,7 +73,8 @@ "type": "Microsoft.Security/pricings", "properties": { "pricingTier": "Standard", - "freeTrialRemainingTime": "PT0S" + "freeTrialRemainingTime": "PT0S", + "enablementTime": "2023-03-01T12:42:42.1921106Z" } }, { @@ -105,7 +109,8 @@ "type": "Microsoft.Security/pricings", "properties": { "pricingTier": "Standard", - "freeTrialRemainingTime": "PT0S" + "freeTrialRemainingTime": "PT0S", + "enablementTime": "2023-03-01T12:42:42.1921106Z" } }, { @@ -114,7 +119,8 @@ "type": "Microsoft.Security/pricings", "properties": { "pricingTier": "Standard", - "freeTrialRemainingTime": "PT0S" + "freeTrialRemainingTime": "PT0S", + "enablementTime": "2023-03-01T12:42:42.1921106Z" } }, { @@ -123,7 +129,8 @@ "type": "Microsoft.Security/pricings", "properties": { "pricingTier": "Standard", - "freeTrialRemainingTime": "PT0S" + "freeTrialRemainingTime": "PT0S", + "enablementTime": "2023-03-01T12:42:42.1921106Z" } }, { @@ -142,6 +149,7 @@ "properties": { "pricingTier": "Standard", "freeTrialRemainingTime": "PT0S", + "enablementTime": "2023-03-01T12:42:42.1921106Z", "extensions": [ { "name": "ContainerRegistriesVulnerabilityAssessments", @@ -157,6 +165,7 @@ "properties": { "pricingTier": "Standard", "freeTrialRemainingTime": "PT0S", + "enablementTime": "2023-03-01T12:42:42.1921106Z", "extensions": [ { "name": "AgentlessVmScanning", diff --git a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/PutPricingByNamePartialSuccess_example.json b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/PutPricingByNamePartialSuccess_example.json index e9f001ed5dca..65dfec8f160e 100644 --- a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/PutPricingByNamePartialSuccess_example.json +++ b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/PutPricingByNamePartialSuccess_example.json @@ -19,6 +19,7 @@ "properties": { "pricingTier": "Standard", "freeTrialRemainingTime": "PT0S", + "enablementTime": "2023-03-01T12:42:42.1921106Z", "extensions": [ { "name": "AgentlessVmScanning", diff --git a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/PutPricingByName_example.json b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/PutPricingByName_example.json index 1b4f805cce02..8d8811a8c300 100644 --- a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/PutPricingByName_example.json +++ b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/PutPricingByName_example.json @@ -19,6 +19,7 @@ "properties": { "pricingTier": "Standard", "freeTrialRemainingTime": "PT0S", + "enablementTime": "2023-03-01T12:42:42.1921106Z", "extensions": [ { "name": "AgentlessVmScanning", diff --git a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/pricings.json b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/pricings.json index 862996047ec9..72499fe99650 100644 --- a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/pricings.json +++ b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/pricings.json @@ -234,6 +234,12 @@ "readOnly": true, "description": "The duration left for the subscriptions free trial period - in ISO 8601 format (e.g. P3Y6M4DT12H30M5S)." }, + "enablementTime": { + "type": "string", + "format": "date-time", + "readOnly": true, + "description": "Optional. If `pricingTier` is `Standard` then this property holds the date of the last time the `pricingTier` was set to `Standard`, when available (e.g 2023-03-01T12:42:42.1921106Z)." + }, "deprecated": { "type": "boolean", "readOnly": true, From 29500ad8300708d8311f9ff799c171ee04de0e59 Mon Sep 17 00:00:00 2001 From: Keren Damari Date: Thu, 2 Mar 2023 19:43:01 +0200 Subject: [PATCH 17/20] . --- .../Microsoft.Security/stable/2023-01-01/pricings.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/pricings.json b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/pricings.json index 862996047ec9..ef66d4c5a8e3 100644 --- a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/pricings.json +++ b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/pricings.json @@ -167,7 +167,6 @@ }, "definitions": { "PricingList": { - "type": "object", "description": "List of pricing configurations response.", "required": [ "value" @@ -379,7 +378,6 @@ "in": "path", "required": true, "type": "string", - "pattern": "^[a-zA-Z]+$", "description": "name of the pricing configuration", "x-ms-parameter-location": "method" }, From 3bae0f0b793733cba920ffd3110c37bd67b8ab6a Mon Sep 17 00:00:00 2001 From: Keren Damari Date: Mon, 6 Mar 2023 02:40:54 +0200 Subject: [PATCH 18/20] . --- .../stable/2023-01-01/pricings.json | 35 +------------------ 1 file changed, 1 insertion(+), 34 deletions(-) diff --git a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/pricings.json b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/pricings.json index 470ecbe3a1a5..9c20089086e3 100644 --- a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/pricings.json +++ b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/pricings.json @@ -271,40 +271,7 @@ "properties": { "name": { "type": "string", - "description": "The extension name.", - "enum": [ - "AgentlessVmScanning", - "AgentlessDiscoveryForKubernetes", - "OnUploadMalwareScanning", - "SensitiveDataDiscovery", - "ContainerRegistriesVulnerabilityAssessments" - ], - "x-ms-enum": { - "name": "name", - "modelAsString": true, - "values": [ - { - "value": "AgentlessVmScanning", - "description": "Available for CloudPosture and VirtualMachines plans." - }, - { - "value": "AgentlessDiscoveryForKubernetes", - "description": "API-based discovery of information about Kubernetes cluster architecture, workload objects, and setup. Required for Kubernetes inventory, identity and network exposure detection, attack path analysis and risk hunting as part of the cloud security explorer.\r\nAvailable for CloudPosture plan." - }, - { - "value": "OnUploadMalwareScanning", - "description": "Limits the GB to be scanned per month for each storage account within the subscription. Once this limit reached on a given storage account, Blobs won't be scanned during current calendar month.\r\nAvailable for StorageAccounts plan." - }, - { - "value": "SensitiveDataDiscovery", - "description": "Sensitive data discovery identifies Blob storage container with sensitive data such as credentials, credit cards, and more, to help prioritize and investigate security events.\r\nAvailable for StorageAccounts and CloudPosture plans." - }, - { - "value": "ContainerRegistriesVulnerabilityAssessments", - "description": "Provides vulnerability management for images stored in your container registries.\r\nAvailable for CloudPosture and Containers plans." - } - ] - } + "description": "The extension name. Supported values are:

**AgentlessDiscoveryForKubernetes** - API-based discovery of information about Kubernetes cluster architecture, workload objects, and setup. Required for Kubernetes inventory, identity and network exposure detection, attack path analysis and risk hunting as part of the cloud security explorer.\r\nAvailable for CloudPosture plan.

**OnUploadMalwareScanning** - Limits the GB to be scanned per month for each storage account within the subscription. Once this limit reached on a given storage account, Blobs won't be scanned during current calendar month.\r\nAvailable for StorageAccounts plan.

**SensitiveDataDiscovery** - Sensitive data discovery identifies Blob storage container with sensitive data such as credentials, credit cards, and more, to help prioritize and investigate security events.\r\nAvailable for StorageAccounts and CloudPosture plans.

**ContainerRegistriesVulnerabilityAssessments** - Provides vulnerability management for images stored in your container registries.\r\nAvailable for CloudPosture and Containers plans.", }, "isEnabled": { "type": "string", From d2e7bff56cf6002ce29af4d83cec85bab1fe80bc Mon Sep 17 00:00:00 2001 From: Keren Damari Date: Mon, 6 Mar 2023 09:32:53 +0200 Subject: [PATCH 19/20] . --- .../Microsoft.Security/stable/2023-01-01/pricings.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/pricings.json b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/pricings.json index 9c20089086e3..fe87c50246d4 100644 --- a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/pricings.json +++ b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/pricings.json @@ -271,7 +271,7 @@ "properties": { "name": { "type": "string", - "description": "The extension name. Supported values are:

**AgentlessDiscoveryForKubernetes** - API-based discovery of information about Kubernetes cluster architecture, workload objects, and setup. Required for Kubernetes inventory, identity and network exposure detection, attack path analysis and risk hunting as part of the cloud security explorer.\r\nAvailable for CloudPosture plan.

**OnUploadMalwareScanning** - Limits the GB to be scanned per month for each storage account within the subscription. Once this limit reached on a given storage account, Blobs won't be scanned during current calendar month.\r\nAvailable for StorageAccounts plan.

**SensitiveDataDiscovery** - Sensitive data discovery identifies Blob storage container with sensitive data such as credentials, credit cards, and more, to help prioritize and investigate security events.\r\nAvailable for StorageAccounts and CloudPosture plans.

**ContainerRegistriesVulnerabilityAssessments** - Provides vulnerability management for images stored in your container registries.\r\nAvailable for CloudPosture and Containers plans.", + "description": "The extension name. Supported values are:

**AgentlessDiscoveryForKubernetes** - API-based discovery of information about Kubernetes cluster architecture, workload objects, and setup. Required for Kubernetes inventory, identity and network exposure detection, attack path analysis and risk hunting as part of the cloud security explorer.\r\nAvailable for CloudPosture plan.

**OnUploadMalwareScanning** - Limits the GB to be scanned per month for each storage account within the subscription. Once this limit reached on a given storage account, Blobs won't be scanned during current calendar month.\r\nAvailable for StorageAccounts plan.

**SensitiveDataDiscovery** - Sensitive data discovery identifies Blob storage container with sensitive data such as credentials, credit cards, and more, to help prioritize and investigate security events.\r\nAvailable for StorageAccounts and CloudPosture plans.

**ContainerRegistriesVulnerabilityAssessments** - Provides vulnerability management for images stored in your container registries.\r\nAvailable for CloudPosture and Containers plans." }, "isEnabled": { "type": "string", From bf55525e278bc7f09e18a586abbd026a77c1fe61 Mon Sep 17 00:00:00 2001 From: Keren Damari Date: Tue, 21 Mar 2023 15:40:16 +0200 Subject: [PATCH 20/20] . --- .../Pricings/PutPricingByNamePartialSuccess_example.json | 3 +-- .../2023-01-01/examples/Pricings/PutPricingByName_example.json | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/PutPricingByNamePartialSuccess_example.json b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/PutPricingByNamePartialSuccess_example.json index 65dfec8f160e..65d2bbe689f0 100644 --- a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/PutPricingByNamePartialSuccess_example.json +++ b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/PutPricingByNamePartialSuccess_example.json @@ -5,8 +5,7 @@ "pricingName": "CloudPosture", "pricing": { "properties": { - "pricingTier": "Standard", - "subPlan": "P2" + "pricingTier": "Standard" } } }, diff --git a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/PutPricingByName_example.json b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/PutPricingByName_example.json index 8d8811a8c300..bb9219fb6ba5 100644 --- a/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/PutPricingByName_example.json +++ b/specification/security/resource-manager/Microsoft.Security/stable/2023-01-01/examples/Pricings/PutPricingByName_example.json @@ -5,8 +5,7 @@ "pricingName": "CloudPosture", "pricing": { "properties": { - "pricingTier": "Standard", - "subPlan": "P2" + "pricingTier": "Standard" } } },