Skip to content

Commit 3da0945

Browse files
committed
Fix policy issues
1 parent afbf176 commit 3da0945

File tree

6 files changed

+91
-80
lines changed

6 files changed

+91
-80
lines changed

src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Commands.Resources.Rest.csproj

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,8 @@
111111
<Compile Include="Entities\Locks\LockLevel.cs" />
112112
<Compile Include="Entities\Locks\LockProperties.cs" />
113113
<Compile Include="Entities\Operations\AzureAsyncOperationResource.cs" />
114+
<Compile Include="Entities\Policy\PolicyAssignment.cs" />
115+
<Compile Include="Entities\Policy\PolicyAssignmentProperties.cs" />
114116
<Compile Include="Entities\Policy\PolicyDefinition.cs" />
115117
<Compile Include="Entities\Policy\PolicyDefinitionProperties.cs" />
116118
<Compile Include="Entities\Policy\PolicyRule.cs" />
@@ -140,10 +142,15 @@
140142
<Compile Include="Implementation\InvokeAzureResourceActionCmdlet.cs" />
141143
<Compile Include="Implementation\MoveAzureResourceCmdlet.cs" />
142144
<Compile Include="Implementation\NewAzureResourceLockCmdlet.cs" />
145+
<Compile Include="Implementation\Policy\GetAzurePolicyAssignment.cs" />
143146
<Compile Include="Implementation\Policy\GetAzurePolicyDefinition.cs" />
147+
<Compile Include="Implementation\Policy\NewAzurePolicyAssignment.cs" />
144148
<Compile Include="Implementation\Policy\NewAzurePolicyDefinition.cs" />
149+
<Compile Include="Implementation\Policy\PolicyAssignmentCmdletBase.cs" />
145150
<Compile Include="Implementation\Policy\PolicyDefinitionCmdletBase.cs" />
151+
<Compile Include="Implementation\Policy\RemoveAzurePolicyAssignment.cs" />
146152
<Compile Include="Implementation\Policy\RemoveAzurePolicyDefinition.cs" />
153+
<Compile Include="Implementation\Policy\SetAzurePolicyAssignment.cs" />
147154
<Compile Include="Implementation\Policy\SetAzurePolicyDefinition.cs" />
148155
<Compile Include="Implementation\RemoveAzureResourceCmdlet.cs" />
149156
<Compile Include="Implementation\RemoveAzureResourceLockCmdlet.cs" />

src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Components/Constants.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,11 @@ public static class Constants
7474
/// </summary>
7575
public static readonly string MicrosoftAuthorizationPolicyDefinitionType = Constants.MicrosoftAuthorizationNamespace + "/policydefinitions";
7676

77+
/// <summary>
78+
/// The policy definition resource type.
79+
/// </summary>
80+
public static readonly string MicrosoftAuthorizationPolicyAssignmentType = Constants.MicrosoftAuthorizationNamespace + "/policyassignments";
81+
7782
/// <summary>
7883
/// The type name of the generic resource.
7984
/// </summary>

src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/Policy/GetAzurePolicyDefinition.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ private async Task<ResponseWithContinuation<JObject[]>> GetResources()
8989
.DetermineApiVersion(resourceId: resourceId)
9090
.ConfigureAwait(continueOnCapturedContext: false);
9191

92-
if (!string.IsNullOrEmpty(ResourceIdUtility.GetResourceGroupName(resourceId)))
92+
if (!string.IsNullOrEmpty(ResourceIdUtility.GetResourceName(resourceId)))
9393
{
9494
var resource = await this
9595
.GetResourcesClient()

src/ResourceManager/Resources/Commands.Resources.Test/Commands.Resources.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@
322322
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
323323
</None>
324324
<None Include="SessionRecords\Microsoft.Azure.Commands.Resources.Test.ScenarioTests.PolicyTests\TestPolicyDefinitionCRUD.json">
325-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
325+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
326326
</None>
327327
<None Include="SessionRecords\Microsoft.Azure.Commands.Resources.Test.ScenarioTests.ProviderFeatureTests\TestAzureProviderFeature.json">
328328
<CopyToOutputDirectory>Always</CopyToOutputDirectory>

0 commit comments

Comments
 (0)