From a4259acbb4cb0fad93bb0c4cb9af687d91903346 Mon Sep 17 00:00:00 2001 From: Dongjiang You Date: Fri, 16 Nov 2018 14:42:48 -0800 Subject: [PATCH] Add network rule set properties, empty resource group validation --- .../2017-06-01-preview/containerregistry.json | 2 +- .../stable/2017-03-01/containerregistry.json | 1 + .../stable/2017-10-01/containerregistry.json | 51 +++++++++++++++++++ .../2018-09-01/containerregistry_build.json | 3 +- 4 files changed, 55 insertions(+), 2 deletions(-) diff --git a/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/preview/2017-06-01-preview/containerregistry.json b/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/preview/2017-06-01-preview/containerregistry.json index 9e75d18d5dc3..1c29a5ce2ba1 100644 --- a/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/preview/2017-06-01-preview/containerregistry.json +++ b/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/preview/2017-06-01-preview/containerregistry.json @@ -1856,7 +1856,7 @@ "type": "integer" }, "digest": { - "description": "The digest of the content, as defined by the Registry V2 HTTP API Specificiation.", + "description": "The digest of the content, as defined by the Registry V2 HTTP API Specification.", "type": "string" }, "length": { diff --git a/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2017-03-01/containerregistry.json b/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2017-03-01/containerregistry.json index 139bd6d5680c..418765d1df55 100644 --- a/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2017-03-01/containerregistry.json +++ b/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2017-03-01/containerregistry.json @@ -808,6 +808,7 @@ "description": "The name of the resource group to which the container registry belongs.", "required": true, "type": "string", + "minLength": 1, "x-ms-parameter-location": "method" }, "RegistryNameParameter": { diff --git a/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2017-10-01/containerregistry.json b/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2017-10-01/containerregistry.json index 3bfc07179b16..17f43a114a38 100644 --- a/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2017-10-01/containerregistry.json +++ b/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2017-10-01/containerregistry.json @@ -1497,6 +1497,10 @@ "storageAccount": { "$ref": "#/definitions/StorageAccountProperties", "description": "The properties of the storage account for the container registry. Only applicable to Classic SKU." + }, + "networkRuleSet": { + "$ref": "#/definitions/NetworkRuleSet", + "description": "The network rule set for a container registry." } } }, @@ -1535,6 +1539,48 @@ } } }, + "NetworkRuleSet": { + "description": "The network rule set for a container registry.", + "required": [ + "defaultAction" + ], + "type": "object", + "properties": { + "defaultAction": { + "description": "The default action of allow or deny when no other rules match.", + "default": "Allow", + "enum": [ + "Allow", + "Deny" + ], + "type": "string", + "x-ms-enum": { + "name": "DefaultAction", + "modelAsString": true + } + }, + "virtualNetworkRules": { + "description": "The virtual network rules.", + "type": "array", + "items": { + "$ref": "#/definitions/VirtualNetworkRule" + } + } + } + }, + "VirtualNetworkRule": { + "description": "The virtual network rule for a container registry.", + "required": [ + "id" + ], + "type": "object", + "properties": { + "id": { + "description": "Resource ID of a subnet, for example: /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworks/{vnetName}/subnets/{subnetName}.", + "type": "string" + } + } + }, "RegistryUpdateParameters": { "description": "The parameters for updating a container registry.", "type": "object", @@ -1568,6 +1614,10 @@ "storageAccount": { "$ref": "#/definitions/StorageAccountProperties", "description": "The parameters of a storage account for the container registry. Only applicable to Classic SKU. If specified, the storage account must be in the same physical location as the container registry." + }, + "networkRuleSet": { + "$ref": "#/definitions/NetworkRuleSet", + "description": "The network rule set for a container registry." } } }, @@ -2370,6 +2420,7 @@ "description": "The name of the resource group to which the container registry belongs.", "required": true, "type": "string", + "minLength": 1, "x-ms-parameter-location": "method" }, "RegistryNameParameter": { diff --git a/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2018-09-01/containerregistry_build.json b/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2018-09-01/containerregistry_build.json index 38cbcb137517..cdd6a36968d5 100644 --- a/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2018-09-01/containerregistry_build.json +++ b/specification/containerregistry/resource-manager/Microsoft.ContainerRegistry/stable/2018-09-01/containerregistry_build.json @@ -1060,7 +1060,7 @@ } }, "Task": { - "description": "The task that has the ARM resource and task properties. \r\nThe task will have all information to schedule a run against it.", + "description": "The task that has the ARM resource and task properties. \r\nThe task will have all information to schedule a run against it.", "type": "object", "allOf": [ { @@ -2194,6 +2194,7 @@ "description": "The name of the resource group to which the container registry belongs.", "required": true, "type": "string", + "minLength": 1, "x-ms-parameter-location": "method" }, "RegistryNameParameter": {