Merge branch 'PetriAsi-issue#67-powershell7-compatibility' into develop

SnipeitPS/Private/Get-ParameterValue.ps1

@@ -21,23 +21,21 @@ function Get-ParameterValue {
     #  }
     [CmdletBinding()]
     param(
-        # The $MyInvocation for the caller -- DO NOT pass this (dot-source Get-ParameterValues instead)
-        $Invocation = $MyInvocation,
-        # The $PSBoundParameters for the caller -- DO NOT pass this (dot-source Get-ParameterValues instead)
-        $BoundParameters = $PSBoundParameters,
+        # Pass $MyInvocation.MyCommand.Parameters to function, powershell 7 seems to only populate variables with dot sourcing
+        [parameter(mandatory = $true)]
+        $Parameters
+        ,
 
         [string[]]$DefaultExcludeParameter = @("id", "url", "apiKey", 'Debug', 'Verbose')
     )
 
     if ($MyInvocation.Line[($MyInvocation.OffsetInLine - 1)] -ne '.') {
-        throw "Get-ParameterValues must be dot-sourced, like this: . Get-ParameterValues"
-    }
-    if ($PSBoundParameters.Count -gt 0) {
-        throw "You should not pass parameters to Get-ParameterValues, just dot-source it like this: . Get-ParameterValues"
+        throw "Get-ParameterValue must be dot-sourced, like this: . Get-ParameterValues"
     }
+    
 
     $ParameterValues = @{}
-    foreach ($parameter in $Invocation.MyCommand.Parameters.GetEnumerator()) {
+    foreach ($parameter in $Parameters.GetEnumerator()) {
         # gm -in $parameter.Value | Out-Default
         try {
             $key = $parameter.Key
@@ -48,9 +46,6 @@ function Get-ParameterValue {
                     }
                 }
 
-                if ($BoundParameters.ContainsKey($key)) {
-                    $ParameterValues[$key] = $BoundParameters[$key]
-                }
             }
         }
         finally {}

SnipeitPS/Public/Get-Accessory.ps1

@@ -60,7 +60,7 @@ function Get-Accessory() {
         [string]$apiKey
     )
 
-    $SearchParameter = . Get-ParameterValue
+    $SearchParameter = . Get-ParameterValue $MyInvocation.MyCommand.Parameters
 
     $Parameters = @{
         Uri           = "$url/api/v1/accessories"

SnipeitPS/Public/Get-Asset.ps1

@@ -118,7 +118,7 @@ function Get-Asset() {
         [string]$apiKey
     )
 
-    $SearchParameter = . Get-ParameterValue
+    $SearchParameter = . Get-ParameterValue $MyInvocation.MyCommand.Parameters
 
 
     $apiurl = "$url/api/v1/hardware"

SnipeitPS/Public/Get-AssetMaintenance.ps1

@@ -62,7 +62,7 @@ function Get-AssetMaintenance() {
         [string]$apiKey
     )
 
-    $SearchParameter = . Get-ParameterValue
+    $SearchParameter = . Get-ParameterValue $MyInvocation.MyCommand.Parameters
 
     $Parameters = @{
         Uri           = "$url/api/v1/maintenances"

SnipeitPS/Public/Get-Category.ps1

@@ -54,7 +54,7 @@ function Get-Category()
         [string]$apiKey
     )
 
-    $SearchParameter = . Get-ParameterValue
+    $SearchParameter = . Get-ParameterValue $MyInvocation.MyCommand.Parameters
     
     $apiurl = "$url/api/v1/categories"
 

SnipeitPS/Public/Get-Company.ps1

@@ -54,7 +54,7 @@ function Get-Company()
         [string]$apiKey
     )
 
-    $SearchParameter = . Get-ParameterValue
+    $SearchParameter = . Get-ParameterValue $MyInvocation.MyCommand.Parameters
 
     $apiurl = "$url/api/v1/companies"
 

SnipeitPS/Public/Get-Component.ps1

@@ -62,7 +62,7 @@ function Get-Component() {
         [string]$apiKey
     )
 
-    $SearchParameter = . Get-ParameterValue
+    $SearchParameter = . Get-ParameterValue $MyInvocation.MyCommand.Parameters
 
     $apiurl = "$url/api/v1/components"
 

SnipeitPS/Public/Get-Department.ps1

@@ -57,7 +57,7 @@ function Get-Department()
         [string]$apiKey
     )
 
