Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[AutoPR sdk/resources/mgmt-v2018_02_01] [DeploymentScripts] Add error property to ScriptStatus object #387

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions sdk/resources/mgmt-v2018_02_01/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@
<parent>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-arm-parent</artifactId>
<version>1.2.0</version>
<version>1.1.0</version>
<relativePath>../../../pom.management.xml</relativePath>
</parent>
<artifactId>azure-mgmt-resources</artifactId>
<version>1.0.0-beta-1</version>
<version>1.0.0-beta</version>
<packaging>jar</packaging>
<name>Microsoft Azure SDK for Resources Management</name>
<description>This package contains Microsoft Resources Management SDK.</description>
<url>https://github.com/Azure/azure-libraries-for-java</url>
<url>https://github.com/Azure/azure-sdk-for-java</url>
<licenses>
<license>
<name>The MIT License (MIT)</name>
Expand All @@ -28,8 +28,8 @@
</license>
</licenses>
<scm>
<url>scm:git:https://github.com/Azure/azure-libraries-for-java</url>
<connection>scm:git:[email protected]:Azure/azure-libraries-for-java.git</connection>
<url>scm:git:https://github.com/Azure/azure-sdk-for-java</url>
<connection>scm:git:[email protected]:Azure/azure-sdk-for-java.git</connection>
<tag>HEAD</tag>
</scm>
<properties>
Expand Down Expand Up @@ -71,6 +71,8 @@
<artifactId>azure-arm-client-runtime</artifactId>
<type>test-jar</type>
<scope>test</scope>
<!--Below version for test jar needs to be removed, this will be done as part of v1-runtime 1.6.7-->
<version>1.6.5</version>
</dependency>
</dependencies>
<build>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@ interface Blank extends WithResourceGroupName {
interface WithResourceGroupName {
/**
* Specifies resourceGroupName.
* @param resourceGroupName The name of the resource group to deploy the resources to. The name is case insensitive. The resource group must already exist
* @return the next definition stage
*/
WithProperties withResourceGroupName(String resourceGroupName);
}
Expand All @@ -69,6 +71,8 @@ interface WithResourceGroupName {
interface WithProperties {
/**
* Specifies properties.
* @param properties The deployment properties
* @return the next definition stage
*/
WithCreate withProperties(DeploymentProperties properties);
}
Expand Down Expand Up @@ -97,6 +101,8 @@ interface UpdateStages {
interface WithProperties {
/**
* Specifies properties.
* @param properties The deployment properties
* @return the next update stage
*/
Update withProperties(DeploymentProperties properties);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public class DeploymentPropertiesExtended {
private DateTime timestamp;

/**
* Key/value pairs that represent deploymentoutput.
* Key/value pairs that represent deployment output.
*/
@JsonProperty(value = "outputs")
private Object outputs;
Expand Down Expand Up @@ -126,7 +126,7 @@ public DateTime timestamp() {
}

/**
* Get key/value pairs that represent deploymentoutput.
* Get key/value pairs that represent deployment output.
*
* @return the outputs value
*/
Expand All @@ -135,7 +135,7 @@ public Object outputs() {
}

/**
* Set key/value pairs that represent deploymentoutput.
* Set key/value pairs that represent deployment output.
*
* @param outputs the outputs value to set
* @return the DeploymentPropertiesExtended object itself.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public interface Deployments extends SupportsCreating<DeploymentExtended.Definit
* @throws IllegalArgumentException thrown if parameters fail the validation
* @return the observable for the request
*/
Completable checkExistenceAsync(String resourceGroupName, String deploymentName);
Observable<Boolean> checkExistenceAsync(String resourceGroupName, String deploymentName);

/**
* Cancels a currently running template deployment.
Expand Down Expand Up @@ -64,4 +64,13 @@ public interface Deployments extends SupportsCreating<DeploymentExtended.Definit
*/
Observable<DeploymentExportResult> exportTemplateAsync(String resourceGroupName, String deploymentName);

/**
* Calculate the hash of the given template.
*
* @param template The template provided to calculate hash.
* @throws IllegalArgumentException thrown if parameters fail the validation
* @return the observable for the request
*/
Observable<TemplateHashResult> calculateTemplateHashAsync(Object template);

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
/**
* 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.resources.v2018_02_01;

import com.fasterxml.jackson.annotation.JsonProperty;

/**
* The resource management error additional info.
*/
public class ErrorAdditionalInfo {
/**
* The additional info type.
*/
@JsonProperty(value = "type", access = JsonProperty.Access.WRITE_ONLY)
private String type;

/**
* The additional info.
*/
@JsonProperty(value = "info", access = JsonProperty.Access.WRITE_ONLY)
private Object info;

/**
* Get the additional info type.
*
* @return the type value
*/
public String type() {
return this.type;
}

/**
* Get the additional info.
*
* @return the info value
*/
public Object info() {
return this.info;
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
/**
* 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.resources.v2018_02_01;

import java.util.List;
import com.fasterxml.jackson.annotation.JsonProperty;

/**
* The resource management error response.
*/
public class ErrorResponse {
/**
* The error code.
*/
@JsonProperty(value = "code", access = JsonProperty.Access.WRITE_ONLY)
private String code;

/**
* The error message.
*/
@JsonProperty(value = "message", access = JsonProperty.Access.WRITE_ONLY)
private String message;

/**
* The error target.
*/
@JsonProperty(value = "target", access = JsonProperty.Access.WRITE_ONLY)
private String target;

/**
* The error details.
*/
@JsonProperty(value = "details", access = JsonProperty.Access.WRITE_ONLY)
private List<ErrorResponse> details;

/**
* The error additional info.
*/
@JsonProperty(value = "additionalInfo", access = JsonProperty.Access.WRITE_ONLY)
private List<ErrorAdditionalInfo> additionalInfo;

/**
* Get the error code.
*
* @return the code value
*/
public String code() {
return this.code;
}

/**
* Get the error message.
*
* @return the message value
*/
public String message() {
return this.message;
}

/**
* Get the error target.
*
* @return the target value
*/
public String target() {
return this.target;
}

/**
* Get the error details.
*
* @return the details value
*/
public List<ErrorResponse> details() {
return this.details;
}

/**
* Get the error additional info.
*
* @return the additionalInfo value
*/
public List<ErrorAdditionalInfo> additionalInfo() {
return this.additionalInfo;
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -16,23 +16,23 @@
*/
public class ExportTemplateRequest {
/**
* The IDs of the resources. The only supported string currently is '*'
* (all resources). Future updates will support exporting specific
* resources.
* The IDs of the resources to filter the export by. To export all
* resources, supply an array with single entry '*'.
*/
@JsonProperty(value = "resources")
private List<String> resources;

/**
* The export template options. Supported values include
* 'IncludeParameterDefaultValue', 'IncludeComments' or
* 'IncludeParameterDefaultValue, IncludeComments.
* The export template options. A CSV-formatted list containing zero or
* more of the following: 'IncludeParameterDefaultValue',
* 'IncludeComments', 'SkipResourceNameParameterization',
* 'SkipAllParameterization'.
*/
@JsonProperty(value = "options")
private String options;

/**
* Get the IDs of the resources. The only supported string currently is '*' (all resources). Future updates will support exporting specific resources.
* Get the IDs of the resources to filter the export by. To export all resources, supply an array with single entry '*'.
*
* @return the resources value
*/
Expand All @@ -41,7 +41,7 @@ public List<String> resources() {
}

/**
* Set the IDs of the resources. The only supported string currently is '*' (all resources). Future updates will support exporting specific resources.
* Set the IDs of the resources to filter the export by. To export all resources, supply an array with single entry '*'.
*
* @param resources the resources value to set
* @return the ExportTemplateRequest object itself.
Expand All @@ -52,7 +52,7 @@ public ExportTemplateRequest withResources(List<String> resources) {
}

/**
* Get the export template options. Supported values include 'IncludeParameterDefaultValue', 'IncludeComments' or 'IncludeParameterDefaultValue, IncludeComments.
* Get the export template options. A CSV-formatted list containing zero or more of the following: 'IncludeParameterDefaultValue', 'IncludeComments', 'SkipResourceNameParameterization', 'SkipAllParameterization'.
*
* @return the options value
*/
Expand All @@ -61,7 +61,7 @@ public String options() {
}

/**
* Set the export template options. Supported values include 'IncludeParameterDefaultValue', 'IncludeComments' or 'IncludeParameterDefaultValue, IncludeComments.
* Set the export template options. A CSV-formatted list containing zero or more of the following: 'IncludeParameterDefaultValue', 'IncludeComments', 'SkipResourceNameParameterization', 'SkipAllParameterization'.
*
* @param options the options value to set
* @return the ExportTemplateRequest object itself.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import com.fasterxml.jackson.annotation.JsonProperty;

/**
* Entity representing the reference to the deployment paramaters.
* Entity representing the reference to the deployment parameters.
*/
public class ParametersLink {
/**
Expand Down
Loading