Skip to content

Commit

Permalink
Generated from 7d2328671276d7a90769184f8cf6d10b968c736f
Browse files Browse the repository at this point in the history 
Revert "Fix Parameter Description for validate resource move (#8524)"

This reverts commit cb0a81fefacc56fca338e3a2658a9390b305fa61.
  • Loading branch information
SDK Automation committed Jun 1, 2020
1 parent f43374d commit 8661dca
Show file tree
Hide file tree
Showing 11 changed files with 154 additions and 68 deletions.
12 changes: 7 additions & 5 deletions sdk/policy/mgmt-v2018_03_01/pom.xml
View file
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>
<relativePath>../../parents/azure-arm-parent</relativePath>
<version>1.1.0</version>
<relativePath>../../../pom.management.xml</relativePath>
</parent>
<artifactId>azure-mgmt-policy</artifactId>
<version>1.0.0-beta</version>
<packaging>jar</packaging>
<name>Microsoft Azure SDK for Authorization Management</name>
<description>This package contains Microsoft Authorization 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
2 changes: 1 addition & 1 deletion ..._03_01/src/main/java/com/microsoft/azure/management/policy/v2018_03_01/ErrorResponse.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import com.fasterxml.jackson.annotation.JsonProperty;

/**
* Error reponse indicates Azure Resource Manager is not able to process the
* Error response indicates Azure Resource Manager is not able to process the
* incoming request. The reason is provided in the error message.
*/
public class ErrorResponse {
Expand Down
34 changes: 34 additions & 0 deletions ..._01/src/main/java/com/microsoft/azure/management/policy/v2018_03_01/PolicyAssignment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,8 @@ interface Blank extends WithScope {
interface WithScope {
/**
* Specifies scope.
* @param scope The scope of the policy assignment. Valid scopes are: management group (format: '/providers/Microsoft.Management/managementGroups/{managementGroup}'), subscription (format: '/subscriptions/{subscriptionId}'), resource group (format: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}', or resource (format: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/[{parentResourcePath}/]{resourceType}/{resourceName}'
* @return the next definition stage
*/
WithCreate withScope(String scope);
}
Expand All @@ -110,6 +112,8 @@ interface WithScope {
interface WithDescription {
/**
* Specifies description.
* @param description This message will be part of response in case of policy violation
* @return the next definition stage
*/
WithCreate withDescription(String description);
}
Expand All @@ -120,6 +124,8 @@ interface WithDescription {
interface WithDisplayName {
/**
* Specifies displayName.
* @param displayName The display name of the policy assignment
* @return the next definition stage
*/
WithCreate withDisplayName(String displayName);
}
Expand All @@ -130,6 +136,8 @@ interface WithDisplayName {
interface WithMetadata {
/**
* Specifies metadata.
* @param metadata The policy assignment metadata
* @return the next definition stage
*/
WithCreate withMetadata(Object metadata);
}
Expand All @@ -140,6 +148,8 @@ interface WithMetadata {
interface WithNotScopes {
/**
* Specifies notScopes.
* @param notScopes The policy's excluded scopes
* @return the next definition stage
*/
WithCreate withNotScopes(List<String> notScopes);
}
Expand All @@ -150,6 +160,8 @@ interface WithNotScopes {
interface WithParameters {
/**
* Specifies parameters.
* @param parameters Required if a parameter is used in policy rule
* @return the next definition stage
*/
WithCreate withParameters(Object parameters);
}
Expand All @@ -160,6 +172,8 @@ interface WithParameters {
interface WithPolicyDefinitionId {
/**
* Specifies policyDefinitionId.
* @param policyDefinitionId The ID of the policy definition or policy set definition being assigned
* @return the next definition stage
*/
WithCreate withPolicyDefinitionId(String policyDefinitionId);
}
Expand All @@ -170,6 +184,8 @@ interface WithPolicyDefinitionId {
interface WithScopeProperty {
/**
* Specifies scopeProperty.
* @param scopeProperty The scope for the policy assignment
* @return the next definition stage
*/
WithCreate withScopeProperty(String scopeProperty);
}
Expand All @@ -180,6 +196,8 @@ interface WithScopeProperty {
interface WithSku {
/**
* Specifies sku.
* @param sku The policy sku. This property is optional, obsolete, and will be ignored
* @return the next definition stage
*/
WithCreate withSku(PolicySku sku);
}
Expand Down Expand Up @@ -208,6 +226,8 @@ interface UpdateStages {
interface WithDescription {
/**
* Specifies description.
* @param description This message will be part of response in case of policy violation
* @return the next update stage
*/
Update withDescription(String description);
}
Expand All @@ -218,6 +238,8 @@ interface WithDescription {
interface WithDisplayName {
/**
* Specifies displayName.
* @param displayName The display name of the policy assignment
* @return the next update stage
*/
Update withDisplayName(String displayName);
}
Expand All @@ -228,6 +250,8 @@ interface WithDisplayName {
interface WithMetadata {
/**
* Specifies metadata.
* @param metadata The policy assignment metadata
* @return the next update stage
*/
Update withMetadata(Object metadata);
}
Expand All @@ -238,6 +262,8 @@ interface WithMetadata {
interface WithNotScopes {
/**
* Specifies notScopes.
* @param notScopes The policy's excluded scopes
* @return the next update stage
*/
Update withNotScopes(List<String> notScopes);
}
Expand All @@ -248,6 +274,8 @@ interface WithNotScopes {
interface WithParameters {
/**
* Specifies parameters.
* @param parameters Required if a parameter is used in policy rule
* @return the next update stage
*/
Update withParameters(Object parameters);
}
Expand All @@ -258,6 +286,8 @@ interface WithParameters {
interface WithPolicyDefinitionId {
/**
* Specifies policyDefinitionId.
* @param policyDefinitionId The ID of the policy definition or policy set definition being assigned
* @return the next update stage
*/
Update withPolicyDefinitionId(String policyDefinitionId);
}
Expand All @@ -268,6 +298,8 @@ interface WithPolicyDefinitionId {
interface WithScopeProperty {
/**
* Specifies scopeProperty.
* @param scopeProperty The scope for the policy assignment
* @return the next update stage
*/
Update withScopeProperty(String scopeProperty);
}
Expand All @@ -278,6 +310,8 @@ interface WithScopeProperty {
interface WithSku {
/**
* Specifies sku.
* @param sku The policy sku. This property is optional, obsolete, and will be ignored
* @return the next update stage
*/
Update withSku(PolicySku sku);
}
Expand Down
2 changes: 1 addition & 1 deletion ...01/src/main/java/com/microsoft/azure/management/policy/v2018_03_01/PolicyAssignments.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public interface PolicyAssignments extends SupportsCreating<PolicyAssignment.Def

/**
* Retrieves all policy assignments that apply to a resource.
* This operation retrieves the list of all policy assignments associated with the specified resource in the given resource group and subscription that match the optional given $filter. Valid values for $filter are: 'atScope()' or 'policyDefinitionId eq '{value}''. If $filter is not provided, the unfiltered list includes all policy assignments associated with the resource, including those that apply directly or from all containing scopes, as well as any applied to resources contained within the resource. If $filter=atScope() is provided, the returned list includes all policy assignments that apply to the resource, which is everything in the unfiltered list except those applied to resources contained within the resource. If $filter=policyDefinitionId eq '{value}' is provided, the returned list includes only policy assignments that apply to the resource and assign the policy definition whose id is {value}. Three parameters plus the resource name are used to identify a specific resource. If the resource is not part of a parent resource (the more common case), the parent resource path should not be provided (or provided as ''). For example a web app could be specified as ({resourceProviderNamespace} == 'Microsoft.Web', {parentResourcePath} == '', {resourceType} == 'sites', {resourceName} == 'MyWebApp'). If the resource is part of a parent resource, then all parameters should be provided. For example a virtual machine DNS name could be specified as ({resourceProviderNamespace} == 'Microsoft.Compute', {parentResourcePath} == 'virtualMachines/MyVirtualMachine', {resourceType} == 'domainNames', {resourceName} == 'MyComputerName'). A convenient alternative to providing the namespace and type name separately is to provide both in the {resourceType} parameter, format: ({resourceProviderNamespace} == '', {parentResourcePath} == '', {resourceType} == 'Microsoft.Web/sites', {resourceName} == 'MyWebApp').
* This operation retrieves the list of all policy assignments associated with the specified resource in the given resource group and subscription that match the optional given $filter. Valid values for $filter are: 'atScope()' or 'policyDefinitionId eq '{value}''. If $filter is not provided, the unfiltered list includes all policy assignments associated with the resource, including those that apply directly or from all containing scopes, as well as any applied to resources contained within the resource. If $filter=atScope() is provided, the returned list includes all policy assignments that apply to the resource, which is everything in the unfiltered list except those applied to resources contained within the resource. If $filter=policyDefinitionId eq '{value}' is provided, the returned list includes all policy assignments of the policy definition whose id is {value} that apply to the resource. Three parameters plus the resource name are used to identify a specific resource. If the resource is not part of a parent resource (the more common case), the parent resource path should not be provided (or provided as ''). For example a web app could be specified as ({resourceProviderNamespace} == 'Microsoft.Web', {parentResourcePath} == '', {resourceType} == 'sites', {resourceName} == 'MyWebApp'). If the resource is part of a parent resource, then all parameters should be provided. For example a virtual machine DNS name could be specified as ({resourceProviderNamespace} == 'Microsoft.Compute', {parentResourcePath} == 'virtualMachines/MyVirtualMachine', {resourceType} == 'domainNames', {resourceName} == 'MyComputerName'). A convenient alternative to providing the namespace and type name separately is to provide both in the {resourceType} parameter, format: ({resourceProviderNamespace} == '', {parentResourcePath} == '', {resourceType} == 'Microsoft.Web/sites', {resourceName} == 'MyWebApp').
*
* @param resourceGroupName The name of the resource group containing the resource.
* @param resourceProviderNamespace The namespace of the resource provider. For example, the namespace of a virtual machine is Microsoft.Compute (from Microsoft.Compute/virtualMachines)
Expand Down
28 changes: 28 additions & 0 deletions ..._01/src/main/java/com/microsoft/azure/management/policy/v2018_03_01/PolicyDefinition.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,8 @@ interface Blank extends WithCreate {
interface WithDescription {
/**
* Specifies description.
* @param description The policy definition description
* @return the next definition stage
*/
WithCreate withDescription(String description);
}
Expand All @@ -104,6 +106,8 @@ interface WithDescription {
interface WithDisplayName {
/**
* Specifies displayName.
* @param displayName The display name of the policy definition
* @return the next definition stage
*/
WithCreate withDisplayName(String displayName);
}
Expand All @@ -114,6 +118,8 @@ interface WithDisplayName {
interface WithMetadata {
/**
* Specifies metadata.
* @param metadata The policy definition metadata
* @return the next definition stage
*/
WithCreate withMetadata(Object metadata);
}
Expand All @@ -124,6 +130,8 @@ interface WithMetadata {
interface WithMode {
/**
* Specifies mode.
* @param mode The policy definition mode. Possible values are NotSpecified, Indexed, and All. Possible values include: 'NotSpecified', 'Indexed', 'All'
* @return the next definition stage
*/
WithCreate withMode(PolicyMode mode);
}
Expand All @@ -134,6 +142,8 @@ interface WithMode {
interface WithParameters {
/**
* Specifies parameters.
* @param parameters Required if a parameter is used in policy rule
* @return the next definition stage
*/
WithCreate withParameters(Object parameters);
}
Expand All @@ -144,6 +154,8 @@ interface WithParameters {
interface WithPolicyRule {
/**
* Specifies policyRule.
* @param policyRule The policy rule
* @return the next definition stage
*/
WithCreate withPolicyRule(Object policyRule);
}
Expand All @@ -154,6 +166,8 @@ interface WithPolicyRule {
interface WithPolicyType {
/**
* Specifies policyType.
* @param policyType The type of policy definition. Possible values are NotSpecified, BuiltIn, and Custom. Possible values include: 'NotSpecified', 'BuiltIn', 'Custom'
* @return the next definition stage
*/
WithCreate withPolicyType(PolicyType policyType);
}
Expand Down Expand Up @@ -182,6 +196,8 @@ interface UpdateStages {
interface WithDescription {
/**
* Specifies description.
* @param description The policy definition description
* @return the next update stage
*/
Update withDescription(String description);
}
Expand All @@ -192,6 +208,8 @@ interface WithDescription {
interface WithDisplayName {
/**
* Specifies displayName.
* @param displayName The display name of the policy definition
* @return the next update stage
*/
Update withDisplayName(String displayName);
}
Expand All @@ -202,6 +220,8 @@ interface WithDisplayName {
interface WithMetadata {
/**
* Specifies metadata.
* @param metadata The policy definition metadata
* @return the next update stage
*/
Update withMetadata(Object metadata);
}
Expand All @@ -212,6 +232,8 @@ interface WithMetadata {
interface WithMode {
/**
* Specifies mode.
* @param mode The policy definition mode. Possible values are NotSpecified, Indexed, and All. Possible values include: 'NotSpecified', 'Indexed', 'All'
* @return the next update stage
*/
Update withMode(PolicyMode mode);
}
Expand All @@ -222,6 +244,8 @@ interface WithMode {
interface WithParameters {
/**
* Specifies parameters.
* @param parameters Required if a parameter is used in policy rule
* @return the next update stage
*/
Update withParameters(Object parameters);
}
Expand All @@ -232,6 +256,8 @@ interface WithParameters {
interface WithPolicyRule {
/**
* Specifies policyRule.
* @param policyRule The policy rule
* @return the next update stage
*/
Update withPolicyRule(Object policyRule);
}
Expand All @@ -242,6 +268,8 @@ interface WithPolicyRule {
interface WithPolicyType {
/**
* Specifies policyType.
* @param policyType The type of policy definition. Possible values are NotSpecified, BuiltIn, and Custom. Possible values include: 'NotSpecified', 'BuiltIn', 'Custom'
* @return the next update stage
*/
Update withPolicyType(PolicyType policyType);
}
Expand Down
Loading

0 comments on commit 8661dca

Please sign in to comment.