Improve testing, add variables, and minor code formatting

Author: Adrian Wells

ITGlueAPI/ITGlueAPI.psd1

@@ -17,7 +17,7 @@ RootModule = '.\ITGlueAPI.psm1'
 # -- MAJOR version when you make incompatible API changes,
 # -- MINOR version when you add functionality in a backwards-compatible manner, and
 # -- PATCH version when you make backwards-compatible bug fixes.
-ModuleVersion = '2.0.1'
+ModuleVersion = '2.0.2'
 
 # ID used to uniquely identify this module
 #GUID = ''

ITGlueAPI/ITGlueAPI.psm1

@@ -3,5 +3,4 @@ $ITGlue_Headers.Add("Content-Type", 'application/vnd.api+json')
 
 Set-Variable -Name "ITGlue_Headers"  -Value $ITGlue_Headers -Scope global
 
-
 Import-ITGlueModuleSettings

ITGlueAPI/Internal/ModuleSettings.ps1

@@ -1,27 +1,31 @@
-function Export-ITGlueModuleSettings {
+# Locations of settings path and file
+$ITGlueAPIConfPath = "$($env:USERPROFILE)\ITGlueAPI"
+$ITGlueAPIConfFile = "config.psd1"
 
-$secureString = $ITGlue_API_KEY | ConvertFrom-SecureString 
-$outputPath = "$($env:USERPROFILE)\ITGlueAPI"
-New-Item -ItemType Directory -Force -Path $outputPath | %{$_.Attributes = "hidden"}
+function Export-ITGlueModuleSettings {
+    # Confirm variables exist and are not null before exporting
+    if ($ITGlue_Base_URI -and $ITGlue_API_Key -and $ITGlue_JSON_Conversion_Depth) {
+        $secureString = $ITGlue_API_KEY | ConvertFrom-SecureString
+        New-Item -ItemType Directory -Force -Path $ITGlueAPIConfPath | ForEach-Object{$_.Attributes = "hidden"}
 @"
 @{
     ITGlue_Base_URI = '$ITGlue_Base_URI'
     ITGlue_API_Key = '$secureString'
     ITGlue_JSON_Conversion_Depth = '$ITGlue_JSON_Conversion_Depth'
 }
-"@ | Out-File -FilePath ($outputPath+"\config.psd1") -Force
-
-
+"@ | Out-File -FilePath ($ITGlueAPIConfPath+"\"+$ITGlueAPIConfFile) -Force
+    }
+    else {
+        Write-Host "Failed export ITGlue Module settings to $ITGlueAPIConfPath\$ITGlueAPIConfFile"
+    }
 }
 
-
-
 function Import-ITGlueModuleSettings {
 
-    # PLEASE ADD ERROR CHECKING
+    # PLEASE ADD ERROR CHECKING SUCH AS TESTING FOR VALID VARIABLES?
 
-    if(test-path "$($env:USERPROFILE)\ITGlueAPI") {
-        $tmp_config = Import-LocalizedData -BaseDirectory "$($env:USERPROFILE)\ITGlueAPI" -FileName "config.psd1"
+    if(test-path ($ITGlueAPIConfPath+"\"+$ITGlueAPIConfFile) )  {
+        $tmp_config = Import-LocalizedData -BaseDirectory $ITGlueAPIConfPath -FileName $ITGlueAPIConfFile
 
         # Send to function to strip potentially superflous slash (/)
         Add-ITGlueBaseURI $tmp_config.ITGlue_Base_URI
@@ -34,19 +38,19 @@ function Import-ITGlueModuleSettings {
         Set-Variable -Name "ITGlue_JSON_Conversion_Depth" -Value $tmp_config.ITGlue_JSON_Conversion_Depth `
                     -Scope global -Force 
 
+        Write-Host "ITGlueAPI Module configuration loaded successfully from $ITGlueAPIConfPath\$ITGlueAPIConfFile!" -ForegroundColor Green
+
         # Clean things up
         Remove-Variable "tmp_config"
-
-        Write-Host "Module configuration loaded successfully!" -ForegroundColor Green
     }
     else {
-        Write-Host "No configuration file was found." -ForegroundColor Red
+        Write-Host "No configuration file was found at $ITGlueAPIConfPath\$ITGlueAPIConfFile." -ForegroundColor Red
 
-        Set-Variable -Name "ITGlue_Base_URI" -Value "https://api.itglue.com"  -Option ReadOnly -Scope global -Force
+        Set-Variable -Name "ITGlue_Base_URI" -Value "https://api.itglue.com" -Option ReadOnly -Scope global -Force
 
         Write-Host "Using https://api.itglue.com as Base URI. Run Add-ITGlueBaseURI to modify."
         Write-Host "Please run Add-ITGlueAPIKey to get started." -ForegroundColor Red
 
-        Set-Variable -Name "ITGlue_JSON_Conversion_Depth" -Value 100  -Scope global -Force
+        Set-Variable -Name "ITGlue_JSON_Conversion_Depth" -Value 100 -Scope global -Force
     }
 }