diff --git a/CHANGELOG.md b/CHANGELOG.md index a96c44f0..9c3bf153 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## v0.22.48 + +- (_Backported from v0.39.6_) Replaced `github.com/go-ozzo/ozzo-validation` with the fork `github.com/pocketbase/ozzo-validation` since the original library has recently changed ownership and the new maintainer cannot be trusted. + +- (_Backported from v0.39.6_) Fixed View collection `*` validator and added more friendly error messages ([#7761](https://github.com/pocketbase/pocketbase/issues/7761)). + + ## v0.22.47 - (_Backported from v0.39.6_) Bumped the min Go GitHub action version to 1.26.5 as it includes some [minor security fixes](https://github.com/golang/go/issues?q=milestone%3AGo1.26.5). diff --git a/apis/api_error.go b/apis/api_error.go index 8658ac8f..2b4eb55e 100644 --- a/apis/api_error.go +++ b/apis/api_error.go @@ -4,7 +4,7 @@ import ( "net/http" "strings" - validation "github.com/go-ozzo/ozzo-validation/v4" + validation "github.com/pocketbase/ozzo-validation/v4" "github.com/pocketbase/pocketbase/tools/inflector" ) diff --git a/apis/api_error_test.go b/apis/api_error_test.go index d6e77b67..bd43d768 100644 --- a/apis/api_error_test.go +++ b/apis/api_error_test.go @@ -5,7 +5,7 @@ import ( "errors" "testing" - validation "github.com/go-ozzo/ozzo-validation/v4" + validation "github.com/pocketbase/ozzo-validation/v4" "github.com/pocketbase/pocketbase/apis" ) diff --git a/apis/settings.go b/apis/settings.go index e5e96ddf..53ce4f08 100644 --- a/apis/settings.go +++ b/apis/settings.go @@ -3,8 +3,8 @@ package apis import ( "net/http" - validation "github.com/go-ozzo/ozzo-validation/v4" "github.com/labstack/echo/v5" + validation "github.com/pocketbase/ozzo-validation/v4" "github.com/pocketbase/pocketbase/core" "github.com/pocketbase/pocketbase/forms" "github.com/pocketbase/pocketbase/models/settings" diff --git a/cmd/admin.go b/cmd/admin.go index 3cac1a04..b977fd14 100644 --- a/cmd/admin.go +++ b/cmd/admin.go @@ -5,7 +5,7 @@ import ( "fmt" "github.com/fatih/color" - "github.com/go-ozzo/ozzo-validation/v4/is" + "github.com/pocketbase/ozzo-validation/v4/is" "github.com/pocketbase/pocketbase/core" "github.com/pocketbase/pocketbase/models" "github.com/spf13/cobra" diff --git a/daos/record_table_sync.go b/daos/record_table_sync.go index 83f45370..559f747b 100644 --- a/daos/record_table_sync.go +++ b/daos/record_table_sync.go @@ -5,8 +5,8 @@ import ( "strconv" "strings" - validation "github.com/go-ozzo/ozzo-validation/v4" "github.com/pocketbase/dbx" + validation "github.com/pocketbase/ozzo-validation/v4" "github.com/pocketbase/pocketbase/models" "github.com/pocketbase/pocketbase/models/schema" "github.com/pocketbase/pocketbase/tools/dbutils" diff --git a/forms/admin_login.go b/forms/admin_login.go index da4631a7..ac37b297 100644 --- a/forms/admin_login.go +++ b/forms/admin_login.go @@ -4,8 +4,8 @@ import ( "database/sql" "errors" - validation "github.com/go-ozzo/ozzo-validation/v4" - "github.com/go-ozzo/ozzo-validation/v4/is" + validation "github.com/pocketbase/ozzo-validation/v4" + "github.com/pocketbase/ozzo-validation/v4/is" "github.com/pocketbase/pocketbase/core" "github.com/pocketbase/pocketbase/daos" "github.com/pocketbase/pocketbase/models" diff --git a/forms/admin_password_reset_confirm.go b/forms/admin_password_reset_confirm.go index 0c5ee11f..db3ea0cc 100644 --- a/forms/admin_password_reset_confirm.go +++ b/forms/admin_password_reset_confirm.go @@ -1,7 +1,7 @@ package forms import ( - validation "github.com/go-ozzo/ozzo-validation/v4" + validation "github.com/pocketbase/ozzo-validation/v4" "github.com/pocketbase/pocketbase/core" "github.com/pocketbase/pocketbase/daos" "github.com/pocketbase/pocketbase/forms/validators" diff --git a/forms/admin_password_reset_request.go b/forms/admin_password_reset_request.go index b0568ae7..ed7cf7c7 100644 --- a/forms/admin_password_reset_request.go +++ b/forms/admin_password_reset_request.go @@ -5,8 +5,8 @@ import ( "fmt" "time" - validation "github.com/go-ozzo/ozzo-validation/v4" - "github.com/go-ozzo/ozzo-validation/v4/is" + validation "github.com/pocketbase/ozzo-validation/v4" + "github.com/pocketbase/ozzo-validation/v4/is" "github.com/pocketbase/pocketbase/core" "github.com/pocketbase/pocketbase/daos" "github.com/pocketbase/pocketbase/mails" diff --git a/forms/admin_upsert.go b/forms/admin_upsert.go index 4afcb67e..5c7a0dbc 100644 --- a/forms/admin_upsert.go +++ b/forms/admin_upsert.go @@ -1,8 +1,8 @@ package forms import ( - validation "github.com/go-ozzo/ozzo-validation/v4" - "github.com/go-ozzo/ozzo-validation/v4/is" + validation "github.com/pocketbase/ozzo-validation/v4" + "github.com/pocketbase/ozzo-validation/v4/is" "github.com/pocketbase/pocketbase/core" "github.com/pocketbase/pocketbase/daos" "github.com/pocketbase/pocketbase/forms/validators" diff --git a/forms/apple_client_secret_create.go b/forms/apple_client_secret_create.go index 72a47e95..6527ef4e 100644 --- a/forms/apple_client_secret_create.go +++ b/forms/apple_client_secret_create.go @@ -5,8 +5,8 @@ import ( "strings" "time" - validation "github.com/go-ozzo/ozzo-validation/v4" "github.com/golang-jwt/jwt/v4" + validation "github.com/pocketbase/ozzo-validation/v4" "github.com/pocketbase/pocketbase/core" ) diff --git a/forms/backup_create.go b/forms/backup_create.go index d7737027..c3850c5d 100644 --- a/forms/backup_create.go +++ b/forms/backup_create.go @@ -4,7 +4,7 @@ import ( "context" "regexp" - validation "github.com/go-ozzo/ozzo-validation/v4" + validation "github.com/pocketbase/ozzo-validation/v4" "github.com/pocketbase/pocketbase/core" ) diff --git a/forms/backup_create_test.go b/forms/backup_create_test.go index 82112ca4..1c2436d1 100644 --- a/forms/backup_create_test.go +++ b/forms/backup_create_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - validation "github.com/go-ozzo/ozzo-validation/v4" + validation "github.com/pocketbase/ozzo-validation/v4" "github.com/pocketbase/pocketbase/forms" "github.com/pocketbase/pocketbase/tests" ) diff --git a/forms/backup_upload.go b/forms/backup_upload.go index 8056e691..3c3941be 100644 --- a/forms/backup_upload.go +++ b/forms/backup_upload.go @@ -3,7 +3,7 @@ package forms import ( "context" - validation "github.com/go-ozzo/ozzo-validation/v4" + validation "github.com/pocketbase/ozzo-validation/v4" "github.com/pocketbase/pocketbase/core" "github.com/pocketbase/pocketbase/forms/validators" "github.com/pocketbase/pocketbase/tools/filesystem" diff --git a/forms/backup_upload_test.go b/forms/backup_upload_test.go index f92ceada..720f7fc8 100644 --- a/forms/backup_upload_test.go +++ b/forms/backup_upload_test.go @@ -5,7 +5,7 @@ import ( "bytes" "testing" - validation "github.com/go-ozzo/ozzo-validation/v4" + validation "github.com/pocketbase/ozzo-validation/v4" "github.com/pocketbase/pocketbase/forms" "github.com/pocketbase/pocketbase/tests" "github.com/pocketbase/pocketbase/tools/filesystem" diff --git a/forms/collection_upsert.go b/forms/collection_upsert.go index eb39a676..20f47ddb 100644 --- a/forms/collection_upsert.go +++ b/forms/collection_upsert.go @@ -7,7 +7,7 @@ import ( "strconv" "strings" - validation "github.com/go-ozzo/ozzo-validation/v4" + validation "github.com/pocketbase/ozzo-validation/v4" "github.com/pocketbase/pocketbase/core" "github.com/pocketbase/pocketbase/daos" "github.com/pocketbase/pocketbase/forms/validators" diff --git a/forms/collection_upsert_test.go b/forms/collection_upsert_test.go index 5de00332..6f16640a 100644 --- a/forms/collection_upsert_test.go +++ b/forms/collection_upsert_test.go @@ -5,7 +5,7 @@ import ( "errors" "testing" - validation "github.com/go-ozzo/ozzo-validation/v4" + validation "github.com/pocketbase/ozzo-validation/v4" "github.com/pocketbase/pocketbase/forms" "github.com/pocketbase/pocketbase/models" "github.com/pocketbase/pocketbase/models/schema" diff --git a/forms/collections_import.go b/forms/collections_import.go index bd17833a..fdabe323 100644 --- a/forms/collections_import.go +++ b/forms/collections_import.go @@ -4,7 +4,7 @@ import ( "encoding/json" "fmt" - validation "github.com/go-ozzo/ozzo-validation/v4" + validation "github.com/pocketbase/ozzo-validation/v4" "github.com/pocketbase/pocketbase/core" "github.com/pocketbase/pocketbase/daos" "github.com/pocketbase/pocketbase/models" diff --git a/forms/realtime_subscribe.go b/forms/realtime_subscribe.go index 8fd5eb51..1279f679 100644 --- a/forms/realtime_subscribe.go +++ b/forms/realtime_subscribe.go @@ -1,7 +1,7 @@ package forms import ( - validation "github.com/go-ozzo/ozzo-validation/v4" + validation "github.com/pocketbase/ozzo-validation/v4" ) // RealtimeSubscribe is a realtime subscriptions request form. diff --git a/forms/realtime_subscribe_test.go b/forms/realtime_subscribe_test.go index 36e57111..5d0da406 100644 --- a/forms/realtime_subscribe_test.go +++ b/forms/realtime_subscribe_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - validation "github.com/go-ozzo/ozzo-validation/v4" + validation "github.com/pocketbase/ozzo-validation/v4" "github.com/pocketbase/pocketbase/forms" ) diff --git a/forms/record_email_change_confirm.go b/forms/record_email_change_confirm.go index 79da8b92..4b9a26f3 100644 --- a/forms/record_email_change_confirm.go +++ b/forms/record_email_change_confirm.go @@ -1,7 +1,7 @@ package forms import ( - validation "github.com/go-ozzo/ozzo-validation/v4" + validation "github.com/pocketbase/ozzo-validation/v4" "github.com/pocketbase/pocketbase/core" "github.com/pocketbase/pocketbase/daos" "github.com/pocketbase/pocketbase/models" diff --git a/forms/record_email_change_confirm_test.go b/forms/record_email_change_confirm_test.go index 90ca6f86..1d46da7d 100644 --- a/forms/record_email_change_confirm_test.go +++ b/forms/record_email_change_confirm_test.go @@ -5,7 +5,7 @@ import ( "errors" "testing" - validation "github.com/go-ozzo/ozzo-validation/v4" + validation "github.com/pocketbase/ozzo-validation/v4" "github.com/pocketbase/pocketbase/forms" "github.com/pocketbase/pocketbase/models" "github.com/pocketbase/pocketbase/tests" diff --git a/forms/record_email_change_request.go b/forms/record_email_change_request.go index f849290a..d732eeec 100644 --- a/forms/record_email_change_request.go +++ b/forms/record_email_change_request.go @@ -1,8 +1,8 @@ package forms import ( - validation "github.com/go-ozzo/ozzo-validation/v4" - "github.com/go-ozzo/ozzo-validation/v4/is" + validation "github.com/pocketbase/ozzo-validation/v4" + "github.com/pocketbase/ozzo-validation/v4/is" "github.com/pocketbase/pocketbase/core" "github.com/pocketbase/pocketbase/daos" "github.com/pocketbase/pocketbase/mails" diff --git a/forms/record_email_change_request_test.go b/forms/record_email_change_request_test.go index c6e8e9d3..cf1d1a81 100644 --- a/forms/record_email_change_request_test.go +++ b/forms/record_email_change_request_test.go @@ -5,7 +5,7 @@ import ( "errors" "testing" - validation "github.com/go-ozzo/ozzo-validation/v4" + validation "github.com/pocketbase/ozzo-validation/v4" "github.com/pocketbase/pocketbase/forms" "github.com/pocketbase/pocketbase/models" "github.com/pocketbase/pocketbase/tests" diff --git a/forms/record_oauth2_login.go b/forms/record_oauth2_login.go index 05b10437..8bac7591 100644 --- a/forms/record_oauth2_login.go +++ b/forms/record_oauth2_login.go @@ -6,8 +6,8 @@ import ( "fmt" "time" - validation "github.com/go-ozzo/ozzo-validation/v4" "github.com/pocketbase/dbx" + validation "github.com/pocketbase/ozzo-validation/v4" "github.com/pocketbase/pocketbase/core" "github.com/pocketbase/pocketbase/daos" "github.com/pocketbase/pocketbase/models" diff --git a/forms/record_oauth2_login_test.go b/forms/record_oauth2_login_test.go index 5a4c0744..6b42bfb7 100644 --- a/forms/record_oauth2_login_test.go +++ b/forms/record_oauth2_login_test.go @@ -4,7 +4,7 @@ import ( "encoding/json" "testing" - validation "github.com/go-ozzo/ozzo-validation/v4" + validation "github.com/pocketbase/ozzo-validation/v4" "github.com/pocketbase/pocketbase/forms" "github.com/pocketbase/pocketbase/tests" ) diff --git a/forms/record_password_login.go b/forms/record_password_login.go index 85f8caae..be946856 100644 --- a/forms/record_password_login.go +++ b/forms/record_password_login.go @@ -4,8 +4,8 @@ import ( "database/sql" "errors" - validation "github.com/go-ozzo/ozzo-validation/v4" - "github.com/go-ozzo/ozzo-validation/v4/is" + validation "github.com/pocketbase/ozzo-validation/v4" + "github.com/pocketbase/ozzo-validation/v4/is" "github.com/pocketbase/pocketbase/core" "github.com/pocketbase/pocketbase/daos" "github.com/pocketbase/pocketbase/models" diff --git a/forms/record_password_reset_confirm.go b/forms/record_password_reset_confirm.go index 370322cd..bba25597 100644 --- a/forms/record_password_reset_confirm.go +++ b/forms/record_password_reset_confirm.go @@ -1,7 +1,7 @@ package forms import ( - validation "github.com/go-ozzo/ozzo-validation/v4" + validation "github.com/pocketbase/ozzo-validation/v4" "github.com/pocketbase/pocketbase/core" "github.com/pocketbase/pocketbase/daos" "github.com/pocketbase/pocketbase/forms/validators" diff --git a/forms/record_password_reset_confirm_test.go b/forms/record_password_reset_confirm_test.go index 18fb7a6d..6d6ea103 100644 --- a/forms/record_password_reset_confirm_test.go +++ b/forms/record_password_reset_confirm_test.go @@ -5,7 +5,7 @@ import ( "errors" "testing" - validation "github.com/go-ozzo/ozzo-validation/v4" + validation "github.com/pocketbase/ozzo-validation/v4" "github.com/pocketbase/pocketbase/forms" "github.com/pocketbase/pocketbase/models" "github.com/pocketbase/pocketbase/tests" diff --git a/forms/record_password_reset_request.go b/forms/record_password_reset_request.go index 0abda397..ba9efc10 100644 --- a/forms/record_password_reset_request.go +++ b/forms/record_password_reset_request.go @@ -5,8 +5,8 @@ import ( "fmt" "time" - validation "github.com/go-ozzo/ozzo-validation/v4" - "github.com/go-ozzo/ozzo-validation/v4/is" + validation "github.com/pocketbase/ozzo-validation/v4" + "github.com/pocketbase/ozzo-validation/v4/is" "github.com/pocketbase/pocketbase/core" "github.com/pocketbase/pocketbase/daos" "github.com/pocketbase/pocketbase/mails" diff --git a/forms/record_upsert.go b/forms/record_upsert.go index 55358de1..6287e89f 100644 --- a/forms/record_upsert.go +++ b/forms/record_upsert.go @@ -9,9 +9,9 @@ import ( "regexp" "strings" - validation "github.com/go-ozzo/ozzo-validation/v4" - "github.com/go-ozzo/ozzo-validation/v4/is" "github.com/pocketbase/dbx" + validation "github.com/pocketbase/ozzo-validation/v4" + "github.com/pocketbase/ozzo-validation/v4/is" "github.com/pocketbase/pocketbase/core" "github.com/pocketbase/pocketbase/daos" "github.com/pocketbase/pocketbase/forms/validators" diff --git a/forms/record_upsert_test.go b/forms/record_upsert_test.go index b037f06b..5c843fa9 100644 --- a/forms/record_upsert_test.go +++ b/forms/record_upsert_test.go @@ -12,8 +12,8 @@ import ( "strings" "testing" - validation "github.com/go-ozzo/ozzo-validation/v4" "github.com/labstack/echo/v5" + validation "github.com/pocketbase/ozzo-validation/v4" "github.com/pocketbase/pocketbase/core" "github.com/pocketbase/pocketbase/daos" "github.com/pocketbase/pocketbase/forms" diff --git a/forms/record_verification_confirm.go b/forms/record_verification_confirm.go index 2d0f7ad5..0b8cf143 100644 --- a/forms/record_verification_confirm.go +++ b/forms/record_verification_confirm.go @@ -1,7 +1,7 @@ package forms import ( - validation "github.com/go-ozzo/ozzo-validation/v4" + validation "github.com/pocketbase/ozzo-validation/v4" "github.com/pocketbase/pocketbase/core" "github.com/pocketbase/pocketbase/daos" "github.com/pocketbase/pocketbase/models" diff --git a/forms/record_verification_request.go b/forms/record_verification_request.go index 09b46799..a988eccd 100644 --- a/forms/record_verification_request.go +++ b/forms/record_verification_request.go @@ -4,8 +4,8 @@ import ( "errors" "time" - validation "github.com/go-ozzo/ozzo-validation/v4" - "github.com/go-ozzo/ozzo-validation/v4/is" + validation "github.com/pocketbase/ozzo-validation/v4" + "github.com/pocketbase/ozzo-validation/v4/is" "github.com/pocketbase/pocketbase/core" "github.com/pocketbase/pocketbase/daos" "github.com/pocketbase/pocketbase/mails" diff --git a/forms/settings_upsert_test.go b/forms/settings_upsert_test.go index fee6fbcf..545b172b 100644 --- a/forms/settings_upsert_test.go +++ b/forms/settings_upsert_test.go @@ -6,7 +6,7 @@ import ( "os" "testing" - validation "github.com/go-ozzo/ozzo-validation/v4" + validation "github.com/pocketbase/ozzo-validation/v4" "github.com/pocketbase/pocketbase/forms" "github.com/pocketbase/pocketbase/models/settings" "github.com/pocketbase/pocketbase/tests" diff --git a/forms/test_email_send.go b/forms/test_email_send.go index 5dd902e4..099b2725 100644 --- a/forms/test_email_send.go +++ b/forms/test_email_send.go @@ -1,8 +1,8 @@ package forms import ( - validation "github.com/go-ozzo/ozzo-validation/v4" - "github.com/go-ozzo/ozzo-validation/v4/is" + validation "github.com/pocketbase/ozzo-validation/v4" + "github.com/pocketbase/ozzo-validation/v4/is" "github.com/pocketbase/pocketbase/core" "github.com/pocketbase/pocketbase/mails" "github.com/pocketbase/pocketbase/models" diff --git a/forms/test_email_send_test.go b/forms/test_email_send_test.go index 4bae5ee3..32b51404 100644 --- a/forms/test_email_send_test.go +++ b/forms/test_email_send_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - validation "github.com/go-ozzo/ozzo-validation/v4" + validation "github.com/pocketbase/ozzo-validation/v4" "github.com/pocketbase/pocketbase/forms" "github.com/pocketbase/pocketbase/tests" ) diff --git a/forms/test_s3_filesystem.go b/forms/test_s3_filesystem.go index c2e26e59..20efb4c3 100644 --- a/forms/test_s3_filesystem.go +++ b/forms/test_s3_filesystem.go @@ -4,7 +4,7 @@ import ( "errors" "fmt" - validation "github.com/go-ozzo/ozzo-validation/v4" + validation "github.com/pocketbase/ozzo-validation/v4" "github.com/pocketbase/pocketbase/core" "github.com/pocketbase/pocketbase/models/settings" "github.com/pocketbase/pocketbase/tools/filesystem" diff --git a/forms/test_s3_filesystem_test.go b/forms/test_s3_filesystem_test.go index 71453705..111365ee 100644 --- a/forms/test_s3_filesystem_test.go +++ b/forms/test_s3_filesystem_test.go @@ -3,7 +3,7 @@ package forms_test import ( "testing" - validation "github.com/go-ozzo/ozzo-validation/v4" + validation "github.com/pocketbase/ozzo-validation/v4" "github.com/pocketbase/pocketbase/forms" "github.com/pocketbase/pocketbase/tests" ) diff --git a/forms/validators/file.go b/forms/validators/file.go index 2177078e..0a65efc1 100644 --- a/forms/validators/file.go +++ b/forms/validators/file.go @@ -5,7 +5,7 @@ import ( "strings" "github.com/gabriel-vasile/mimetype" - validation "github.com/go-ozzo/ozzo-validation/v4" + validation "github.com/pocketbase/ozzo-validation/v4" "github.com/pocketbase/pocketbase/tools/filesystem" ) diff --git a/forms/validators/model.go b/forms/validators/model.go index 035c1239..f378297d 100644 --- a/forms/validators/model.go +++ b/forms/validators/model.go @@ -4,8 +4,8 @@ import ( "database/sql" "errors" - validation "github.com/go-ozzo/ozzo-validation/v4" "github.com/pocketbase/dbx" + validation "github.com/pocketbase/ozzo-validation/v4" "github.com/pocketbase/pocketbase/daos" ) diff --git a/forms/validators/record_data.go b/forms/validators/record_data.go index b1d8359d..c029534a 100644 --- a/forms/validators/record_data.go +++ b/forms/validators/record_data.go @@ -7,9 +7,9 @@ import ( "regexp" "strings" - validation "github.com/go-ozzo/ozzo-validation/v4" - "github.com/go-ozzo/ozzo-validation/v4/is" "github.com/pocketbase/dbx" + validation "github.com/pocketbase/ozzo-validation/v4" + "github.com/pocketbase/ozzo-validation/v4/is" "github.com/pocketbase/pocketbase/daos" "github.com/pocketbase/pocketbase/models" "github.com/pocketbase/pocketbase/models/schema" diff --git a/forms/validators/record_data_test.go b/forms/validators/record_data_test.go index 029dc6ea..c3ded338 100644 --- a/forms/validators/record_data_test.go +++ b/forms/validators/record_data_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - validation "github.com/go-ozzo/ozzo-validation/v4" + validation "github.com/pocketbase/ozzo-validation/v4" "github.com/pocketbase/pocketbase/daos" "github.com/pocketbase/pocketbase/forms/validators" "github.com/pocketbase/pocketbase/models" diff --git a/forms/validators/string.go b/forms/validators/string.go index 00eb997d..c131321b 100644 --- a/forms/validators/string.go +++ b/forms/validators/string.go @@ -1,7 +1,7 @@ package validators import ( - validation "github.com/go-ozzo/ozzo-validation/v4" + validation "github.com/pocketbase/ozzo-validation/v4" ) // Compare checks whether the validated value matches another string. diff --git a/go.mod b/go.mod index 48a49ae2..0f7c163f 100644 --- a/go.mod +++ b/go.mod @@ -18,12 +18,12 @@ require ( github.com/fsnotify/fsnotify v1.7.0 github.com/gabriel-vasile/mimetype v1.4.7 github.com/ganigeorgiev/fexpr v0.4.1 - github.com/go-ozzo/ozzo-validation/v4 v4.3.0 github.com/goccy/go-json v0.10.4 github.com/golang-jwt/jwt/v4 v4.5.2 github.com/labstack/echo/v5 v5.0.0-20230722203903-ec5b858dab61 github.com/mattn/go-sqlite3 v1.14.24 github.com/pocketbase/dbx v1.11.0 + github.com/pocketbase/ozzo-validation/v4 v4.3.0 github.com/pocketbase/tygoja v0.0.0-20241015175937-d6ff411a0f75 github.com/spf13/cast v1.7.1 github.com/spf13/cobra v1.8.1 diff --git a/go.sum b/go.sum index dfe6cc53..64d4511c 100644 --- a/go.sum +++ b/go.sum @@ -104,8 +104,6 @@ github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= -github.com/go-ozzo/ozzo-validation/v4 v4.3.0 h1:byhDUpfEwjsVQb1vBunvIjh2BHQ9ead57VkAEY4V+Es= -github.com/go-ozzo/ozzo-validation/v4 v4.3.0/go.mod h1:2NKgrcHl3z6cJs+3Oo940FPRiTzuqKbvfrL2RxCj6Ew= github.com/go-sourcemap/sourcemap v2.1.4+incompatible h1:a+iTbH5auLKxaNwQFg0B+TCYl6lbukKPc7b5x0n1s6Q= github.com/go-sourcemap/sourcemap v2.1.4+incompatible/go.mod h1:F8jJfvm2KbVjc5NqelyYJmf/v5J0dwNLS2mL4sNA1Jg= github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= @@ -187,6 +185,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pocketbase/dbx v1.11.0 h1:LpZezioMfT3K4tLrqA55wWFw1EtH1pM4tzSVa7kgszU= github.com/pocketbase/dbx v1.11.0/go.mod h1:xXRCIAKTHMgUCyCKZm55pUOdvFziJjQfXaWKhu2vhMs= +github.com/pocketbase/ozzo-validation/v4 v4.3.0 h1:uKBDVma7bZqgR2a6AwE+k9hkuDFfiZMpBHQdZ1z3iQs= +github.com/pocketbase/ozzo-validation/v4 v4.3.0/go.mod h1:6XNjSTw/Jb2F8LOkKO3oyzIWExbrGiYoS4uVxVwz90g= github.com/pocketbase/tygoja v0.0.0-20241015175937-d6ff411a0f75 h1:XSbmekxgmbI2uPrre/nkCz7y8VsV652TPb3hAYzPb74= github.com/pocketbase/tygoja v0.0.0-20241015175937-d6ff411a0f75/go.mod h1:hKJWPGFqavk3cdTa47Qvs8g37lnfI57OYdVVbIqW5aE= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= diff --git a/models/collection.go b/models/collection.go index f9a3eaa5..cc2023c4 100644 --- a/models/collection.go +++ b/models/collection.go @@ -3,8 +3,8 @@ package models import ( "encoding/json" - validation "github.com/go-ozzo/ozzo-validation/v4" - "github.com/go-ozzo/ozzo-validation/v4/is" + validation "github.com/pocketbase/ozzo-validation/v4" + "github.com/pocketbase/ozzo-validation/v4/is" "github.com/pocketbase/pocketbase/models/schema" "github.com/pocketbase/pocketbase/tools/types" ) diff --git a/models/collection_test.go b/models/collection_test.go index ab8c0525..e2e8162e 100644 --- a/models/collection_test.go +++ b/models/collection_test.go @@ -4,7 +4,7 @@ import ( "encoding/json" "testing" - validation "github.com/go-ozzo/ozzo-validation/v4" + validation "github.com/pocketbase/ozzo-validation/v4" "github.com/pocketbase/pocketbase/models" "github.com/pocketbase/pocketbase/tools/list" "github.com/pocketbase/pocketbase/tools/types" diff --git a/models/schema/schema.go b/models/schema/schema.go index d48b0550..100759ca 100644 --- a/models/schema/schema.go +++ b/models/schema/schema.go @@ -9,7 +9,7 @@ import ( "strconv" "strings" - validation "github.com/go-ozzo/ozzo-validation/v4" + validation "github.com/pocketbase/ozzo-validation/v4" "github.com/pocketbase/pocketbase/tools/list" "github.com/pocketbase/pocketbase/tools/security" ) diff --git a/models/schema/schema_field.go b/models/schema/schema_field.go index 38a735f1..d2e06a97 100644 --- a/models/schema/schema_field.go +++ b/models/schema/schema_field.go @@ -7,8 +7,8 @@ import ( "strconv" "strings" - validation "github.com/go-ozzo/ozzo-validation/v4" - "github.com/go-ozzo/ozzo-validation/v4/is" + validation "github.com/pocketbase/ozzo-validation/v4" + "github.com/pocketbase/ozzo-validation/v4/is" "github.com/pocketbase/pocketbase/tools/filesystem" "github.com/pocketbase/pocketbase/tools/list" "github.com/pocketbase/pocketbase/tools/types" diff --git a/models/schema/schema_field_test.go b/models/schema/schema_field_test.go index abc7c244..1c2d879b 100644 --- a/models/schema/schema_field_test.go +++ b/models/schema/schema_field_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - validation "github.com/go-ozzo/ozzo-validation/v4" + validation "github.com/pocketbase/ozzo-validation/v4" "github.com/pocketbase/pocketbase/models/schema" "github.com/pocketbase/pocketbase/tools/types" ) diff --git a/models/settings/settings.go b/models/settings/settings.go index 32f1ebeb..6835d2dc 100644 --- a/models/settings/settings.go +++ b/models/settings/settings.go @@ -7,8 +7,8 @@ import ( "strings" "sync" - validation "github.com/go-ozzo/ozzo-validation/v4" - "github.com/go-ozzo/ozzo-validation/v4/is" + validation "github.com/pocketbase/ozzo-validation/v4" + "github.com/pocketbase/ozzo-validation/v4/is" "github.com/pocketbase/pocketbase/tools/auth" "github.com/pocketbase/pocketbase/tools/cron" "github.com/pocketbase/pocketbase/tools/mailer" diff --git a/models/settings/settings_test.go b/models/settings/settings_test.go index e54ceb5e..feee9c04 100644 --- a/models/settings/settings_test.go +++ b/models/settings/settings_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - validation "github.com/go-ozzo/ozzo-validation/v4" + validation "github.com/pocketbase/ozzo-validation/v4" "github.com/pocketbase/pocketbase/models/settings" "github.com/pocketbase/pocketbase/tools/auth" "github.com/pocketbase/pocketbase/tools/mailer" diff --git a/plugins/jsvm/binds.go b/plugins/jsvm/binds.go index 7e97ab3a..d8a7e0a1 100644 --- a/plugins/jsvm/binds.go +++ b/plugins/jsvm/binds.go @@ -16,10 +16,10 @@ import ( "time" "github.com/dop251/goja" - validation "github.com/go-ozzo/ozzo-validation/v4" "github.com/labstack/echo/v5" "github.com/labstack/echo/v5/middleware" "github.com/pocketbase/dbx" + validation "github.com/pocketbase/ozzo-validation/v4" "github.com/pocketbase/pocketbase/apis" "github.com/pocketbase/pocketbase/core" "github.com/pocketbase/pocketbase/daos" diff --git a/plugins/jsvm/binds_test.go b/plugins/jsvm/binds_test.go index 0c973930..94b9eb4d 100644 --- a/plugins/jsvm/binds_test.go +++ b/plugins/jsvm/binds_test.go @@ -14,8 +14,8 @@ import ( "time" "github.com/dop251/goja" - validation "github.com/go-ozzo/ozzo-validation/v4" "github.com/pocketbase/dbx" + validation "github.com/pocketbase/ozzo-validation/v4" "github.com/pocketbase/pocketbase/apis" "github.com/pocketbase/pocketbase/core" "github.com/pocketbase/pocketbase/daos" diff --git a/plugins/jsvm/internal/types/types.go b/plugins/jsvm/internal/types/types.go index d472fb3a..918563a7 100644 --- a/plugins/jsvm/internal/types/types.go +++ b/plugins/jsvm/internal/types/types.go @@ -1090,7 +1090,7 @@ func main() { gen := tygoja.New(tygoja.Config{ Packages: map[string][]string{ "github.com/labstack/echo/v5/middleware": {"Gzip", "BodyLimit"}, - "github.com/go-ozzo/ozzo-validation/v4": {"Error"}, + "github.com/pocketbase/ozzo-validation/v4": {"Error"}, "github.com/pocketbase/dbx": {"*"}, "github.com/pocketbase/pocketbase/tools/security": {"*"}, "github.com/pocketbase/pocketbase/tools/filesystem": {"*"}, diff --git a/tools/auth/gitee.go b/tools/auth/gitee.go index fea0a34d..a3d6731b 100644 --- a/tools/auth/gitee.go +++ b/tools/auth/gitee.go @@ -6,7 +6,7 @@ import ( "io" "strconv" - "github.com/go-ozzo/ozzo-validation/v4/is" + "github.com/pocketbase/ozzo-validation/v4/is" "github.com/pocketbase/pocketbase/tools/types" "golang.org/x/oauth2" ) diff --git a/tools/logger/batch_handler.go b/tools/logger/batch_handler.go index 7f1384dc..41424c60 100644 --- a/tools/logger/batch_handler.go +++ b/tools/logger/batch_handler.go @@ -7,7 +7,7 @@ import ( "log/slog" "sync" - validation "github.com/go-ozzo/ozzo-validation/v4" + validation "github.com/pocketbase/ozzo-validation/v4" "github.com/pocketbase/pocketbase/tools/types" ) diff --git a/tools/logger/batch_handler_test.go b/tools/logger/batch_handler_test.go index 11f8aa26..dcbf0d3c 100644 --- a/tools/logger/batch_handler_test.go +++ b/tools/logger/batch_handler_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - validation "github.com/go-ozzo/ozzo-validation/v4" + validation "github.com/pocketbase/ozzo-validation/v4" ) func TestNewBatchHandlerPanic(t *testing.T) { diff --git a/tools/template/registry.go b/tools/template/registry.go index c80b3391..57af4b29 100644 --- a/tools/template/registry.go +++ b/tools/template/registry.go @@ -6,19 +6,19 @@ // // Example: // -// registry := template.NewRegistry() +// registry := template.NewRegistry() // -// html1, err := registry.LoadFiles( -// // the files set wil be parsed only once and then cached -// "layout.html", -// "content.html", -// ).Render(map[string]any{"name": "John"}) +// html1, err := registry.LoadFiles( +// // the files set wil be parsed only once and then cached +// "layout.html", +// "content.html", +// ).Render(map[string]any{"name": "John"}) // -// html2, err := registry.LoadFiles( -// // reuse the already parsed and cached files set -// "layout.html", -// "content.html", -// ).Render(map[string]any{"name": "Jane"}) +// html2, err := registry.LoadFiles( +// // reuse the already parsed and cached files set +// "layout.html", +// "content.html", +// ).Render(map[string]any{"name": "Jane"}) package template import ( @@ -64,12 +64,12 @@ type Registry struct { // // Example: // -// r.AddFuncs(map[string]any{ -// "toUpper": func(str string) string { -// return strings.ToUppser(str) -// }, -// ... -// }) +// r.AddFuncs(map[string]any{ +// "toUpper": func(str string) string { +// return strings.ToUppser(str) +// }, +// ... +// }) func (r *Registry) AddFuncs(funcs map[string]any) *Registry { for name, f := range funcs { r.funcs[name] = f diff --git a/tools/tokenizer/tokenizer_test.go b/tools/tokenizer/tokenizer_test.go index 801ba946..c9aab596 100644 --- a/tools/tokenizer/tokenizer_test.go +++ b/tools/tokenizer/tokenizer_test.go @@ -159,8 +159,8 @@ func TestScanAll(t *testing.T) { }, }, { - name: "keep separators", - content: `a, b, c, d e, "a,b, c ", (123, 456)`, + name: "keep separators", + content: `a, b, c, d e, "a,b, c ", (123, 456)`, separators: []rune{',', ' '}, // the space should be removed from the cutset keepSeparator: true, keepEmptyTokens: true,