From 9845076934a449f7c0e3207a9bf03943c8f652f7 Mon Sep 17 00:00:00 2001 From: trajkobal Date: Tue, 30 Aug 2022 20:58:08 -0400 Subject: [PATCH 1/9] Swagger documentation for /locations/{location}/billingMeters - GET endpoint --- .../2022-06-01-preview/CommonDefinitions.json | 54 +++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/CommonDefinitions.json b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/CommonDefinitions.json index 4be8167f677c..573f6c78eef6 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/CommonDefinitions.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/CommonDefinitions.json @@ -903,6 +903,60 @@ "description": "Application-specific metadata in the form of key-value pairs." } } + }, + "BillingMeter": { + "type": "object", + "properties": { + "meterId":{ + "type": "string", + "description": "Billing meter id." + }, + "category":{ + "type": "string", + "enum": [ + "PremiumSkuGeneralCompute", + "PremiumSkuMemoryOptimized", + "PremiumSkuComputeOptimized" + ], + "description": "Used to map workload profile types to billing meter." + }, + "type":{ + "type": "string", + "enum": [ + "Memory", + "CPU" + ], + "description": "Compute type." + }, + "shortName":{ + "type": "string", + "description": "Unique short name for the meter." + }, + "friendlyName":{ + "type": "string", + "description": "The everyday name of the billing meter." + }, + "billingLocation":{ + "type": "string", + "description": "Region for the billing meter." + } + } + }, + "BillingMeterCollection": { + "description": "Collection of premium workload billing meters.", + "required": [ + "value" + ], + "type": "object", + "properties": { + "value": { + "description": "Collection of billing meters.", + "type": "array", + "items": { + "$ref": "#/definitions/BillingMeter" + } + } + } } }, "securityDefinitions": { From 404bde200d3bc51a7b44321b4daadc58cb7ef227 Mon Sep 17 00:00:00 2001 From: trajkobal Date: Tue, 30 Aug 2022 22:34:38 -0400 Subject: [PATCH 2/9] Add example, fix validation errors --- .../2022-06-01-preview/CommonDefinitions.json | 13 ++++++-- .../examples/BillingMeters_Get.json | 31 +++++++++++++++++++ 2 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/BillingMeters_Get.json diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/CommonDefinitions.json b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/CommonDefinitions.json index 573f6c78eef6..84adaf3937ab 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/CommonDefinitions.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/CommonDefinitions.json @@ -905,6 +905,7 @@ } }, "BillingMeter": { + "description": "A premium billing meter.", "type": "object", "properties": { "meterId":{ @@ -912,21 +913,29 @@ "description": "Billing meter id." }, "category":{ + "description": "Used to map workload profile types to billing meter.", "type": "string", "enum": [ "PremiumSkuGeneralCompute", "PremiumSkuMemoryOptimized", "PremiumSkuComputeOptimized" ], - "description": "Used to map workload profile types to billing meter." + "x-ms-enum": { + "name": "Category", + "modelAsString": true + } }, "type":{ + "description": "Compute type.", "type": "string", "enum": [ "Memory", "CPU" ], - "description": "Compute type." + "x-ms-enum": { + "name": "ComputeType", + "modelAsString": true + } }, "shortName":{ "type": "string", diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/BillingMeters_Get.json b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/BillingMeters_Get.json new file mode 100644 index 000000000000..e25b8433bd02 --- /dev/null +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/BillingMeters_Get.json @@ -0,0 +1,31 @@ +{ + "parameters": { + "subscriptionId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345", + "location ": "East US", + "api-version": "2022-06-01-preview" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "meterId": "7a3b96e3-1c68-4506-86d8-224b89b3347f", + "category": "PremiumSkuGeneralCompute", + "type": "CPU", + "shortName": "PremiumSKUGeneralComputeCPU", + "friendlyName": "Premium SKU General Compute Cores per Second", + "billingLocation": "East US" + }, + { + "meterId": "2343b96e3-1c68-4506-86d8-224b8ass347f", + "category": "PremiumSkuGeneralCompute", + "type": "Memory", + "shortName": "PremiumSKUGeneralComputeMemory", + "friendlyName": "Premium SKU General Compute Memory GB per Second", + "billingLocation": "East US" + } + ] + } + } + } +} From 51042c8681a17b1491350f9442349fea589a4313 Mon Sep 17 00:00:00 2001 From: trajkobal Date: Wed, 31 Aug 2022 14:53:40 -0400 Subject: [PATCH 3/9] Fix ARM validation errors, code review comments --- .../2022-06-01-preview/BillingMeters.json | 127 ++++++++++++++++++ .../2022-06-01-preview/CommonDefinitions.json | 63 --------- .../examples/BillingMeters_Get.json | 6 +- 3 files changed, 130 insertions(+), 66 deletions(-) create mode 100644 specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/BillingMeters.json diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/BillingMeters.json b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/BillingMeters.json new file mode 100644 index 000000000000..4610f7ac6810 --- /dev/null +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/BillingMeters.json @@ -0,0 +1,127 @@ +{ + "swagger": "2.0", + "info": { + "version": "2022-06-01-preview", + "title": "ContainerApps API Client" + }, + "host": "management.azure.com", + "schemes": [ + "https" + ], + "produces": [ + "application/json" + ], + "paths": { + "/subscriptions/{subscriptionId}/providers/Microsoft.App/locations/{location}/billingMeters": { + "get": { + "tags": [ + "BillingMeters" + ], + "summary": "Get billing meters by location.", + "description": "Get all billingMeters for a location.", + "operationId": "BillingMeters_Get", + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/LocationParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/BillingMeterCollection" + } + } + }, + "x-ms-examples": { + "List billing meters by location": { + "$ref": "./examples/BillingMeters_Get.json" + } + } + } + } + }, + "definitions": { + "BillingMeter": { + "description": "A premium billing meter.", + "type": "object", + "properties": { + "id":{ + "type": "string", + "description": "Billing meter id." + }, + "category":{ + "description": "Used to map workload profile types to billing meter.", + "type": "string", + "enum": [ + "PremiumSkuGeneralCompute", + "PremiumSkuMemoryOptimized", + "PremiumSkuComputeOptimized" + ], + "x-ms-enum": { + "name": "Category", + "modelAsString": true + } + }, + "type":{ + "description": "Compute type.", + "type": "string", + "enum": [ + "Memory", + "CPU" + ], + "x-ms-enum": { + "name": "ComputeType", + "modelAsString": true + } + }, + "shortName":{ + "type": "string", + "description": "Unique short name for the meter." + }, + "friendlyName":{ + "type": "string", + "description": "The everyday name of the billing meter." + }, + "billingLocation":{ + "type": "string", + "description": "Region for the billing meter." + } + } + }, + "BillingMeterCollection": { + "description": "Collection of premium workload billing meters.", + "required": [ + "value", + "location" + ], + "type": "object", + "properties": { + "value": { + "description": "Collection of billing meters.", + "type": "array", + "items": { + "$ref": "#/definitions/BillingMeter" + } + } + } + } + }, + "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" + } + } + } +} diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/CommonDefinitions.json b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/CommonDefinitions.json index 84adaf3937ab..4be8167f677c 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/CommonDefinitions.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/CommonDefinitions.json @@ -903,69 +903,6 @@ "description": "Application-specific metadata in the form of key-value pairs." } } - }, - "BillingMeter": { - "description": "A premium billing meter.", - "type": "object", - "properties": { - "meterId":{ - "type": "string", - "description": "Billing meter id." - }, - "category":{ - "description": "Used to map workload profile types to billing meter.", - "type": "string", - "enum": [ - "PremiumSkuGeneralCompute", - "PremiumSkuMemoryOptimized", - "PremiumSkuComputeOptimized" - ], - "x-ms-enum": { - "name": "Category", - "modelAsString": true - } - }, - "type":{ - "description": "Compute type.", - "type": "string", - "enum": [ - "Memory", - "CPU" - ], - "x-ms-enum": { - "name": "ComputeType", - "modelAsString": true - } - }, - "shortName":{ - "type": "string", - "description": "Unique short name for the meter." - }, - "friendlyName":{ - "type": "string", - "description": "The everyday name of the billing meter." - }, - "billingLocation":{ - "type": "string", - "description": "Region for the billing meter." - } - } - }, - "BillingMeterCollection": { - "description": "Collection of premium workload billing meters.", - "required": [ - "value" - ], - "type": "object", - "properties": { - "value": { - "description": "Collection of billing meters.", - "type": "array", - "items": { - "$ref": "#/definitions/BillingMeter" - } - } - } } }, "securityDefinitions": { diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/BillingMeters_Get.json b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/BillingMeters_Get.json index e25b8433bd02..bd2fcd5a265c 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/BillingMeters_Get.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/BillingMeters_Get.json @@ -1,7 +1,7 @@ { "parameters": { "subscriptionId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345", - "location ": "East US", + "location": "East US", "api-version": "2022-06-01-preview" }, "responses": { @@ -9,7 +9,7 @@ "body": { "value": [ { - "meterId": "7a3b96e3-1c68-4506-86d8-224b89b3347f", + "id": "7a3b96e3-1c68-4506-86d8-224b89b3347f", "category": "PremiumSkuGeneralCompute", "type": "CPU", "shortName": "PremiumSKUGeneralComputeCPU", @@ -17,7 +17,7 @@ "billingLocation": "East US" }, { - "meterId": "2343b96e3-1c68-4506-86d8-224b8ass347f", + "id": "2343b96e3-1c68-4506-86d8-224b8ass347f", "category": "PremiumSkuGeneralCompute", "type": "Memory", "shortName": "PremiumSKUGeneralComputeMemory", From 54d80fd7d64515c1953b5e4fb9487a2c1fb8d4d8 Mon Sep 17 00:00:00 2001 From: trajkobal Date: Wed, 31 Aug 2022 15:01:42 -0400 Subject: [PATCH 4/9] Fix response validation --- .../preview/2022-06-01-preview/BillingMeters.json | 3 +-- specification/app/resource-manager/readme.md | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/BillingMeters.json b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/BillingMeters.json index 4610f7ac6810..61e5977de0ba 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/BillingMeters.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/BillingMeters.json @@ -98,8 +98,7 @@ "BillingMeterCollection": { "description": "Collection of premium workload billing meters.", "required": [ - "value", - "location" + "value" ], "type": "object", "properties": { diff --git a/specification/app/resource-manager/readme.md b/specification/app/resource-manager/readme.md index a709225896f8..4bae9429efa6 100644 --- a/specification/app/resource-manager/readme.md +++ b/specification/app/resource-manager/readme.md @@ -50,6 +50,7 @@ input-file: - Microsoft.App/preview/2022-06-01-preview/ConnectedEnvironmentsCertificates.json - Microsoft.App/preview/2022-06-01-preview/ConnectedEnvironmentsDaprComponents.json - Microsoft.App/preview/2022-06-01-preview/ConnectedEnvironmentsStorages.json + - Microsoft.App/preview/2022-06-01-preview/BillingMeters.json ``` ### Tag: package-2022-05 From 10ea6b00260939bcd8c66f712467becf3df28cca Mon Sep 17 00:00:00 2001 From: trajkobal Date: Wed, 7 Sep 2022 14:31:42 -0400 Subject: [PATCH 5/9] add proxy resource properties --- .../2022-06-01-preview/BillingMeters.json | 87 +++++++++---------- 1 file changed, 41 insertions(+), 46 deletions(-) diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/BillingMeters.json b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/BillingMeters.json index 61e5977de0ba..c04909ec07c6 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/BillingMeters.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/BillingMeters.json @@ -51,47 +51,42 @@ "BillingMeter": { "description": "A premium billing meter.", "type": "object", + "allOf": [ + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/ProxyResource" + } + ], "properties": { - "id":{ - "type": "string", - "description": "Billing meter id." - }, - "category":{ - "description": "Used to map workload profile types to billing meter.", - "type": "string", - "enum": [ - "PremiumSkuGeneralCompute", - "PremiumSkuMemoryOptimized", - "PremiumSkuComputeOptimized" - ], - "x-ms-enum": { - "name": "Category", - "modelAsString": true - } - }, - "type":{ - "description": "Compute type.", - "type": "string", - "enum": [ - "Memory", - "CPU" - ], - "x-ms-enum": { - "name": "ComputeType", - "modelAsString": true + "properties": { + "description": "Revision resource specific properties", + "type": "object", + "properties": { + "category": { + "description": "Used to map workload profile types to billing meter.", + "type": "string", + "enum": [ + "PremiumSkuGeneralCompute", + "PremiumSkuMemoryOptimized", + "PremiumSkuComputeOptimized" + ], + "x-ms-enum": { + "name": "Category", + "modelAsString": true + } + }, + "shortName": { + "type": "string", + "description": "Unique short name for the meter." + }, + "friendlyName": { + "type": "string", + "description": "The everyday name of the billing meter." + }, + "billingLocation": { + "type": "string", + "description": "Region for the billing meter." + } } - }, - "shortName":{ - "type": "string", - "description": "Unique short name for the meter." - }, - "friendlyName":{ - "type": "string", - "description": "The everyday name of the billing meter." - }, - "billingLocation":{ - "type": "string", - "description": "Region for the billing meter." } } }, @@ -114,13 +109,13 @@ }, "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" - } + "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" + } } } } From df7c4b8c36461d3a93c1807fc27cf3964b277c1c Mon Sep 17 00:00:00 2001 From: trajkobal Date: Wed, 7 Sep 2022 17:09:07 -0400 Subject: [PATCH 6/9] Response formatting --- .../2022-06-01-preview/BillingMeters.json | 14 ++-- .../examples/BillingMeters_Get.json | 74 ++++++++++++++++--- 2 files changed, 69 insertions(+), 19 deletions(-) diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/BillingMeters.json b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/BillingMeters.json index c04909ec07c6..89defea0af21 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/BillingMeters.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/BillingMeters.json @@ -40,7 +40,7 @@ } }, "x-ms-examples": { - "List billing meters by location": { + "BillingMeters_Get": { "$ref": "./examples/BillingMeters_Get.json" } } @@ -57,6 +57,10 @@ } ], "properties": { + "location": { + "type": "string", + "description": "Region for the billing meter." + }, "properties": { "description": "Revision resource specific properties", "type": "object", @@ -74,17 +78,13 @@ "modelAsString": true } }, - "shortName": { + "meterType": { "type": "string", - "description": "Unique short name for the meter." + "description": "Billing meter type." }, "friendlyName": { "type": "string", "description": "The everyday name of the billing meter." - }, - "billingLocation": { - "type": "string", - "description": "Region for the billing meter." } } } diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/BillingMeters_Get.json b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/BillingMeters_Get.json index bd2fcd5a265c..12417fdbe7ae 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/BillingMeters_Get.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/BillingMeters_Get.json @@ -9,20 +9,70 @@ "body": { "value": [ { - "id": "7a3b96e3-1c68-4506-86d8-224b89b3347f", - "category": "PremiumSkuGeneralCompute", - "type": "CPU", - "shortName": "PremiumSKUGeneralComputeCPU", - "friendlyName": "Premium SKU General Compute Cores per Second", - "billingLocation": "East US" + "location": "East US", + "properties": { + "category": "PremiumSkuGeneralCompute", + "meterType": "CPU", + "friendlyName": "Premium SKU General Compute Cores per Second" + }, + "id": "/subscriptions/55f240e3-3d66-44f6-8358-4e4f3d7a2e51/providers/Microsoft.App/PremiumSKUGeneralComputeCPU", + "name": "PremiumSKUGeneralComputeCPU", + "type": "Microsoft.App/billingMeters" }, { - "id": "2343b96e3-1c68-4506-86d8-224b8ass347f", - "category": "PremiumSkuGeneralCompute", - "type": "Memory", - "shortName": "PremiumSKUGeneralComputeMemory", - "friendlyName": "Premium SKU General Compute Memory GB per Second", - "billingLocation": "East US" + "location": "East US", + "properties": { + "category": "PremiumSkuGeneralCompute", + "meterType": "Memory", + "friendlyName": "Premium SKU General Compute Memory GB per Second" + }, + "id": "/subscriptions/55f240e3-3d66-44f6-8358-4e4f3d7a2e51/providers/Microsoft.App/PremiumSKUGeneralComputeMemory", + "name": "PremiumSKUGeneralComputeMemory", + "type": "Microsoft.App/billingMeters" + }, + { + "location": "East US", + "properties": { + "category": "PremiumSkuMemoryOptimized", + "meterType": "CPU", + "friendlyName": "Premium SKU Memory Optimized Cores per Second" + }, + "id": "/subscriptions/55f240e3-3d66-44f6-8358-4e4f3d7a2e51/providers/Microsoft.App/PremiumSKUMemoryOptimizedCPU", + "name": "PremiumSKUMemoryOptimizedCPU", + "type": "Microsoft.App/billingMeters" + }, + { + "location": "East US", + "properties": { + "category": "PremiumSkuMemoryOptimized", + "meterType": "Memory", + "friendlyName": "Premium SKU Memory Optimized Memory GB per Second" + }, + "id": "/subscriptions/55f240e3-3d66-44f6-8358-4e4f3d7a2e51/providers/Microsoft.App/PremiumSkuMemoryOptimizedMemory", + "name": "PremiumSkuMemoryOptimizedMemory", + "type": "Microsoft.App/billingMeters" + }, + { + "location": "East US", + "properties": { + "category": "PremiumSkuComputeOptimized", + "meterType": "CPU", + "friendlyName": "Premium SKU Compute Optimized Cores per Second" + }, + "id": "/subscriptions/55f240e3-3d66-44f6-8358-4e4f3d7a2e51/providers/Microsoft.App/PremiumSKUComputeOptimizedCPU", + "name": "PremiumSKUComputeOptimizedCPU", + "type": "Microsoft.App/billingMeters" + }, + { + "location": "East US", + "properties": { + "category": "PremiumSkuComputeOptimized", + "meterType": "Memory", + "friendlyName": "Premium SKU Compute Optimized Memory GB per Second" + }, + "id": "/subscriptions/55f240e3-3d66-44f6-8358-4e4f3d7a2e51/providers/Microsoft.App/PremiumSKUGeneralComputeMemory", + "name": "PremiumSKUGeneralComputeMemory", + "type": "Microsoft.App/billingMeters" } ] } From cebac9473393d0306ebb90630041a1c77fb60375 Mon Sep 17 00:00:00 2001 From: trajkobal Date: Thu, 8 Sep 2022 13:00:25 -0400 Subject: [PATCH 7/9] add default error response --- .../preview/2022-06-01-preview/BillingMeters.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/BillingMeters.json b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/BillingMeters.json index 89defea0af21..e409a865ead0 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/BillingMeters.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/BillingMeters.json @@ -37,6 +37,12 @@ "schema": { "$ref": "#/definitions/BillingMeterCollection" } + }, + "default": { + "description": "Error response.", + "schema": { + "$ref": "./CommonDefinitions.json#/definitions/DefaultErrorResponse" + } } }, "x-ms-examples": { From 1c59c0eb149845b769ea098dc6095d51586ff6c5 Mon Sep 17 00:00:00 2001 From: trajkobal Date: Tue, 13 Sep 2022 12:19:08 -0400 Subject: [PATCH 8/9] ARM Review feedback + small naming change for a property --- .../2022-06-01-preview/BillingMeters.json | 4 ++-- .../examples/BillingMeters_Get.json | 24 +++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/BillingMeters.json b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/BillingMeters.json index e409a865ead0..2b241cfefaa6 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/BillingMeters.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/BillingMeters.json @@ -75,7 +75,7 @@ "description": "Used to map workload profile types to billing meter.", "type": "string", "enum": [ - "PremiumSkuGeneralCompute", + "PremiumSkuGeneralPurpose", "PremiumSkuMemoryOptimized", "PremiumSkuComputeOptimized" ], @@ -88,7 +88,7 @@ "type": "string", "description": "Billing meter type." }, - "friendlyName": { + "displayName": { "type": "string", "description": "The everyday name of the billing meter." } diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/BillingMeters_Get.json b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/BillingMeters_Get.json index 12417fdbe7ae..5c8d91bf8df2 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/BillingMeters_Get.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/BillingMeters_Get.json @@ -11,23 +11,23 @@ { "location": "East US", "properties": { - "category": "PremiumSkuGeneralCompute", + "category": "PremiumSkuGeneralPurpose", "meterType": "CPU", - "friendlyName": "Premium SKU General Compute Cores per Second" + "displayName": "Premium SKU General Purpose Cores per Second" }, - "id": "/subscriptions/55f240e3-3d66-44f6-8358-4e4f3d7a2e51/providers/Microsoft.App/PremiumSKUGeneralComputeCPU", - "name": "PremiumSKUGeneralComputeCPU", + "id": "/subscriptions/55f240e3-3d66-44f6-8358-4e4f3d7a2e51/providers/Microsoft.App/PremiumSKUGeneralPurposeCPU", + "name": "PremiumSKUGeneralPurposeCPU", "type": "Microsoft.App/billingMeters" }, { "location": "East US", "properties": { - "category": "PremiumSkuGeneralCompute", + "category": "PremiumSkuGeneralPurpose", "meterType": "Memory", - "friendlyName": "Premium SKU General Compute Memory GB per Second" + "displayName": "Premium SKU General Purpose Memory GB per Second" }, - "id": "/subscriptions/55f240e3-3d66-44f6-8358-4e4f3d7a2e51/providers/Microsoft.App/PremiumSKUGeneralComputeMemory", - "name": "PremiumSKUGeneralComputeMemory", + "id": "/subscriptions/55f240e3-3d66-44f6-8358-4e4f3d7a2e51/providers/Microsoft.App/PremiumSKUGeneralPurposeMemory", + "name": "PremiumSKUGeneralPurposeMemory", "type": "Microsoft.App/billingMeters" }, { @@ -35,7 +35,7 @@ "properties": { "category": "PremiumSkuMemoryOptimized", "meterType": "CPU", - "friendlyName": "Premium SKU Memory Optimized Cores per Second" + "displayName": "Premium SKU Memory Optimized Cores per Second" }, "id": "/subscriptions/55f240e3-3d66-44f6-8358-4e4f3d7a2e51/providers/Microsoft.App/PremiumSKUMemoryOptimizedCPU", "name": "PremiumSKUMemoryOptimizedCPU", @@ -46,7 +46,7 @@ "properties": { "category": "PremiumSkuMemoryOptimized", "meterType": "Memory", - "friendlyName": "Premium SKU Memory Optimized Memory GB per Second" + "displayName": "Premium SKU Memory Optimized Memory GB per Second" }, "id": "/subscriptions/55f240e3-3d66-44f6-8358-4e4f3d7a2e51/providers/Microsoft.App/PremiumSkuMemoryOptimizedMemory", "name": "PremiumSkuMemoryOptimizedMemory", @@ -57,7 +57,7 @@ "properties": { "category": "PremiumSkuComputeOptimized", "meterType": "CPU", - "friendlyName": "Premium SKU Compute Optimized Cores per Second" + "displayName": "Premium SKU Compute Optimized Cores per Second" }, "id": "/subscriptions/55f240e3-3d66-44f6-8358-4e4f3d7a2e51/providers/Microsoft.App/PremiumSKUComputeOptimizedCPU", "name": "PremiumSKUComputeOptimizedCPU", @@ -68,7 +68,7 @@ "properties": { "category": "PremiumSkuComputeOptimized", "meterType": "Memory", - "friendlyName": "Premium SKU Compute Optimized Memory GB per Second" + "displayName": "Premium SKU Compute Optimized Memory GB per Second" }, "id": "/subscriptions/55f240e3-3d66-44f6-8358-4e4f3d7a2e51/providers/Microsoft.App/PremiumSKUGeneralComputeMemory", "name": "PremiumSKUGeneralComputeMemory", From bcb461ce07852b799286026dd1bf7bf93dfa7dc0 Mon Sep 17 00:00:00 2001 From: trajkobal Date: Tue, 13 Sep 2022 13:01:17 -0400 Subject: [PATCH 9/9] Change GB to GiB --- .../2022-06-01-preview/examples/BillingMeters_Get.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/BillingMeters_Get.json b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/BillingMeters_Get.json index 5c8d91bf8df2..e6cb1af50bc1 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/BillingMeters_Get.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/BillingMeters_Get.json @@ -24,7 +24,7 @@ "properties": { "category": "PremiumSkuGeneralPurpose", "meterType": "Memory", - "displayName": "Premium SKU General Purpose Memory GB per Second" + "displayName": "Premium SKU General Purpose Memory GiB per Second" }, "id": "/subscriptions/55f240e3-3d66-44f6-8358-4e4f3d7a2e51/providers/Microsoft.App/PremiumSKUGeneralPurposeMemory", "name": "PremiumSKUGeneralPurposeMemory", @@ -46,7 +46,7 @@ "properties": { "category": "PremiumSkuMemoryOptimized", "meterType": "Memory", - "displayName": "Premium SKU Memory Optimized Memory GB per Second" + "displayName": "Premium SKU Memory Optimized Memory GiB per Second" }, "id": "/subscriptions/55f240e3-3d66-44f6-8358-4e4f3d7a2e51/providers/Microsoft.App/PremiumSkuMemoryOptimizedMemory", "name": "PremiumSkuMemoryOptimizedMemory", @@ -68,7 +68,7 @@ "properties": { "category": "PremiumSkuComputeOptimized", "meterType": "Memory", - "displayName": "Premium SKU Compute Optimized Memory GB per Second" + "displayName": "Premium SKU Compute Optimized Memory GiB per Second" }, "id": "/subscriptions/55f240e3-3d66-44f6-8358-4e4f3d7a2e51/providers/Microsoft.App/PremiumSKUGeneralComputeMemory", "name": "PremiumSKUGeneralComputeMemory",