Refactor

Signed-off-by: Abdulbois <abdulbois.tursunov@dsr-corporation.com>

Author: Abdulbois

Makefile

@@ -115,6 +115,7 @@ go.sum: go.mod
 
 test:
 	URL_LIVENESS_CHECK_ENABLED=false go test -tags=dev -v $(PACKAGES)
+	go test -v utils/validator/url_liveness_test.go
 
 lint:
 	golangci-lint run ./... --timeout 5m0s

utils/validator/validations_test.go utils/validator/url_liveness_test.goutils/validator/validations_test.go renamed to utils/validator/url_liveness_test.go

@@ -48,5 +48,4 @@ func TestURLLivenessCheck(t *testing.T) {
 
 		require.True(t, _isLiveURL(u))
 	}
-
 }

utils/validator/validations.go

@@ -15,6 +15,7 @@
 package validator
 
 import (
+	"context"
 	"net/http"
 	"net/url"
 	"reflect"
@@ -82,6 +83,7 @@ func _validURL(fl validator.FieldLevel, allowedSchemas ...string) bool {
 	for _, schema := range allowedSchemas {
 		if u.Scheme == schema {
 			isSchemaAllowed = true
+
 			break
 		}
 	}
@@ -97,9 +99,13 @@ func _isLiveURL(u *url.URL) bool {
 	if config.DisableURLLivenessCheck {
 		return true
 	}
-
 	// HEAD request only retrieves headers, not the body
-	resp, err := httpClient.Head(u.String())
+	req, err := http.NewRequestWithContext(context.Background(), http.MethodHead, u.String(), nil)
+	if err != nil {
+		return false
+	}
+
+	resp, err := httpClient.Do(req)
 	if err != nil {
 		return false
 	}