drop validated support

build.sbt

@@ -32,15 +32,20 @@ lazy val proto = project
  .enablePlugins(Fs2Grpc)
  .settings(
  name := "spice4s-client-proto-api",
- scalapbCodeGenerators := scalapbCodeGenerators.value ++ Seq(
+ scalapbCodeGenerators := scalapbCodeGenerators.value/* ++ Seq(
  protocbridge.Target(scalapb.validate.gen(), (Compile / sourceManaged).value / "scalapb")
- ),
+ )*/,
  libraryDependencies ++= Seq(
- "com.thesamet.scalapb" %% "scalapb-validate-core" % scalapb.validate.compiler.BuildInfo.version % "protobuf",
+ /* "com.thesamet.scalapb" %% "scalapb-validate-core" % scalapb.validate.compiler.BuildInfo.version % "protobuf", */
+ "com.thesamet.scalapb.common-protos" %% "pgv-proto-scalapb_0.11" % "0.6.13-0",
+ "com.thesamet.scalapb.common-protos" %% "pgv-proto-scalapb_0.11" % "0.6.13-0" % "protobuf",
  "com.thesamet.scalapb.common-protos" %% "proto-google-common-protos-scalapb_0.11" % "2.9.6-0" % "protobuf",
  "com.thesamet.scalapb.common-protos" %% "proto-google-common-protos-scalapb_0.11" % "2.9.6-0"
  ),
- tlFatalWarningsInCi := false
+ tlFatalWarningsInCi := false,
+ excludeDependencies ++= Seq(
+ ExclusionRule("com.thesamet.scalapb", "scalapb-validate-core_2.13"),
+ )
  )
 
 lazy val client = project

client/src/main/scala/spice4s/client/models/Limit.scala

@@ -26,5 +26,5 @@ object Limit {
 
  def apply(value: Int): Validation[Limit] =
  if (value >= 0 || value <= 1000) unsafeFromString(value).valid
- else invalid("limit", value, "Limit must be between 0 and 1000")
+ else invalid("limit", "Limit must be between 0 and 1000")
 }

client/src/main/scala/spice4s/client/models/ZedToken.scala

@@ -28,7 +28,8 @@ object ZedToken {
  def unsafeFromString(token: String): ZedToken = new ZedToken(token) {}
 
  def apply(token: String): Validation[ZedToken] =
- unsafeFromString(token).validator(_.encode)
+ if (token.size >= 1) unsafeFromString(token).valid
+ else invalid("zed-token", "ZedToken must be at least 1 character long")
 
  def decode(x: core.ZedToken): Decoded[Option[ZedToken]] =
  opt(x.token).map(unsafeFromString).pure[Decoded]

client/src/main/scala/spice4s/client/util/package.scala

@@ -17,34 +17,36 @@
 package spice4s.client
 
 import cats._
-import scalapb.validate._
 import cats.data._
 import cats.implicits._
 import scala.util.matching.Regex
 import cats.ApplicativeError
 
 package object util {
+ final case class ValidationFailure(name: String, message: String)
+
  implicit class AnyUtilOps[A](private val value: A) {
- def validator[V: Validator](f: A => V): Validated[List[ValidationFailure], A] =
- Validator[V].validate(f(value)) match {
- case Failure(violations) => violations.invalid
- case Success => value.valid
- }
+ def minSize(size: Int)(f: A => String): Validated[List[ValidationFailure], A] =
+ if (f(value).length >= size) value.valid
+ else
+ invalid(
+ "min-size-field",
+ s"'$value' with encoded value ${f(value)} is less than min size $size"
+ )
 
  def validateRegex(regex: Regex)(f: A => String): Validated[List[ValidationFailure], A] =
  if (regex.matches(f(value))) value.valid
  else
  invalid(
  "regex-field",
- f(value),
  s"$value with encoded value ${f(value)} does not match regex ${regex.toString}"
  )
  }
 
  type Validation[A] = Validated[List[ValidationFailure], A]
 
- def invalid[A](name: String, a: Any, reason: String): Validation[A] =
- List(ValidationFailure(name, a.toString, reason)).invalid
+ def invalid[A](name: String, message: String): Validation[A] =
+ List(ValidationFailure(name, message)).invalid
 
  final case class DecoderError(message: String, path: Chain[String]) {
  def prepend(p: String): DecoderError = copy(path = p +: path)

project/metals.sbt

@@ -3,3 +3,4 @@
 // This file enables sbt-bloop to create bloop config files.
 
 addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.5.6")
+

project/plugins.sbt

@@ -7,3 +7,5 @@ libraryDependencies ++= Seq(
  "com.thesamet.scalapb" %% "compilerplugin" % "0.11.11",
  "com.thesamet.scalapb" %% "scalapb-validate-codegen" % "0.3.4"
 )
+
+addDependencyTreePlugin

proto/src/main/protobuf/authzed/api/v1/package.proto

@@ -0,0 +1,9 @@
+syntax = "proto3";
+import "scalapb/scalapb.proto";
+
+package google.api;
+
+option (scalapb.options) = {
+ scope: PACKAGE
+ flat_package: false
+};

proto/src/main/protobuf/authzed/api/v1/package2.proto

@@ -0,0 +1,9 @@
+syntax = "proto3";
+import "scalapb/scalapb.proto";
+
+package authzed.api;
+
+option (scalapb.options) = {
+ scope: PACKAGE
+ flat_package: false
+};

proto/src/main/protobuf/authzed/api/v1/permission_service.proto

@@ -545,4 +545,4 @@ message ResolvedSubject {
 
  // partial_caveat_info holds information of a partially-evaluated caveated response
  PartialCaveatInfo partial_caveat_info = 3 [ (validate.rules).message.required = false ];
-}
+}