Remove redundancies from ModuleDependencyHandler

Author: Kapil Borle

Engine/Generic/ModuleDependencyHandler.cs

@@ -50,9 +50,8 @@ public string TempPath
             private set
             {
                 tempPath
-                    = (string.IsNullOrEmpty(value)
-                        || string.IsNullOrWhiteSpace(value))
-                    ? Environment.GetEnvironmentVariable("TEMP")
+                    = string.IsNullOrWhiteSpace(value)
+                    ? Path.GetTempPath()
                     : value;
             }
 
@@ -69,10 +68,9 @@ public string LocalAppDataPath
             }
             private set
             {
-                localAppdataPath 
-                    = (string.IsNullOrEmpty(value)
-                        || string.IsNullOrWhiteSpace(value))
-                    ? Environment.GetEnvironmentVariable("LOCALAPPDATA")
+                localAppdataPath
+                    = string.IsNullOrWhiteSpace(value)
+                    ? Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData)
                     : value;
             }
         }        
@@ -90,8 +88,7 @@ public string ModuleRepository
             set
             {
                 moduleRepository
-                    = (string.IsNullOrEmpty(value)
-                        || string.IsNullOrWhiteSpace(value))
+                    = string.IsNullOrWhiteSpace(value)
                     ? "PSGallery"
                     : value;
             }
@@ -106,14 +103,6 @@ public string PSSAAppDataPath
             {
                 return pssaAppDataPath;
             }
-            private set
-            {
-                var leaf
-                    = (string.IsNullOrEmpty(value) || string.IsNullOrWhiteSpace(value))
-                    ? "PSScriptAnalyzer"
-                    : value;
-                pssaAppDataPath = Path.Combine(LocalAppDataPath, leaf);
-            }
         }        
 
         /// <summary>
@@ -156,8 +145,7 @@ private void SetupPSSAAppData()
                     tempModulePath = GetTempModulePath(symLinkPath);
 
                     // check if the temp dir exists
-                    if (tempModulePath != null
-                        && Directory.Exists(tempModulePath))
+                    if (Directory.Exists(tempModulePath))
                     {
                         return;
                     }
@@ -204,12 +192,12 @@ private string GetPSSATempDirPath()
         // Return the first line of the file
         private string GetTempModulePath(string symLinkPath)
         {
-            var symLinkLines = File.ReadAllLines(symLinkPath);
-            if(symLinkLines.Length != 1)
+            string line; 
+            using (var fileStream = new StreamReader(symLinkPath))
             {
-                return null;
+                line = fileStream.ReadLine();
             }
-            return symLinkLines[0];
+            return line;
         }
 
         private void SaveModule(PSObject module)
@@ -278,9 +266,13 @@ public ModuleDependencyHandler(
             // and then passed into modulehandler
             TempPath = tempPath;
             LocalAppDataPath = localAppDataPath;
-            PSSAAppDataPath = pssaAppDataPath;
             ModuleRepository = moduleRepository;
-                        
+            pssaAppDataPath = Path.Combine(
+                LocalAppDataPath,
+                string.IsNullOrWhiteSpace(pssaAppDataPath)
+                        ? "PSScriptAnalyzer"
+                        : pssaAppDataPath);
+
             modulesFound = new Dictionary<string, PSObject>();            
 
             // TODO Add PSSA Version in the path

Tests/Engine/ModuleDependencyHandler.tests.ps1

@@ -31,7 +31,7 @@ Describe "Resolve DSC Resource Dependency" {
         It "Sets defaults correctly" {
             $depHandler = [Microsoft.Windows.PowerShell.ScriptAnalyzer.Generic.ModuleDependencyHandler]::new()
 
-            $expectedPath = [System.Environment]::GetEnvironmentVariable("TEMP");
+            $expectedPath = [System.IO.Path]::GetTempPath()
             $depHandler.TempPath | Should Be $expectedPath
 
             $expectedLocalAppDataPath = [System.Environment]::GetEnvironmentVariable("LOCALAPPDATA");
@@ -105,8 +105,8 @@ Describe "Resolve DSC Resource Dependency" {
         #restore environment variables and clean up temporary location
         $env:LOCALAPPDATA = $oldLocalAppDataPath
         $env:TEMP = $oldTempPath
-        Remove-Item -Recurse -Path $tempModulePath
-        Remove-Item -Recurse -Path $tempPath
+        Remove-Item -Recurse -Path $tempModulePath -Force
+        Remove-Item -Recurse -Path $tempPath -Force
 
         It "Keeps the environment variables unchanged" {
             Test-EnvironmentVariables($oldEnvVars)