diff --git a/common/containers/container.go b/common/containers/container.go
index da174a4ee..3097a3f78 100644
--- a/common/containers/container.go
+++ b/common/containers/container.go
@@ -214,7 +214,7 @@ func Abbrevs(qualifiedNames ...string) ContainerOption {
return func(c *Container) (*Container, error) {
for _, qn := range qualifiedNames {
qn = strings.TrimSpace(qn)
- for _, r := range []rune(qn) {
+ for _, r := range qn {
if !isIdentifierChar(r) {
return nil, fmt.Errorf(
"invalid qualified name: %s, wanted name of the form 'qualified.name'", qn)
diff --git a/common/types/null.go b/common/types/null.go
index 8fb3c3c73..36514ff20 100644
--- a/common/types/null.go
+++ b/common/types/null.go
@@ -66,7 +66,7 @@ func (n Null) ConvertToNative(typeDesc reflect.Type) (any, error) {
uint64WrapperType, durationValueType, timestampValueType, protoIfaceType:
return nil, nil
case jsonListValueType, jsonStructType:
- break
+ // skip handling
default:
if typeDesc.Implements(protoIfaceType) {
return nil, nil
diff --git a/common/types/null_test.go b/common/types/null_test.go
index 6f350a231..782f8ff36 100644
--- a/common/types/null_test.go
+++ b/common/types/null_test.go
@@ -20,9 +20,9 @@ import (
"reflect"
"testing"
- "github.com/google/cel-go/test/proto3pb"
"google.golang.org/protobuf/proto"
+ proto3pb "github.com/google/cel-go/test/proto3pb"
dynamicpb "google.golang.org/protobuf/types/dynamicpb"
anypb "google.golang.org/protobuf/types/known/anypb"
structpb "google.golang.org/protobuf/types/known/structpb"
diff --git a/conformance/conformance_test.go b/conformance/conformance_test.go
index d784bc675..bc343adf0 100644
--- a/conformance/conformance_test.go
+++ b/conformance/conformance_test.go
@@ -12,17 +12,20 @@ import (
"cel.dev/expr/proto/test/v1/testpb"
"github.com/bazelbuild/rules_go/go/runfiles"
+
"github.com/google/cel-go/cel"
"github.com/google/cel-go/common"
"github.com/google/cel-go/common/types"
"github.com/google/cel-go/common/types/ref"
"github.com/google/cel-go/ext"
"github.com/google/go-cmp/cmp"
+
"google.golang.org/protobuf/encoding/prototext"
"google.golang.org/protobuf/testing/protocmp"
test2pb "cel.dev/expr/proto/test/v1/proto2/test_all_types"
test3pb "cel.dev/expr/proto/test/v1/proto3/test_all_types"
+
exprpb "google.golang.org/genproto/googleapis/api/expr/v1alpha1"
)
diff --git a/interpreter/interpreter_test.go b/interpreter/interpreter_test.go
index 241fe3222..ad4709730 100644
--- a/interpreter/interpreter_test.go
+++ b/interpreter/interpreter_test.go
@@ -26,8 +26,6 @@ import (
"time"
"google.golang.org/protobuf/proto"
- "google.golang.org/protobuf/types/known/structpb"
- "google.golang.org/protobuf/types/known/wrapperspb"
"github.com/google/cel-go/checker"
"github.com/google/cel-go/common"
@@ -42,7 +40,9 @@ import (
"github.com/google/cel-go/parser"
exprpb "google.golang.org/genproto/googleapis/api/expr/v1alpha1"
+ structpb "google.golang.org/protobuf/types/known/structpb"
tpb "google.golang.org/protobuf/types/known/timestamppb"
+ wrapperspb "google.golang.org/protobuf/types/known/wrapperspb"
proto2pb "github.com/google/cel-go/test/proto2pb"
proto3pb "github.com/google/cel-go/test/proto3pb"
diff --git a/policy/compiler_test.go b/policy/compiler_test.go
index 5fde5cfaf..923b9933d 100644
--- a/policy/compiler_test.go
+++ b/policy/compiler_test.go
@@ -223,6 +223,9 @@ func (r *runner) run(t *testing.T) {
t.Fatalf("context variable is not a valid proto: %v", err)
}
activation, err = cel.ContextProtoVars(ctx.(proto.Message))
+ if err != nil {
+ t.Fatalf("cel.ContextProtoVars() failed: %v", err)
+ }
break
}
input[k] = v.Value
@@ -276,6 +279,9 @@ func (r *runner) bench(b *testing.B) {
b.Fatalf("context variable is not a valid proto: %v", err)
}
activation, err = cel.ContextProtoVars(ctx.(proto.Message))
+ if err != nil {
+ b.Fatalf("cel.ContextProtoVars() failed: %v", err)
+ }
break
}
input[k] = v.Value
diff --git a/policy/config_test.go b/policy/config_test.go
index c2859a526..68196327a 100644
--- a/policy/config_test.go
+++ b/policy/config_test.go
@@ -179,7 +179,7 @@ variables:
{
config: `
variables:
- - type:
+ - type:
type_name: "no variable name"`,
err: "invalid variable, must set 'name' or 'context_proto' field",
},
diff --git a/policy/helper_test.go b/policy/helper_test.go
index 2bee9abef..00dbd53d5 100644
--- a/policy/helper_test.go
+++ b/policy/helper_test.go
@@ -22,9 +22,10 @@ import (
"github.com/google/cel-go/cel"
"github.com/google/cel-go/common/types"
"github.com/google/cel-go/common/types/ref"
- "github.com/google/cel-go/test/proto3pb"
"gopkg.in/yaml.v3"
+
+ proto3pb "github.com/google/cel-go/test/proto3pb"
)
var (
diff --git a/repl/evaluator.go b/repl/evaluator.go
index d6c8d8399..0cb95bf8a 100644
--- a/repl/evaluator.go
+++ b/repl/evaluator.go
@@ -742,7 +742,7 @@ func newExtensionOption(extType string) (*extensionOption, error) {
return &extensionOption{extensionType: extType, option: extOption}, nil
} else {
keys := make([]string, 0)
- for k, _ := range extensionMap {
+ for k := range extensionMap {
keys = append(keys, k)
}
sort.Strings(keys)
@@ -821,7 +821,7 @@ func (e *Evaluator) loadExtensionOption(idx int, args []string) error {
argExtType := args[idx]
if argExtType == "all" {
// Load all extension types as a convenience
- for val, _ := range extensionMap {
+ for val := range extensionMap {
err := e.loadExtensionOptionType(val)
if err != nil {
return err