Merge pull request #75 from Sam-Martin/development

Rick-2CA · web-flow · commit 056d79c8b54b · 2019-02-13T14:40:42.000-06:00
v1.5.1 - Specified connection parameters bug fix
diff --git a/Build/build.ps1 b/Build/build.ps1
@@ -29,7 +29,7 @@ ForEach ($Module in $Modules) {
 }
 
 $Path = (Resolve-Path $PSScriptRoot\..).Path
-Set-BuildEnvironment -Path $Path
+Set-BuildEnvironment -Path $Path -Force
 
 $invokepsakeSplat = @{
     buildFile  = "$PSScriptRoot\psake.ps1"
diff --git a/ServiceNow/Public/Get-ServiceNowChangeRequest.ps1 b/ServiceNow/Public/Get-ServiceNowChangeRequest.ps1
@@ -67,11 +67,11 @@ function Get-ServiceNowChangeRequest {
 
     # Update the Table Splat if the parameters have values
     if ($null -ne $PSBoundParameters.Connection) {
-        $getServiceNowTableSplat.Add('Connection',$Connection)
+        $getServiceNowTableSplat.Add('Connection', $Connection)
     }
     elseif ($null -ne $PSBoundParameters.ServiceNowCredential -and $null -ne $PSBoundParameters.ServiceNowURL) {
-         $getServiceNowTableSplat.Add('ServiceNowCredential',$ServiceNowCredential)
-         $getServiceNowTableSplat.Add('ServiceNowURL',$ServiceNowURL)
+        $getServiceNowTableSplat.Add('Credential', $Credential)
+        $getServiceNowTableSplat.Add('ServiceNowURL', $ServiceNowURL)
     }
 
     # Only add the Limit parameter if it was explicitly provided
diff --git a/ServiceNow/Public/Get-ServiceNowConfigurationItem.ps1 b/ServiceNow/Public/Get-ServiceNowConfigurationItem.ps1
@@ -67,11 +67,11 @@ function Get-ServiceNowConfigurationItem {
 
     # Update the Table Splat if the parameters have values
     if ($null -ne $PSBoundParameters.Connection) {
-        $getServiceNowTableSplat.Add('Connection',$Connection)
+        $getServiceNowTableSplat.Add('Connection', $Connection)
     }
     elseif ($null -ne $PSBoundParameters.ServiceNowCredential -and $null -ne $PSBoundParameters.ServiceNowURL) {
-         $getServiceNowTableSplat.Add('ServiceNowCredential',$ServiceNowCredential)
-         $getServiceNowTableSplat.Add('ServiceNowURL',$ServiceNowURL)
+        $getServiceNowTableSplat.Add('Credential', $Credential)
+        $getServiceNowTableSplat.Add('ServiceNowURL', $ServiceNowURL)
     }
 
     # Only add the Limit parameter if it was explicitly provided
diff --git a/ServiceNow/Public/Get-ServiceNowIncident.ps1 b/ServiceNow/Public/Get-ServiceNowIncident.ps1
@@ -67,11 +67,11 @@ function Get-ServiceNowIncident{
 
     # Update the splat if the parameters have values
     if ($null -ne $PSBoundParameters.Connection) {
-        $getServiceNowTableSplat.Add('Connection',$Connection)
+        $getServiceNowTableSplat.Add('Connection', $Connection)
     }
     elseif ($null -ne $PSBoundParameters.ServiceNowCredential -and $null -ne $PSBoundParameters.ServiceNowURL) {
-         $getServiceNowTableSplat.Add('ServiceNowCredential',$ServiceNowCredential)
-         $getServiceNowTableSplat.Add('ServiceNowURL',$ServiceNowURL)
+        $getServiceNowTableSplat.Add('Credential', $Credential)
+        $getServiceNowTableSplat.Add('ServiceNowURL', $ServiceNowURL)
     }
 
     # Only add the Limit parameter if it was explicitly provided
diff --git a/ServiceNow/Public/Get-ServiceNowRequest.ps1 b/ServiceNow/Public/Get-ServiceNowRequest.ps1
@@ -70,7 +70,7 @@ function Get-ServiceNowRequest {
         $getServiceNowTableSplat.Add('Connection', $Connection)
     }
     elseif ($null -ne $PSBoundParameters.ServiceNowCredential -and $null -ne $PSBoundParameters.ServiceNowURL) {
-        $getServiceNowTableSplat.Add('ServiceNowCredential', $ServiceNowCredential)
+        $getServiceNowTableSplat.Add('Credential', $Credential)
         $getServiceNowTableSplat.Add('ServiceNowURL', $ServiceNowURL)
     }
 
diff --git a/ServiceNow/Public/Get-ServiceNowRequestItem.ps1 b/ServiceNow/Public/Get-ServiceNowRequestItem.ps1
@@ -85,7 +85,7 @@ function Get-ServiceNowRequestItem {
         $getServiceNowTableSplat.Add('Connection', $Connection)
     }
     elseif ($null -ne $PSBoundParameters.ServiceNowCredential -and $null -ne $PSBoundParameters.ServiceNowURL) {
-        $getServiceNowTableSplat.Add('ServiceNowCredential', $ServiceNowCredential)
+        $getServiceNowTableSplat.Add('Credential', $Credential)
         $getServiceNowTableSplat.Add('ServiceNowURL', $ServiceNowURL)
     }
 
diff --git a/ServiceNow/Public/Get-ServiceNowTable.ps1 b/ServiceNow/Public/Get-ServiceNowTable.ps1
@@ -57,15 +57,20 @@ function Get-ServiceNowTable {
     # Get credential and ServiceNow REST URL
     if ($null -ne $Connection) {
         $SecurePassword = ConvertTo-SecureString $Connection.Password -AsPlainText -Force
-        $ServiceNowCredential = New-Object System.Management.Automation.PSCredential ($Connection.Username, $SecurePassword)
+        $Credential = New-Object System.Management.Automation.PSCredential ($Connection.Username, $SecurePassword)
         $ServiceNowURL = 'https://' + $Connection.ServiceNowUri + '/api/now/v1'
     }
-    elseif ($null -ne $ServiceNowCredential -and $null -ne $ServiceNowURL) {
-        Test-ServiceNowURL -Url $ServiceNowURL
-        $ServiceNowURL = 'https://' + $ServiceNowURL + '/api/now/v1'
+    elseif ($null -ne $Credential -and $null -ne $ServiceNowURL) {
+        Try {
+            $null = Test-ServiceNowURL -Url $ServiceNowURL -ErrorAction Stop
+            $ServiceNowURL = 'https://' + $ServiceNowURL + '/api/now/v1'
+        }
+        Catch {
+            Throw $PSItem
+        }
     }
     elseif ((Test-ServiceNowAuthIsSet)) {
-        $ServiceNowCredential = $Global:ServiceNowCredentials
+        $Credential = $Global:ServiceNowCredentials
         $ServiceNowURL = $global:ServiceNowRESTURL
     }
     else {
@@ -124,7 +129,7 @@ function Get-ServiceNowTable {
 
     # Perform table query and capture results
     $Uri = $ServiceNowURL + "/table/$Table"
-    $Result = (Invoke-RestMethod -Uri $Uri -Credential $ServiceNowCredential -Body $Body -ContentType "application/json").Result
+    $Result = (Invoke-RestMethod -Uri $Uri -Credential $Credential -Body $Body -ContentType "application/json").Result
 
     # Convert specific fields to DateTime format
     $ConvertToDateField = @('closed_at', 'expected_start', 'follow_up', 'opened_at', 'sys_created_on', 'sys_updated_on', 'work_end', 'work_start')
diff --git a/ServiceNow/Public/Get-ServiceNowTableEntry.ps1 b/ServiceNow/Public/Get-ServiceNowTableEntry.ps1
@@ -94,7 +94,7 @@ function Get-ServiceNowTableEntry {
         # Update the Table Splat if an applicable parameter set name is in use
         Switch ($PSCmdlet.ParameterSetName) {
             'SpecifyConnectionFields' {
-                $getServiceNowTableSplat.Add('ServiceNowCredential', $Credential)
+                $getServiceNowTableSplat.Add('Credential', $Credential)
                 $getServiceNowTableSplat.Add('ServiceNowURL', $ServiceNowURL)
             }
             'UseConnectionObject' {
diff --git a/ServiceNow/Public/Get-ServiceNowUser.ps1 b/ServiceNow/Public/Get-ServiceNowUser.ps1
@@ -67,10 +67,10 @@ function Get-ServiceNowUser{
 
     # Update the splat if the parameters have values
     if ($null -ne $PSBoundParameters.Connection) {
-        $getServiceNowTableSplat.Add('Connection',$Connection)
+        $getServiceNowTableSplat.Add('Connection', $Connection)
     }
     elseif ($null -ne $PSBoundParameters.ServiceNowCredential -and $null -ne $PSBoundParameters.ServiceNowURL) {
-        $getServiceNowTableSplat.Add('ServiceNowCredential', $ServiceNowCredential)
+        $getServiceNowTableSplat.Add('Credential', $Credential)
         $getServiceNowTableSplat.Add('ServiceNowURL', $ServiceNowURL)
     }
 
diff --git a/ServiceNow/Public/Get-ServiceNowUserGroup.ps1 b/ServiceNow/Public/Get-ServiceNowUserGroup.ps1
@@ -67,10 +67,10 @@ function Get-ServiceNowUserGroup{
 
     # Update the splat if the parameters have values
     if ($null -ne $PSBoundParameters.Connection) {
-        $getServiceNowTableSplat.Add('Connection',$Connection)
+        $getServiceNowTableSplat.Add('Connection', $Connection)
     }
     elseif ($null -ne $PSBoundParameters.ServiceNowCredential -and $null -ne $PSBoundParameters.ServiceNowURL) {
-        $getServiceNowTableSplat.Add('ServiceNowCredential', $ServiceNowCredential)
+        $getServiceNowTableSplat.Add('Credential', $Credential)
         $getServiceNowTableSplat.Add('ServiceNowURL', $ServiceNowURL)
     }
 
diff --git a/ServiceNow/ServiceNow.psd1 b/ServiceNow/ServiceNow.psd1
@@ -12,7 +12,7 @@
 RootModule = 'ServiceNow.psm1'
 
 # Version number of this module.
-ModuleVersion = '1.5.0'
+ModuleVersion = '1.5.1'
 
 # ID used to uniquely identify this module
 GUID = 'b90d67da-f8d0-4406-ad74-89d169cd0633'
@@ -118,6 +118,8 @@ PrivateData = @{
 
 
 
+
+
 
 
 
diff --git a/Tests/ServiceNow.Tests.ps1 b/Tests/ServiceNow.Tests.ps1
@@ -39,6 +39,11 @@ Describe "ServiceNow-Module" {
         Remove-ServiceNowAuth
     }
 
+    # Validate Environment
+    It "ServiceNow url has Test-Connection connectivity" {
+        Test-Connection $Defaults.ServiceNowURL -Quiet | Should -Be $true
+    }
+
     # Auth Functions
     It "Test-ServiceNowAuthIsSet not set" {
         Test-ServiceNowAuthIsSet | Should -Be $false
@@ -61,7 +66,7 @@ Describe "ServiceNow-Module" {
         $getServiceNowTableSplat = @{
             Table                = 'incident'
             Query                = 'ORDERBYDESCopened_at'
-            ServiceNowCredential = $Defaults.Creds
+            Credential           = $Defaults.Creds
             ServiceNowURL        = $Defaults.ServiceNowURL
         }
         ([array](Get-ServiceNowTable @getServiceNowTableSplat)).Count -gt 0  | Should -Match $true
@@ -119,7 +124,7 @@ Describe "ServiceNow-Module" {
 
     # Update functions
     It "Update-ServiceNowChangeRequest works" {
-        $TestTicket = Get-ServiceNowChangeRequest -Limit 1
+        $TestTicket = Get-ServiceNowChangeRequest -First 1
 
         $Values = @{
             description = 'Pester Comment:  Update-ServiceNowChangeRequest works'
@@ -243,7 +248,7 @@ Describe "ServiceNow-Module" {
 
     # Remove Functions
     It "Remove-ServiceNowTable works" {
-        $TestTicket = Get-ServiceNowIncident -Limit 1
+        $TestTicket = Get-ServiceNowIncident -First 1
         $removeServiceNowTableEntrySplat = @{
             SysId = $TestTicket.sys_id
             Table = 'incident'

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ ForEach ($Module in $Modules) {`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`$Path = (Resolve-Path $PSScriptRoot\..).Path`
`32`		`-Set-BuildEnvironment -Path $Path`
	`32`	`+Set-BuildEnvironment -Path $Path -Force`
`33`	`33`
`34`	`34`	`$invokepsakeSplat = @{`
`35`	`35`	`buildFile = "$PSScriptRoot\psake.ps1"`
Original file line number	Diff line number	Diff line change
`@@ -67,11 +67,11 @@ function Get-ServiceNowChangeRequest {`
`67`	`67`
`68`	`68`	`# Update the Table Splat if the parameters have values`
`69`	`69`	`if ($null -ne $PSBoundParameters.Connection) {`
`70`		`- $getServiceNowTableSplat.Add('Connection',$Connection)`
	`70`	`+ $getServiceNowTableSplat.Add('Connection', $Connection)`
`71`	`71`	`}`
`72`	`72`	`elseif ($null -ne $PSBoundParameters.ServiceNowCredential -and $null -ne $PSBoundParameters.ServiceNowURL) {`
`73`		`- $getServiceNowTableSplat.Add('ServiceNowCredential',$ServiceNowCredential)`
`74`		`- $getServiceNowTableSplat.Add('ServiceNowURL',$ServiceNowURL)`
	`73`	`+ $getServiceNowTableSplat.Add('Credential', $Credential)`
	`74`	`+ $getServiceNowTableSplat.Add('ServiceNowURL', $ServiceNowURL)`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`# Only add the Limit parameter if it was explicitly provided`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ function Get-ServiceNowRequest {`
`70`	`70`	`$getServiceNowTableSplat.Add('Connection', $Connection)`
`71`	`71`	`}`
`72`	`72`	`elseif ($null -ne $PSBoundParameters.ServiceNowCredential -and $null -ne $PSBoundParameters.ServiceNowURL) {`
`73`		`- $getServiceNowTableSplat.Add('ServiceNowCredential', $ServiceNowCredential)`
	`73`	`+ $getServiceNowTableSplat.Add('Credential', $Credential)`
`74`	`74`	`$getServiceNowTableSplat.Add('ServiceNowURL', $ServiceNowURL)`
`75`	`75`	`}`
`76`	`76`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ function Get-ServiceNowRequestItem {`
`85`	`85`	`$getServiceNowTableSplat.Add('Connection', $Connection)`
`86`	`86`	`}`
`87`	`87`	`elseif ($null -ne $PSBoundParameters.ServiceNowCredential -and $null -ne $PSBoundParameters.ServiceNowURL) {`
`88`		`- $getServiceNowTableSplat.Add('ServiceNowCredential', $ServiceNowCredential)`
	`88`	`+ $getServiceNowTableSplat.Add('Credential', $Credential)`
`89`	`89`	`$getServiceNowTableSplat.Add('ServiceNowURL', $ServiceNowURL)`
`90`	`90`	`}`
`91`	`91`
Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ function Get-ServiceNowTableEntry {`
`94`	`94`	`# Update the Table Splat if an applicable parameter set name is in use`
`95`	`95`	`Switch ($PSCmdlet.ParameterSetName) {`
`96`	`96`	`'SpecifyConnectionFields' {`
`97`		`- $getServiceNowTableSplat.Add('ServiceNowCredential', $Credential)`
	`97`	`+ $getServiceNowTableSplat.Add('Credential', $Credential)`
`98`	`98`	`$getServiceNowTableSplat.Add('ServiceNowURL', $ServiceNowURL)`
`99`	`99`	`}`
`100`	`100`	`'UseConnectionObject' {`
Original file line number	Diff line number	Diff line change
`@@ -67,10 +67,10 @@ function Get-ServiceNowUser{`
`67`	`67`
`68`	`68`	`# Update the splat if the parameters have values`
`69`	`69`	`if ($null -ne $PSBoundParameters.Connection) {`
`70`		`- $getServiceNowTableSplat.Add('Connection',$Connection)`
	`70`	`+ $getServiceNowTableSplat.Add('Connection', $Connection)`
`71`	`71`	`}`
`72`	`72`	`elseif ($null -ne $PSBoundParameters.ServiceNowCredential -and $null -ne $PSBoundParameters.ServiceNowURL) {`
`73`		`- $getServiceNowTableSplat.Add('ServiceNowCredential', $ServiceNowCredential)`
	`73`	`+ $getServiceNowTableSplat.Add('Credential', $Credential)`
`74`	`74`	`$getServiceNowTableSplat.Add('ServiceNowURL', $ServiceNowURL)`
`75`	`75`	`}`
`76`	`76`