diff --git a/sdk/containerregistry/mgmt-v2018_09_01/pom.xml b/sdk/containerregistry/mgmt-v2018_09_01/pom.xml index 5735700f3744c..f2178a9eea51e 100644 --- a/sdk/containerregistry/mgmt-v2018_09_01/pom.xml +++ b/sdk/containerregistry/mgmt-v2018_09_01/pom.xml @@ -11,11 +11,11 @@ com.microsoft.azure azure-arm-parent - 1.2.0 - ../../parents/azure-arm-parent + 1.1.0 + ../../../pom.management.xml azure-mgmt-containerregistry - 1.0.0-beta-1 + 1.0.0-beta jar Microsoft Azure SDK for ContainerRegistry Management This package contains Microsoft ContainerRegistry Management SDK. @@ -71,6 +71,8 @@ azure-arm-client-runtime test-jar test + + 1.6.5 diff --git a/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/Action.java b/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/Action.java new file mode 100644 index 0000000000000..f1f6cb1864f50 --- /dev/null +++ b/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 { + /** 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 values() { + return values(Action.class); + } +} diff --git a/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/Credentials.java b/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/Credentials.java new file mode 100644 index 0000000000000..b560a18678776 --- /dev/null +++ b/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 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 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 customRegistries) { + this.customRegistries = customRegistries; + return this; + } + +} diff --git a/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/CustomRegistryCredentials.java b/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/CustomRegistryCredentials.java new file mode 100644 index 0000000000000..2c40e09b01998 --- /dev/null +++ b/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; + } + +} diff --git a/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/DefaultAction.java b/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/DefaultAction.java new file mode 100644 index 0000000000000..f7a000a028732 --- /dev/null +++ b/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 { + /** 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 values() { + return values(DefaultAction.class); + } +} diff --git a/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/DockerBuildRequest.java b/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/DockerBuildRequest.java index 5584232f9184f..29da5d03a94f8 100644 --- a/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/DockerBuildRequest.java +++ b/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; + } + } diff --git a/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/DockerBuildStep.java b/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/DockerBuildStep.java index 07dbfcf21097b..c4ee5042c7fd3 100644 --- a/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/DockerBuildStep.java +++ b/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/DockerBuildStep.java @@ -16,7 +16,7 @@ /** * The Docker build step. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type") +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type", defaultImpl = DockerBuildStep.class) @JsonTypeName("Docker") public class DockerBuildStep extends TaskStepProperties { /** @@ -45,6 +45,12 @@ public class DockerBuildStep extends TaskStepProperties { @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 this * build step. @@ -132,6 +138,26 @@ public DockerBuildStep 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 DockerBuildStep object itself. + */ + public DockerBuildStep withTarget(String target) { + this.target = target; + return this; + } + /** * Get the collection of override arguments to be used when executing this build step. * diff --git a/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/DockerBuildStepUpdateParameters.java b/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/DockerBuildStepUpdateParameters.java index 57a180720f00e..f74ecd33473f0 100644 --- a/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/DockerBuildStepUpdateParameters.java +++ b/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/DockerBuildStepUpdateParameters.java @@ -16,7 +16,7 @@ /** * The properties for updating a docker build step. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type") +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type", defaultImpl = DockerBuildStepUpdateParameters.class) @JsonTypeName("Docker") public class DockerBuildStepUpdateParameters extends TaskStepUpdateParameters { /** @@ -52,6 +52,12 @@ public class DockerBuildStepUpdateParameters extends TaskStepUpdateParameters { @JsonProperty(value = "arguments") private List arguments; + /** + * The name of the target build stage for the docker build. + */ + @JsonProperty(value = "target") + private String target; + /** * Get the fully qualified image names including the repository and tag. * @@ -152,4 +158,24 @@ public DockerBuildStepUpdateParameters withArguments(List arguments) { 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 DockerBuildStepUpdateParameters object itself. + */ + public DockerBuildStepUpdateParameters withTarget(String target) { + this.target = target; + return this; + } + } diff --git a/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/EncodedTaskRunRequest.java b/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/EncodedTaskRunRequest.java index 1539de33bbef6..f619260f9beb3 100644 --- a/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/EncodedTaskRunRequest.java +++ b/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/EncodedTaskRunRequest.java @@ -16,7 +16,7 @@ /** * The parameters for a quick task run request. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type") +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type", defaultImpl = EncodedTaskRunRequest.class) @JsonTypeName("EncodedTaskRunRequest") public class EncodedTaskRunRequest extends RunRequest { /** @@ -58,13 +58,20 @@ public class EncodedTaskRunRequest 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 base64 encoded value of the template/definition file content. * @@ -186,7 +193,7 @@ public EncodedTaskRunRequest withAgentConfiguration(AgentProperties agentConfigu } /** - * 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 @@ -196,7 +203,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 @@ -207,4 +214,24 @@ public EncodedTaskRunRequest 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 EncodedTaskRunRequest object itself. + */ + public EncodedTaskRunRequest withCredentials(Credentials credentials) { + this.credentials = credentials; + return this; + } + } diff --git a/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/EncodedTaskStep.java b/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/EncodedTaskStep.java index 85115af6fe6b3..0c92e181562ad 100644 --- a/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/EncodedTaskStep.java +++ b/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/EncodedTaskStep.java @@ -16,7 +16,7 @@ /** * The properties of a encoded task step. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type") +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type", defaultImpl = EncodedTaskStep.class) @JsonTypeName("EncodedTask") public class EncodedTaskStep extends TaskStepProperties { /** diff --git a/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/EncodedTaskStepUpdateParameters.java b/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/EncodedTaskStepUpdateParameters.java index 38c7d05e93438..811dbd03e37a1 100644 --- a/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/EncodedTaskStepUpdateParameters.java +++ b/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/EncodedTaskStepUpdateParameters.java @@ -16,7 +16,7 @@ /** * The properties for updating encoded task step. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type") +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type", defaultImpl = EncodedTaskStepUpdateParameters.class) @JsonTypeName("EncodedTask") public class EncodedTaskStepUpdateParameters extends TaskStepUpdateParameters { /** diff --git a/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/FileTaskRunRequest.java b/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/FileTaskRunRequest.java index 31b0901a695b5..cf2349563a875 100644 --- a/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/FileTaskRunRequest.java +++ b/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/FileTaskRunRequest.java @@ -16,7 +16,7 @@ /** * The request parameters for a scheduling run against a task file. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type") +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type", defaultImpl = FileTaskRunRequest.class) @JsonTypeName("FileTaskRunRequest") public class FileTaskRunRequest extends RunRequest { /** @@ -58,13 +58,20 @@ public class FileTaskRunRequest 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 template/definition file path relative to the source. * @@ -186,7 +193,7 @@ public FileTaskRunRequest 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 @@ -196,7 +203,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 @@ -207,4 +214,24 @@ public FileTaskRunRequest 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 FileTaskRunRequest object itself. + */ + public FileTaskRunRequest withCredentials(Credentials credentials) { + this.credentials = credentials; + return this; + } + } diff --git a/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/FileTaskStep.java b/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/FileTaskStep.java index c716727a587f4..82a1e3bb03d5a 100644 --- a/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/FileTaskStep.java +++ b/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/FileTaskStep.java @@ -16,7 +16,7 @@ /** * The properties of a task step. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type") +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type", defaultImpl = FileTaskStep.class) @JsonTypeName("FileTask") public class FileTaskStep extends TaskStepProperties { /** diff --git a/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/FileTaskStepUpdateParameters.java b/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/FileTaskStepUpdateParameters.java index 9cf1c75b4651e..dfe5ab093ffaf 100644 --- a/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/FileTaskStepUpdateParameters.java +++ b/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/FileTaskStepUpdateParameters.java @@ -16,7 +16,7 @@ /** * The properties of updating a task step. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type") +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type", defaultImpl = FileTaskStepUpdateParameters.class) @JsonTypeName("FileTask") public class FileTaskStepUpdateParameters extends TaskStepUpdateParameters { /** diff --git a/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/IPRule.java b/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/IPRule.java new file mode 100644 index 0000000000000..0ccbb4daeff4c --- /dev/null +++ b/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/IPRule.java @@ -0,0 +1,70 @@ +/** + * 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; + +/** + * IP rule with specific IP or IP range in CIDR format. + */ +public class IPRule { + /** + * The action of IP ACL rule. Possible values include: 'Allow'. + */ + @JsonProperty(value = "action") + private Action action; + + /** + * Specifies the IP or IP range in CIDR format. Only IPV4 address is + * allowed. + */ + @JsonProperty(value = "value", required = true) + private String iPAddressOrRange; + + /** + * Get the action of IP ACL rule. Possible values include: 'Allow'. + * + * @return the action value + */ + public Action action() { + return this.action; + } + + /** + * Set the action of IP ACL rule. Possible values include: 'Allow'. + * + * @param action the action value to set + * @return the IPRule object itself. + */ + public IPRule withAction(Action action) { + this.action = action; + return this; + } + + /** + * Get specifies the IP or IP range in CIDR format. Only IPV4 address is allowed. + * + * @return the iPAddressOrRange value + */ + public String iPAddressOrRange() { + return this.iPAddressOrRange; + } + + /** + * Set specifies the IP or IP range in CIDR format. Only IPV4 address is allowed. + * + * @param iPAddressOrRange the iPAddressOrRange value to set + * @return the IPRule object itself. + */ + public IPRule withIPAddressOrRange(String iPAddressOrRange) { + this.iPAddressOrRange = iPAddressOrRange; + return this; + } + +} diff --git a/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/ImportSource.java b/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/ImportSource.java index ad69fe0e1df09..8d9f89c456657 100644 --- a/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/ImportSource.java +++ b/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/ImportSource.java @@ -21,11 +21,17 @@ public class ImportSource { private String resourceId; /** - * The address of the source registry. + * The address of the source registry (e.g. 'mcr.microsoft.com'). */ @JsonProperty(value = "registryUri") private String registryUri; + /** + * Credentials used when importing from a registry uri. + */ + @JsonProperty(value = "credentials") + private ImportSourceCredentials credentials; + /** * Repository name of the source image. * Specify an image by repository ('hello-world'). This will use the @@ -58,7 +64,7 @@ public ImportSource withResourceId(String resourceId) { } /** - * Get the address of the source registry. + * Get the address of the source registry (e.g. 'mcr.microsoft.com'). * * @return the registryUri value */ @@ -67,7 +73,7 @@ public String registryUri() { } /** - * Set the address of the source registry. + * Set the address of the source registry (e.g. 'mcr.microsoft.com'). * * @param registryUri the registryUri value to set * @return the ImportSource object itself. @@ -77,6 +83,26 @@ public ImportSource withRegistryUri(String registryUri) { return this; } + /** + * Get credentials used when importing from a registry uri. + * + * @return the credentials value + */ + public ImportSourceCredentials credentials() { + return this.credentials; + } + + /** + * Set credentials used when importing from a registry uri. + * + * @param credentials the credentials value to set + * @return the ImportSource object itself. + */ + public ImportSource withCredentials(ImportSourceCredentials credentials) { + this.credentials = credentials; + return this; + } + /** * Get repository name of the source image. Specify an image by repository ('hello-world'). This will use the 'latest' tag. diff --git a/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/ImportSourceCredentials.java b/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/ImportSourceCredentials.java new file mode 100644 index 0000000000000..86b39d6e50a9f --- /dev/null +++ b/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/ImportSourceCredentials.java @@ -0,0 +1,69 @@ +/** + * 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; + +/** + * The ImportSourceCredentials model. + */ +public class ImportSourceCredentials { + /** + * The username to authenticate with the source registry. + */ + @JsonProperty(value = "username") + private String username; + + /** + * The password used to authenticate with the source registry. + */ + @JsonProperty(value = "password", required = true) + private String password; + + /** + * Get the username to authenticate with the source registry. + * + * @return the username value + */ + public String username() { + return this.username; + } + + /** + * Set the username to authenticate with the source registry. + * + * @param username the username value to set + * @return the ImportSourceCredentials object itself. + */ + public ImportSourceCredentials withUsername(String username) { + this.username = username; + return this; + } + + /** + * Get the password used to authenticate with the source registry. + * + * @return the password value + */ + public String password() { + return this.password; + } + + /** + * Set the password used to authenticate with the source registry. + * + * @param password the password value to set + * @return the ImportSourceCredentials object itself. + */ + public ImportSourceCredentials withPassword(String password) { + this.password = password; + return this; + } + +} diff --git a/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/NetworkRuleSet.java b/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/NetworkRuleSet.java new file mode 100644 index 0000000000000..ed43414afc6a8 --- /dev/null +++ b/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/NetworkRuleSet.java @@ -0,0 +1,97 @@ +/** + * 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.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 virtualNetworkRules; + + /** + * The IP ACL rules. + */ + @JsonProperty(value = "ipRules") + private List ipRules; + + /** + * 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 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 virtualNetworkRules) { + this.virtualNetworkRules = virtualNetworkRules; + return this; + } + + /** + * Get the IP ACL rules. + * + * @return the ipRules value + */ + public List ipRules() { + return this.ipRules; + } + + /** + * Set the IP ACL rules. + * + * @param ipRules the ipRules value to set + * @return the NetworkRuleSet object itself. + */ + public NetworkRuleSet withIpRules(List ipRules) { + this.ipRules = ipRules; + return this; + } + +} diff --git a/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/Registry.java b/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/Registry.java index b0e249cf5ddfc..cc5da3ffa3e44 100644 --- a/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/Registry.java +++ b/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/Registry.java @@ -40,6 +40,11 @@ public interface Registry extends HasInner, 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, Resource.DefinitionWithTags, DefinitionStages.WithAdminUserEnabled, DefinitionStages.WithStorageAccount { + interface WithCreate extends Creatable, Resource.DefinitionWithTags, 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, Resource.UpdateWithTags, UpdateStages.WithAdminUserEnabled, UpdateStages.WithSku, UpdateStages.WithStorageAccount { + interface Update extends Appliable, Resource.UpdateWithTags, 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. */ diff --git a/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/RegistryUpdateParameters.java b/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/RegistryUpdateParameters.java index 97ddffade2478..9e42bf8f71998 100644 --- a/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/RegistryUpdateParameters.java +++ b/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_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; + } + } diff --git a/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/Run.java b/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/Run.java index 636c2fa24826f..e50c4d69a04c5 100644 --- a/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/Run.java +++ b/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/Run.java @@ -33,6 +33,11 @@ public interface Run extends HasInner, Indexable, Refreshable, Up */ DateTime createTime(); + /** + * @return the customRegistries value. + */ + List customRegistries(); + /** * @return the finishTime value. */ @@ -78,6 +83,11 @@ public interface Run extends HasInner, Indexable, Refreshable, Up */ ProvisioningState provisioningState(); + /** + * @return the runErrorMessage value. + */ + String runErrorMessage(); + /** * @return the runId value. */ @@ -88,6 +98,11 @@ public interface Run extends HasInner, Indexable, Refreshable, Up */ RunType runType(); + /** + * @return the sourceRegistryAuth value. + */ + String sourceRegistryAuth(); + /** * @return the sourceTrigger value. */ diff --git a/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/RunRequest.java b/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/RunRequest.java index fda7672c5183b..bce1a770183e1 100644 --- a/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/RunRequest.java +++ b/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/RunRequest.java @@ -16,7 +16,7 @@ /** * The request parameters for scheduling a run. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type") +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type", defaultImpl = RunRequest.class) @JsonTypeName("RunRequest") @JsonSubTypes({ @JsonSubTypes.Type(name = "DockerBuildRequest", value = DockerBuildRequest.class), diff --git a/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/SecretObject.java b/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/SecretObject.java new file mode 100644 index 0000000000000..8f5ee8620f57e --- /dev/null +++ b/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/SecretObject.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 com.fasterxml.jackson.annotation.JsonProperty; + +/** + * Describes the properties of a secret object value. + */ +public class SecretObject { + /** + * The value of the secret. The format of this value will be determined + * based on the type of the secret object. If the type is Opaque, the value + * will be + * used as is without any modification. + */ + @JsonProperty(value = "value") + private String value; + + /** + * The type of the secret object which determines how the value of the + * secret object has to be + * interpreted. Possible values include: 'Opaque'. + */ + @JsonProperty(value = "type") + private SecretObjectType type; + + /** + * Get the value of the secret. The format of this value will be determined + based on the type of the secret object. If the type is Opaque, the value will be + used as is without any modification. + * + * @return the value value + */ + public String value() { + return this.value; + } + + /** + * Set the value of the secret. The format of this value will be determined + based on the type of the secret object. If the type is Opaque, the value will be + used as is without any modification. + * + * @param value the value value to set + * @return the SecretObject object itself. + */ + public SecretObject withValue(String value) { + this.value = value; + return this; + } + + /** + * Get the type of the secret object which determines how the value of the secret object has to be + interpreted. Possible values include: 'Opaque'. + * + * @return the type value + */ + public SecretObjectType type() { + return this.type; + } + + /** + * Set the type of the secret object which determines how the value of the secret object has to be + interpreted. Possible values include: 'Opaque'. + * + * @param type the type value to set + * @return the SecretObject object itself. + */ + public SecretObject withType(SecretObjectType type) { + this.type = type; + return this; + } + +} diff --git a/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/SecretObjectType.java b/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/SecretObjectType.java new file mode 100644 index 0000000000000..6b9244e8ecc22 --- /dev/null +++ b/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/SecretObjectType.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 SecretObjectType. + */ +public final class SecretObjectType extends ExpandableStringEnum { + /** Static value Opaque for SecretObjectType. */ + public static final SecretObjectType OPAQUE = fromString("Opaque"); + + /** + * Creates or finds a SecretObjectType from its string representation. + * @param name a name to look for + * @return the corresponding SecretObjectType + */ + @JsonCreator + public static SecretObjectType fromString(String name) { + return fromString(name, SecretObjectType.class); + } + + /** + * @return known SecretObjectType values + */ + public static Collection values() { + return values(SecretObjectType.class); + } +} diff --git a/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/SourceProperties.java b/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/SourceProperties.java index 61ad3f497b134..10a3bc5941ab6 100644 --- a/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/SourceProperties.java +++ b/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/SourceProperties.java @@ -22,7 +22,7 @@ public class SourceProperties { private SourceControlType sourceControlType; /** - * The full URL to the source code respository. + * The full URL to the source code repository. */ @JsonProperty(value = "repositoryUrl", required = true) private String repositoryUrl; @@ -62,7 +62,7 @@ public SourceProperties withSourceControlType(SourceControlType sourceControlTyp } /** - * Get the full URL to the source code respository. + * Get the full URL to the source code repository. * * @return the repositoryUrl value */ @@ -71,7 +71,7 @@ public String repositoryUrl() { } /** - * Set the full URL to the source code respository. + * Set the full URL to the source code repository. * * @param repositoryUrl the repositoryUrl value to set * @return the SourceProperties object itself. diff --git a/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/SourceRegistryCredentials.java b/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/SourceRegistryCredentials.java new file mode 100644 index 0000000000000..8291e2b56be08 --- /dev/null +++ b/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/SourceRegistryCredentials.java @@ -0,0 +1,52 @@ +/** + * 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 credential parameters for accessing the source registry. + */ +public class SourceRegistryCredentials { + /** + * The authentication mode which determines the source registry login + * scope. The credentials for the source registry + * will be generated using the given scope. These credentials will be used + * to login to + * the source registry during the run. Possible values include: 'None', + * 'Default'. + */ + @JsonProperty(value = "loginMode") + private SourceRegistryLoginMode loginMode; + + /** + * Get the authentication mode which determines the source registry login scope. The credentials for the source registry + will be generated using the given scope. These credentials will be used to login to + the source registry during the run. Possible values include: 'None', 'Default'. + * + * @return the loginMode value + */ + public SourceRegistryLoginMode loginMode() { + return this.loginMode; + } + + /** + * Set the authentication mode which determines the source registry login scope. The credentials for the source registry + will be generated using the given scope. These credentials will be used to login to + the source registry during the run. Possible values include: 'None', 'Default'. + * + * @param loginMode the loginMode value to set + * @return the SourceRegistryCredentials object itself. + */ + public SourceRegistryCredentials withLoginMode(SourceRegistryLoginMode loginMode) { + this.loginMode = loginMode; + return this; + } + +} diff --git a/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/SourceRegistryLoginMode.java b/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/SourceRegistryLoginMode.java new file mode 100644 index 0000000000000..3b9c361bf208d --- /dev/null +++ b/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/SourceRegistryLoginMode.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 SourceRegistryLoginMode. + */ +public final class SourceRegistryLoginMode extends ExpandableStringEnum { + /** Static value None for SourceRegistryLoginMode. */ + public static final SourceRegistryLoginMode NONE = fromString("None"); + + /** Static value Default for SourceRegistryLoginMode. */ + public static final SourceRegistryLoginMode DEFAULT = fromString("Default"); + + /** + * Creates or finds a SourceRegistryLoginMode from its string representation. + * @param name a name to look for + * @return the corresponding SourceRegistryLoginMode + */ + @JsonCreator + public static SourceRegistryLoginMode fromString(String name) { + return fromString(name, SourceRegistryLoginMode.class); + } + + /** + * @return known SourceRegistryLoginMode values + */ + public static Collection values() { + return values(SourceRegistryLoginMode.class); + } +} diff --git a/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/SourceUpdateParameters.java b/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/SourceUpdateParameters.java index 73ac21a69f939..6b76c924267bb 100644 --- a/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/SourceUpdateParameters.java +++ b/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/SourceUpdateParameters.java @@ -22,7 +22,7 @@ public class SourceUpdateParameters { private SourceControlType sourceControlType; /** - * The full URL to the source code respository. + * The full URL to the source code repository. */ @JsonProperty(value = "repositoryUrl") private String repositoryUrl; @@ -62,7 +62,7 @@ public SourceUpdateParameters withSourceControlType(SourceControlType sourceCont } /** - * Get the full URL to the source code respository. + * Get the full URL to the source code repository. * * @return the repositoryUrl value */ @@ -71,7 +71,7 @@ public String repositoryUrl() { } /** - * Set the full URL to the source code respository. + * Set the full URL to the source code repository. * * @param repositoryUrl the repositoryUrl value to set * @return the SourceUpdateParameters object itself. diff --git a/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/Target.java b/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/Target.java index 2a66dc67ccaa6..f7b7c262a85f5 100644 --- a/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/Target.java +++ b/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/Target.java @@ -57,6 +57,18 @@ public class Target { @JsonProperty(value = "tag") private String tag; + /** + * The name of the artifact. + */ + @JsonProperty(value = "name") + private String name; + + /** + * The version of the artifact. + */ + @JsonProperty(value = "version") + private String version; + /** * Get the MIME type of the referenced object. * @@ -197,4 +209,44 @@ public Target withTag(String tag) { return this; } + /** + * Get the name of the artifact. + * + * @return the name value + */ + public String name() { + return this.name; + } + + /** + * Set the name of the artifact. + * + * @param name the name value to set + * @return the Target object itself. + */ + public Target withName(String name) { + this.name = name; + return this; + } + + /** + * Get the version of the artifact. + * + * @return the version value + */ + public String version() { + return this.version; + } + + /** + * Set the version of the artifact. + * + * @param version the version value to set + * @return the Target object itself. + */ + public Target withVersion(String version) { + this.version = version; + return this; + } + } diff --git a/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/Task.java b/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/Task.java index eba8d044c1582..0023b1846f60f 100644 --- a/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/Task.java +++ b/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/Task.java @@ -34,6 +34,11 @@ public interface Task extends HasInner, Indexable, Refreshable, */ DateTime creationDate(); + /** + * @return the credentials value. + */ + Credentials credentials(); + /** * @return the id value. */ @@ -166,6 +171,18 @@ interface WithAgentConfiguration { WithCreate withAgentConfiguration(AgentProperties agentConfiguration); } + /** + * The stage of the task definition allowing to specify Credentials. + */ + interface WithCredentials { + /** + * Specifies credentials. + * @param credentials The properties that describes a set of credentials that will be used when this run is invoked + * @return the next definition stage + */ + WithCreate withCredentials(Credentials credentials); + } + /** * The stage of the task definition allowing to specify Status. */ @@ -219,13 +236,13 @@ interface WithTrigger { * the resource to be created (via {@link WithCreate#create()}), but also allows * for any other optional settings to be specified. */ - interface WithCreate extends Creatable, DefinitionStages.WithAgentConfiguration, DefinitionStages.WithStatus, DefinitionStages.WithTags, DefinitionStages.WithTimeout, DefinitionStages.WithTrigger { + interface WithCreate extends Creatable, DefinitionStages.WithAgentConfiguration, DefinitionStages.WithCredentials, DefinitionStages.WithStatus, DefinitionStages.WithTags, DefinitionStages.WithTimeout, DefinitionStages.WithTrigger { } } /** * The template for a Task update operation, containing all the settings that can be modified. */ - interface Update extends Appliable, UpdateStages.WithAgentConfiguration, UpdateStages.WithPlatform, UpdateStages.WithStatus, UpdateStages.WithStep, UpdateStages.WithTags, UpdateStages.WithTimeout, UpdateStages.WithTrigger { + interface Update extends Appliable, UpdateStages.WithAgentConfiguration, UpdateStages.WithCredentials, UpdateStages.WithPlatform, UpdateStages.WithStatus, UpdateStages.WithStep, UpdateStages.WithTags, UpdateStages.WithTimeout, UpdateStages.WithTrigger { } /** @@ -244,6 +261,18 @@ interface WithAgentConfiguration { Update withAgentConfiguration(AgentProperties agentConfiguration); } + /** + * The stage of the task update allowing to specify Credentials. + */ + interface WithCredentials { + /** + * Specifies credentials. + * @param credentials The parameters that describes a set of credentials that will be used when this run is invoked + * @return the next update stage + */ + Update withCredentials(Credentials credentials); + } + /** * The stage of the task update allowing to specify Platform. */ diff --git a/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/TaskRunRequest.java b/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/TaskRunRequest.java index 04a71888ef0d6..3d4e09832d927 100644 --- a/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/TaskRunRequest.java +++ b/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/TaskRunRequest.java @@ -16,7 +16,7 @@ /** * The parameters for a task run request. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type") +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type", defaultImpl = TaskRunRequest.class) @JsonTypeName("TaskRunRequest") public class TaskRunRequest extends RunRequest { /** diff --git a/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/TaskStepProperties.java b/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/TaskStepProperties.java index 15b19a914c8ec..52a20a9f4c623 100644 --- a/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/TaskStepProperties.java +++ b/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/TaskStepProperties.java @@ -17,7 +17,7 @@ /** * Base properties for any task step. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type") +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type", defaultImpl = TaskStepProperties.class) @JsonTypeName("TaskStepProperties") @JsonSubTypes({ @JsonSubTypes.Type(name = "Docker", value = DockerBuildStep.class), @@ -37,6 +37,13 @@ public class TaskStepProperties { @JsonProperty(value = "contextPath") private String contextPath; + /** + * The token (git PAT or SAS token of storage account blob) associated with + * the context for a step. + */ + @JsonProperty(value = "contextAccessToken") + private String contextAccessToken; + /** * Get list of base image dependencies for a step. * @@ -66,4 +73,24 @@ public TaskStepProperties withContextPath(String contextPath) { return this; } + /** + * Get the token (git PAT or SAS token of storage account blob) associated with the context for a step. + * + * @return the contextAccessToken value + */ + public String contextAccessToken() { + return this.contextAccessToken; + } + + /** + * Set the token (git PAT or SAS token of storage account blob) associated with the context for a step. + * + * @param contextAccessToken the contextAccessToken value to set + * @return the TaskStepProperties object itself. + */ + public TaskStepProperties withContextAccessToken(String contextAccessToken) { + this.contextAccessToken = contextAccessToken; + return this; + } + } diff --git a/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/TaskStepUpdateParameters.java b/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/TaskStepUpdateParameters.java index f07e7ee9a5693..bf4d9cbc2d5a0 100644 --- a/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/TaskStepUpdateParameters.java +++ b/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/TaskStepUpdateParameters.java @@ -16,7 +16,7 @@ /** * Base properties for updating any task step. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type") +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type", defaultImpl = TaskStepUpdateParameters.class) @JsonTypeName("TaskStepUpdateParameters") @JsonSubTypes({ @JsonSubTypes.Type(name = "Docker", value = DockerBuildStepUpdateParameters.class), @@ -30,6 +30,13 @@ public class TaskStepUpdateParameters { @JsonProperty(value = "contextPath") private String contextPath; + /** + * The token (git PAT or SAS token of storage account blob) associated with + * the context for a step. + */ + @JsonProperty(value = "contextAccessToken") + private String contextAccessToken; + /** * Get the URL(absolute or relative) of the source context for the task step. * @@ -50,4 +57,24 @@ public TaskStepUpdateParameters withContextPath(String contextPath) { return this; } + /** + * Get the token (git PAT or SAS token of storage account blob) associated with the context for a step. + * + * @return the contextAccessToken value + */ + public String contextAccessToken() { + return this.contextAccessToken; + } + + /** + * Set the token (git PAT or SAS token of storage account blob) associated with the context for a step. + * + * @param contextAccessToken the contextAccessToken value to set + * @return the TaskStepUpdateParameters object itself. + */ + public TaskStepUpdateParameters withContextAccessToken(String contextAccessToken) { + this.contextAccessToken = contextAccessToken; + return this; + } + } diff --git a/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/TaskUpdateParameters.java b/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/TaskUpdateParameters.java index 1a0a169153657..0815d45e8a8e0 100644 --- a/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/TaskUpdateParameters.java +++ b/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/TaskUpdateParameters.java @@ -54,6 +54,13 @@ public class TaskUpdateParameters { @JsonProperty(value = "properties.trigger") private TriggerUpdateParameters trigger; + /** + * The parameters that describes a set of credentials that will be used + * when this run is invoked. + */ + @JsonProperty(value = "properties.credentials") + private Credentials credentials; + /** * The ARM resource tags. */ @@ -180,6 +187,26 @@ public TaskUpdateParameters withTrigger(TriggerUpdateParameters trigger) { return this; } + /** + * Get the parameters 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 parameters that describes a set of credentials that will be used when this run is invoked. + * + * @param credentials the credentials value to set + * @return the TaskUpdateParameters object itself. + */ + public TaskUpdateParameters withCredentials(Credentials credentials) { + this.credentials = credentials; + return this; + } + /** * Get the ARM resource tags. * diff --git a/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/VirtualNetworkRule.java b/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/VirtualNetworkRule.java new file mode 100644 index 0000000000000..db1cbaceb2967 --- /dev/null +++ b/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/VirtualNetworkRule.java @@ -0,0 +1,70 @@ +/** + * 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; + +/** + * Virtual network rule. + */ +public class VirtualNetworkRule { + /** + * The action of virtual network rule. Possible values include: 'Allow'. + */ + @JsonProperty(value = "action") + private Action action; + + /** + * 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 virtualNetworkResourceId; + + /** + * Get the action of virtual network rule. Possible values include: 'Allow'. + * + * @return the action value + */ + public Action action() { + return this.action; + } + + /** + * Set the action of virtual network rule. Possible values include: 'Allow'. + * + * @param action the action value to set + * @return the VirtualNetworkRule object itself. + */ + public VirtualNetworkRule withAction(Action action) { + this.action = action; + return this; + } + + /** + * Get resource ID of a subnet, for example: /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworks/{vnetName}/subnets/{subnetName}. + * + * @return the virtualNetworkResourceId value + */ + public String virtualNetworkResourceId() { + return this.virtualNetworkResourceId; + } + + /** + * Set resource ID of a subnet, for example: /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworks/{vnetName}/subnets/{subnetName}. + * + * @param virtualNetworkResourceId the virtualNetworkResourceId value to set + * @return the VirtualNetworkRule object itself. + */ + public VirtualNetworkRule withVirtualNetworkResourceId(String virtualNetworkResourceId) { + this.virtualNetworkResourceId = virtualNetworkResourceId; + return this; + } + +} diff --git a/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/WebhookAction.java b/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/WebhookAction.java index 75da739a7b577..70b874156329e 100644 --- a/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/WebhookAction.java +++ b/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/WebhookAction.java @@ -25,6 +25,12 @@ public final class WebhookAction extends ExpandableStringEnum { /** Static value quarantine for WebhookAction. */ public static final WebhookAction QUARANTINE = fromString("quarantine"); + /** Static value chart_push for WebhookAction. */ + public static final WebhookAction CHART_PUSH = fromString("chart_push"); + + /** Static value chart_delete for WebhookAction. */ + public static final WebhookAction CHART_DELETE = fromString("chart_delete"); + /** * Creates or finds a WebhookAction from its string representation. * @param name a name to look for diff --git a/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/implementation/RegistryImpl.java b/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/implementation/RegistryImpl.java index 83691c502116c..54f62869737ee 100644 --- a/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/implementation/RegistryImpl.java +++ b/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/implementation/RegistryImpl.java @@ -17,6 +17,7 @@ import com.microsoft.azure.management.containerregistry.v2018_09_01.ProvisioningState; import com.microsoft.azure.management.containerregistry.v2018_09_01.Status; import com.microsoft.azure.management.containerregistry.v2018_09_01.StorageAccountProperties; +import com.microsoft.azure.management.containerregistry.v2018_09_01.NetworkRuleSet; import rx.functions.Func1; class RegistryImpl extends GroupableResourceCoreImpl 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()) { diff --git a/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/implementation/RegistryInner.java b/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/implementation/RegistryInner.java index 8ff0a1cbef071..376a284615be7 100644 --- a/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/implementation/RegistryInner.java +++ b/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/implementation/RegistryInner.java @@ -13,6 +13,7 @@ import com.microsoft.azure.management.containerregistry.v2018_09_01.ProvisioningState; import com.microsoft.azure.management.containerregistry.v2018_09_01.Status; import com.microsoft.azure.management.containerregistry.v2018_09_01.StorageAccountProperties; +import com.microsoft.azure.management.containerregistry.v2018_09_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; + } + } diff --git a/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/implementation/ReplicationsImpl.java b/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/implementation/ReplicationsImpl.java index e7a0faf449a9d..8996c50479d75 100644 --- a/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/implementation/ReplicationsImpl.java +++ b/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/implementation/ReplicationsImpl.java @@ -64,10 +64,14 @@ public Replication call(ReplicationInner inner) { public Observable getAsync(String resourceGroupName, String registryName, String replicationName) { ReplicationsInner client = this.inner(); return client.getAsync(resourceGroupName, registryName, replicationName) - .map(new Func1() { + .flatMap(new Func1>() { @Override - public Replication call(ReplicationInner inner) { - return wrapModel(inner); + public Observable call(ReplicationInner inner) { + if (inner == null) { + return Observable.empty(); + } else { + return Observable.just((Replication)wrapModel(inner)); + } } }); } diff --git a/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/implementation/RunImpl.java b/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/implementation/RunImpl.java index 212203f91ded2..cd7c63beffae0 100644 --- a/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/implementation/RunImpl.java +++ b/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/implementation/RunImpl.java @@ -13,8 +13,8 @@ import rx.Observable; import com.microsoft.azure.management.containerregistry.v2018_09_01.AgentProperties; import org.joda.time.DateTime; -import com.microsoft.azure.management.containerregistry.v2018_09_01.ImageUpdateTrigger; import java.util.List; +import com.microsoft.azure.management.containerregistry.v2018_09_01.ImageUpdateTrigger; import com.microsoft.azure.management.containerregistry.v2018_09_01.ImageDescriptor; import com.microsoft.azure.management.containerregistry.v2018_09_01.PlatformProperties; import com.microsoft.azure.management.containerregistry.v2018_09_01.ProvisioningState; @@ -89,6 +89,11 @@ public DateTime createTime() { return this.inner().createTime(); } + @Override + public List customRegistries() { + return this.inner().customRegistries(); + } + @Override public DateTime finishTime() { return this.inner().finishTime(); @@ -134,6 +139,11 @@ public ProvisioningState provisioningState() { return this.inner().provisioningState(); } + @Override + public String runErrorMessage() { + return this.inner().runErrorMessage(); + } + @Override public String runId() { return this.inner().runId(); @@ -144,6 +154,11 @@ public RunType runType() { return this.inner().runType(); } + @Override + public String sourceRegistryAuth() { + return this.inner().sourceRegistryAuth(); + } + @Override public SourceTriggerDescriptor sourceTrigger() { return this.inner().sourceTrigger(); diff --git a/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/implementation/RunInner.java b/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/implementation/RunInner.java index e892261af1229..6eb2379d64958 100644 --- a/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/implementation/RunInner.java +++ b/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/implementation/RunInner.java @@ -98,12 +98,6 @@ public class RunInner extends ProxyResource { @JsonProperty(value = "properties.sourceTrigger") private SourceTriggerDescriptor sourceTrigger; - /** - * The value that indicates whether archiving is enabled or not. - */ - @JsonProperty(value = "properties.isArchiveEnabled") - private Boolean isArchiveEnabled; - /** * The platform properties against which the run will happen. */ @@ -116,6 +110,26 @@ public class RunInner extends ProxyResource { @JsonProperty(value = "properties.agentConfiguration") private AgentProperties agentConfiguration; + /** + * The scope of the credentials that were used to login to the source + * registry during this run. + */ + @JsonProperty(value = "properties.sourceRegistryAuth") + private String sourceRegistryAuth; + + /** + * The list of custom registries that were logged in during this run. + */ + @JsonProperty(value = "properties.customRegistries") + private List customRegistries; + + /** + * The error message received from backend systems after the run is + * scheduled. + */ + @JsonProperty(value = "properties.runErrorMessage", access = JsonProperty.Access.WRITE_ONLY) + private String runErrorMessage; + /** * The provisioning state of a run. Possible values include: 'Creating', * 'Updating', 'Deleting', 'Succeeded', 'Failed', 'Canceled'. @@ -123,6 +137,12 @@ public class RunInner extends ProxyResource { @JsonProperty(value = "properties.provisioningState") private ProvisioningState provisioningState; + /** + * The value that indicates whether archiving is enabled or not. + */ + @JsonProperty(value = "properties.isArchiveEnabled") + private Boolean isArchiveEnabled; + /** * Get the unique identifier for the run. * @@ -343,26 +363,6 @@ public RunInner withSourceTrigger(SourceTriggerDescriptor sourceTrigger) { return this; } - /** - * Get the value that indicates whether archiving is enabled or not. - * - * @return the isArchiveEnabled value - */ - public Boolean isArchiveEnabled() { - return this.isArchiveEnabled; - } - - /** - * Set the value that indicates whether archiving is enabled or not. - * - * @param isArchiveEnabled the isArchiveEnabled value to set - * @return the RunInner object itself. - */ - public RunInner withIsArchiveEnabled(Boolean isArchiveEnabled) { - this.isArchiveEnabled = isArchiveEnabled; - return this; - } - /** * Get the platform properties against which the run will happen. * @@ -403,6 +403,55 @@ public RunInner withAgentConfiguration(AgentProperties agentConfiguration) { return this; } + /** + * Get the scope of the credentials that were used to login to the source registry during this run. + * + * @return the sourceRegistryAuth value + */ + public String sourceRegistryAuth() { + return this.sourceRegistryAuth; + } + + /** + * Set the scope of the credentials that were used to login to the source registry during this run. + * + * @param sourceRegistryAuth the sourceRegistryAuth value to set + * @return the RunInner object itself. + */ + public RunInner withSourceRegistryAuth(String sourceRegistryAuth) { + this.sourceRegistryAuth = sourceRegistryAuth; + return this; + } + + /** + * Get the list of custom registries that were logged in during this run. + * + * @return the customRegistries value + */ + public List customRegistries() { + return this.customRegistries; + } + + /** + * Set the list of custom registries that were logged in during this run. + * + * @param customRegistries the customRegistries value to set + * @return the RunInner object itself. + */ + public RunInner withCustomRegistries(List customRegistries) { + this.customRegistries = customRegistries; + return this; + } + + /** + * Get the error message received from backend systems after the run is scheduled. + * + * @return the runErrorMessage value + */ + public String runErrorMessage() { + return this.runErrorMessage; + } + /** * Get the provisioning state of a run. Possible values include: 'Creating', 'Updating', 'Deleting', 'Succeeded', 'Failed', 'Canceled'. * @@ -423,4 +472,24 @@ public RunInner withProvisioningState(ProvisioningState provisioningState) { return this; } + /** + * Get the value that indicates whether archiving is enabled or not. + * + * @return the isArchiveEnabled value + */ + public Boolean isArchiveEnabled() { + return this.isArchiveEnabled; + } + + /** + * Set the value that indicates whether archiving is enabled or not. + * + * @param isArchiveEnabled the isArchiveEnabled value to set + * @return the RunInner object itself. + */ + public RunInner withIsArchiveEnabled(Boolean isArchiveEnabled) { + this.isArchiveEnabled = isArchiveEnabled; + return this; + } + } diff --git a/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/implementation/RunsImpl.java b/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/implementation/RunsImpl.java index 6526a261434d8..5fd9424d8ef3a 100644 --- a/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/implementation/RunsImpl.java +++ b/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/implementation/RunsImpl.java @@ -74,10 +74,14 @@ public Run call(RunInner inner) { public Observable getAsync(String resourceGroupName, String registryName, String runId) { RunsInner client = this.inner(); return client.getAsync(resourceGroupName, registryName, runId) - .map(new Func1() { + .flatMap(new Func1>() { @Override - public Run call(RunInner inner) { - return wrapModel(inner); + public Observable call(RunInner inner) { + if (inner == null) { + return Observable.empty(); + } else { + return Observable.just((Run)wrapModel(inner)); + } } }); } diff --git a/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/implementation/TaskImpl.java b/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/implementation/TaskImpl.java index 8be39a27a7adc..68b33e8f0f91b 100644 --- a/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/implementation/TaskImpl.java +++ b/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/implementation/TaskImpl.java @@ -20,6 +20,7 @@ import com.microsoft.azure.management.containerregistry.v2018_09_01.AgentProperties; import com.microsoft.azure.management.containerregistry.v2018_09_01.TaskStepProperties; import com.microsoft.azure.management.containerregistry.v2018_09_01.TriggerProperties; +import com.microsoft.azure.management.containerregistry.v2018_09_01.Credentials; import com.microsoft.azure.management.containerregistry.v2018_09_01.PlatformUpdateParameters; import com.microsoft.azure.management.containerregistry.v2018_09_01.TaskStepUpdateParameters; import com.microsoft.azure.management.containerregistry.v2018_09_01.TriggerUpdateParameters; @@ -112,6 +113,11 @@ public DateTime creationDate() { return this.inner().creationDate(); } + @Override + public Credentials credentials() { + return this.inner().credentials(); + } + @Override public String id() { return this.inner().id(); @@ -226,6 +232,16 @@ public TaskImpl withAgentConfiguration(AgentProperties agentConfiguration) { return this; } + @Override + public TaskImpl withCredentials(Credentials credentials) { + if (isInCreateMode()) { + this.inner().withCredentials(credentials); + } else { + this.updateParameter.withCredentials(credentials); + } + return this; + } + @Override public TaskImpl withStatus(TaskStatus status) { if (isInCreateMode()) { diff --git a/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/implementation/TaskInner.java b/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/implementation/TaskInner.java index a8ed57f81df90..9440f15c938c5 100644 --- a/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/implementation/TaskInner.java +++ b/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/implementation/TaskInner.java @@ -15,13 +15,14 @@ import com.microsoft.azure.management.containerregistry.v2018_09_01.AgentProperties; import com.microsoft.azure.management.containerregistry.v2018_09_01.TaskStepProperties; import com.microsoft.azure.management.containerregistry.v2018_09_01.TriggerProperties; +import com.microsoft.azure.management.containerregistry.v2018_09_01.Credentials; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; import com.microsoft.azure.Resource; /** * 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. */ @JsonFlatten public class TaskInner extends Resource { @@ -75,6 +76,13 @@ public class TaskInner extends Resource { @JsonProperty(value = "properties.trigger") private TriggerProperties trigger; + /** + * The properties that describes a set of credentials that will be used + * when this run is invoked. + */ + @JsonProperty(value = "properties.credentials") + private Credentials credentials; + /** * Get the provisioning state of the task. Possible values include: 'Creating', 'Updating', 'Deleting', 'Succeeded', 'Failed', 'Canceled'. * @@ -213,4 +221,24 @@ public TaskInner withTrigger(TriggerProperties trigger) { 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 TaskInner object itself. + */ + public TaskInner withCredentials(Credentials credentials) { + this.credentials = credentials; + return this; + } + } diff --git a/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/implementation/TasksImpl.java b/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/implementation/TasksImpl.java index 4389897eb8028..32b5bd22ff4fc 100644 --- a/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/implementation/TasksImpl.java +++ b/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/implementation/TasksImpl.java @@ -76,10 +76,14 @@ public Task call(TaskInner inner) { public Observable getAsync(String resourceGroupName, String registryName, String taskName) { TasksInner client = this.inner(); return client.getAsync(resourceGroupName, registryName, taskName) - .map(new Func1() { + .flatMap(new Func1>() { @Override - public Task call(TaskInner inner) { - return wrapModel(inner); + public Observable call(TaskInner inner) { + if (inner == null) { + return Observable.empty(); + } else { + return Observable.just((Task)wrapModel(inner)); + } } }); } diff --git a/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/implementation/WebhooksImpl.java b/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/implementation/WebhooksImpl.java index 3a6ff2fc9630b..0af9abc436ffe 100644 --- a/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/implementation/WebhooksImpl.java +++ b/sdk/containerregistry/mgmt-v2018_09_01/src/main/java/com/microsoft/azure/management/containerregistry/v2018_09_01/implementation/WebhooksImpl.java @@ -109,10 +109,14 @@ public Webhook call(WebhookInner inner) { public Observable getAsync(String resourceGroupName, String registryName, String webhookName) { WebhooksInner client = this.inner(); return client.getAsync(resourceGroupName, registryName, webhookName) - .map(new Func1() { + .flatMap(new Func1>() { @Override - public Webhook call(WebhookInner inner) { - return wrapModel(inner); + public Observable call(WebhookInner inner) { + if (inner == null) { + return Observable.empty(); + } else { + return Observable.just((Webhook)wrapModel(inner)); + } } }); }