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

containerregistry/resource-manager/v2017_06_01_preview/src/main/java/com/microsoft/azure/management/containerregistry/v2017_06_01_preview/Target.java

@@ -28,7 +28,7 @@ public class Target {
 
     /**
      * The digest of the content, as defined by the Registry V2 HTTP API
-     * Specificiation.
+     * Specification.
      */
     @JsonProperty(value = "digest")
     private String digest;
@@ -98,7 +98,7 @@ public Target withSize(Long size) {
     }
 
     /**
-     * Get the digest of the content, as defined by the Registry V2 HTTP API Specificiation.
+     * Get the digest of the content, as defined by the Registry V2 HTTP API Specification.
      *
      * @return the digest value
      */
@@ -107,7 +107,7 @@ public String digest() {
     }
 
     /**
-     * Set the digest of the content, as defined by the Registry V2 HTTP API Specificiation.
+     * Set the digest of the content, as defined by the Registry V2 HTTP API Specification.
      *
      * @param digest the digest value to set
      * @return the Target object itself.

containerregistry/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/containerregistry/v2017_10_01/DefaultAction.java

@@ -0,0 +1,41 @@
+/**
+ * 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.
+ */
+
+package com.microsoft.azure.management.containerregistry.v2017_10_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for DefaultAction.
+ */
+public final class DefaultAction extends ExpandableStringEnum<DefaultAction> {
+    /** Static value Allow for DefaultAction. */
+    public static final DefaultAction ALLOW = fromString("Allow");
+
+    /** Static value Deny for DefaultAction. */
+    public static final DefaultAction DENY = fromString("Deny");
+
+    /**
+     * Creates or finds a DefaultAction from its string representation.
+     * @param name a name to look for
+     * @return the corresponding DefaultAction
+     */
+    @JsonCreator
+    public static DefaultAction fromString(String name) {
+        return fromString(name, DefaultAction.class);
+    }
+
+    /**
+     * @return known DefaultAction values
+     */
+    public static Collection<DefaultAction> values() {
+        return values(DefaultAction.class);
+    }
+}

containerregistry/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/containerregistry/v2017_10_01/NetworkRuleSet.java

@@ -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.
+ */
+
+package com.microsoft.azure.management.containerregistry.v2017_10_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The network rule set for a container registry.
+ */
+public class NetworkRuleSet {
+    /**
+     * The default action of allow or deny when no other rules match. Possible
+     * values include: 'Allow', 'Deny'.
+     */
+    @JsonProperty(value = "defaultAction", required = true)
+    private DefaultAction defaultAction;
+
+    /**
+     * The virtual network rules.
+     */
+    @JsonProperty(value = "virtualNetworkRules")
+    private List<VirtualNetworkRule> virtualNetworkRules;
+
+    /**
+     * Get the default action of allow or deny when no other rules match. Possible values include: 'Allow', 'Deny'.
+     *
+     * @return the defaultAction value
+     */
+    public DefaultAction defaultAction() {
+        return this.defaultAction;
+    }
+
+    /**
+     * Set the default action of allow or deny when no other rules match. Possible values include: 'Allow', 'Deny'.
+     *
+     * @param defaultAction the defaultAction value to set
+     * @return the NetworkRuleSet object itself.
+     */
+    public NetworkRuleSet withDefaultAction(DefaultAction defaultAction) {
+        this.defaultAction = defaultAction;
+        return this;
+    }
+
+    /**
+     * Get the virtual network rules.
+     *
+     * @return the virtualNetworkRules value
+     */
+    public List<VirtualNetworkRule> virtualNetworkRules() {
+        return this.virtualNetworkRules;
+    }
+
+    /**
+     * Set the virtual network rules.
+     *
+     * @param virtualNetworkRules the virtualNetworkRules value to set
+     * @return the NetworkRuleSet object itself.
+     */
+    public NetworkRuleSet withVirtualNetworkRules(List<VirtualNetworkRule> virtualNetworkRules) {
+        this.virtualNetworkRules = virtualNetworkRules;
+        return this;
+    }
+
+}

containerregistry/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/containerregistry/v2017_10_01/Registry.java

@@ -40,6 +40,11 @@ public interface Registry extends HasInner<RegistryInner>, Resource, GroupableRe
      */
     String loginServer();
 
+    /**
+     * @return the networkRuleSet value.
+     */
+    NetworkRuleSet networkRuleSet();
+
     /**
      * @return the provisioningState value.
      */
@@ -106,6 +111,18 @@ interface WithAdminUserEnabled {
             WithCreate withAdminUserEnabled(Boolean adminUserEnabled);
         }
 
+        /**
+         * The stage of the registry definition allowing to specify NetworkRuleSet.
+         */
+        interface WithNetworkRuleSet {
+            /**
+             * Specifies networkRuleSet.
+             * @param networkRuleSet The network rule set for a container registry
+             * @return the next definition stage
+             */
+            WithCreate withNetworkRuleSet(NetworkRuleSet networkRuleSet);
+        }
+
         /**
          * The stage of the registry definition allowing to specify StorageAccount.
          */
@@ -123,13 +140,13 @@ interface WithStorageAccount {
          * the resource to be created (via {@link WithCreate#create()}), but also allows
          * for any other optional settings to be specified.
          */
-        interface WithCreate extends Creatable<Registry>, Resource.DefinitionWithTags<WithCreate>, DefinitionStages.WithAdminUserEnabled, DefinitionStages.WithStorageAccount {
+        interface WithCreate extends Creatable<Registry>, Resource.DefinitionWithTags<WithCreate>, DefinitionStages.WithAdminUserEnabled, DefinitionStages.WithNetworkRuleSet, DefinitionStages.WithStorageAccount {
         }
     }
     /**
      * The template for a Registry update operation, containing all the settings that can be modified.
      */
-    interface Update extends Appliable<Registry>, Resource.UpdateWithTags<Update>, UpdateStages.WithAdminUserEnabled, UpdateStages.WithSku, UpdateStages.WithStorageAccount {
+    interface Update extends Appliable<Registry>, Resource.UpdateWithTags<Update>, UpdateStages.WithAdminUserEnabled, UpdateStages.WithNetworkRuleSet, UpdateStages.WithSku, UpdateStages.WithStorageAccount {
     }
 
     /**
@@ -148,6 +165,18 @@ interface WithAdminUserEnabled {
             Update withAdminUserEnabled(Boolean adminUserEnabled);
         }
 
+        /**
+         * The stage of the registry update allowing to specify NetworkRuleSet.
+         */
+        interface WithNetworkRuleSet {
+            /**
+             * Specifies networkRuleSet.
+             * @param networkRuleSet The network rule set for a container registry
+             * @return the next update stage
+             */
+            Update withNetworkRuleSet(NetworkRuleSet networkRuleSet);
+        }
+
         /**
          * The stage of the registry update allowing to specify Sku.
          */

containerregistry/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/containerregistry/v2017_10_01/RegistryUpdateParameters.java

@@ -43,6 +43,12 @@ public class RegistryUpdateParameters {
     @JsonProperty(value = "properties.storageAccount")
     private StorageAccountProperties storageAccount;
 
+    /**
+     * The network rule set for a container registry.
+     */
+    @JsonProperty(value = "properties.networkRuleSet")
+    private NetworkRuleSet networkRuleSet;
+
     /**
      * Get the tags for the container registry.
      *
@@ -123,4 +129,24 @@ public RegistryUpdateParameters withStorageAccount(StorageAccountProperties stor
         return this;
     }
 
+    /**
+     * Get the network rule set for a container registry.
+     *
+     * @return the networkRuleSet value
+     */
+    public NetworkRuleSet networkRuleSet() {
+        return this.networkRuleSet;
+    }
+
+    /**
+     * Set the network rule set for a container registry.
+     *
+     * @param networkRuleSet the networkRuleSet value to set
+     * @return the RegistryUpdateParameters object itself.
+     */
+    public RegistryUpdateParameters withNetworkRuleSet(NetworkRuleSet networkRuleSet) {
+        this.networkRuleSet = networkRuleSet;
+        return this;
+    }
+
 }

containerregistry/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/containerregistry/v2017_10_01/VirtualNetworkRule.java

@@ -0,0 +1,44 @@
+/**
+ * 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.
+ */
+
+package com.microsoft.azure.management.containerregistry.v2017_10_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The virtual network rule for a container registry.
+ */
+public class VirtualNetworkRule {
+    /**
+     * Resource ID of a subnet, for example:
+     * /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworks/{vnetName}/subnets/{subnetName}.
+     */
+    @JsonProperty(value = "id", required = true)
+    private String id;
+
+    /**
+     * Get resource ID of a subnet, for example: /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworks/{vnetName}/subnets/{subnetName}.
+     *
+     * @return the id value
+     */
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Set resource ID of a subnet, for example: /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworks/{vnetName}/subnets/{subnetName}.
+     *
+     * @param id the id value to set
+     * @return the VirtualNetworkRule object itself.
+     */
+    public VirtualNetworkRule withId(String id) {
+        this.id = id;
+        return this;
+    }
+
+}

containerregistry/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/containerregistry/v2017_10_01/implementation/RegistryImpl.java

@@ -17,6 +17,7 @@
 import com.microsoft.azure.management.containerregistry.v2017_10_01.ProvisioningState;
 import com.microsoft.azure.management.containerregistry.v2017_10_01.Status;
 import com.microsoft.azure.management.containerregistry.v2017_10_01.StorageAccountProperties;
+import com.microsoft.azure.management.containerregistry.v2017_10_01.NetworkRuleSet;
 import rx.functions.Func1;
 
 class RegistryImpl extends GroupableResourceCoreImpl<Registry, RegistryInner, RegistryImpl, ContainerRegistryManager> implements Registry, Registry.Definition, Registry.Update {
@@ -84,6 +85,11 @@ public String loginServer() {
         return this.inner().loginServer();
     }
 
+    @Override
+    public NetworkRuleSet networkRuleSet() {
+        return this.inner().networkRuleSet();
+    }
+
     @Override
     public ProvisioningState provisioningState() {
         return this.inner().provisioningState();
@@ -124,6 +130,16 @@ public RegistryImpl withAdminUserEnabled(Boolean adminUserEnabled) {
         return this;
     }
 
+    @Override
+    public RegistryImpl withNetworkRuleSet(NetworkRuleSet networkRuleSet) {
+        if (isInCreateMode()) {
+            this.inner().withNetworkRuleSet(networkRuleSet);
+        } else {
+            this.updateParameter.withNetworkRuleSet(networkRuleSet);
+        }
+        return this;
+    }
+
     @Override
     public RegistryImpl withStorageAccount(StorageAccountProperties storageAccount) {
         if (isInCreateMode()) {

containerregistry/resource-manager/v2017_10_01/src/main/java/com/microsoft/azure/management/containerregistry/v2017_10_01/implementation/RegistryInner.java

@@ -13,6 +13,7 @@
 import com.microsoft.azure.management.containerregistry.v2017_10_01.ProvisioningState;
 import com.microsoft.azure.management.containerregistry.v2017_10_01.Status;
 import com.microsoft.azure.management.containerregistry.v2017_10_01.StorageAccountProperties;
+import com.microsoft.azure.management.containerregistry.v2017_10_01.NetworkRuleSet;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.microsoft.rest.serializer.JsonFlatten;
 import com.microsoft.azure.Resource;
@@ -68,6 +69,12 @@ public class RegistryInner extends Resource {
     @JsonProperty(value = "properties.storageAccount")
     private StorageAccountProperties storageAccount;
 
+    /**
+     * The network rule set for a container registry.
+     */
+    @JsonProperty(value = "properties.networkRuleSet")
+    private NetworkRuleSet networkRuleSet;
+
     /**
      * Get the SKU of the container registry.
      *
@@ -164,4 +171,24 @@ public RegistryInner withStorageAccount(StorageAccountProperties storageAccount)
         return this;
     }
 
+    /**
+     * Get the network rule set for a container registry.
+     *
+     * @return the networkRuleSet value
+     */
+    public NetworkRuleSet networkRuleSet() {
+        return this.networkRuleSet;
+    }
+
+    /**
+     * Set the network rule set for a container registry.
+     *
+     * @param networkRuleSet the networkRuleSet value to set
+     * @return the RegistryInner object itself.
+     */
+    public RegistryInner withNetworkRuleSet(NetworkRuleSet networkRuleSet) {
+        this.networkRuleSet = networkRuleSet;
+        return this;
+    }
+
 }