From 3e6afd7dc44f0db210a9bb0dd4d7dfc29d467cf3 Mon Sep 17 00:00:00 2001 From: Jiacheng Liu Date: Mon, 25 Jan 2021 08:00:21 -0800 Subject: [PATCH 1/4] Add missing properties for KeyVault --- .../2019-09-01/examples/createVault.json | 30 +++++++ .../2019-09-01/examples/listOperations.json | 30 +++++++ .../2019-09-01/examples/updateVault.json | 30 +++++++ .../stable/2019-09-01/keyvault.json | 8 ++ .../stable/2019-09-01/providers.json | 82 +++++++++++++++++++ 5 files changed, 180 insertions(+) diff --git a/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2019-09-01/examples/createVault.json b/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2019-09-01/examples/createVault.json index e30f2dc68e70..536c03b2ffb4 100644 --- a/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2019-09-01/examples/createVault.json +++ b/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2019-09-01/examples/createVault.json @@ -84,6 +84,21 @@ "name": "standard" }, "tenantId": "00000000-0000-0000-0000-000000000000", + "networkAcls": { + "bypass": "AzureServices", + "defaultAction": "Deny", + "ipRules": [ + { + "value": "" + } + ], + "virtualNetworkRules": [ + { + "id": "", + "ignoreMissingVnetServiceEndpoint": false + } + ] + }, "accessPolicies": [ { "tenantId": "00000000-0000-0000-0000-000000000000", @@ -136,6 +151,21 @@ } } ], + "privateEndpointConnections": [ + { + "id": "", + "properties": { + "provisioningState": "Succeeded", + "privateEndpoint": { + "id": "" + }, + "privateLinkServiceConnectionState": { + "status": "Approved", + "actionsRequired": "None" + } + } + } + ], "enabledForDeployment": true, "enabledForDiskEncryption": true, "enabledForTemplateDeployment": true, diff --git a/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2019-09-01/examples/listOperations.json b/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2019-09-01/examples/listOperations.json index be106ba931ad..bab2483224f4 100644 --- a/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2019-09-01/examples/listOperations.json +++ b/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2019-09-01/examples/listOperations.json @@ -94,6 +94,36 @@ "displayName": "Audit Logs", "blobDuration": "PT1H" } + ], + "metricSpecifications": [ + { + "name": "ServiceApiHit", + "displayName": "", + "displayDescription": "", + "unit": "", + "aggregationType": "", + "supportedAggregationTypes": [ + "" + ], + "supportedTimeGrainTypes": [ + "" + ], + "lockAggregationType": "", + "dimensions": [ + { + "name": "ActivityType", + "displayName": "", + "toBeExportedForShoebox": true + }, + { + "name": "ActivityName", + "displayName": "", + "toBeExportedForShoebox": true + } + ], + "fillGapWithZero": false, + "internalMetricName": "AuditEvent" + } ] } } diff --git a/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2019-09-01/examples/updateVault.json b/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2019-09-01/examples/updateVault.json index 8ca879358c90..955c0c3e2401 100644 --- a/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2019-09-01/examples/updateVault.json +++ b/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2019-09-01/examples/updateVault.json @@ -83,6 +83,21 @@ "name": "standard" }, "tenantId": "00000000-0000-0000-0000-000000000000", + "networkAcls": { + "bypass": "AzureServices", + "defaultAction": "Deny", + "ipRules": [ + { + "value": "" + } + ], + "virtualNetworkRules": [ + { + "id": "", + "ignoreMissingVnetServiceEndpoint": false + } + ] + }, "accessPolicies": [ { "tenantId": "00000000-0000-0000-0000-000000000000", @@ -135,6 +150,21 @@ } } ], + "privateEndpointConnections": [ + { + "id": "", + "properties": { + "provisioningState": "Succeeded", + "privateEndpoint": { + "id": "" + }, + "privateLinkServiceConnectionState": { + "status": "Approved", + "actionsRequired": "None" + } + } + } + ], "enabledForDeployment": true, "enabledForDiskEncryption": true, "enabledForTemplateDeployment": true, diff --git a/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2019-09-01/keyvault.json b/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2019-09-01/keyvault.json index a57bc8f2e040..8801eb21921f 100644 --- a/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2019-09-01/keyvault.json +++ b/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2019-09-01/keyvault.json @@ -1759,6 +1759,10 @@ "id": { "type": "string", "description": "Full resource id of a vnet subnet, such as '/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/subnet1'." + }, + "ignoreMissingVnetServiceEndpoint": { + "type": "boolean", + "description": "Property to specify whether NRP will ignore the check if parent subnet has serviceEndpoints configured" } }, "required": [ @@ -1768,6 +1772,10 @@ }, "PrivateEndpointConnectionItem": { "properties": { + "id": { + "type": "string", + "description": "Id of private endpoint connection." + }, "properties": { "$ref": "#/definitions/PrivateEndpointConnectionProperties", "x-ms-client-flatten": true, diff --git a/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2019-09-01/providers.json b/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2019-09-01/providers.json index d1f28d8f5599..c4e877c75c7f 100644 --- a/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2019-09-01/providers.json +++ b/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2019-09-01/providers.json @@ -133,6 +133,13 @@ "items": { "$ref": "#/definitions/LogSpecification" } + }, + "metricSpecifications": { + "description": "Metric specifications of operation.", + "type": "array", + "items": { + "$ref": "#/definitions/MetricSpecification" + } } } }, @@ -152,6 +159,81 @@ "description": "Blob duration of specification." } } + }, + "MetricSpecification": { + "description": "Metric specification of operation.", + "properties": { + "name": { + "type": "string", + "description": "Name of metric specification." + }, + "displayName": { + "type": "string", + "description": "Display name of Metric specification." + }, + "displayDescription": { + "type": "string", + "description": "Display description of Metric specification." + }, + "unit": { + "type": "string", + "description": "The metric unit. Possible values include: 'Bytes', 'Count', 'Milliseconds'" + }, + "aggregationType": { + "type": "string", + "description": "The metric aggregation type. Possible values include: 'Average', 'Count', 'Total'" + }, + "supportedAggregationTypes": { + "type": "array", + "description": "The supported aggregation types for the metrics", + "items": { + "type": "string" + } + }, + "supportedTimeGrainTypes": { + "type": "array", + "description": "The supported tiem grain types for the metrics", + "items": { + "type": "string" + } + }, + "lockAggregationType": { + "type": "string", + "description": "The metric lock aggregation type" + }, + "dimension": { + "type": "array", + "description": "The dimensions of metric", + "items": { + "$ref": "#/definitions/DimensionProperties" + } + }, + "fillGapWithZero": { + "type": "boolean", + "description": "Property to specify whether to fill gap with zero" + }, + "internalMetricName": { + "type": "string", + "description": "The internal metric name" + } + } + }, + "DimensionProperties": { + "description": "Type of operation: get, read, delete, etc.", + "properties": { + "name": { + "type": "string", + "description": "Name of dimension" + }, + "displaynName": { + "type": "string", + "description":"Display name of dimension" + }, + "toBeExportedForShoebox": { + "type": "boolean", + "description": "Property to specify whether the dimension should be exported for shoebox" + } + } } }, "parameters": { From b86db27e0d60d5aa69c2f4d1ca810893cab0b71a Mon Sep 17 00:00:00 2001 From: Jiacheng Liu Date: Mon, 25 Jan 2021 08:21:39 -0800 Subject: [PATCH 2/4] Fix typo --- .../Microsoft.KeyVault/stable/2019-09-01/providers.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2019-09-01/providers.json b/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2019-09-01/providers.json index c4e877c75c7f..30fe5e026207 100644 --- a/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2019-09-01/providers.json +++ b/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2019-09-01/providers.json @@ -201,7 +201,7 @@ "type": "string", "description": "The metric lock aggregation type" }, - "dimension": { + "dimensions": { "type": "array", "description": "The dimensions of metric", "items": { From e4aef7395e46f70f14443a6d205cd2742f064c96 Mon Sep 17 00:00:00 2001 From: Jiacheng Liu Date: Mon, 25 Jan 2021 08:33:34 -0800 Subject: [PATCH 3/4] Fix typo --- .../Microsoft.KeyVault/stable/2019-09-01/providers.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2019-09-01/providers.json b/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2019-09-01/providers.json index 30fe5e026207..5b08d7dfd133 100644 --- a/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2019-09-01/providers.json +++ b/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2019-09-01/providers.json @@ -225,7 +225,7 @@ "type": "string", "description": "Name of dimension" }, - "displaynName": { + "displayName": { "type": "string", "description":"Display name of dimension" }, From 77772e5a24394afd95052f904ea3d3497b48054f Mon Sep 17 00:00:00 2001 From: Jiacheng Liu Date: Wed, 27 Jan 2021 01:46:50 -0800 Subject: [PATCH 4/4] Add missing punctuation and space --- .../stable/2019-09-01/keyvault.json | 2 +- .../stable/2019-09-01/providers.json | 20 +++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2019-09-01/keyvault.json b/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2019-09-01/keyvault.json index 8801eb21921f..4af3085b679e 100644 --- a/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2019-09-01/keyvault.json +++ b/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2019-09-01/keyvault.json @@ -1762,7 +1762,7 @@ }, "ignoreMissingVnetServiceEndpoint": { "type": "boolean", - "description": "Property to specify whether NRP will ignore the check if parent subnet has serviceEndpoints configured" + "description": "Property to specify whether NRP will ignore the check if parent subnet has serviceEndpoints configured." } }, "required": [ diff --git a/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2019-09-01/providers.json b/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2019-09-01/providers.json index 5b08d7dfd133..75c40cd20457 100644 --- a/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2019-09-01/providers.json +++ b/specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2019-09-01/providers.json @@ -177,29 +177,29 @@ }, "unit": { "type": "string", - "description": "The metric unit. Possible values include: 'Bytes', 'Count', 'Milliseconds'" + "description": "The metric unit. Possible values include: 'Bytes', 'Count', 'Milliseconds'." }, "aggregationType": { "type": "string", - "description": "The metric aggregation type. Possible values include: 'Average', 'Count', 'Total'" + "description": "The metric aggregation type. Possible values include: 'Average', 'Count', 'Total'." }, "supportedAggregationTypes": { "type": "array", - "description": "The supported aggregation types for the metrics", + "description": "The supported aggregation types for the metrics.", "items": { "type": "string" } }, "supportedTimeGrainTypes": { "type": "array", - "description": "The supported tiem grain types for the metrics", + "description": "The supported time grain types for the metrics.", "items": { "type": "string" } }, "lockAggregationType": { "type": "string", - "description": "The metric lock aggregation type" + "description": "The metric lock aggregation type." }, "dimensions": { "type": "array", @@ -210,11 +210,11 @@ }, "fillGapWithZero": { "type": "boolean", - "description": "Property to specify whether to fill gap with zero" + "description": "Property to specify whether to fill gap with zero." }, "internalMetricName": { "type": "string", - "description": "The internal metric name" + "description": "The internal metric name." } } }, @@ -223,15 +223,15 @@ "properties": { "name": { "type": "string", - "description": "Name of dimension" + "description": "Name of dimension." }, "displayName": { "type": "string", - "description":"Display name of dimension" + "description": "Display name of dimension." }, "toBeExportedForShoebox": { "type": "boolean", - "description": "Property to specify whether the dimension should be exported for shoebox" + "description": "Property to specify whether the dimension should be exported for shoebox." } } }