FileConventions(Test),scripts: add globalEnv arg

To functions used to detect inconsistent versions in GithubCI.
This change is needed to be able to take .env file into account
when searching for vars referenced in Github workflow files.

Author: webwarrior-ws

scripts/inconsistentVersionsInGitHubCI.fsx

@@ -33,7 +33,7 @@ let targetDir =
         |> fst
 
 let inconsistentVersionsInGitHubCI =
-    FileConventions.DetectInconsistentVersionsInGitHubCI targetDir
+    FileConventions.DetectInconsistentVersionsInGitHubCI targetDir Map.empty
 
 if inconsistentVersionsInGitHubCI then
     failwith

src/FileConventions.Test/FileConventions.Test.fs

@@ -289,7 +289,7 @@ let DetectInconsistentVersionsInGitHubCIWorkflow1() =
         ))
 
     Assert.That(
-        DetectInconsistentVersionsInGitHubCIWorkflow fileInfo,
+        DetectInconsistentVersionsInGitHubCIWorkflow fileInfo Map.empty,
         Is.EqualTo false
     )
 
@@ -307,7 +307,7 @@ let DetectInconsistentVersionsInGitHubCIWorkflow2() =
         ))
 
     Assert.That(
-        DetectInconsistentVersionsInGitHubCIWorkflow fileInfo,
+        DetectInconsistentVersionsInGitHubCIWorkflow fileInfo Map.empty,
         Is.EqualTo true
     )
 
@@ -325,7 +325,7 @@ let DetectInconsistentVersionsInGitHubCIWorkflow3() =
         ))
 
     Assert.That(
-        DetectInconsistentVersionsInGitHubCIWorkflow fileInfo,
+        DetectInconsistentVersionsInGitHubCIWorkflow fileInfo Map.empty,
         Is.EqualTo true
     )
 
@@ -343,7 +343,7 @@ let DetectInconsistentVersionsInGitHubCIWorkflow4() =
         ))
 
     Assert.That(
-        DetectInconsistentVersionsInGitHubCIWorkflow fileInfo,
+        DetectInconsistentVersionsInGitHubCIWorkflow fileInfo Map.empty,
         Is.EqualTo false
     )
 
@@ -370,7 +370,7 @@ let DetectInconsistentVersionsInGitHubCIWorkflow5() =
         })
 
     Assert.That(
-        DetectInconsistentVersionsInGitHubCIWorkflow fileInfo,
+        DetectInconsistentVersionsInGitHubCIWorkflow fileInfo Map.empty,
         Is.EqualTo true
     )
 
@@ -388,7 +388,7 @@ let DetectInconsistentVersionsInGitHubCIWorkflow6() =
         ))
 
     Assert.That(
-        DetectInconsistentVersionsInGitHubCIWorkflow fileInfo,
+        DetectInconsistentVersionsInGitHubCIWorkflow fileInfo Map.empty,
         Is.EqualTo true
     )
 
@@ -406,7 +406,7 @@ let DetectInconsistentVersionsInGitHubCIWorkflow7() =
         ))
 
     Assert.That(
-        DetectInconsistentVersionsInGitHubCIWorkflow fileInfo,
+        DetectInconsistentVersionsInGitHubCIWorkflow fileInfo Map.empty,
         Is.EqualTo true
     )
 
@@ -418,7 +418,10 @@ let DetectInconsistentVersionsInGitHubCI1() =
             Path.Combine(dummyFilesDirectory.FullName, "DummyWorkflows")
         )
 
-    Assert.That(DetectInconsistentVersionsInGitHubCI fileInfo, Is.EqualTo true)
+    Assert.That(
+        DetectInconsistentVersionsInGitHubCI fileInfo Map.empty,
+        Is.EqualTo true
+    )
 
 [<Test>]
 let DetectInconsistentVersionsInGitHubCI2() =
@@ -427,7 +430,10 @@ let DetectInconsistentVersionsInGitHubCI2() =
             Path.Combine(dummyFilesDirectory.FullName, "DummyWorkflowsWithEnv")
         )
 
-    Assert.That(DetectInconsistentVersionsInGitHubCI fileInfo, Is.EqualTo true)
+    Assert.That(
+        DetectInconsistentVersionsInGitHubCI fileInfo Map.empty,
+        Is.EqualTo true
+    )
 
 [<Test>]
 let DetectInconsistentVersionsInGitHubCI3() =
@@ -439,7 +445,10 @@ let DetectInconsistentVersionsInGitHubCI3() =
             )
         )
 
-    Assert.That(DetectInconsistentVersionsInGitHubCI fileInfo, Is.EqualTo true)
+    Assert.That(
+        DetectInconsistentVersionsInGitHubCI fileInfo Map.empty,
+        Is.EqualTo true
+    )
 
 [<Test>]
 let DetectInconsistentVersionsInNugetRefsInFSharpScripts1() =

src/FileConventions/Library.fs

@@ -362,6 +362,7 @@ let private GetVersionsMapFromFiles
 let private DetectInconsistentVersionsInYamlFiles
     (fileInfos: seq<FileInfo>)
     (extractVersionsFunction: YamlNode -> seq<string * string>)
+    (_globalEnv: Map<string, string>)
     =
     let envVarRegex =
         Regex(@"\s*\$\{\{\s*([^\s\}]+)\s*\}\}\s*", RegexOptions.Compiled)
@@ -426,7 +427,10 @@ let private DetectInconsistentVersionsInYamlFiles
     |> Seq.map(fun item -> Seq.length item.Value > 1)
     |> Seq.contains true
 
-let DetectInconsistentVersionsInGitHubCIWorkflow(fileInfos: seq<FileInfo>) =
+let DetectInconsistentVersionsInGitHubCIWorkflow
+    (fileInfos: seq<FileInfo>)
+    (globalEnv: Map<string, string>)
+    =
     fileInfos
     |> Seq.iter(fun fileInfo -> assert (fileInfo.FullName.EndsWith ".yml"))
 
@@ -462,15 +466,18 @@ let DetectInconsistentVersionsInGitHubCIWorkflow(fileInfos: seq<FileInfo>) =
             )
         | _ -> Seq.empty
 
-    DetectInconsistentVersionsInYamlFiles fileInfos extractVersions
+    DetectInconsistentVersionsInYamlFiles fileInfos extractVersions globalEnv
 
-let DetectInconsistentVersionsInGitHubCI(dir: DirectoryInfo) =
+let DetectInconsistentVersionsInGitHubCI
+    (dir: DirectoryInfo)
+    (globalEnv: Map<string, string>)
+    =
     let ymlFiles = dir.GetFiles("*.yml", SearchOption.AllDirectories)
 
     if Seq.isEmpty ymlFiles then
         false
     else
-        DetectInconsistentVersionsInGitHubCIWorkflow ymlFiles
+        DetectInconsistentVersionsInGitHubCIWorkflow ymlFiles globalEnv
 
 let GetVersionsMapForNugetRefsInFSharpScripts(fileInfos: seq<FileInfo>) =
     fileInfos