Throw an error is JSON validation fails

Author: TinaMor

Tests/CommonToolUtilities.Tests.ps1

@@ -535,7 +535,7 @@ Describe "CommonToolUtilities.psm1" {
         }
 
         It "should skip JSON validation when Test-Json is not available" {
-            Mock Get-Command -ModuleName "CommonToolUtilities" -MockWith { return $null }-ParameterFilter {
+            Mock Get-Command -ModuleName "CommonToolUtilities" -MockWith { return $null } -ParameterFilter {
                 $Name -eq 'Test-Json'
             }
 
@@ -585,7 +585,7 @@ Describe "CommonToolUtilities.psm1" {
             { & $Script:FunctionToCall } | Should -Throw "Invalid schema file: $Script:SchemaFile. Schema file is empty."
         }
 
-        It "should throw an error if the JSON file is not valid" {
+        It "should throw an error if Test-Json fails" {
             Mock Get-Content -ModuleName "CommonToolUtilities" -MockWith { return "Test data" }
 
             # Test-Json returns true if the JSON is valid, otherwise it throws an error
@@ -595,6 +595,16 @@ Describe "CommonToolUtilities.psm1" {
             { & $Script:FunctionToCall } | Should -Throw "Error validating JSON checksum file. Error"
         }
 
+        It "should throw an error if the JSON file is not valid" {
+            Mock Get-Content -ModuleName "CommonToolUtilities" -MockWith { return "Test data" }
+
+            # Test-Json returns true if the JSON is valid, otherwise it throws an error
+            Mock Test-Json -ModuleName "CommonToolUtilities" -MockWith { return $false }
+
+            # Test the function
+            { & $Script:FunctionToCall } | Should -Throw "Checksum file validation failed for $Script:ChecksumFile. Please check the file format and schema."
+        }
+
         It "should throw an error if script block throws an error" {
             # ParentContainsErrorRecordException: Exception calling "Invoke" with "1" argument(s): "Error message"
             { Test-CheckSum -DownloadedFile $Script:DownloadedFile -ChecksumFile $Script:ChecksumFile -JSON -SchemaFile $Script:SchemaFile -ExtractDigestScriptBlock { (Throw "Error message") } | `

containers-toolkit/Private/CommonToolUtilities.psm1

@@ -579,6 +579,9 @@ function Test-JSONChecksum {
     # Validate the checksum file
     $isJsonValid = ValidateJSONChecksumFile -ChecksumFilePath $checksumFile -SchemaFile $SchemaFile
     Write-Debug "Checksum JSON file validation status. {success: $isJsonValid}"
+    if ($isJsonValid -eq $false) {
+        Throw "Checksum file validation failed for $checksumFile. Please check the file format and schema."
+    }
 
     if ($null -eq $ExtractDigestScriptBlock) {
         Write-Debug "Using default JSON checksum extraction script block"
@@ -653,7 +656,7 @@ function ValidateJSONChecksumFile {
         # Check if Test-Json cmdlet is available
         if (-not (Get-Command -Name Test-Json -ErrorAction SilentlyContinue)) {
             Write-Warning "Couldn't validate JSON checksum file. Test-Json cmdlet is not available. Upgrade to PowerShell 6.1 or later to use this feature."
-            return $false
+            return $null
         }
         $isValidJSON = Test-Json -Json "$(Get-Content -Path $ChecksumFilePath -Raw)" -Schema "$schemaFileContent"
         return $isValidJSON