From dcc3ea2f28dc8766ade83f8e59c441e6c66ce491 Mon Sep 17 00:00:00 2001 From: kerend Date: Thu, 17 Feb 2022 17:46:07 +0200 Subject: [PATCH 1/6] Adds base for updating Microsoft.Security from version stable/2018-06-01 to version 2022-03-01 --- .../Pricings/GetPricingByName_example.json | 19 ++ .../Pricings/ListPricings_example.json | 46 ++++ .../Pricings/PutPricingByName_example.json | 27 ++ .../stable/2022-03-01/pricings.json | 243 ++++++++++++++++++ 4 files changed, 335 insertions(+) create mode 100644 specification/security/resource-manager/Microsoft.Security/stable/2022-03-01/examples/Pricings/GetPricingByName_example.json create mode 100644 specification/security/resource-manager/Microsoft.Security/stable/2022-03-01/examples/Pricings/ListPricings_example.json create mode 100644 specification/security/resource-manager/Microsoft.Security/stable/2022-03-01/examples/Pricings/PutPricingByName_example.json create mode 100644 specification/security/resource-manager/Microsoft.Security/stable/2022-03-01/pricings.json diff --git a/specification/security/resource-manager/Microsoft.Security/stable/2022-03-01/examples/Pricings/GetPricingByName_example.json b/specification/security/resource-manager/Microsoft.Security/stable/2022-03-01/examples/Pricings/GetPricingByName_example.json new file mode 100644 index 000000000000..3444e71fb1a6 --- /dev/null +++ b/specification/security/resource-manager/Microsoft.Security/stable/2022-03-01/examples/Pricings/GetPricingByName_example.json @@ -0,0 +1,19 @@ +{ + "parameters": { + "api-version": "2018-06-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" + } + } + } + } +} diff --git a/specification/security/resource-manager/Microsoft.Security/stable/2022-03-01/examples/Pricings/ListPricings_example.json b/specification/security/resource-manager/Microsoft.Security/stable/2022-03-01/examples/Pricings/ListPricings_example.json new file mode 100644 index 000000000000..2dc0d3f02223 --- /dev/null +++ b/specification/security/resource-manager/Microsoft.Security/stable/2022-03-01/examples/Pricings/ListPricings_example.json @@ -0,0 +1,46 @@ +{ + "parameters": { + "api-version": "2018-06-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" + } + }, + { + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/pricings/SqlServers", + "name": "SqlServers", + "type": "Microsoft.Security/pricings", + "properties": { + "pricingTier": "Standard" + } + }, + { + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/pricings/AppServices", + "name": "AppServices", + "type": "Microsoft.Security/pricings", + "properties": { + "pricingTier": "Free" + } + }, + { + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/pricings/StorageAccounts", + "name": "StorageAccounts", + "type": "Microsoft.Security/pricings", + "properties": { + "pricingTier": "Standard" + } + } + ] + } + } + } +} diff --git a/specification/security/resource-manager/Microsoft.Security/stable/2022-03-01/examples/Pricings/PutPricingByName_example.json b/specification/security/resource-manager/Microsoft.Security/stable/2022-03-01/examples/Pricings/PutPricingByName_example.json new file mode 100644 index 000000000000..957038093df2 --- /dev/null +++ b/specification/security/resource-manager/Microsoft.Security/stable/2022-03-01/examples/Pricings/PutPricingByName_example.json @@ -0,0 +1,27 @@ +{ + "parameters": { + "api-version": "2018-06-01", + "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23", + "pricingName": "VirtualMachines", + "pricing": { + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/pricings/VirtualMachines", + "name": "VirtualMachines", + "type": "Microsoft.Security/pricings", + "properties": { + "pricingTier": "Standard" + } + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/pricings/VirtualMachines", + "name": "VirtualMachines", + "type": "Microsoft.Security/pricings", + "properties": { + "pricingTier": "Standard" + } + } + } + } +} diff --git a/specification/security/resource-manager/Microsoft.Security/stable/2022-03-01/pricings.json b/specification/security/resource-manager/Microsoft.Security/stable/2022-03-01/pricings.json new file mode 100644 index 000000000000..426dfb6bc744 --- /dev/null +++ b/specification/security/resource-manager/Microsoft.Security/stable/2022-03-01/pricings.json @@ -0,0 +1,243 @@ +{ + "swagger": "2.0", + "info": { + "title": "Security Center", + "description": "API spec for Microsoft.Security (Azure Security Center) resource provider", + "version": "2018-06-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 Security Center 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": { + "$ref": "./examples/Pricings/GetPricingByName_example.json" + } + }, + "tags": [ + "Pricings" + ], + "description": "Gets a provided Security Center 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 Security Center 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": "Azure Security Center 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. Azure Security Center 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 Azure security center experience with basic security features" + }, + { + "value": "Standard", + "description": "Get the standard Azure security center experience with advanced security features" + } + ] + } + }, + "freeTrialRemainingTime": { + "type": "string", + "format": "duration", + "readOnly": true, + "description": "The duration left for the subscriptions free trial period - in ISO 8601 format (e.g. P3Y6M4DT12H30M5S)." + } + }, + "required": [ + "pricingTier" + ] + } + }, + "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 e8029021bd999ec2490461efefe284a9fa1ca3be Mon Sep 17 00:00:00 2001 From: kerend Date: Thu, 17 Feb 2022 17:46:10 +0200 Subject: [PATCH 2/6] Updates readme --- .../security/resource-manager/readme.md | 23 ++++++++++++++----- 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/specification/security/resource-manager/readme.md b/specification/security/resource-manager/readme.md index abd1373a9744..ef369ee63ffa 100644 --- a/specification/security/resource-manager/readme.md +++ b/specification/security/resource-manager/readme.md @@ -66,13 +66,22 @@ These are the global settings for the Security API. title: SecurityCenter description: API spec for Microsoft.Security (Azure Security Center) resource provider openapi-type: arm -tag: package-composite-v3 +tag: package-2022-03 ``` ### Composite packages The following packages may be composed from multiple api-versions. + +### Tag: package-2022-03 + +These settings apply only when `--tag=package-2022-03` is specified on the command line. + +```yaml $(tag) == 'package-2022-03' +input-file: + - Microsoft.Security/stable/2022-03-01/pricings.json +``` ### Tag: package-preview-2021-08 These settings apply only when `--tag=package-preview-2021-08` is specified on the command line. @@ -84,7 +93,7 @@ input-file: override-info: title: SecurityCenter -``` +``` ### Tag: package-composite-v1 @@ -454,7 +463,7 @@ override-info: These settings apply only when `--tag=package-2021-07-preview-only` is specified on the command line. -```yaml $(tag) == 'package-2021-07-preview-only' +``` yaml $(tag) == 'package-2021-07-preview-only' input-file: - Microsoft.Security/preview/2021-07-01-preview/customAssessmentAutomation.json - Microsoft.Security/preview/2021-07-01-preview/customEntityStoreAssignment.json @@ -464,14 +473,16 @@ input-file: These settings apply only when `--tag=package-2021-10-preview-only` is specified on the command line. -```yaml $(tag) == 'package-2021-10-preview-only' +``` yaml $(tag) == 'package-2021-10-preview-only' input-file: - Microsoft.Security/preview/2021-10-01-preview/mdeOnboardings.json ``` # Needed when there is more than one input file + override-info: - title: SecurityCenter +title: SecurityCenter + ``` ### Tag: package-2021-06-only @@ -548,4 +559,4 @@ See configuration in [readme.ruby.md](./readme.ruby.md) ## Java -See configuration in [readme.java.md](./readme.java.md) \ No newline at end of file +See configuration in [readme.java.md](./readme.java.md) From 552a032e31b002aa95fd16c02f1752d0826a7edc Mon Sep 17 00:00:00 2001 From: kerend Date: Thu, 17 Feb 2022 17:46:11 +0200 Subject: [PATCH 3/6] Updates API version in new specs and examples --- .../2022-03-01/examples/Pricings/GetPricingByName_example.json | 2 +- .../2022-03-01/examples/Pricings/ListPricings_example.json | 2 +- .../2022-03-01/examples/Pricings/PutPricingByName_example.json | 2 +- .../Microsoft.Security/stable/2022-03-01/pricings.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/specification/security/resource-manager/Microsoft.Security/stable/2022-03-01/examples/Pricings/GetPricingByName_example.json b/specification/security/resource-manager/Microsoft.Security/stable/2022-03-01/examples/Pricings/GetPricingByName_example.json index 3444e71fb1a6..597553d937b9 100644 --- a/specification/security/resource-manager/Microsoft.Security/stable/2022-03-01/examples/Pricings/GetPricingByName_example.json +++ b/specification/security/resource-manager/Microsoft.Security/stable/2022-03-01/examples/Pricings/GetPricingByName_example.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2018-06-01", + "api-version": "2022-03-01", "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23", "pricingName": "VirtualMachines" }, diff --git a/specification/security/resource-manager/Microsoft.Security/stable/2022-03-01/examples/Pricings/ListPricings_example.json b/specification/security/resource-manager/Microsoft.Security/stable/2022-03-01/examples/Pricings/ListPricings_example.json index 2dc0d3f02223..bc068271a0a9 100644 --- a/specification/security/resource-manager/Microsoft.Security/stable/2022-03-01/examples/Pricings/ListPricings_example.json +++ b/specification/security/resource-manager/Microsoft.Security/stable/2022-03-01/examples/Pricings/ListPricings_example.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2018-06-01", + "api-version": "2022-03-01", "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23" }, "responses": { diff --git a/specification/security/resource-manager/Microsoft.Security/stable/2022-03-01/examples/Pricings/PutPricingByName_example.json b/specification/security/resource-manager/Microsoft.Security/stable/2022-03-01/examples/Pricings/PutPricingByName_example.json index 957038093df2..e6675ac55dd7 100644 --- a/specification/security/resource-manager/Microsoft.Security/stable/2022-03-01/examples/Pricings/PutPricingByName_example.json +++ b/specification/security/resource-manager/Microsoft.Security/stable/2022-03-01/examples/Pricings/PutPricingByName_example.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2018-06-01", + "api-version": "2022-03-01", "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23", "pricingName": "VirtualMachines", "pricing": { diff --git a/specification/security/resource-manager/Microsoft.Security/stable/2022-03-01/pricings.json b/specification/security/resource-manager/Microsoft.Security/stable/2022-03-01/pricings.json index 426dfb6bc744..7a6b55b79125 100644 --- a/specification/security/resource-manager/Microsoft.Security/stable/2022-03-01/pricings.json +++ b/specification/security/resource-manager/Microsoft.Security/stable/2022-03-01/pricings.json @@ -3,7 +3,7 @@ "info": { "title": "Security Center", "description": "API spec for Microsoft.Security (Azure Security Center) resource provider", - "version": "2018-06-01" + "version": "2022-03-01" }, "host": "management.azure.com", "schemes": [ From 3c9b94d1102ab66dd1a0f8c06265e3db4eca7bd3 Mon Sep 17 00:00:00 2001 From: Keren Damari Date: Sun, 20 Feb 2022 10:55:14 +0200 Subject: [PATCH 4/6] . --- .../Pricings/GetPricingByName_example.json | 4 +- .../Pricings/ListPricings_example.json | 85 ++++++++++++++++++- .../Pricings/PutPricingByName_example.json | 7 +- .../stable/2022-03-01/pricings.json | 4 + 4 files changed, 93 insertions(+), 7 deletions(-) diff --git a/specification/security/resource-manager/Microsoft.Security/stable/2022-03-01/examples/Pricings/GetPricingByName_example.json b/specification/security/resource-manager/Microsoft.Security/stable/2022-03-01/examples/Pricings/GetPricingByName_example.json index 597553d937b9..f43d551ab096 100644 --- a/specification/security/resource-manager/Microsoft.Security/stable/2022-03-01/examples/Pricings/GetPricingByName_example.json +++ b/specification/security/resource-manager/Microsoft.Security/stable/2022-03-01/examples/Pricings/GetPricingByName_example.json @@ -11,7 +11,9 @@ "name": "VirtualMachines", "type": "Microsoft.Security/pricings", "properties": { - "pricingTier": "Standard" + "pricingTier": "Standard", + "freeTrialRemainingTime": "PT0S", + "planName": "P1" } } } diff --git a/specification/security/resource-manager/Microsoft.Security/stable/2022-03-01/examples/Pricings/ListPricings_example.json b/specification/security/resource-manager/Microsoft.Security/stable/2022-03-01/examples/Pricings/ListPricings_example.json index bc068271a0a9..52ab5845366e 100644 --- a/specification/security/resource-manager/Microsoft.Security/stable/2022-03-01/examples/Pricings/ListPricings_example.json +++ b/specification/security/resource-manager/Microsoft.Security/stable/2022-03-01/examples/Pricings/ListPricings_example.json @@ -12,7 +12,9 @@ "name": "VirtualMachines", "type": "Microsoft.Security/pricings", "properties": { - "pricingTier": "Standard" + "pricingTier": "Standard", + "freeTrialRemainingTime": "PT0S", + "planName": "P2" } }, { @@ -20,7 +22,8 @@ "name": "SqlServers", "type": "Microsoft.Security/pricings", "properties": { - "pricingTier": "Standard" + "pricingTier": "Standard", + "freeTrialRemainingTime": "PT0S" } }, { @@ -28,7 +31,8 @@ "name": "AppServices", "type": "Microsoft.Security/pricings", "properties": { - "pricingTier": "Free" + "pricingTier": "Free", + "freeTrialRemainingTime": "PT0S" } }, { @@ -36,7 +40,80 @@ "name": "StorageAccounts", "type": "Microsoft.Security/pricings", "properties": { - "pricingTier": "Standard" + "pricingTier": "Standard", + "freeTrialRemainingTime": "PT0S" + } + }, + { + "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" + } + }, + { + "id": "/subscriptions/d34fd44c-ebfa-4a9c-bceb-9eeafe72ac15/providers/Microsoft.Security/pricings/ContainerRegistry", + "name": "ContainerRegistry", + "type": "Microsoft.Security/pricings", + "properties": { + "pricingTier": "Free", + "freeTrialRemainingTime": "PT0S" + } + }, + { + "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" } } ] diff --git a/specification/security/resource-manager/Microsoft.Security/stable/2022-03-01/examples/Pricings/PutPricingByName_example.json b/specification/security/resource-manager/Microsoft.Security/stable/2022-03-01/examples/Pricings/PutPricingByName_example.json index e6675ac55dd7..3810a33890a8 100644 --- a/specification/security/resource-manager/Microsoft.Security/stable/2022-03-01/examples/Pricings/PutPricingByName_example.json +++ b/specification/security/resource-manager/Microsoft.Security/stable/2022-03-01/examples/Pricings/PutPricingByName_example.json @@ -8,7 +8,8 @@ "name": "VirtualMachines", "type": "Microsoft.Security/pricings", "properties": { - "pricingTier": "Standard" + "pricingTier": "Standard", + "planName": "P2" } } }, @@ -19,7 +20,9 @@ "name": "VirtualMachines", "type": "Microsoft.Security/pricings", "properties": { - "pricingTier": "Standard" + "pricingTier": "Standard", + "freeTrialRemainingTime": "PT0S", + "planName": "P2" } } } diff --git a/specification/security/resource-manager/Microsoft.Security/stable/2022-03-01/pricings.json b/specification/security/resource-manager/Microsoft.Security/stable/2022-03-01/pricings.json index 7a6b55b79125..308134371dcf 100644 --- a/specification/security/resource-manager/Microsoft.Security/stable/2022-03-01/pricings.json +++ b/specification/security/resource-manager/Microsoft.Security/stable/2022-03-01/pricings.json @@ -208,6 +208,10 @@ ] } }, + "planName": { + "type": "string", + "description": "The name of the plan selected for a Standard pricing configuration, when more than one plan is available. Each plan enables a set of security features. When not specified, full plan is applied." + }, "freeTrialRemainingTime": { "type": "string", "format": "duration", From 099440199a9eede4d7f719b48c0c9dad7ca04f35 Mon Sep 17 00:00:00 2001 From: Keren Damari Date: Mon, 21 Feb 2022 11:24:39 +0200 Subject: [PATCH 5/6] . --- .../examples/Pricings/GetPricingByName_example.json | 2 +- .../2022-03-01/examples/Pricings/ListPricings_example.json | 2 +- .../examples/Pricings/PutPricingByName_example.json | 7 ++----- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/specification/security/resource-manager/Microsoft.Security/stable/2022-03-01/examples/Pricings/GetPricingByName_example.json b/specification/security/resource-manager/Microsoft.Security/stable/2022-03-01/examples/Pricings/GetPricingByName_example.json index f43d551ab096..aa131a40c7ea 100644 --- a/specification/security/resource-manager/Microsoft.Security/stable/2022-03-01/examples/Pricings/GetPricingByName_example.json +++ b/specification/security/resource-manager/Microsoft.Security/stable/2022-03-01/examples/Pricings/GetPricingByName_example.json @@ -13,7 +13,7 @@ "properties": { "pricingTier": "Standard", "freeTrialRemainingTime": "PT0S", - "planName": "P1" + "planName": "P1" } } } diff --git a/specification/security/resource-manager/Microsoft.Security/stable/2022-03-01/examples/Pricings/ListPricings_example.json b/specification/security/resource-manager/Microsoft.Security/stable/2022-03-01/examples/Pricings/ListPricings_example.json index 52ab5845366e..1aa4fa931bf3 100644 --- a/specification/security/resource-manager/Microsoft.Security/stable/2022-03-01/examples/Pricings/ListPricings_example.json +++ b/specification/security/resource-manager/Microsoft.Security/stable/2022-03-01/examples/Pricings/ListPricings_example.json @@ -105,7 +105,7 @@ "properties": { "pricingTier": "Free", "freeTrialRemainingTime": "PT0S" - } + } }, { "id": "/subscriptions/d34fd44c-ebfa-4a9c-bceb-9eeafe72ac15/providers/Microsoft.Security/pricings/Containers", diff --git a/specification/security/resource-manager/Microsoft.Security/stable/2022-03-01/examples/Pricings/PutPricingByName_example.json b/specification/security/resource-manager/Microsoft.Security/stable/2022-03-01/examples/Pricings/PutPricingByName_example.json index 3810a33890a8..bb3beac32bac 100644 --- a/specification/security/resource-manager/Microsoft.Security/stable/2022-03-01/examples/Pricings/PutPricingByName_example.json +++ b/specification/security/resource-manager/Microsoft.Security/stable/2022-03-01/examples/Pricings/PutPricingByName_example.json @@ -4,12 +4,9 @@ "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23", "pricingName": "VirtualMachines", "pricing": { - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/pricings/VirtualMachines", - "name": "VirtualMachines", - "type": "Microsoft.Security/pricings", "properties": { "pricingTier": "Standard", - "planName": "P2" + "planName": "P2" } } }, @@ -22,7 +19,7 @@ "properties": { "pricingTier": "Standard", "freeTrialRemainingTime": "PT0S", - "planName": "P2" + "planName": "P2" } } } From 81b1c898fb476a6bae00dfdd7868ac2e567a6b83 Mon Sep 17 00:00:00 2001 From: Keren Damari Date: Wed, 23 Feb 2022 11:18:28 +0200 Subject: [PATCH 6/6] . --- .../examples/Pricings/GetPricingByName_example.json | 2 +- .../2022-03-01/examples/Pricings/ListPricings_example.json | 2 +- .../examples/Pricings/PutPricingByName_example.json | 4 ++-- .../Microsoft.Security/stable/2022-03-01/pricings.json | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/specification/security/resource-manager/Microsoft.Security/stable/2022-03-01/examples/Pricings/GetPricingByName_example.json b/specification/security/resource-manager/Microsoft.Security/stable/2022-03-01/examples/Pricings/GetPricingByName_example.json index aa131a40c7ea..614236b08bdb 100644 --- a/specification/security/resource-manager/Microsoft.Security/stable/2022-03-01/examples/Pricings/GetPricingByName_example.json +++ b/specification/security/resource-manager/Microsoft.Security/stable/2022-03-01/examples/Pricings/GetPricingByName_example.json @@ -13,7 +13,7 @@ "properties": { "pricingTier": "Standard", "freeTrialRemainingTime": "PT0S", - "planName": "P1" + "subPlan": "P1" } } } diff --git a/specification/security/resource-manager/Microsoft.Security/stable/2022-03-01/examples/Pricings/ListPricings_example.json b/specification/security/resource-manager/Microsoft.Security/stable/2022-03-01/examples/Pricings/ListPricings_example.json index 1aa4fa931bf3..5876f2bf22e1 100644 --- a/specification/security/resource-manager/Microsoft.Security/stable/2022-03-01/examples/Pricings/ListPricings_example.json +++ b/specification/security/resource-manager/Microsoft.Security/stable/2022-03-01/examples/Pricings/ListPricings_example.json @@ -14,7 +14,7 @@ "properties": { "pricingTier": "Standard", "freeTrialRemainingTime": "PT0S", - "planName": "P2" + "subPlan": "P2" } }, { diff --git a/specification/security/resource-manager/Microsoft.Security/stable/2022-03-01/examples/Pricings/PutPricingByName_example.json b/specification/security/resource-manager/Microsoft.Security/stable/2022-03-01/examples/Pricings/PutPricingByName_example.json index bb3beac32bac..d5d1fd40fef9 100644 --- a/specification/security/resource-manager/Microsoft.Security/stable/2022-03-01/examples/Pricings/PutPricingByName_example.json +++ b/specification/security/resource-manager/Microsoft.Security/stable/2022-03-01/examples/Pricings/PutPricingByName_example.json @@ -6,7 +6,7 @@ "pricing": { "properties": { "pricingTier": "Standard", - "planName": "P2" + "subPlan": "P2" } } }, @@ -19,7 +19,7 @@ "properties": { "pricingTier": "Standard", "freeTrialRemainingTime": "PT0S", - "planName": "P2" + "subPlan": "P2" } } } diff --git a/specification/security/resource-manager/Microsoft.Security/stable/2022-03-01/pricings.json b/specification/security/resource-manager/Microsoft.Security/stable/2022-03-01/pricings.json index 308134371dcf..156cc45020ad 100644 --- a/specification/security/resource-manager/Microsoft.Security/stable/2022-03-01/pricings.json +++ b/specification/security/resource-manager/Microsoft.Security/stable/2022-03-01/pricings.json @@ -208,9 +208,9 @@ ] } }, - "planName": { + "subPlan": { "type": "string", - "description": "The name of the plan selected for a Standard pricing configuration, when more than one plan is available. Each plan enables a set of security features. When not specified, full plan is applied." + "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",