ci: manual CodeQL dispatch + consolidated full-repo findings

.github/workflows/codeql.yml

@@ -7,6 +7,7 @@ on:
     branches: [ "main" ]
   schedule:
     - cron: '35 21 * * 0'
+  workflow_dispatch:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

csharp/PhoneNumbers.MetadataBuilder/Program.cs

@@ -141,7 +141,7 @@ private static int BuildGeocoding(string inputDir, string outputDir)
             {
                 var countryCode = Path.GetFileNameWithoutExtension(txtPath);
                 var map = ParseAreaCodeText(txtPath);
-                var outPath = Path.Combine(outputDir, $"{lang}.{countryCode}");
+                var outPath = Path.Join(outputDir, Path.GetFileName($"{lang}.{countryCode}"));
                 using var gz = new GZipStream(File.Create(outPath), CompressionLevel.SmallestSize);
                 BuildPrefixMapFromBin.WriteAreaCodeMap(gz, map);
                 written++;
@@ -251,11 +251,7 @@ private static bool IsOutputUpToDate(string inputXml, string outputDir, string f
         var existing = Directory.GetFiles(outputDir, filePrefix + "_*");
         if (existing.Length == 0) return false;
         var inputMTime = File.GetLastWriteTimeUtc(inputXml);
-        foreach (var file in existing)
-        {
-            if (File.GetLastWriteTimeUtc(file) < inputMTime) return false;
-        }
-        return true;
+        return !existing.Any(file => File.GetLastWriteTimeUtc(file) < inputMTime);
     }
 
     /// <summary>
@@ -267,17 +263,9 @@ private static bool IsGeocodingOutputUpToDate(string inputDir, string outputDir)
         if (!Directory.Exists(outputDir)) return false;
         var existing = Directory.GetFiles(outputDir);
         if (existing.Length == 0) return false;
-        var newestInput = DateTime.MinValue;
-        foreach (var f in Directory.EnumerateFiles(inputDir, "*.txt", SearchOption.AllDirectories))
-        {
-            var t = File.GetLastWriteTimeUtc(f);
-            if (t > newestInput) newestInput = t;
-        }
-        foreach (var file in existing)
-        {
-            if (File.GetLastWriteTimeUtc(file) < newestInput) return false;
-        }
-        return true;
+        var newestInput = Directory.EnumerateFiles(inputDir, "*.txt", SearchOption.AllDirectories)
+            .Select(File.GetLastWriteTimeUtc).DefaultIfEmpty(DateTime.MinValue).Max();
+        return !existing.Any(file => File.GetLastWriteTimeUtc(file) < newestInput);
     }
 
     private static SortedDictionary<int, string> ParseAreaCodeText(string path)
@@ -348,7 +336,7 @@ private static int BuildPerRegion(
         foreach (var metadata in metadataList)
         {
             var key = MakeFileNameKey(metadata, isAlternateFormatsMetadata);
-            var path = Path.Combine(outputDir, $"{filePrefix}_{key}");
+            var path = Path.Join(outputDir, Path.GetFileName($"{filePrefix}_{key}"));
             using var gz = new GZipStream(File.Create(path), CompressionLevel.SmallestSize);
             BuildMetadataFromBin.WriteMetadata(gz, metadata);
             written++;

csharp/PhoneNumbers.Test/TestBuildMetadataFromXml.cs

@@ -181,15 +181,8 @@ public void TestLoadInternationalFormatExpectsOnlyOnePattern()
             var metadata = new PhoneMetadata.Builder();
 
             // Should throw an exception as multiple intlFormats are provided.
-            try
-            {
-                BuildMetadataFromXml.LoadInternationalFormat(metadata, numberFormatElement, "");
-                Assert.True(false);
-            }
-            catch (Exception)
-            {
-                // Test passed.
-            }
+            Assert.Throws<Exception>(() =>
+                BuildMetadataFromXml.LoadInternationalFormat(metadata, numberFormatElement, ""));
         }
 
         [Fact]
@@ -247,15 +240,8 @@ public void TestLoadNationalFormatRequiresFormat()
             var metadata = new PhoneMetadata.Builder();
             var numberFormat = new NumberFormat.Builder();
 
-            try
-            {
-                BuildMetadataFromXml.LoadNationalFormat(metadata, numberFormatElement, numberFormat);
-                Assert.True(false);
-            }
-            catch (Exception)
-            {
-                // Test passed.
-            }
+            Assert.Throws<Exception>(() =>
+                BuildMetadataFromXml.LoadNationalFormat(metadata, numberFormatElement, numberFormat));
         }
 
         [Fact]
@@ -266,15 +252,8 @@ public void TestLoadNationalFormatExpectsExactlyOneFormat()
             var metadata = new PhoneMetadata.Builder();
             var numberFormat = new NumberFormat.Builder();
 
-            try
-            {
-                BuildMetadataFromXml.LoadNationalFormat(metadata, numberFormatElement, numberFormat);
-                Assert.True(false);
-            }
-            catch (Exception)
-            {
-                // Test passed.
-            }
+            Assert.Throws<Exception>(() =>
+                BuildMetadataFromXml.LoadNationalFormat(metadata, numberFormatElement, numberFormat));
         }
 
         // Tests loadAvailableFormats().

csharp/PhoneNumbers.Test/TestBuildPrefixMapFromBin.cs

