fix test cases

Author: VeryEarly

src/Resources/Policy.Autorest/custom/New-AzPolicyAssignment.ps1

@@ -71,22 +71,13 @@ param(
 
     [Parameter(ParameterSetName='ParameterObject', ValueFromPipeline)]
     [Parameter(ParameterSetName='ParameterString', ValueFromPipeline)]
-    [Parameter(ParameterSetName='PolicyDefinition', Mandatory, ValueFromPipelineByPropertyName)]
+    [Parameter(ParameterSetName='PolicyDefinitionOrPolicySetDefinition', Mandatory, ValueFromPipeline)]
     [Microsoft.Azure.PowerShell.Cmdlets.Policy.Category('Body')]
-    [Microsoft.Azure.PowerShell.Cmdlets.Policy.Runtime.Info(PossibleTypes=([Microsoft.Azure.PowerShell.Cmdlets.Policy.Models.IPolicyDefinition]))]
     [PSCustomObject]
-    # The ID of the policy definition being assigned.
+    [Alias('PolicySetDefinition')]
+    # Accept policy definition or policy set definition object
     ${PolicyDefinition},
 
-    [Parameter(ParameterSetName='ParameterObject', ValueFromPipeline)]
-    [Parameter(ParameterSetName='ParameterString', ValueFromPipeline)]
-    [Parameter(ParameterSetName='PolicySetDefinition', Mandatory, ValueFromPipeline)]
-    [Microsoft.Azure.PowerShell.Cmdlets.Policy.Category('Body')]
-    [Microsoft.Azure.PowerShell.Cmdlets.Policy.Runtime.Info(PossibleTypes=([Microsoft.Azure.PowerShell.Cmdlets.Policy.Models.IPolicySetDefinition]))]
-    [PSCustomObject]
-    # The ID of the policy set definition being assigned.
-    ${PolicySetDefinition},
-
     [Parameter(ParameterSetName='ParameterObject', Mandatory)]
     [ValidateNotNullOrEmpty()]
     [Microsoft.Azure.PowerShell.Cmdlets.Policy.Category('Body')]
@@ -157,15 +148,6 @@ param(
     # Causes cmdlet to return artifacts using legacy format placing policy-specific properties in a property bag object.
     ${BackwardCompatible} = $false,
 
-    # This parameter is generated by autorest, but not yet supported. Fully implementing it is beyond the scope of
-    # the initial port to autorest: we are hiding this for now and will implement it in a future PR.
-    [Parameter(DontShow)]
-    [Microsoft.Azure.PowerShell.Cmdlets.Policy.Category('Path')]
-    [Microsoft.Azure.PowerShell.Cmdlets.Policy.Models.IPolicyIdentity]
-    # Identity Parameter
-    # To construct, see NOTES section for INPUTOBJECT properties and create a hash table.
-    ${InputObject},
-
     [Parameter()]
     [Alias('AzureRMContext', 'AzureCredential')]
     [ValidateNotNull()]
@@ -306,10 +288,6 @@ process {
     }
 
     $calledParameters = $PSBoundParameters
-    if ($_ -or $InputObject) {
-        $calledParameters = @{}
-    }
-
     # convert input parameter to generated parameter and remove
     if ($Name) {
         $calledParameters.Name = $Name
@@ -322,20 +300,12 @@ process {
     $calledParameters.Scope = $Scope
 
     # route the input policy id to the correct place
-    if ($PolicyDefinition) {
+    if ($CalledParameters.ContainsKey('PolicyDefinition')) {
         $calledParameters.PolicyDefinitionId = $PolicyDefinition.Id
         $null = $calledParameters.Remove('PolicyDefinition')
     }
-    elseif ($PolicySetDefinition) {
-        $calledParameters.PolicyDefinitionId = $PolicySetDefinition.Id
-        $null = $calledParameters.Remove('PolicySetDefinition')
-    }
-    elseif ($InputObject)
-    {
-        $calledParameters.PolicyDefinitionId = $InputObject.Id
-    }
     else {
-        throw 'One of -PolicyDefinition or -PolicySetDefinition must be provided.'
+        throw 'One of PolicyDefinition or PolicySetDefinition must be provided.'
     }
 
     # client side parameter validation

src/Resources/Policy.Autorest/docs/New-AzPolicyAssignment.md

@@ -26,34 +26,26 @@ New-AzPolicyAssignment -Name <String> -PolicyParameterObject <Hashtable> [-Scope
  [-BackwardCompatible] [-Description <String>] [-DisplayName <String>] [-EnforcementMode <String>]
  [-IdentityId <String>] [-IdentityType <String>] [-Location <String>] [-Metadata <String>]
  [-NonComplianceMessage <PSObject[]>] [-NotScope <String[]>] [-PolicyDefinition <PSObject>]
- [-PolicySetDefinition <PSObject>] [-DefaultProfile <PSObject>] [-Confirm] [-WhatIf] [<CommonParameters>]
+ [-DefaultProfile <PSObject>] [-Confirm] [-WhatIf] [<CommonParameters>]
 ```
 
 ### ParameterString
 ```
 New-AzPolicyAssignment -Name <String> -PolicyParameter <String> [-Scope <String>] [-BackwardCompatible]
  [-Description <String>] [-DisplayName <String>] [-EnforcementMode <String>] [-IdentityId <String>]
  [-IdentityType <String>] [-Location <String>] [-Metadata <String>] [-NonComplianceMessage <PSObject[]>]
- [-NotScope <String[]>] [-PolicyDefinition <PSObject>] [-PolicySetDefinition <PSObject>]
- [-DefaultProfile <PSObject>] [-Confirm] [-WhatIf] [<CommonParameters>]
+ [-NotScope <String[]>] [-PolicyDefinition <PSObject>] [-DefaultProfile <PSObject>] [-Confirm] [-WhatIf]
+ [<CommonParameters>]
 ```
 
-### PolicyDefinition
+### PolicyDefinitionOrPolicySetDefinition
 ```
 New-AzPolicyAssignment -Name <String> -PolicyDefinition <PSObject> [-Scope <String>] [-BackwardCompatible]
  [-Description <String>] [-DisplayName <String>] [-EnforcementMode <String>] [-IdentityId <String>]
  [-IdentityType <String>] [-Location <String>] [-Metadata <String>] [-NonComplianceMessage <PSObject[]>]
  [-NotScope <String[]>] [-DefaultProfile <PSObject>] [-Confirm] [-WhatIf] [<CommonParameters>]
 ```
 
-### PolicySetDefinition
-```
-New-AzPolicyAssignment -Name <String> -PolicySetDefinition <PSObject> [-Scope <String>] [-BackwardCompatible]
- [-Description <String>] [-DisplayName <String>] [-EnforcementMode <String>] [-IdentityId <String>]
- [-IdentityType <String>] [-Location <String>] [-Metadata <String>] [-NonComplianceMessage <PSObject[]>]
- [-NotScope <String[]>] [-DefaultProfile <PSObject>] [-Confirm] [-WhatIf] [<CommonParameters>]
-```
-
 ## DESCRIPTION
 The **New-AzPolicyAssignment** cmdlet creates or updates a policy assignment with the given scope and name.
 Policy assignments apply to all resources contained within their scope.
@@ -403,17 +395,17 @@ Accept wildcard characters: False
 ```
 
 ### -PolicyDefinition
-The ID of the policy definition being assigned.
+Accept policy definition or policy set definition object
 
 ```yaml
 Type: System.Management.Automation.PSObject
-Parameter Sets: ParameterObject, ParameterString, PolicyDefinition
-Aliases:
+Parameter Sets: ParameterObject, ParameterString, PolicyDefinitionOrPolicySetDefinition
+Aliases: PolicySetDefinition
 
 Required: True
 Position: Named
 Default value: None
-Accept pipeline input: True (ByValue, ByPropertyName)
+Accept pipeline input: True (ByValue)
 Accept wildcard characters: False
 ```
 
@@ -449,21 +441,6 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -PolicySetDefinition
-The ID of the policy set definition being assigned.
-
-```yaml
-Type: System.Management.Automation.PSObject
-Parameter Sets: ParameterObject, ParameterString, PolicySetDefinition
-Aliases:
-
-Required: True
-Position: Named
-Default value: None
-Accept pipeline input: True (ByValue)
-Accept wildcard characters: False
-```
-
 ### -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}'

src/Resources/Policy.Autorest/test/Backcompat/PolicyAssignmentUserAssignedIdentity.Tests.ps1

@@ -1,7 +1,7 @@
 # setup the Pester environment for policy backcompat tests
 . (Join-Path $PSScriptRoot 'Common.ps1') 'Backcompat-PolicyAssignmentUserAssignedIdentity'
 
-Describe 'Backcompat-PolicyAssignmentUserAssignedIdentity' -Tag 'LiveOnly' {
+Describe 'Backcompat-PolicyAssignmentUserAssignedIdentity' {
 
     BeforeAll {
         # setup
@@ -11,12 +11,10 @@ Describe 'Backcompat-PolicyAssignmentUserAssignedIdentity' -Tag 'LiveOnly' {
         $testPA = Get-ResourceName
         $test2 = Get-ResourceName
         $location = "westus"
-        $userassignedidentityname = "test-user-msi"
-    
+        
         # make a new resource group and policy definition
         $policy = New-AzPolicyDefinition -Name $policyName -Policy "$testFilesFolder\SamplePolicyDefinition.json" -Description $description -BackwardCompatible
-        $userassignedidentity = New-AzUserAssignedIdentity -ResourceGroupName $rgName -Name $userassignedidentityname -Location $location
-        $userassignedidentityid = $userassignedidentity.Id
+        $userassignedidentityid = $env.userassignedidentityId
         # assign the policy definition with user MSI to the resource group
         $actual = New-AzPolicyAssignment -Name $testPA -PolicyDefinition $policy -Scope $rgScope -Description $description -IdentityType "UserAssigned" -IdentityId $userassignedidentityid -Location $location -BackwardCompatible
     }
@@ -104,9 +102,6 @@ Describe 'Backcompat-PolicyAssignmentUserAssignedIdentity' -Tag 'LiveOnly' {
         # clean up
         $remove = Remove-AzPolicyAssignment -Name $testPA -Scope $rgScope -BackwardCompatible
         $remove = (Remove-AzPolicyAssignment -Name $test2 -Scope $rgScope -BackwardCompatible) -and $remove
-
-        Remove-AzUserAssignedIdentity -ResourceGroupName $rgName -Name $userassignedidentityname
-
         $remove = (Remove-AzPolicyDefinition -Name $policyName -Force -BackwardCompatible) -and $remove
         Assert-AreEqual True $remove
 

src/Resources/Policy.Autorest/test/Backcompat/PolicyObjectPiping.Tests.ps1

@@ -1,7 +1,7 @@
 # setup the Pester environment for policy backcompat tests
 . (Join-Path $PSScriptRoot 'Common.ps1') 'Backcompat-PolicyObjectPiping'
 
-Describe 'Backcompat-PolicyObjectPiping' -Tag 'LiveOnly' {
+Describe 'Backcompat-PolicyObjectPiping' {
 
     BeforeAll {
         # setup

src/Resources/Policy.Autorest/test/PolicyAssignmentUserAssignedIdentity.Tests.ps1

@@ -1,7 +1,7 @@
 # setup the Pester environment for policy tests
 . (Join-Path $PSScriptRoot 'Common.ps1') 'PolicyAssignmentUserAssignedIdentity'
 
-Describe 'PolicyAssignmentUserAssignedIdentity' -Tag 'LiveOnly' {
+Describe 'PolicyAssignmentUserAssignedIdentity' {
 
     BeforeAll {
         # setup
@@ -15,8 +15,7 @@ Describe 'PolicyAssignmentUserAssignedIdentity' -Tag 'LiveOnly' {
 
         # make a new resource group and policy definition
         $policy = New-AzPolicyDefinition -Name $policyName -Policy "$testFilesFolder\SamplePolicyDefinition.json" -Description $description
-        $userassignedidentity = New-AzUserAssignedIdentity -ResourceGroupName $rgName -Name $userassignedidentityname -Location $location
-        $userassignedidentityid = $userassignedidentity.Id
+        $userassignedidentityid = $env.userassignedidentityId
         # assign the policy definition with user MSI to the resource group
         $actual = New-AzPolicyAssignment -Name $testPA -PolicyDefinition $policy -Scope $rgScope -Description $description -IdentityType "UserAssigned" -IdentityId $userassignedidentityid -Location $location
     }
@@ -100,9 +99,6 @@ Describe 'PolicyAssignmentUserAssignedIdentity' -Tag 'LiveOnly' {
         # clean up
         $remove = Remove-AzPolicyAssignment -Name $testPA -Scope $rgScope -PassThru
         $remove = (Remove-AzPolicyAssignment -Name $test2 -Scope $rgScope -PassThru) -and $remove
-
-        Remove-AzUserAssignedIdentity -ResourceGroupName $rgName -Name $userassignedidentityname
-
         $remove = (Remove-AzPolicyDefinition -Name $policyName -Force -PassThru) -and $remove
         $remove | Should -Be $true
 

src/Resources/Policy.Autorest/test/PolicyObjectPiping.Tests.ps1

@@ -1,7 +1,7 @@
 # setup the Pester environment for policy tests
 . (Join-Path $PSScriptRoot 'Common.ps1') 'PolicyObjectPiping'
 
-Describe 'PolicyObjectPiping' -Tag 'LiveOnly' {
+Describe 'PolicyObjectPiping' {
 
     BeforeAll {
         # setup

src/Resources/Policy.Autorest/test/utils.ps1

@@ -258,6 +258,11 @@ function setupEnv() {
     $rg = New-ResourceGroup -Name $env.rgName -Location "west us"
     $env['rgScope'] = $rg.ResourceId
 
+    $env['userassignedidentityName'] = "test-user-msi"
+    $location = "westus"
+    $userassignedidentity = New-AzUserAssignedIdentity -ResourceGroupName $env.rgName -Name $env.userassignedidentityName -Location $location
+    $env['userassignedidentityId'] = $userassignedidentity.Id
+
     $env['managementGroup'] = 'AzGovPerfTest'
     $env['managementGroupScope'] = '/providers/Microsoft.Management/managementGroups/AzGovPerfTest'
     $env['description'] = 'Unit test junk: sorry for littering. Please delete me!'
@@ -328,5 +333,6 @@ function setupEnv() {
 }
 function cleanupEnv() {
     # Clean resources you create for testing
+    $null = Remove-AzUserAssignedIdentity -ResourceGroupName $env.rgName -Name $env.userassignedidentityName
     $null = Remove-ResourceGroup -Name $env.rgName
 }