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.

Sign up for GitHub

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

Updated Management.ResourceManager sdk models and tests for new api version. #7419

Merged
merged 11 commits into from
Sep 6, 2019
Merged

Updated Management.ResourceManager sdk models and tests for new api version. #7419

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f18f8b1
updated tests for new api version.
sandipsh Aug 28, 2019
abfbd6f
Merge remote-tracking branch 'upstream/master'
sandipsh Aug 28, 2019
099bcf9
Fixed merging of couple of models and a record file.
sandipsh Aug 29, 2019
0c1c2b6
minor: adjusted whitepacing
sandipsh Aug 29, 2019
45aa855
Fixed test.
sandipsh Aug 29, 2019
c151d0e
updated .csproj, .props and assembly info.
sandipsh Aug 29, 2019
6acd69f
reverting proj version to 2.4.0-preview as it is the latest.
sandipsh Sep 3, 2019
65113d7
updated generate.ps1 and resources_resource-manager.txt tracking file.
sandipsh Sep 4, 2019
5c2b55d
updated generate.ps1 as suggested.
sandipsh Sep 5, 2019
5d31065
updated generate.ps1 as suggested.
sandipsh Sep 5, 2019
20a3098
correct the line that needs to be commented out
isra-fel Sep 6, 2019
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
66 changes: 32 additions & 34 deletions ...sources/Microsoft.Azure.Management.Resource/src/Generated/IPolicyAssignmentsOperations.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,9 +156,9 @@ public partial interface IPolicyAssignmentsOperations
/// policy assignments that apply to the resource group, which is
/// everything in the unfiltered list except those applied to resources
/// contained within the resource group. If $filter=policyDefinitionId
/// eq '{value}' is provided, the returned list includes only policy
/// assignments that apply to the resource group and assign the policy
/// definition whose id is {value}.
/// eq '{value}' is provided, the returned list includes all policy
/// assignments of the policy definition whose id is {value} that apply
/// to the resource group.
/// </remarks>
/// <param name='resourceGroupName'>
/// The name of the resource group that contains policy assignments.
Expand Down Expand Up @@ -200,17 +200,17 @@ public partial interface IPolicyAssignmentsOperations
/// 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
/// 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} ==
Expand Down Expand Up @@ -273,9 +273,8 @@ public partial interface IPolicyAssignmentsOperations
/// policy assignments that apply to the subscription, which is
/// everything in the unfiltered list except those applied to objects
/// contained within the subscription. If $filter=policyDefinitionId eq
/// '{value}' is provided, the returned list includes only policy
/// assignments that apply to the subscription and assign the policy
/// definition whose id is {value}.
/// '{value}' is provided, the returned list includes all policy
/// assignments of the policy definition whose id is {value}.
/// </remarks>
/// <param name='odataQuery'>
/// OData parameters to apply to the operation.
Expand Down Expand Up @@ -424,9 +423,9 @@ public partial interface IPolicyAssignmentsOperations
/// policy assignments that apply to the resource group, which is
/// everything in the unfiltered list except those applied to resources
/// contained within the resource group. If $filter=policyDefinitionId
/// eq '{value}' is provided, the returned list includes only policy
/// assignments that apply to the resource group and assign the policy
/// definition whose id is {value}.
/// eq '{value}' is provided, the returned list includes all policy
/// assignments of the policy definition whose id is {value} that apply
/// to the resource group.
/// </remarks>
/// <param name='nextPageLink'>
/// The NextLink from the previous successful call to List operation.
Expand Down Expand Up @@ -463,17 +462,17 @@ public partial interface IPolicyAssignmentsOperations
/// 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
/// 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} ==
Expand Down Expand Up @@ -518,9 +517,8 @@ public partial interface IPolicyAssignmentsOperations
/// policy assignments that apply to the subscription, which is
/// everything in the unfiltered list except those applied to objects
/// contained within the subscription. If $filter=policyDefinitionId eq
/// '{value}' is provided, the returned list includes only policy
/// assignments that apply to the subscription and assign the policy
/// definition whose id is {value}.
/// '{value}' is provided, the returned list includes all policy
/// assignments of the policy definition whose id is {value}.
/// </remarks>
/// <param name='nextPageLink'>
/// The NextLink from the previous successful call to List operation.
Expand Down
29 changes: 29 additions & 0 deletions sdk/resources/Microsoft.Azure.Management.Resource/src/Generated/Models/EnforcementMode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
// <auto-generated>
// 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.
// Changes may cause incorrect behavior and will be lost if the code is
// regenerated.
// </auto-generated>

