[AutoPR containerregistry/resource-manager] [ACR] Add empty resource group name validation, minor cleanup

lib/services/containerRegistryManagement/lib/models/index.d.ts

@@ -259,6 +259,35 @@ export interface StorageAccountProperties {
   id: string;
 }
 
+/**
+ * @class
+ * Initializes a new instance of the VirtualNetworkRule class.
+ * @constructor
+ * The virtual network rule for a container registry.
+ *
+ * @member {string} id Resource ID of a subnet, for example:
+ * /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworks/{vnetName}/subnets/{subnetName}.
+ */
+export interface VirtualNetworkRule {
+  id: string;
+}
+
+/**
+ * @class
+ * Initializes a new instance of the NetworkRuleSet class.
+ * @constructor
+ * The network rule set for a container registry.
+ *
+ * @member {string} defaultAction The default action of allow or deny when no
+ * other rules match. Possible values include: 'Allow', 'Deny'. Default value:
+ * 'Allow' .
+ * @member {array} [virtualNetworkRules] The virtual network rules.
+ */
+export interface NetworkRuleSet {
+  defaultAction: string;
+  virtualNetworkRules?: VirtualNetworkRule[];
+}
+
 /**
  * @class
  * Initializes a new instance of the Resource class.
@@ -311,6 +340,12 @@ export interface Resource extends BaseResource {
  * @member {object} [storageAccount] The properties of the storage account for
  * the container registry. Only applicable to Classic SKU.
  * @member {string} [storageAccount.id] The resource ID of the storage account.
+ * @member {object} [networkRuleSet] The network rule set for a container
+ * registry.
+ * @member {string} [networkRuleSet.defaultAction] The default action of allow
+ * or deny when no other rules match. Possible values include: 'Allow', 'Deny'
+ * @member {array} [networkRuleSet.virtualNetworkRules] The virtual network
+ * rules.
  */
 export interface Registry extends Resource {
   sku: Sku;
@@ -320,6 +355,7 @@ export interface Registry extends Resource {
   readonly status?: Status;
   adminUserEnabled?: boolean;
   storageAccount?: StorageAccountProperties;
+  networkRuleSet?: NetworkRuleSet;
 }
 
 /**
@@ -342,12 +378,19 @@ export interface Registry extends Resource {
  * storage account must be in the same physical location as the container
  * registry.
  * @member {string} [storageAccount.id] The resource ID of the storage account.
+ * @member {object} [networkRuleSet] The network rule set for a container
+ * registry.
+ * @member {string} [networkRuleSet.defaultAction] The default action of allow
+ * or deny when no other rules match. Possible values include: 'Allow', 'Deny'
+ * @member {array} [networkRuleSet.virtualNetworkRules] The virtual network
+ * rules.
  */
 export interface RegistryUpdateParameters {
   tags?: { [propertyName: string]: string };
   sku?: Sku;
   adminUserEnabled?: boolean;
   storageAccount?: StorageAccountProperties;
+  networkRuleSet?: NetworkRuleSet;
 }
 
 /**
@@ -1381,7 +1424,7 @@ export interface TriggerProperties {
  * Initializes a new instance of the Task class.
  * @constructor
  * The task that has the ARM resource and task properties.
- * The  task will have all information to schedule a run against it.
+ * The task will have all information to schedule a run against it.
  *
  * @member {string} [provisioningState] The provisioning state of the task.
  * Possible values include: 'Creating', 'Updating', 'Deleting', 'Succeeded',

lib/services/containerRegistryManagement/lib/models/index.js

@@ -30,6 +30,8 @@ exports.OperationDefinition = require('./operationDefinition');
 exports.Sku = require('./sku');
 exports.Status = require('./status');
 exports.StorageAccountProperties = require('./storageAccountProperties');
+exports.VirtualNetworkRule = require('./virtualNetworkRule');
+exports.NetworkRuleSet = require('./networkRuleSet');
 exports.Resource = require('./resource');
 exports.Registry = require('./registry');
 exports.RegistryUpdateParameters = require('./registryUpdateParameters');

lib/services/containerRegistryManagement/lib/models/networkRuleSet.js

@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ * Changes may cause incorrect behavior and will be lost if the code is
+ * regenerated.
+ */
+
+'use strict';
+
+/**
+ * The network rule set for a container registry.
+ *
+ */
+class NetworkRuleSet {
+  /**
+   * Create a NetworkRuleSet.
+   * @member {string} defaultAction The default action of allow or deny when no
+   * other rules match. Possible values include: 'Allow', 'Deny'. Default
+   * value: 'Allow' .
+   * @member {array} [virtualNetworkRules] The virtual network rules.
+   */
+  constructor() {
+  }
+
+  /**
+   * Defines the metadata of NetworkRuleSet
+   *
+   * @returns {object} metadata of NetworkRuleSet
+   *
+   */
+  mapper() {
+    return {
+      required: false,
+      serializedName: 'NetworkRuleSet',
+      type: {
+        name: 'Composite',
+        className: 'NetworkRuleSet',
+        modelProperties: {
+          defaultAction: {
+            required: true,
+            serializedName: 'defaultAction',
+            defaultValue: 'Allow',
+            type: {
+              name: 'String'
+            }
+          },
+          virtualNetworkRules: {
+            required: false,
+            serializedName: 'virtualNetworkRules',
+            type: {
+              name: 'Sequence',
+              element: {
+                  required: false,
+                  serializedName: 'VirtualNetworkRuleElementType',
+                  type: {
+                    name: 'Composite',
+                    className: 'VirtualNetworkRule'
+                  }
+              }
+            }
+          }
+        }
+      }
+    };
+  }
+}
+
+module.exports = NetworkRuleSet;

lib/services/containerRegistryManagement/lib/models/registry.js

@@ -47,6 +47,13 @@ class Registry extends models['Resource'] {
    * for the container registry. Only applicable to Classic SKU.
    * @member {string} [storageAccount.id] The resource ID of the storage
    * account.
+   * @member {object} [networkRuleSet] The network rule set for a container
+   * registry.
+   * @member {string} [networkRuleSet.defaultAction] The default action of
+   * allow or deny when no other rules match. Possible values include: 'Allow',
+   * 'Deny'
+   * @member {array} [networkRuleSet.virtualNetworkRules] The virtual network
+   * rules.
    */
   constructor() {
     super();
@@ -167,6 +174,14 @@ class Registry extends models['Resource'] {
               name: 'Composite',
               className: 'StorageAccountProperties'
             }
+          },
+          networkRuleSet: {
+            required: false,
+            serializedName: 'properties.networkRuleSet',
+            type: {
+              name: 'Composite',
+              className: 'NetworkRuleSet'
+            }
           }
         }
       }

