chore: migrate configs to protovalidate (#667)

Signed-off-by: Miguel Martinez Trivino <[email protected]>

Author: migmartri

app/artifact-cas/cmd/main.go

@@ -1,5 +1,5 @@
 //
-// Copyright 2023 The Chainloop Authors.
+// Copyright 2024 The Chainloop Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@ import (
 	"os"
 	"time"
 
+	"github.com/bufbuild/protovalidate-go"
 	"github.com/getsentry/sentry-go"
 
 	"github.com/chainloop-dev/chainloop/app/artifact-cas/internal/conf"
@@ -102,6 +103,16 @@ func main() {
 		panic(err)
 	}
 
+	// validate configuration
+	validator, err := protovalidate.New()
+	if err != nil {
+		panic(err)
+	}
+
+	if err := validator.Validate(&bc); err != nil {
+		panic(err)
+	}
+
 	logger, err := servicelogger.InitZapLogger(Version)
 	if err != nil {
 		panic(err)

app/artifact-cas/internal/conf/buf.lock

@@ -2,10 +2,10 @@
 version: v1
 deps:
   - remote: buf.build
-    owner: envoyproxy
-    repository: protoc-gen-validate
-    commit: 45685e052c7e406b9fbd441fc7a568a5
+    owner: bufbuild
+    repository: protovalidate
+    commit: b983156c5e994cc9892e0ce3e64e17e0
   - remote: buf.build
     owner: googleapis
     repository: googleapis
-    commit: cc916c31859748a68fd229a3c8d7a2e8
+    commit: 7a6bc1e3207144b38e9066861e1de0ff

app/artifact-cas/internal/conf/buf.yaml

@@ -4,7 +4,7 @@ breaking:
     - FILE
 deps:
   - buf.build/googleapis/googleapis
-  - buf.build/envoyproxy/protoc-gen-validate:45685e052c7e406b9fbd441fc7a568a5
+  - buf.build/bufbuild/protovalidate
 lint:
   use:
     - DEFAULT

app/artifact-cas/internal/conf/conf.pb.go

@@ -1,5 +1,5 @@
 //
-// Copyright 2023 The Chainloop Authors.
+// Copyright 2024 The Chainloop Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -15,10 +15,10 @@
 
 syntax = "proto3";
 
-option go_package = "github.com/chainloop-dev/chainloop/app/artifact-cas/internal/conf;conf";
-
-import "google/protobuf/duration.proto";
 import "credentials/v1/config.proto";
+import "google/protobuf/duration.proto";
+
+option go_package = "github.com/chainloop-dev/chainloop/app/artifact-cas/internal/conf;conf";
 
 message Bootstrap {
   Server server = 1;

app/artifact-cas/internal/conf/conf.proto

@@ -8,7 +8,7 @@ deps:
   - remote: buf.build
     owner: googleapis
     repository: googleapis
-    commit: cc916c31859748a68fd229a3c8d7a2e8
+    commit: 7a6bc1e3207144b38e9066861e1de0ff
   - remote: buf.build
     owner: kratos-go
     repository: kratos

app/controlplane/api/buf.lock

@@ -1,5 +1,5 @@
 //
-// Copyright 2023 The Chainloop Authors.
+// Copyright 2024 The Chainloop Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@ import (
 	"os"
 	"time"
 
+	"github.com/bufbuild/protovalidate-go"
 	"github.com/getsentry/sentry-go"
 	flag "github.com/spf13/pflag"
 
@@ -90,6 +91,16 @@ func main() {
 		panic(err)
 	}
 
+	// validate configuration
+	validator, err := protovalidate.New()
+	if err != nil {
+		panic(err)
+	}
+
+	if err := validator.Validate(&bc); err != nil {
+		panic(err)
+	}
+
 	logger, err := servicelogger.InitZapLogger(Version)
 	if err != nil {
 		panic(err)

app/controlplane/cmd/main.go

@@ -1,5 +1,5 @@
 //
-// Copyright 2023 The Chainloop Authors.
+// Copyright 2024 The Chainloop Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -21,6 +21,8 @@ import (
 	"fmt"
 	"io"
 
+	"github.com/bufbuild/protovalidate-go"
+
 	"github.com/chainloop-dev/chainloop/app/controlplane/internal/conf"
 	"github.com/chainloop-dev/chainloop/internal/casclient"
 	"github.com/chainloop-dev/chainloop/internal/grpcconn"
@@ -152,8 +154,12 @@ func (uc *CASClientUseCase) IsReady(ctx context.Context) (bool, error) {
 		return false, errors.New("missing CAS server configuration")
 	}
 
-	err := uc.casServerConf.ValidateAll()
+	v, err := protovalidate.New()
 	if err != nil {
+		return false, fmt.Errorf("failed to create validator: %w", err)
+	}
+
+	if err := v.Validate(uc.casServerConf); err != nil {
 		return false, fmt.Errorf("invalid CAS client configuration: %w", err)
 	}
 

app/controlplane/internal/biz/casclient.go

@@ -3,6 +3,3 @@ plugins:
   - name: go
     out: .
     opt: paths=source_relative
-  - name: validate
-    out: .
-    opt: paths=source_relative,lang=go

app/controlplane/internal/conf/buf.gen.yaml

@@ -2,10 +2,10 @@
 version: v1
 deps:
   - remote: buf.build
-    owner: envoyproxy
-    repository: protoc-gen-validate
-    commit: 45685e052c7e406b9fbd441fc7a568a5
+    owner: bufbuild
+    repository: protovalidate
+    commit: b983156c5e994cc9892e0ce3e64e17e0
   - remote: buf.build
     owner: googleapis
     repository: googleapis
-    commit: 463926e7ee924d46ad0a726e1cf4eacd
+    commit: 7a6bc1e3207144b38e9066861e1de0ff