namespace Microsoft.Azure.Management.ResourceManager.Models
{

/// <summary>
/// Defines values for EnforcementMode.
/// </summary>
public static class EnforcementMode
{
/// <summary>
/// The policy effect is enforced during resource creation or update.
/// </summary>
public const string Default = "Default";
/// <summary>
/// The policy effect is not enforced during resource creation or
/// update.
/// </summary>
public const string DoNotEnforce = "DoNotEnforce";
}
}
14 changes: 13 additions & 1 deletion sdk/resources/Microsoft.Azure.Management.Resource/src/Generated/Models/PolicyAssignment.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@ public PolicyAssignment()
/// <param name="description">This message will be part of response in
/// case of policy violation.</param>
/// <param name="metadata">The policy assignment metadata.</param>
/// <param name="enforcementMode">The policy assignment enforcement
/// mode. Possible values are Default and DoNotEnforce. Possible values
/// include: 'Default', 'DoNotEnforce'</param>
/// <param name="id">The ID of the policy assignment.</param>
/// <param name="type">The type of the policy assignment.</param>
/// <param name="name">The name of the policy assignment.</param>
Expand All @@ -55,7 +58,7 @@ public PolicyAssignment()
/// required when utilizing managed identity.</param>
/// <param name="identity">The managed identity associated with the
/// policy assignment.</param>
public PolicyAssignment(string displayName = default(string), string policyDefinitionId = default(string), string scope = default(string), IList<string> notScopes = default(IList<string>), object parameters = default(object), string description = default(string), object metadata = default(object), string id = default(string), string type = default(string), string name = default(string), PolicySku sku = default(PolicySku), string location = default(string), Identity identity = default(Identity))
public PolicyAssignment(string displayName = default(string), string policyDefinitionId = default(string), string scope = default(string), IList<string> notScopes = default(IList<string>), object parameters = default(object), string description = default(string), object metadata = default(object), string enforcementMode = default(string), string id = default(string), string type = default(string), string name = default(string), PolicySku sku = default(PolicySku), string location = default(string), Identity identity = default(Identity))
{
DisplayName = displayName;
PolicyDefinitionId = policyDefinitionId;
Expand All @@ -64,6 +67,7 @@ public PolicyAssignment()
Parameters = parameters;
Description = description;
Metadata = metadata;
EnforcementMode = enforcementMode;
Id = id;
Type = type;
Name = name;
Expand Down Expand Up @@ -122,6 +126,14 @@ public PolicyAssignment()
[JsonProperty(PropertyName = "properties.metadata")]
public object Metadata { get; set; }

/// <summary>
/// Gets or sets the policy assignment enforcement mode. Possible
/// values are Default and DoNotEnforce. Possible values include:
/// 'Default', 'DoNotEnforce'
/// </summary>
[JsonProperty(PropertyName = "properties.enforcementMode")]
public string EnforcementMode { get; set; }

/// <summary>
/// Gets the ID of the policy assignment.
/// </summary>
Expand Down
10 changes: 4 additions & 6 deletions sdk/resources/Microsoft.Azure.Management.Resource/src/Generated/Models/PolicyDefinition.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,8 @@ public PolicyDefinition()
/// <param name="policyType">The type of policy definition. Possible
/// values are NotSpecified, BuiltIn, and Custom. Possible values
/// include: 'NotSpecified', 'BuiltIn', 'Custom'</param>
/// <param name="mode">The policy definition mode. Possible values are
/// NotSpecified, Indexed, and All. Possible values include:
/// 'NotSpecified', 'Indexed', 'All'</param>
/// <param name="mode">The policy definition mode. Some examples are
/// All, Indexed, Microsoft.KeyVault.Data.</param>
/// <param name="displayName">The display name of the policy
/// definition.</param>
/// <param name="description">The policy definition
Expand Down Expand Up @@ -80,9 +79,8 @@ public PolicyDefinition()
public string PolicyType { get; set; }

/// <summary>
/// Gets or sets the policy definition mode. Possible values are
/// NotSpecified, Indexed, and All. Possible values include:
/// 'NotSpecified', 'Indexed', 'All'
/// Gets or sets the policy definition mode. Some examples are All,
/// Indexed, Microsoft.KeyVault.Data.
/// </summary>
[JsonProperty(PropertyName = "properties.mode")]
public string Mode { get; set; }
Expand Down
42 changes: 20 additions & 22 deletions ...esources/Microsoft.Azure.Management.Resource/src/Generated/PolicyAssignmentsOperations.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -679,9 +679,8 @@ internal PolicyAssignmentsOperations(PolicyClient client)
/// includes all policy assignments that apply to the resource group, which is
/// everything in the unfiltered list except those applied to resources
/// contained within the resource group. If $filter=policyDefinitionId eq
/// '{value}' is provided, the returned list includes only policy assignments
/// that apply to the resource group and assign the policy definition whose id
/// is {value}.
/// '{value}' is provided, the returned list includes all policy assignments of
/// the policy definition whose id is {value} that apply to the resource group.
/// </remarks>
/// <param name='resourceGroupName'>
/// The name of the resource group that contains policy assignments.
Expand Down Expand Up @@ -902,12 +901,12 @@ internal PolicyAssignmentsOperations(PolicyClient client)
/// 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',
/// 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
Expand Down Expand Up @@ -1179,8 +1178,8 @@ internal PolicyAssignmentsOperations(PolicyClient client)
/// assignments that apply to the subscription, which is everything in the
/// unfiltered list except those applied to objects contained within the
/// subscription. If $filter=policyDefinitionId eq '{value}' is provided, the
/// returned list includes only policy assignments that apply to the
/// subscription and assign the policy definition whose id is {value}.
/// returned list includes all policy assignments of the policy definition
/// whose id is {value}.
/// </remarks>
/// <param name='odataQuery'>
/// OData parameters to apply to the operation.
Expand Down Expand Up @@ -1970,9 +1969,8 @@ internal PolicyAssignmentsOperations(PolicyClient client)
/// includes all policy assignments that apply to the resource group, which is
/// everything in the unfiltered list except those applied to resources
/// contained within the resource group. If $filter=policyDefinitionId eq
/// '{value}' is provided, the returned list includes only policy assignments
/// that apply to the resource group and assign the policy definition whose id
/// is {value}.
/// '{value}' is provided, the returned list includes all policy assignments of
/// the policy definition whose id is {value} that apply to the resource group.
/// </remarks>
/// <param name='nextPageLink'>
/// The NextLink from the previous successful call to List operation.
Expand Down Expand Up @@ -2154,12 +2152,12 @@ internal PolicyAssignmentsOperations(PolicyClient client)
/// 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',
/// 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
Expand Down Expand Up @@ -2351,8 +2349,8 @@ internal PolicyAssignmentsOperations(PolicyClient client)
/// assignments that apply to the subscription, which is everything in the
/// unfiltered list except those applied to objects contained within the
/// subscription. If $filter=policyDefinitionId eq '{value}' is provided, the
/// returned list includes only policy assignments that apply to the
/// subscription and assign the policy definition whose id is {value}.
/// returned list includes all policy assignments of the policy definition
/// whose id is {value}.
/// </remarks>
/// <param name='nextPageLink'>
/// The NextLink from the previous successful call to List operation.
Expand Down
Loading