-    $SearchParameter = . Get-ParameterValue
+    $SearchParameter = . Get-ParameterValue $MyInvocation.MyCommand.Parameters
     
     $apiurl = "$url/api/v1/departments"
 

SnipeitPS/Public/Get-License.ps1

@@ -79,7 +79,7 @@ function Get-License() {
         [string]$apiKey
     )
 
-    $SearchParameter = . Get-ParameterValue
+    $SearchParameter = . Get-ParameterValue $MyInvocation.MyCommand.Parameters
     
     $apiurl = "$url/api/v1/licenses"
 

SnipeitPS/Public/Get-Manufacturer.ps1

@@ -54,7 +54,7 @@ function Get-Manufacturer()
         [string]$apiKey
     )
 
-    $SearchParameter = . Get-ParameterValue
+    $SearchParameter = . Get-ParameterValue $MyInvocation.MyCommand.Parameters
 
     $apiurl = "$url/api/v1/manufacturers"
 

SnipeitPS/Public/Get-Model.ps1

@@ -54,7 +54,7 @@ function Get-Model()
         [string]$apiKey
     )
 
-    $SearchParameter = . Get-ParameterValue
+    $SearchParameter = . Get-ParameterValue $MyInvocation.MyCommand.Parameters
     
     $apiurl = "$url/api/v1/models"
 

SnipeitPS/Public/Get-SnipeitLocation.ps1

@@ -54,7 +54,7 @@ function Get-SnipeitLocation()
         [string]$apiKey
     )
 
-    $SearchParameter = . Get-ParameterValue
+    $SearchParameter = . Get-ParameterValue $MyInvocation.MyCommand.Parameters
 
     $apiurl = "$url/api/v1/locations"
 

SnipeitPS/Public/Get-Status.ps1

@@ -54,7 +54,7 @@ function Get-Status()
         [string]$apiKey
     )
 
-    $SearchParameter = . Get-ParameterValue
+    $SearchParameter = . Get-ParameterValue $MyInvocation.MyCommand.Parameters
     
     $apiurl = "$url/api/v1/statuslabels"
 

SnipeitPS/Public/Get-Supplier.ps1

@@ -54,7 +54,7 @@ function Get-Supplier()
         [string]$apiKey
     )
 
-    $SearchParameter = . Get-ParameterValue
+    $SearchParameter = . Get-ParameterValue $MyInvocation.MyCommand.Parameters
     
     $apiurl = "$url/api/v1/suppliers"
 

SnipeitPS/Public/Get-User.ps1

@@ -60,7 +60,7 @@ function Get-User() {
         [string]$apiKey
     )
 
-    $SearchParameter = . Get-ParameterValue
+    $SearchParameter = . Get-ParameterValue $MyInvocation.MyCommand.Parameters
     
     $apiurl = "$url/api/v1/users"
 

SnipeitPS/Public/New-Accessory.ps1

@@ -41,7 +41,7 @@ function New-Accessory() {
         [string]$apiKey
     )
 