@@ -27,8 +27,8 @@ public void TestAreaCodeMap_WriteAndRead_VerifiesIntegrity()
             Assert.Equal(testMap.Count, deserializedMap.Count);
             foreach (var kvp in testMap)
             {
-                Assert.True(deserializedMap.ContainsKey(kvp.Key));
-                Assert.Equal(kvp.Value, deserializedMap[kvp.Key]);
+                Assert.True(deserializedMap.TryGetValue(kvp.Key, out var value));
+                Assert.Equal(kvp.Value, value);
             }
         }
 
@@ -93,8 +93,8 @@ public void TestTimezoneMap_WriteAndRead_VerifiesIntegrity()
             Assert.Equal(testMap.Count, deserializedMap.Count);
             foreach (var kvp in testMap)
             {
-                Assert.True(deserializedMap.ContainsKey(kvp.Key));
-                Assert.Equal(kvp.Value, deserializedMap[kvp.Key]);
+                Assert.True(deserializedMap.TryGetValue(kvp.Key, out var value));
+                Assert.Equal(kvp.Value, value);
             }
         }
 

csharp/PhoneNumbers.Test/TestExampleNumbers.cs

@@ -15,6 +15,7 @@
  */
 
 using System.Collections.Generic;
+using System.Linq;
 using Xunit;
 
 namespace PhoneNumbers.Test
@@ -162,10 +163,9 @@ public void TestSharedCost()
         [Fact]
         public void TestGlobalNetworkNumbers()
         {
-            foreach(var callingCode in phoneNumberUtil.GetSupportedGlobalNetworkCallingCodes())
+            foreach (var exampleNumber in phoneNumberUtil.GetSupportedGlobalNetworkCallingCodes()
+                         .Select(callingCode => phoneNumberUtil.GetExampleNumberForNonGeoEntity(callingCode)))
             {
-                var exampleNumber =
-                    phoneNumberUtil.GetExampleNumberForNonGeoEntity(callingCode);
                 Assert.NotNull(exampleNumber);
                 if (!phoneNumberUtil.IsValidNumber(exampleNumber))
                 {

csharp/PhoneNumbers.Test/TestMetadataFilter.cs

@@ -396,15 +396,7 @@ public void testParseFieldMapFromString_RuntimeExceptionCases()
             Assert.Throws<Exception>(() => MetadataFilter.ParseFieldMapFromString(""));
 
             // Whitespace input.
-            try
-            {
-                MetadataFilter.ParseFieldMapFromString(" ");
-                Assert.True(false);
-            }
-            catch (Exception)
-            {
-                // Test passed.
-            }
+            Assert.Throws<Exception>(() => MetadataFilter.ParseFieldMapFromString(" "));
 
             // Bad token given as only group.
             Assert.Throws<Exception>(() => MetadataFilter.ParseFieldMapFromString("something_else"));
@@ -413,16 +405,8 @@ public void testParseFieldMapFromString_RuntimeExceptionCases()
             Assert.Throws<Exception>(() => MetadataFilter.ParseFieldMapFromString("fixedLine:something_else"));
 
             // Bad token given as middle group.
-            try
-            {
-                MetadataFilter.ParseFieldMapFromString(
-                    "pager:nationalPrefix:something_else:nationalNumberPattern");
-                Assert.True(false);
-            }
-            catch (Exception)
-            {
-                // Test passed.
-            }
+            Assert.Throws<Exception>(() => MetadataFilter.ParseFieldMapFromString(
+                "pager:nationalPrefix:something_else:nationalNumberPattern"));
 
             // Childless field given as parent.
             Assert.Throws<Exception>(() => MetadataFilter.ParseFieldMapFromString("nationalPrefix(exampleNumber)"));
@@ -458,43 +442,19 @@ public void testParseFieldMapFromString_RuntimeExceptionCases()
             Assert.Throws<Exception>(() => MetadataFilter.ParseFieldMapFromString("(exampleNumber)"));
 
             // Whitespace parent.
-            try
-            {
-                MetadataFilter.ParseFieldMapFromString(" (exampleNumber)");
-                Assert.True(false);
-            }
-            catch (Exception)
-            {
-                // Test passed.
-            }
+            Assert.Throws<Exception>(() => MetadataFilter.ParseFieldMapFromString(" (exampleNumber)"));
 
             // Empty child.
             Assert.Throws<Exception>(() => MetadataFilter.ParseFieldMapFromString("fixedLine()"));
 
             // Whitespace child.
-            try
-            {
-                MetadataFilter.ParseFieldMapFromString("fixedLine( )");
-                Assert.True(false);
-            }
-            catch (Exception)
-            {
-                // Test passed.
-            }
+            Assert.Throws<Exception>(() => MetadataFilter.ParseFieldMapFromString("fixedLine( )"));
 
             // Empty parent and child.
             Assert.Throws<Exception>(() => MetadataFilter.ParseFieldMapFromString("()"));
 
             // Whitespace parent and empty child.
-            try
-            {
-                MetadataFilter.ParseFieldMapFromString(" ()");
-                Assert.True(false);
-            }
-            catch (Exception)
-            {
-                // Test passed.
-            }
+            Assert.Throws<Exception>(() => MetadataFilter.ParseFieldMapFromString(" ()"));
 
             // Parent field given as a group twice.
             Assert.Throws<Exception>(() => MetadataFilter.ParseFieldMapFromString("fixedLine:uan:fixedLine"));