dev: bump santhosh-tekuri/jsonschema/v5 to v6

Author: alexandear

go.mod

@@ -90,7 +90,7 @@ require (
 	github.com/ryancurrah/gomodguard v1.3.5
 	github.com/ryanrolds/sqlclosecheck v0.5.1
 	github.com/sanposhiho/wastedassign/v2 v2.0.7
-	github.com/santhosh-tekuri/jsonschema/v5 v5.3.1
+	github.com/santhosh-tekuri/jsonschema/v6 v6.0.1
 	github.com/sashamelentyev/interfacebloat v1.1.0
 	github.com/sashamelentyev/usestdlibvars v1.27.0
 	github.com/securego/gosec/v2 v2.21.4

go.sum

@@ -1,6 +1,7 @@
 package commands
 
 import (
+	"encoding/json"
 	"errors"
 	"fmt"
 	"net/http"
@@ -11,8 +12,7 @@ import (
 
 	hcversion "github.com/hashicorp/go-version"
 	"github.com/pelletier/go-toml/v2"
-	"github.com/santhosh-tekuri/jsonschema/v5"
-	"github.com/santhosh-tekuri/jsonschema/v5/httploader"
+	"github.com/santhosh-tekuri/jsonschema/v6"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 	"gopkg.in/yaml.v3"
@@ -45,7 +45,7 @@ func (c *configCommand) executeVerify(cmd *cobra.Command, _ []string) error {
 
 		detail := v.DetailedOutput()
 
-		printValidationDetail(cmd, &detail)
+		printValidationDetail(cmd, detail)
 
 		return errors.New("the configuration contains invalid elements")
 	}
@@ -100,10 +100,13 @@ func createSchemaURL(flags *pflag.FlagSet, buildInfo BuildInfo) (string, error)
 }
 
 func validateConfiguration(schemaPath, targetFile string) error {
-	httploader.Client = &http.Client{Timeout: 2 * time.Second}
-
 	compiler := jsonschema.NewCompiler()
-	compiler.Draft = jsonschema.Draft7
+	loader := jsonschema.SchemeURLLoader{
+		"file":  jsonschema.FileLoader{},
+		"https": newHTTPURLLoader(),
+	}
+	compiler.UseLoader(loader)
+	compiler.DefaultDraft(jsonschema.Draft7)
 
 	schema, err := compiler.Compile(schemaPath)
 	if err != nil {
@@ -133,10 +136,11 @@ func validateConfiguration(schemaPath, targetFile string) error {
 	return schema.Validate(m)
 }
 
-func printValidationDetail(cmd *cobra.Command, detail *jsonschema.Detailed) {
-	if detail.Error != "" {
+func printValidationDetail(cmd *cobra.Command, detail *jsonschema.OutputUnit) {
+	if detail.Error != nil {
+		b, _ := json.Marshal(detail.Error)
 		cmd.PrintErrf("jsonschema: %q does not validate with %q: %s\n",
-			strings.ReplaceAll(strings.TrimPrefix(detail.InstanceLocation, "/"), "/", "."), detail.KeywordLocation, detail.Error)
+			strings.ReplaceAll(strings.TrimPrefix(detail.InstanceLocation, "/"), "/", "."), detail.KeywordLocation, b)
 	}
 
 	for _, d := range detail.Errors {
@@ -177,3 +181,26 @@ func decodeTomlFile(filename string) (any, error) {
 
 	return m, nil
 }
+
+type httpURLLoader http.Client
+
+func newHTTPURLLoader() *httpURLLoader {
+	httpLoader := httpURLLoader(http.Client{
+		Timeout: 2 * time.Second,
+	})
+	return &httpLoader
+}
+
+func (l *httpURLLoader) Load(url string) (any, error) {
+	client := (*http.Client)(l)
+	resp, err := client.Get(url)
+	if err != nil {
+		return nil, err
+	}
+	defer resp.Body.Close()
+	if resp.StatusCode != http.StatusOK {
+		return nil, fmt.Errorf("%s returned status code %d", url, resp.StatusCode)
+	}
+
+	return jsonschema.UnmarshalJSON(resp.Body)
+}

pkg/commands/config_verify.go

@@ -9,7 +9,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/santhosh-tekuri/jsonschema/v5"
+	"github.com/santhosh-tekuri/jsonschema/v6"
 	"github.com/stretchr/testify/require"
 	"gopkg.in/yaml.v3"
 )