-    $Values = . Get-ParameterValue
+    $Values = . Get-ParameterValue $MyInvocation.MyCommand.Parameters
 
     if ($values['purchase_date']) {
         $values['purchase_date'] = $values['purchase_date'].ToString("yyyy-MM-dd")

SnipeitPS/Public/New-AssetMaintenance.ps1

@@ -36,7 +36,7 @@ function New-AssetMaintenance() {
         [string]$apiKey
     )
 
-    $Values = . Get-ParameterValue
+    $Values = . Get-ParameterValue $MyInvocation.MyCommand.Parameters
 
     if ($values['start_date']) {
         $values['start_date'] = $values['start_date'].ToString("yyyy-MM-dd")

SnipeitPS/Public/New-Company.ps1

@@ -39,7 +39,7 @@ function New-Company()
         [string]$apiKey
     )
 
-    $Values = . Get-ParameterValue
+    $Values = . Get-ParameterValue $MyInvocation.MyCommand.Parameters
 
     $Body = $Values | ConvertTo-Json;
 

SnipeitPS/Public/New-Component.ps1

@@ -58,7 +58,7 @@ function New-Component() {
         [string]$apiKey
     )
 
-    $Values = . Get-ParameterValue
+    $Values = . Get-ParameterValue $MyInvocation.MyCommand.Parameters
 
     if ($values['purchase_date']) {
         $values['purchase_date'] = $values['purchase_date'].ToString("yyyy-MM-dd")

SnipeitPS/Public/New-CustomField.ps1

@@ -46,7 +46,7 @@ function New-CustomField()
         [string]$apiKey
     )
 
-    $Values = . Get-ParameterValue
+    $Values = . Get-ParameterValue $MyInvocation.MyCommand.Parameters
 
     #Convert Values to JSON format
     $Body = $Values | ConvertTo-Json;

SnipeitPS/Public/New-Department.ps1

@@ -52,7 +52,7 @@ function New-Department() {
         [string]$apiKey
     )
 
-    $Values = . Get-ParameterValue
+    $Values = . Get-ParameterValue $MyInvocation.MyCommand.Parameters
 
     $Body = $Values | ConvertTo-Json;
 

SnipeitPS/Public/New-License.ps1

@@ -56,7 +56,7 @@ function New-License() {
         [string]$apiKey
     )
 
-    $Values = . Get-ParameterValue
+    $Values = . Get-ParameterValue $MyInvocation.MyCommand.Parameters
 
     if ($values['expiration_date']) {
         $values['expiration_date'] = $values['expiration_date'].ToString("yyyy-MM-dd")

SnipeitPS/Public/New-Location.ps1

@@ -78,7 +78,7 @@ function New-Location() {
         [string]$apiKey
     )
 
-    $Values = . Get-ParameterValue
+    $Values = . Get-ParameterValue $MyInvocation.MyCommand.Parameters
 
     $Body = $Values | ConvertTo-Json;
 

SnipeitPS/Public/Set-Accessory.ps1

@@ -41,7 +41,7 @@ function Set-Accessory() {
         [string]$apiKey
     )
 
-    $Values = . Get-ParameterValue
+    $Values = . Get-ParameterValue $MyInvocation.MyCommand.Parameters
 
     if ($values['purchase_date']) {
         $values['purchase_date'] = $values['purchase_date'].ToString("yyyy-MM-dd")

SnipeitPS/Public/Set-Asset.ps1

@@ -16,7 +16,7 @@
 
     .PARAMETER Model_id
     Model ID of the asset, this can be got using Get-Model
-    
+
     .PARAMETER last_checkout
     Date the asset was last checked out
 
@@ -82,7 +82,7 @@ function Set-Asset()
         [string]$Status_id,
 
         [string]$Model_id,
-        
+
         [DateTime]$last_checkout,
 
         [int]$assigned_to,
@@ -114,7 +114,9 @@ function Set-Asset()
         [hashtable] $customfields
     )
 
-    $Values = . Get-ParameterValue
+    $Values = . Get-ParameterValue $MyInvocation.MyCommand.Parameters
+
+    if ($model_id) { $Values.Add('model_id',$model_id)}
 
     if ($customfields)
     {

SnipeitPS/Public/Set-License.ps1

@@ -58,7 +58,7 @@ function Set-License() {
         [string]$apiKey
     )
 
-     $Values = . Get-ParameterValue
+     $Values = . Get-ParameterValue $MyInvocation.MyCommand.Parameters
 
     if ($values['expiration_date']) {
         $values['expiration_date'] = $values['expiration_date'].ToString("yyyy-MM-dd")

SnipeitPS/Public/Set-Model.ps1

@@ -31,7 +31,7 @@ function Set-Model() {
         [string]$apiKey
     )
 
-    $Values = . Get-ParameterValue
+    $Values = . Get-ParameterValue $MyInvocation.MyCommand.Parameters
 
     $Body = $Values | ConvertTo-Json;
 

SnipeitPS/Public/Set-SnipeitLocation.ps1

@@ -82,7 +82,7 @@ function Set-SnipeitLocation() {
         [string]$apiKey
     )
 
-    $Values = . Get-ParameterValue
+    $Values = . Get-ParameterValue $MyInvocation.MyCommand.Parameters 
 
     $Body = $Values | ConvertTo-Json;