review

Author: ldez

pkg/commands/config_verify.go

@@ -1,6 +1,7 @@
 package commands
 
 import (
+	"context"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -103,7 +104,7 @@ func validateConfiguration(schemaPath, targetFile string) error {
 	compiler := jsonschema.NewCompiler()
 	loader := jsonschema.SchemeURLLoader{
 		"file":  jsonschema.FileLoader{},
-		"https": newHTTPURLLoader(),
+		"https": newJSONSchemaHTTPLoader(),
 	}
 	compiler.UseLoader(loader)
 	compiler.DefaultDraft(jsonschema.Draft7)
@@ -182,22 +183,29 @@ func decodeTomlFile(filename string) (any, error) {
 	return m, nil
 }
 
-type httpURLLoader http.Client
+type jsonschemaHTTPLoader struct {
+	*http.Client
+}
 
-func newHTTPURLLoader() *httpURLLoader {
-	httpLoader := httpURLLoader(http.Client{
+func newJSONSchemaHTTPLoader() *jsonschemaHTTPLoader {
+	return &jsonschemaHTTPLoader{Client: &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)
+func (l jsonschemaHTTPLoader) Load(url string) (any, error) {
+	req, err := http.NewRequestWithContext(context.Background(), http.MethodGet, url, http.NoBody)
 	if err != nil {
 		return nil, err
 	}
+
+	resp, err := l.Do(req)
+	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)
 	}

test/configuration_file_test.go

@@ -15,7 +15,7 @@ import (
 )
 
 func Test_validateTestConfigurationFiles(t *testing.T) {
-	err := validateTestConfigurationFiles("../jsonschema/golangci.next.jsonschema.json", ".")
+	err := validateTestConfigurationFiles("../../jsonschema/golangci.next.jsonschema.json", ".")
 	require.NoError(t, err)
 }
 
@@ -59,7 +59,7 @@ func validateTestConfigurationFiles(schemaPath, targetDir string) error {
 
 func loadSchema(schemaPath string) (*jsonschema.Schema, error) {
 	compiler := jsonschema.NewCompiler()
-	compiler.Draft = jsonschema.Draft7
+	compiler.DefaultDraft(jsonschema.Draft7)
 
 	schemaFile, err := os.Open(schemaPath)
 	if err != nil {
@@ -73,7 +73,7 @@ func loadSchema(schemaPath string) (*jsonschema.Schema, error) {
 		return nil, fmt.Errorf("add schema resource: %w", err)
 	}
 
-	schema, err := compiler.Compile(filepath.Base(schemaPath))
+	schema, err := compiler.Compile(schemaPath)
 	if err != nil {
 		return nil, fmt.Errorf("compile schema: %w", err)
 	}