Update from master

sdk/containerregistry/mgmt-v2018_09_01/pom.xml

@@ -11,11 +11,11 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-arm-parent</artifactId>
-        <version>1.2.0</version>
+        <version>1.1.0</version>
         <relativePath>../../../pom.management.xml</relativePath>
     </parent>
     <artifactId>azure-mgmt-containerregistry</artifactId>
-    <version>1.0.0-beta-1</version>
+    <version>1.0.0-beta</version>
     <packaging>jar</packaging>
     <name>Microsoft Azure SDK for ContainerRegistry Management</name>
     <description>This package contains Microsoft ContainerRegistry Management SDK.</description>
@@ -71,6 +71,8 @@
             <artifactId>azure-arm-client-runtime</artifactId>
             <type>test-jar</type>
             <scope>test</scope>
+            <!--Below version for test jar needs to be removed, this will be done as part of v1-runtime 1.6.7-->
+            <version>1.6.5</version>
         </dependency>
     </dependencies>
     <build>

sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/Action.java

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

sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/Credentials.java

@@ -0,0 +1,80 @@
+/**
+ * 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.v2018_09_01;
+
+import java.util.Map;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The parameters that describes a set of credentials that will be used when a
+ * run is invoked.
+ */
+public class Credentials {
+    /**
+     * Describes the credential parameters for accessing the source registry.
+     */
+    @JsonProperty(value = "sourceRegistry")
+    private SourceRegistryCredentials sourceRegistry;
+
+    /**
+     * Describes the credential parameters for accessing other custom
+     * registries. The key
+     * for the dictionary item will be the registry login server
+     * (myregistry.azurecr.io) and
+     * the value of the item will be the registry credentials for accessing the
+     * registry.
+     */
+    @JsonProperty(value = "customRegistries")
+    private Map<String, CustomRegistryCredentials> customRegistries;
+
+    /**
+     * Get describes the credential parameters for accessing the source registry.
+     *
+     * @return the sourceRegistry value
+     */
+    public SourceRegistryCredentials sourceRegistry() {
+        return this.sourceRegistry;
+    }
+
+    /**
+     * Set describes the credential parameters for accessing the source registry.
+     *
+     * @param sourceRegistry the sourceRegistry value to set
+     * @return the Credentials object itself.
+     */
+    public Credentials withSourceRegistry(SourceRegistryCredentials sourceRegistry) {
+        this.sourceRegistry = sourceRegistry;
+        return this;
+    }
+
+    /**
+     * Get describes the credential parameters for accessing other custom registries. The key
+     for the dictionary item will be the registry login server (myregistry.azurecr.io) and
+     the value of the item will be the registry credentials for accessing the registry.
+     *
+     * @return the customRegistries value
+     */
+    public Map<String, CustomRegistryCredentials> customRegistries() {
+        return this.customRegistries;
+    }
+
+    /**
+     * Set describes the credential parameters for accessing other custom registries. The key
+     for the dictionary item will be the registry login server (myregistry.azurecr.io) and
+     the value of the item will be the registry credentials for accessing the registry.
+     *
+     * @param customRegistries the customRegistries value to set
+     * @return the Credentials object itself.
+     */
+    public Credentials withCustomRegistries(Map<String, CustomRegistryCredentials> customRegistries) {
+        this.customRegistries = customRegistries;
+        return this;
+    }
+
+}

sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/CustomRegistryCredentials.java

@@ -0,0 +1,74 @@
+/**
+ * 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.v2018_09_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Describes the credentials that will be used to access a custom registry
+ * during a run.
+ */
+public class CustomRegistryCredentials {
+    /**
+     * The username for logging into the custom registry.
+     */
+    @JsonProperty(value = "userName")
+    private SecretObject userName;
+
+    /**
+     * The password for logging into the custom registry. The password is a
+     * secret
+     * object that allows multiple ways of providing the value for it.
+     */
+    @JsonProperty(value = "password")
+    private SecretObject password;
+
+    /**
+     * Get the username for logging into the custom registry.
+     *
+     * @return the userName value
+     */
+    public SecretObject userName() {
+        return this.userName;
+    }
+
+    /**
+     * Set the username for logging into the custom registry.
+     *
+     * @param userName the userName value to set
+     * @return the CustomRegistryCredentials object itself.
+     */
+    public CustomRegistryCredentials withUserName(SecretObject userName) {
+        this.userName = userName;
+        return this;
+    }
+
+    /**
+     * Get the password for logging into the custom registry. The password is a secret
+     object that allows multiple ways of providing the value for it.
+     *
+     * @return the password value
+     */
+    public SecretObject password() {
+        return this.password;
+    }
+
+    /**
+     * Set the password for logging into the custom registry. The password is a secret
+     object that allows multiple ways of providing the value for it.
+     *
+     * @param password the password value to set
+     * @return the CustomRegistryCredentials object itself.
+     */
+    public CustomRegistryCredentials withPassword(SecretObject password) {
+        this.password = password;
+        return this;
+    }
+
+}

sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_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.v2018_09_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);
+    }
+}

sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/DockerBuildRequest.java

@@ -16,7 +16,7 @@
 /**
  * The parameters for a docker quick build.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type", defaultImpl = DockerBuildRequest.class)
 @JsonTypeName("DockerBuildRequest")
 public class DockerBuildRequest extends RunRequest {
     /**
@@ -45,6 +45,12 @@ public class DockerBuildRequest extends RunRequest {
     @JsonProperty(value = "dockerFilePath", required = true)
     private String dockerFilePath;
 
+    /**
+     * The name of the target build stage for the docker build.
+     */
+    @JsonProperty(value = "target")
+    private String target;
+
     /**
      * The collection of override arguments to be used when executing the run.
      */
@@ -71,13 +77,20 @@ public class DockerBuildRequest extends RunRequest {
 
     /**
      * The URL(absolute or relative) of the source context. It can be an URL to
-     * a tar or git repoistory.
+     * a tar or git repository.
      * If it is relative URL, the relative path should be obtained from calling
      * listBuildSourceUploadUrl API.
      */
     @JsonProperty(value = "sourceLocation")
     private String sourceLocation;
 
+    /**
+     * The properties that describes a set of credentials that will be used
+     * when this run is invoked.
+     */
+    @JsonProperty(value = "credentials")
+    private Credentials credentials;
+
     /**
      * Get the fully qualified image names including the repository and tag.
      *
@@ -158,6 +171,26 @@ public DockerBuildRequest withDockerFilePath(String dockerFilePath) {
         return this;
     }
 
+    /**
+     * Get the name of the target build stage for the docker build.
+     *
+     * @return the target value
+     */
+    public String target() {
+        return this.target;
+    }
+
+    /**
+     * Set the name of the target build stage for the docker build.
+     *
+     * @param target the target value to set
+     * @return the DockerBuildRequest object itself.
+     */
+    public DockerBuildRequest withTarget(String target) {
+        this.target = target;
+        return this;
+    }
+
     /**
      * Get the collection of override arguments to be used when executing the run.
      *
@@ -239,7 +272,7 @@ public DockerBuildRequest withAgentConfiguration(AgentProperties agentConfigurat
     }
 
     /**
-     * Get the URL(absolute or relative) of the source context. It can be an URL to a tar or git repoistory.
+     * Get the URL(absolute or relative) of the source context. It can be an URL to a tar or git repository.
      If it is relative URL, the relative path should be obtained from calling listBuildSourceUploadUrl API.
      *
      * @return the sourceLocation value
@@ -249,7 +282,7 @@ public String sourceLocation() {
     }
 
     /**
-     * Set the URL(absolute or relative) of the source context. It can be an URL to a tar or git repoistory.
+     * Set the URL(absolute or relative) of the source context. It can be an URL to a tar or git repository.
      If it is relative URL, the relative path should be obtained from calling listBuildSourceUploadUrl API.
      *
      * @param sourceLocation the sourceLocation value to set
@@ -260,4 +293,24 @@ public DockerBuildRequest withSourceLocation(String sourceLocation) {
         return this;
     }
 
+    /**
+     * Get the properties that describes a set of credentials that will be used when this run is invoked.
+     *
+     * @return the credentials value
+     */
+    public Credentials credentials() {
+        return this.credentials;
+    }
+
+    /**
+     * Set the properties that describes a set of credentials that will be used when this run is invoked.
+     *
+     * @param credentials the credentials value to set
+     * @return the DockerBuildRequest object itself.
+     */
+    public DockerBuildRequest withCredentials(Credentials credentials) {
+        this.credentials = credentials;
+        return this;
+    }
+
 }