lib/services/containerRegistryManagement/lib/models/registryUpdateParameters.js

@@ -32,6 +32,13 @@ class RegistryUpdateParameters {
    * registry.
    * @member {string} [storageAccount.id] The resource ID of the storage
    * account.
+   * @member {object} [networkRuleSet] The network rule set for a container
+   * registry.
+   * @member {string} [networkRuleSet.defaultAction] The default action of
+   * allow or deny when no other rules match. Possible values include: 'Allow',
+   * 'Deny'
+   * @member {array} [networkRuleSet.virtualNetworkRules] The virtual network
+   * rules.
    */
   constructor() {
   }
@@ -86,6 +93,14 @@ class RegistryUpdateParameters {
               name: 'Composite',
               className: 'StorageAccountProperties'
             }
+          },
+          networkRuleSet: {
+            required: false,
+            serializedName: 'properties.networkRuleSet',
+            type: {
+              name: 'Composite',
+              className: 'NetworkRuleSet'
+            }
           }
         }
       }

lib/services/containerRegistryManagement/lib/models/task.js

@@ -14,7 +14,7 @@ const models = require('./index');
 
 /**
  * The task that has the ARM resource and task properties.
- * The  task will have all information to schedule a run against it.
+ * The task will have all information to schedule a run against it.
  *
  * @extends models['Resource']
  */

lib/services/containerRegistryManagement/lib/models/virtualNetworkRule.js

@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ * Changes may cause incorrect behavior and will be lost if the code is
+ * regenerated.
+ */
+
+'use strict';
+
+/**
+ * The virtual network rule for a container registry.
+ *
+ */
+class VirtualNetworkRule {
+  /**
+   * Create a VirtualNetworkRule.
+   * @member {string} id Resource ID of a subnet, for example:
+   * /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworks/{vnetName}/subnets/{subnetName}.
+   */
+  constructor() {
+  }
+
+  /**
+   * Defines the metadata of VirtualNetworkRule
+   *
+   * @returns {object} metadata of VirtualNetworkRule
+   *
+   */
+  mapper() {
+    return {
+      required: false,
+      serializedName: 'VirtualNetworkRule',
+      type: {
+        name: 'Composite',
+        className: 'VirtualNetworkRule',
+        modelProperties: {
+          id: {
+            required: true,
+            serializedName: 'id',
+            type: {
+              name: 'String'
+            }
+          }
+        }
+      }
+    };
+  }
+}
+
+module.exports = VirtualNetworkRule;