[build] Move validators to internal (cloudprober#590)

jumpojoy · Oct 20, 2023 · 8f3ff5f · 8f3ff5f
1 parent 5a30656
commit 8f3ff5f
Show file tree

Hide file tree

Showing 39 changed files with 1,146 additions and 1,132 deletions.
diff --git a/validators/http/http.go → internal/validators/http/http.go b/validators/http/http.go → internal/validators/http/http.go
@@ -25,8 +25,8 @@ import (
 	"strings"
 	"time"
 
+	configpb "github.com/cloudprober/cloudprober/internal/validators/http/proto"
 	"github.com/cloudprober/cloudprober/logger"
-	configpb "github.com/cloudprober/cloudprober/validators/http/proto"
 )
 
 // Validator implements a validator for HTTP responses.

diff --git a/validators/http/http_test.go → internal/validators/http/http_test.go b/validators/http/http_test.go → internal/validators/http/http_test.go
@@ -22,8 +22,8 @@ import (
 	"testing"
 	"time"
 
+	configpb "github.com/cloudprober/cloudprober/internal/validators/http/proto"
 	"github.com/cloudprober/cloudprober/logger"
-	configpb "github.com/cloudprober/cloudprober/validators/http/proto"
 	"google.golang.org/protobuf/proto"
 )
 

diff --git a/internal/validators/http/proto/config.pb.go b/internal/validators/http/proto/config.pb.go
diff --git a/validators/http/proto/config.proto → internal/validators/http/proto/config.proto b/validators/http/proto/config.proto → internal/validators/http/proto/config.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package cloudprober.validators.http;
 
-option go_package = "github.com/cloudprober/cloudprober/validators/http/proto";
+option go_package = "github.com/cloudprober/cloudprober/internal/validators/http/proto";
 
 // HTTP validator configuration. For HTTP validator to succeed, all conditions
 // specified in the validator should succeed. Note that failures conditions are

diff --git a/validators/http/proto/config_proto_gen.cue → ...alidators/http/proto/config_proto_gen.cue b/validators/http/proto/config_proto_gen.cue → ...alidators/http/proto/config_proto_gen.cue
diff --git a/validators/integrity/integrity.go → internal/validators/integrity/integrity.go b/validators/integrity/integrity.go → internal/validators/integrity/integrity.go
@@ -19,9 +19,9 @@ package integrity
 import (
 	"fmt"
 
+	configpb "github.com/cloudprober/cloudprober/internal/validators/integrity/proto"
 	"github.com/cloudprober/cloudprober/logger"
 	"github.com/cloudprober/cloudprober/probes/probeutils"
-	configpb "github.com/cloudprober/cloudprober/validators/integrity/proto"
 )
 
 // Validator implements an integrity validator.
@@ -76,7 +76,7 @@ func (v *Validator) Validate(responseBody []byte) (bool, error) {
 }
 
 // PatternNumBytesValidator returns a data integrity validator with number of
-/// pattern bytes set to patternNumbBytes.
+// / pattern bytes set to patternNumbBytes.
 func PatternNumBytesValidator(patternNumbBytes int32, l *logger.Logger) (*Validator, error) {
 	v := &Validator{}
 

diff --git a/validators/integrity/integrity_test.go → ...al/validators/integrity/integrity_test.go b/validators/integrity/integrity_test.go → ...al/validators/integrity/integrity_test.go
@@ -18,8 +18,8 @@ import (
 	"strings"
 	"testing"
 
+	configpb "github.com/cloudprober/cloudprober/internal/validators/integrity/proto"
 	"github.com/cloudprober/cloudprober/logger"
-	configpb "github.com/cloudprober/cloudprober/validators/integrity/proto"
 )
 
 func TestInvalidConfig(t *testing.T) {