From 63d85fc703b0c63450b1498f5825756e426f735a Mon Sep 17 00:00:00 2001 From: TristonianJones Date: Mon, 26 Aug 2024 22:36:13 -0700 Subject: [PATCH] Update go package references and artifacts on cel-spec --- BUILD.bazel | 31 ++ go.mod | 13 +- go.sum | 23 +- proto/test/v1/BUILD.bazel | 2 +- proto/test/v1/envcheck.proto | 2 +- proto/test/v1/proto2/BUILD.bazel | 2 +- proto/test/v1/proto2/test_all_types.proto | 2 +- .../test_all_types_extensions.pb.go | 336 ++++++++++++++++++ .../v1/proto2/test_all_types_extensions.proto | 2 +- proto/test/v1/proto3/BUILD.bazel | 2 +- proto/test/v1/proto3/test_all_types.proto | 2 +- proto/test/v1/simple.proto | 2 +- proto/test/v1/testpb/envcheck.pb.go | 9 +- proto/test/v1/testpb/simple.pb.go | 7 +- tests/envcheck/BUILD.bazel | 2 +- tests/envcheck/envcheck.go | 41 ++- tests/envcheck/envcheck_test.go | 4 +- tests/go.mod | 18 +- tests/go.sum | 16 + tests/simple/BUILD.bazel | 2 +- tests/simple/simple.go | 9 +- tests/simple/simple_test.go | 8 +- tools/celrpc/BUILD.bazel | 2 +- 23 files changed, 476 insertions(+), 61 deletions(-) create mode 100755 proto/test/v1/proto2/test_all_types/test_all_types_extensions.pb.go diff --git a/BUILD.bazel b/BUILD.bazel index f631b6df..0bbe9ed7 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -1,3 +1,34 @@ +load("@io_bazel_rules_go//go:def.bzl", "go_library") + package(default_visibility = ["//visibility:public"]) licenses(["notice"]) # Apache 2.0 + +go_library( + name = "expr", + srcs = [ + "checked.pb.go", + "eval.pb.go", + "explain.pb.go", + "syntax.pb.go", + "value.pb.go", + ], + importpath = "cel.dev/expr", + visibility = ["//visibility:public"], + deps = [ + "//proto/cel/expr:google_rpc_status_go_proto", + "@org_golang_google_protobuf//reflect/protoreflect", + "@org_golang_google_protobuf//runtime/protoimpl", + "@org_golang_google_protobuf//types/known/anypb", + "@org_golang_google_protobuf//types/known/durationpb", + "@org_golang_google_protobuf//types/known/emptypb", + "@org_golang_google_protobuf//types/known/structpb", + "@org_golang_google_protobuf//types/known/timestamppb", + ], +) + +alias( + name = "go_default_library", + actual = ":expr", + visibility = ["//visibility:public"], +) diff --git a/go.mod b/go.mod index ba829820..6cc92a78 100644 --- a/go.mod +++ b/go.mod @@ -3,6 +3,15 @@ module cel.dev/expr go 1.18 require ( - google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 - google.golang.org/protobuf v1.33.0 + github.com/bazelbuild/rules_go v0.49.0 + google.golang.org/genproto/googleapis/api v0.0.0-20240826202546-f6391c0de4c7 + google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7 + google.golang.org/grpc v1.65.0 + google.golang.org/protobuf v1.34.2 +) + +require ( + golang.org/x/net v0.26.0 // indirect + golang.org/x/sys v0.21.0 // indirect + golang.org/x/text v0.16.0 // indirect ) diff --git a/go.sum b/go.sum index 9c37b040..685d58a3 100644 --- a/go.sum +++ b/go.sum @@ -1,6 +1,17 @@ -github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= -github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 h1:NnYq6UN9ReLM9/Y01KWNOWyI5xQ9kbIms5GGJVwS/Yc= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY= -google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= -google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +github.com/bazelbuild/rules_go v0.49.0 h1:5vCbuvy8Q11g41lseGJDc5vxhDjJtfxr6nM/IC4VmqM= +github.com/bazelbuild/rules_go v0.49.0/go.mod h1:Dhcz716Kqg1RHNWos+N6MlXNkjNP2EwZQ0LukRKJfMs= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= +golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= +golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= +golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= +golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= +google.golang.org/genproto/googleapis/api v0.0.0-20240826202546-f6391c0de4c7 h1:YcyjlL1PRr2Q17/I0dPk2JmYS5CDXfcdb2Z3YRioEbw= +google.golang.org/genproto/googleapis/api v0.0.0-20240826202546-f6391c0de4c7/go.mod h1:OCdP9MfskevB/rbYvHTsXTtKC+3bHWajPdoKgjcYkfo= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7 h1:2035KHhUv+EpyB+hWgJnaWKJOdX1E95w2S8Rr4uWKTs= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU= +google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= +google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= +google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= +google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= diff --git a/proto/test/v1/BUILD.bazel b/proto/test/v1/BUILD.bazel index d880f719..a05b8f48 100644 --- a/proto/test/v1/BUILD.bazel +++ b/proto/test/v1/BUILD.bazel @@ -40,7 +40,7 @@ go_proto_library( ":envcheck_proto", ":simple_proto", ], - importpath = "github.com/google/cel-spec/proto/test/v1/testpb", + importpath = "cel.dev/expr/proto/test/v1/testpb", deps = [ "@org_golang_google_genproto_googleapis_api//expr/v1alpha1:go_default_library", ], diff --git a/proto/test/v1/envcheck.proto b/proto/test/v1/envcheck.proto index d5e0253a..00bf3fb9 100644 --- a/proto/test/v1/envcheck.proto +++ b/proto/test/v1/envcheck.proto @@ -5,7 +5,7 @@ syntax = "proto3"; package google.api.expr.test.v1; // Note, run regen_go_proto.sh after making modifications to this file. -option go_package = "github.com/google/cel-spec/test/v1/testpb"; +option go_package = "cel.dev/expr/test/v1/testpb"; import "google/api/expr/v1alpha1/checked.proto"; diff --git a/proto/test/v1/proto2/BUILD.bazel b/proto/test/v1/proto2/BUILD.bazel index c4495ddc..758cbac5 100644 --- a/proto/test/v1/proto2/BUILD.bazel +++ b/proto/test/v1/proto2/BUILD.bazel @@ -33,7 +33,7 @@ cc_proto_library( go_proto_library( name = "test_all_types_go_proto", proto = ":test_all_types_proto", - importpath = "github.com/google/cel-spec/proto/test/v1/proto2/test_all_types", + importpath = "cel.dev/expr/proto/test/v1/proto2/test_all_types", deps = [ "@org_golang_google_protobuf//types/known/anypb:go_default_library", "@org_golang_google_protobuf//types/known/durationpb:go_default_library", diff --git a/proto/test/v1/proto2/test_all_types.proto b/proto/test/v1/proto2/test_all_types.proto index 5a9500f3..8143ee29 100644 --- a/proto/test/v1/proto2/test_all_types.proto +++ b/proto/test/v1/proto2/test_all_types.proto @@ -11,7 +11,7 @@ import "google/protobuf/timestamp.proto"; import "google/protobuf/wrappers.proto"; // Note, run regen_go_proto.sh after making modifications to this file. -option go_package = "github.com/google/cel-spec/test/v1/proto2/test_all_types"; +option go_package = "cel.dev/expr/test/v1/proto2/test_all_types"; option cc_enable_arenas = true; option java_outer_classname = "TestAllTypesProto"; option java_package = "com.google.api.expr.test.v1.proto2"; diff --git a/proto/test/v1/proto2/test_all_types/test_all_types_extensions.pb.go b/proto/test/v1/proto2/test_all_types/test_all_types_extensions.pb.go new file mode 100755 index 00000000..f894eac4 --- /dev/null +++ b/proto/test/v1/proto2/test_all_types/test_all_types_extensions.pb.go @@ -0,0 +1,336 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.28.1 +// protoc v3.21.5 +// source: proto/test/v1/proto2/test_all_types_extensions.proto + +package test_all_types + +import ( + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" +) + +const ( + // Verify that this generated code is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) + // Verify that runtime/protoimpl is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) +) + +type Proto2ExtensionScopedMessage struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields +} + +func (x *Proto2ExtensionScopedMessage) Reset() { + *x = Proto2ExtensionScopedMessage{} + if protoimpl.UnsafeEnabled { + mi := &file_proto_test_v1_proto2_test_all_types_extensions_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *Proto2ExtensionScopedMessage) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*Proto2ExtensionScopedMessage) ProtoMessage() {} + +func (x *Proto2ExtensionScopedMessage) ProtoReflect() protoreflect.Message { + mi := &file_proto_test_v1_proto2_test_all_types_extensions_proto_msgTypes[0] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use Proto2ExtensionScopedMessage.ProtoReflect.Descriptor instead. +func (*Proto2ExtensionScopedMessage) Descriptor() ([]byte, []int) { + return file_proto_test_v1_proto2_test_all_types_extensions_proto_rawDescGZIP(), []int{0} +} + +var file_proto_test_v1_proto2_test_all_types_extensions_proto_extTypes = []protoimpl.ExtensionInfo{ + { + ExtendedType: (*TestAllTypes)(nil), + ExtensionType: (*int32)(nil), + Field: 1000, + Name: "google.api.expr.test.v1.proto2.int32_ext", + Tag: "varint,1000,opt,name=int32_ext", + Filename: "proto/test/v1/proto2/test_all_types_extensions.proto", + }, + { + ExtendedType: (*TestAllTypes)(nil), + ExtensionType: (*TestAllTypes)(nil), + Field: 1001, + Name: "google.api.expr.test.v1.proto2.nested_ext", + Tag: "bytes,1001,opt,name=nested_ext", + Filename: "proto/test/v1/proto2/test_all_types_extensions.proto", + }, + { + ExtendedType: (*TestAllTypes)(nil), + ExtensionType: (*TestAllTypes)(nil), + Field: 1002, + Name: "google.api.expr.test.v1.proto2.test_all_types_ext", + Tag: "bytes,1002,opt,name=test_all_types_ext", + Filename: "proto/test/v1/proto2/test_all_types_extensions.proto", + }, + { + ExtendedType: (*TestAllTypes)(nil), + ExtensionType: (*TestAllTypes_NestedEnum)(nil), + Field: 1003, + Name: "google.api.expr.test.v1.proto2.nested_enum_ext", + Tag: "varint,1003,opt,name=nested_enum_ext,enum=google.api.expr.test.v1.proto2.TestAllTypes_NestedEnum", + Filename: "proto/test/v1/proto2/test_all_types_extensions.proto", + }, + { + ExtendedType: (*TestAllTypes)(nil), + ExtensionType: ([]*TestAllTypes)(nil), + Field: 1004, + Name: "google.api.expr.test.v1.proto2.repeated_test_all_types", + Tag: "bytes,1004,rep,name=repeated_test_all_types", + Filename: "proto/test/v1/proto2/test_all_types_extensions.proto", + }, + { + ExtendedType: (*TestAllTypes)(nil), + ExtensionType: (*int64)(nil), + Field: 1005, + Name: "google.api.expr.test.v1.proto2.Proto2ExtensionScopedMessage.int64_ext", + Tag: "varint,1005,opt,name=int64_ext", + Filename: "proto/test/v1/proto2/test_all_types_extensions.proto", + }, + { + ExtendedType: (*TestAllTypes)(nil), + ExtensionType: (*TestAllTypes)(nil), + Field: 1006, + Name: "google.api.expr.test.v1.proto2.Proto2ExtensionScopedMessage.message_scoped_nested_ext", + Tag: "bytes,1006,opt,name=message_scoped_nested_ext", + Filename: "proto/test/v1/proto2/test_all_types_extensions.proto", + }, + { + ExtendedType: (*TestAllTypes)(nil), + ExtensionType: (*TestAllTypes_NestedEnum)(nil), + Field: 1007, + Name: "google.api.expr.test.v1.proto2.Proto2ExtensionScopedMessage.nested_enum_ext", + Tag: "varint,1007,opt,name=nested_enum_ext,enum=google.api.expr.test.v1.proto2.TestAllTypes_NestedEnum", + Filename: "proto/test/v1/proto2/test_all_types_extensions.proto", + }, + { + ExtendedType: (*TestAllTypes)(nil), + ExtensionType: ([]*TestAllTypes)(nil), + Field: 1008, + Name: "google.api.expr.test.v1.proto2.Proto2ExtensionScopedMessage.message_scoped_repeated_test_all_types", + Tag: "bytes,1008,rep,name=message_scoped_repeated_test_all_types", + Filename: "proto/test/v1/proto2/test_all_types_extensions.proto", + }, +} + +// Extension fields to TestAllTypes. +var ( + // optional int32 int32_ext = 1000; + E_Int32Ext = &file_proto_test_v1_proto2_test_all_types_extensions_proto_extTypes[0] + // optional google.api.expr.test.v1.proto2.TestAllTypes nested_ext = 1001; + E_NestedExt = &file_proto_test_v1_proto2_test_all_types_extensions_proto_extTypes[1] + // optional google.api.expr.test.v1.proto2.TestAllTypes test_all_types_ext = 1002; + E_TestAllTypesExt = &file_proto_test_v1_proto2_test_all_types_extensions_proto_extTypes[2] + // optional google.api.expr.test.v1.proto2.TestAllTypes.NestedEnum nested_enum_ext = 1003; + E_NestedEnumExt = &file_proto_test_v1_proto2_test_all_types_extensions_proto_extTypes[3] + // repeated google.api.expr.test.v1.proto2.TestAllTypes repeated_test_all_types = 1004; + E_RepeatedTestAllTypes = &file_proto_test_v1_proto2_test_all_types_extensions_proto_extTypes[4] + // optional int64 int64_ext = 1005; + E_Proto2ExtensionScopedMessage_Int64Ext = &file_proto_test_v1_proto2_test_all_types_extensions_proto_extTypes[5] + // optional google.api.expr.test.v1.proto2.TestAllTypes message_scoped_nested_ext = 1006; + E_Proto2ExtensionScopedMessage_MessageScopedNestedExt = &file_proto_test_v1_proto2_test_all_types_extensions_proto_extTypes[6] + // optional google.api.expr.test.v1.proto2.TestAllTypes.NestedEnum nested_enum_ext = 1007; + E_Proto2ExtensionScopedMessage_NestedEnumExt = &file_proto_test_v1_proto2_test_all_types_extensions_proto_extTypes[7] + // repeated google.api.expr.test.v1.proto2.TestAllTypes message_scoped_repeated_test_all_types = 1008; + E_Proto2ExtensionScopedMessage_MessageScopedRepeatedTestAllTypes = &file_proto_test_v1_proto2_test_all_types_extensions_proto_extTypes[8] +) + +var File_proto_test_v1_proto2_test_all_types_extensions_proto protoreflect.FileDescriptor + +var file_proto_test_v1_proto2_test_all_types_extensions_proto_rawDesc = []byte{ + 0x0a, 0x34, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x2f, 0x76, 0x31, 0x2f, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x32, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x5f, 0x61, 0x6c, 0x6c, 0x5f, + 0x74, 0x79, 0x70, 0x65, 0x73, 0x5f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, + 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x1e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x61, + 0x70, 0x69, 0x2e, 0x65, 0x78, 0x70, 0x72, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x76, 0x31, 0x2e, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x32, 0x1a, 0x29, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x74, 0x65, + 0x73, 0x74, 0x2f, 0x76, 0x31, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x32, 0x2f, 0x74, 0x65, 0x73, + 0x74, 0x5f, 0x61, 0x6c, 0x6c, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x22, 0xc5, 0x04, 0x0a, 0x1c, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x32, 0x45, 0x78, 0x74, 0x65, + 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x53, 0x63, 0x6f, 0x70, 0x65, 0x64, 0x4d, 0x65, 0x73, 0x73, 0x61, + 0x67, 0x65, 0x32, 0x4a, 0x0a, 0x09, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x5f, 0x65, 0x78, 0x74, 0x12, + 0x2c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x65, 0x78, 0x70, + 0x72, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x32, + 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x54, 0x79, 0x70, 0x65, 0x73, 0x18, 0xed, 0x07, + 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x45, 0x78, 0x74, 0x32, 0x96, + 0x01, 0x0a, 0x19, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x5f, 0x73, 0x63, 0x6f, 0x70, 0x65, + 0x64, 0x5f, 0x6e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x5f, 0x65, 0x78, 0x74, 0x12, 0x2c, 0x2e, 0x67, + 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x65, 0x78, 0x70, 0x72, 0x2e, 0x74, + 0x65, 0x73, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x32, 0x2e, 0x54, 0x65, + 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x54, 0x79, 0x70, 0x65, 0x73, 0x18, 0xee, 0x07, 0x20, 0x01, 0x28, + 0x0b, 0x32, 0x2c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x65, + 0x78, 0x70, 0x72, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x32, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x54, 0x79, 0x70, 0x65, 0x73, 0x52, + 0x16, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x53, 0x63, 0x6f, 0x70, 0x65, 0x64, 0x4e, 0x65, + 0x73, 0x74, 0x65, 0x64, 0x45, 0x78, 0x74, 0x32, 0x8e, 0x01, 0x0a, 0x0f, 0x6e, 0x65, 0x73, 0x74, + 0x65, 0x64, 0x5f, 0x65, 0x6e, 0x75, 0x6d, 0x5f, 0x65, 0x78, 0x74, 0x12, 0x2c, 0x2e, 0x67, 0x6f, + 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x65, 0x78, 0x70, 0x72, 0x2e, 0x74, 0x65, + 0x73, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x32, 0x2e, 0x54, 0x65, 0x73, + 0x74, 0x41, 0x6c, 0x6c, 0x54, 0x79, 0x70, 0x65, 0x73, 0x18, 0xef, 0x07, 0x20, 0x01, 0x28, 0x0e, + 0x32, 0x37, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x65, 0x78, + 0x70, 0x72, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x32, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x54, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x4e, + 0x65, 0x73, 0x74, 0x65, 0x64, 0x45, 0x6e, 0x75, 0x6d, 0x52, 0x0d, 0x6e, 0x65, 0x73, 0x74, 0x65, + 0x64, 0x45, 0x6e, 0x75, 0x6d, 0x45, 0x78, 0x74, 0x32, 0xae, 0x01, 0x0a, 0x26, 0x6d, 0x65, 0x73, + 0x73, 0x61, 0x67, 0x65, 0x5f, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x64, 0x5f, 0x72, 0x65, 0x70, 0x65, + 0x61, 0x74, 0x65, 0x64, 0x5f, 0x74, 0x65, 0x73, 0x74, 0x5f, 0x61, 0x6c, 0x6c, 0x5f, 0x74, 0x79, + 0x70, 0x65, 0x73, 0x12, 0x2c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x61, 0x70, 0x69, + 0x2e, 0x65, 0x78, 0x70, 0x72, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x32, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x54, 0x79, 0x70, 0x65, + 0x73, 0x18, 0xf0, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, + 0x65, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x65, 0x78, 0x70, 0x72, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, + 0x76, 0x31, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x32, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, + 0x6c, 0x54, 0x79, 0x70, 0x65, 0x73, 0x52, 0x21, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x53, + 0x63, 0x6f, 0x70, 0x65, 0x64, 0x52, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x54, 0x65, 0x73, + 0x74, 0x41, 0x6c, 0x6c, 0x54, 0x79, 0x70, 0x65, 0x73, 0x3a, 0x4a, 0x0a, 0x09, 0x69, 0x6e, 0x74, + 0x33, 0x32, 0x5f, 0x65, 0x78, 0x74, 0x12, 0x2c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, + 0x61, 0x70, 0x69, 0x2e, 0x65, 0x78, 0x70, 0x72, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x76, 0x31, + 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x32, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x54, + 0x79, 0x70, 0x65, 0x73, 0x18, 0xe8, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x69, 0x6e, 0x74, + 0x33, 0x32, 0x45, 0x78, 0x74, 0x3a, 0x7a, 0x0a, 0x0a, 0x6e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x5f, + 0x65, 0x78, 0x74, 0x12, 0x2c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x61, 0x70, 0x69, + 0x2e, 0x65, 0x78, 0x70, 0x72, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x32, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x54, 0x79, 0x70, 0x65, + 0x73, 0x18, 0xe9, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, + 0x65, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x65, 0x78, 0x70, 0x72, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, + 0x76, 0x31, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x32, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, + 0x6c, 0x54, 0x79, 0x70, 0x65, 0x73, 0x52, 0x09, 0x6e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x45, 0x78, + 0x74, 0x3a, 0x88, 0x01, 0x0a, 0x12, 0x74, 0x65, 0x73, 0x74, 0x5f, 0x61, 0x6c, 0x6c, 0x5f, 0x74, + 0x79, 0x70, 0x65, 0x73, 0x5f, 0x65, 0x78, 0x74, 0x12, 0x2c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, + 0x65, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x65, 0x78, 0x70, 0x72, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, + 0x76, 0x31, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x32, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, + 0x6c, 0x54, 0x79, 0x70, 0x65, 0x73, 0x18, 0xea, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2c, 0x2e, + 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x65, 0x78, 0x70, 0x72, 0x2e, + 0x74, 0x65, 0x73, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x32, 0x2e, 0x54, + 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x54, 0x79, 0x70, 0x65, 0x73, 0x52, 0x0f, 0x74, 0x65, 0x73, + 0x74, 0x41, 0x6c, 0x6c, 0x54, 0x79, 0x70, 0x65, 0x73, 0x45, 0x78, 0x74, 0x3a, 0x8e, 0x01, 0x0a, + 0x0f, 0x6e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x5f, 0x65, 0x6e, 0x75, 0x6d, 0x5f, 0x65, 0x78, 0x74, + 0x12, 0x2c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x65, 0x78, + 0x70, 0x72, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x32, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x54, 0x79, 0x70, 0x65, 0x73, 0x18, 0xeb, + 0x07, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x37, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x61, + 0x70, 0x69, 0x2e, 0x65, 0x78, 0x70, 0x72, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x76, 0x31, 0x2e, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x32, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x54, 0x79, + 0x70, 0x65, 0x73, 0x2e, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x45, 0x6e, 0x75, 0x6d, 0x52, 0x0d, + 0x6e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x45, 0x6e, 0x75, 0x6d, 0x45, 0x78, 0x74, 0x3a, 0x92, 0x01, + 0x0a, 0x17, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x74, 0x65, 0x73, 0x74, 0x5f, + 0x61, 0x6c, 0x6c, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x12, 0x2c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, + 0x6c, 0x65, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x65, 0x78, 0x70, 0x72, 0x2e, 0x74, 0x65, 0x73, 0x74, + 0x2e, 0x76, 0x31, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x32, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x41, + 0x6c, 0x6c, 0x54, 0x79, 0x70, 0x65, 0x73, 0x18, 0xec, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2c, + 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x65, 0x78, 0x70, 0x72, + 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x32, 0x2e, + 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x54, 0x79, 0x70, 0x65, 0x73, 0x52, 0x14, 0x72, 0x65, + 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x54, 0x79, 0x70, + 0x65, 0x73, 0x42, 0x78, 0x0a, 0x22, 0x63, 0x6f, 0x6d, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, + 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x65, 0x78, 0x70, 0x72, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x76, + 0x31, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x32, 0x42, 0x16, 0x54, 0x65, 0x73, 0x74, 0x41, 0x6c, + 0x6c, 0x54, 0x79, 0x70, 0x65, 0x73, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, + 0x50, 0x01, 0x5a, 0x38, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, + 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x63, 0x65, 0x6c, 0x2d, 0x73, 0x70, 0x65, 0x63, 0x2f, 0x74, + 0x65, 0x73, 0x74, 0x2f, 0x76, 0x31, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x32, 0x2f, 0x74, 0x65, + 0x73, 0x74, 0x5f, 0x61, 0x6c, 0x6c, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x73, +} + +var ( + file_proto_test_v1_proto2_test_all_types_extensions_proto_rawDescOnce sync.Once + file_proto_test_v1_proto2_test_all_types_extensions_proto_rawDescData = file_proto_test_v1_proto2_test_all_types_extensions_proto_rawDesc +) + +func file_proto_test_v1_proto2_test_all_types_extensions_proto_rawDescGZIP() []byte { + file_proto_test_v1_proto2_test_all_types_extensions_proto_rawDescOnce.Do(func() { + file_proto_test_v1_proto2_test_all_types_extensions_proto_rawDescData = protoimpl.X.CompressGZIP(file_proto_test_v1_proto2_test_all_types_extensions_proto_rawDescData) + }) + return file_proto_test_v1_proto2_test_all_types_extensions_proto_rawDescData +} + +var file_proto_test_v1_proto2_test_all_types_extensions_proto_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_proto_test_v1_proto2_test_all_types_extensions_proto_goTypes = []interface{}{ + (*Proto2ExtensionScopedMessage)(nil), // 0: google.api.expr.test.v1.proto2.Proto2ExtensionScopedMessage + (*TestAllTypes)(nil), // 1: google.api.expr.test.v1.proto2.TestAllTypes + (TestAllTypes_NestedEnum)(0), // 2: google.api.expr.test.v1.proto2.TestAllTypes.NestedEnum +} +var file_proto_test_v1_proto2_test_all_types_extensions_proto_depIdxs = []int32{ + 1, // 0: google.api.expr.test.v1.proto2.int32_ext:extendee -> google.api.expr.test.v1.proto2.TestAllTypes + 1, // 1: google.api.expr.test.v1.proto2.nested_ext:extendee -> google.api.expr.test.v1.proto2.TestAllTypes + 1, // 2: google.api.expr.test.v1.proto2.test_all_types_ext:extendee -> google.api.expr.test.v1.proto2.TestAllTypes + 1, // 3: google.api.expr.test.v1.proto2.nested_enum_ext:extendee -> google.api.expr.test.v1.proto2.TestAllTypes + 1, // 4: google.api.expr.test.v1.proto2.repeated_test_all_types:extendee -> google.api.expr.test.v1.proto2.TestAllTypes + 1, // 5: google.api.expr.test.v1.proto2.Proto2ExtensionScopedMessage.int64_ext:extendee -> google.api.expr.test.v1.proto2.TestAllTypes + 1, // 6: google.api.expr.test.v1.proto2.Proto2ExtensionScopedMessage.message_scoped_nested_ext:extendee -> google.api.expr.test.v1.proto2.TestAllTypes + 1, // 7: google.api.expr.test.v1.proto2.Proto2ExtensionScopedMessage.nested_enum_ext:extendee -> google.api.expr.test.v1.proto2.TestAllTypes + 1, // 8: google.api.expr.test.v1.proto2.Proto2ExtensionScopedMessage.message_scoped_repeated_test_all_types:extendee -> google.api.expr.test.v1.proto2.TestAllTypes + 1, // 9: google.api.expr.test.v1.proto2.nested_ext:type_name -> google.api.expr.test.v1.proto2.TestAllTypes + 1, // 10: google.api.expr.test.v1.proto2.test_all_types_ext:type_name -> google.api.expr.test.v1.proto2.TestAllTypes + 2, // 11: google.api.expr.test.v1.proto2.nested_enum_ext:type_name -> google.api.expr.test.v1.proto2.TestAllTypes.NestedEnum + 1, // 12: google.api.expr.test.v1.proto2.repeated_test_all_types:type_name -> google.api.expr.test.v1.proto2.TestAllTypes + 1, // 13: google.api.expr.test.v1.proto2.Proto2ExtensionScopedMessage.message_scoped_nested_ext:type_name -> google.api.expr.test.v1.proto2.TestAllTypes + 2, // 14: google.api.expr.test.v1.proto2.Proto2ExtensionScopedMessage.nested_enum_ext:type_name -> google.api.expr.test.v1.proto2.TestAllTypes.NestedEnum + 1, // 15: google.api.expr.test.v1.proto2.Proto2ExtensionScopedMessage.message_scoped_repeated_test_all_types:type_name -> google.api.expr.test.v1.proto2.TestAllTypes + 16, // [16:16] is the sub-list for method output_type + 16, // [16:16] is the sub-list for method input_type + 9, // [9:16] is the sub-list for extension type_name + 0, // [0:9] is the sub-list for extension extendee + 0, // [0:0] is the sub-list for field type_name +} + +func init() { file_proto_test_v1_proto2_test_all_types_extensions_proto_init() } +func file_proto_test_v1_proto2_test_all_types_extensions_proto_init() { + if File_proto_test_v1_proto2_test_all_types_extensions_proto != nil { + return + } + file_proto_test_v1_proto2_test_all_types_proto_init() + if !protoimpl.UnsafeEnabled { + file_proto_test_v1_proto2_test_all_types_extensions_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*Proto2ExtensionScopedMessage); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + } + type x struct{} + out := protoimpl.TypeBuilder{ + File: protoimpl.DescBuilder{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: file_proto_test_v1_proto2_test_all_types_extensions_proto_rawDesc, + NumEnums: 0, + NumMessages: 1, + NumExtensions: 9, + NumServices: 0, + }, + GoTypes: file_proto_test_v1_proto2_test_all_types_extensions_proto_goTypes, + DependencyIndexes: file_proto_test_v1_proto2_test_all_types_extensions_proto_depIdxs, + MessageInfos: file_proto_test_v1_proto2_test_all_types_extensions_proto_msgTypes, + ExtensionInfos: file_proto_test_v1_proto2_test_all_types_extensions_proto_extTypes, + }.Build() + File_proto_test_v1_proto2_test_all_types_extensions_proto = out.File + file_proto_test_v1_proto2_test_all_types_extensions_proto_rawDesc = nil + file_proto_test_v1_proto2_test_all_types_extensions_proto_goTypes = nil + file_proto_test_v1_proto2_test_all_types_extensions_proto_depIdxs = nil +} diff --git a/proto/test/v1/proto2/test_all_types_extensions.proto b/proto/test/v1/proto2/test_all_types_extensions.proto index 2cfa194f..4ac8cd6f 100644 --- a/proto/test/v1/proto2/test_all_types_extensions.proto +++ b/proto/test/v1/proto2/test_all_types_extensions.proto @@ -4,7 +4,7 @@ package google.api.expr.test.v1.proto2; import "proto/test/v1/proto2/test_all_types.proto"; -option go_package = "github.com/google/cel-spec/test/v1/proto2/test_all_types"; +option go_package = "cel.dev/expr/test/v1/proto2/test_all_types"; option java_outer_classname = "TestAllTypesExtensions"; option java_package = "com.google.api.expr.test.v1.proto2"; option java_multiple_files = true; diff --git a/proto/test/v1/proto3/BUILD.bazel b/proto/test/v1/proto3/BUILD.bazel index 7f9ebd2b..a7442bdc 100644 --- a/proto/test/v1/proto3/BUILD.bazel +++ b/proto/test/v1/proto3/BUILD.bazel @@ -30,7 +30,7 @@ cc_proto_library( go_proto_library( name = "test_all_types_go_proto", proto = ":test_all_types_proto", - importpath = "github.com/google/cel-spec/proto/test/v1/proto3/test_all_types", + importpath = "cel.dev/expr/proto/test/v1/proto3/test_all_types", deps = [ "@org_golang_google_protobuf//types/known/anypb:go_default_library", "@org_golang_google_protobuf//types/known/durationpb:go_default_library", diff --git a/proto/test/v1/proto3/test_all_types.proto b/proto/test/v1/proto3/test_all_types.proto index d444eb55..d9699c05 100644 --- a/proto/test/v1/proto3/test_all_types.proto +++ b/proto/test/v1/proto3/test_all_types.proto @@ -11,7 +11,7 @@ import "google/protobuf/timestamp.proto"; import "google/protobuf/wrappers.proto"; // Note, run regen_go_proto.sh after making modifications to this file. -option go_package = "github.com/google/cel-spec/test/v1/proto3/test_all_types"; +option go_package = "cel.dev/expr/test/v1/proto3/test_all_types"; option cc_enable_arenas = true; option java_outer_classname = "TestAllTypesProto"; option java_package = "com.google.api.expr.test.v1.proto3"; diff --git a/proto/test/v1/simple.proto b/proto/test/v1/simple.proto index 74d6917d..0558d3cc 100644 --- a/proto/test/v1/simple.proto +++ b/proto/test/v1/simple.proto @@ -5,7 +5,7 @@ syntax = "proto3"; package google.api.expr.test.v1; // Note, run regen_go_proto.sh after making modifications to this file. -option go_package = "github.com/google/cel-spec/test/v1/testpb"; +option go_package = "cel.dev/expr/test/v1/testpb"; import "google/api/expr/v1alpha1/checked.proto"; import "google/api/expr/v1alpha1/eval.proto"; diff --git a/proto/test/v1/testpb/envcheck.pb.go b/proto/test/v1/testpb/envcheck.pb.go index 2c6a4eaf..d20f2e3a 100755 --- a/proto/test/v1/testpb/envcheck.pb.go +++ b/proto/test/v1/testpb/envcheck.pb.go @@ -89,11 +89,10 @@ var file_proto_test_v1_envcheck_proto_rawDesc = []byte{ 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x32, 0x0a, 0x04, 0x64, 0x65, 0x63, 0x6c, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x65, 0x78, 0x70, 0x72, 0x2e, 0x76, 0x31, 0x61, 0x6c, 0x70, - 0x68, 0x61, 0x31, 0x2e, 0x44, 0x65, 0x63, 0x6c, 0x52, 0x04, 0x64, 0x65, 0x63, 0x6c, 0x42, 0x2b, - 0x5a, 0x29, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x6f, 0x6f, - 0x67, 0x6c, 0x65, 0x2f, 0x63, 0x65, 0x6c, 0x2d, 0x73, 0x70, 0x65, 0x63, 0x2f, 0x74, 0x65, 0x73, - 0x74, 0x2f, 0x76, 0x31, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x33, + 0x68, 0x61, 0x31, 0x2e, 0x44, 0x65, 0x63, 0x6c, 0x52, 0x04, 0x64, 0x65, 0x63, 0x6c, 0x42, 0x1d, + 0x5a, 0x1b, 0x63, 0x65, 0x6c, 0x2e, 0x64, 0x65, 0x76, 0x2f, 0x65, 0x78, 0x70, 0x72, 0x2f, 0x74, + 0x65, 0x73, 0x74, 0x2f, 0x76, 0x31, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x62, 0x06, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/proto/test/v1/testpb/simple.pb.go b/proto/test/v1/testpb/simple.pb.go index 3686f823..b1543f9d 100755 --- a/proto/test/v1/testpb/simple.pb.go +++ b/proto/test/v1/testpb/simple.pb.go @@ -519,10 +519,9 @@ var file_proto_test_v1_simple_proto_rawDesc = []byte{ 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x65, 0x78, 0x70, 0x72, 0x2e, 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x2e, 0x55, 0x6e, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x53, 0x65, 0x74, 0x52, 0x08, - 0x75, 0x6e, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x73, 0x42, 0x2b, 0x5a, 0x29, 0x67, 0x69, 0x74, 0x68, - 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x63, 0x65, - 0x6c, 0x2d, 0x73, 0x70, 0x65, 0x63, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x2f, 0x76, 0x31, 0x2f, 0x74, - 0x65, 0x73, 0x74, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x75, 0x6e, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x73, 0x42, 0x1d, 0x5a, 0x1b, 0x63, 0x65, 0x6c, 0x2e, + 0x64, 0x65, 0x76, 0x2f, 0x65, 0x78, 0x70, 0x72, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x2f, 0x76, 0x31, + 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/tests/envcheck/BUILD.bazel b/tests/envcheck/BUILD.bazel index 9c179e23..4a9ab603 100644 --- a/tests/envcheck/BUILD.bazel +++ b/tests/envcheck/BUILD.bazel @@ -13,7 +13,7 @@ go_library( srcs = [ "envcheck.go", ], - importpath = "github.com/google/cel-spec/tests/envcheck", + importpath = "cel.dev/expr/tests/envcheck", deps = [ "//tools/celrpc:go_default_library", "@com_github_golang_protobuf//proto:go_default_library", diff --git a/tests/envcheck/envcheck.go b/tests/envcheck/envcheck.go index 8d729239..38eed338 100644 --- a/tests/envcheck/envcheck.go +++ b/tests/envcheck/envcheck.go @@ -20,37 +20,37 @@ // Identifier declarations are compiled to an expression of just that // identifiers. For instance, the "int" type identifier produces: // -// int +// int // // Function declarations are compiled to a separate expression for // each overload. The expression is an invocation of the overload with // "zeroish" arguments of the appropriate type. The zeroish arguments // are: // -// int 0 -// uint 0u -// double 0.0 -// bool false -// string "" -// bytes b"" -// null_type null -// type type -// list [] -// map {} -// enum E 0 -// message M M{} +// int 0 +// uint 0u +// double 0.0 +// bool false +// string "" +// bytes b"" +// null_type null +// type type +// list [] +// map {} +// enum E 0 +// message M M{} // // For instance, the "_/_" function with overloads // -// _/_: (int, int) -> int -// _/_: (uint, uint) -> uint -// _/_: (double, double) -> double +// _/_: (int, int) -> int +// _/_: (uint, uint) -> uint +// _/_: (double, double) -> double // // compiles to the expressions // -// (0)/(0) -// (0u)/(0u) -// (0.0)/(0.0) +// (0)/(0) +// (0u)/(0u) +// (0.0)/(0.0) // // which are then evaluated. // @@ -60,7 +60,6 @@ // error other than "no_matching_overload". For instance, the first // two expressions for _/_ will generate division-by-zero errors, but // this will pass the test. -// package envcheck import ( @@ -68,7 +67,7 @@ import ( "fmt" "testing" - "github.com/google/cel-spec/tools/celrpc" + "cel.dev/expr/tools/celrpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/tests/envcheck/envcheck_test.go b/tests/envcheck/envcheck_test.go index c91430d3..9bb904c1 100644 --- a/tests/envcheck/envcheck_test.go +++ b/tests/envcheck/envcheck_test.go @@ -22,11 +22,11 @@ import ( "os" "testing" - "github.com/google/cel-spec/tools/celrpc" + "cel.dev/expr/tools/celrpc" "google.golang.org/protobuf/encoding/prototext" - envpb "github.com/google/cel-spec/proto/test/v1/testpb" + envpb "cel.dev/expr/proto/test/v1/testpb" ) var ( diff --git a/tests/go.mod b/tests/go.mod index 4926075e..3b591896 100644 --- a/tests/go.mod +++ b/tests/go.mod @@ -1,3 +1,19 @@ -module github.com/google/cel-spec/tests +module cel.dev/expr/tests go 1.18 + +require ( + cel.dev/expr v0.16.0 + google.golang.org/genproto/googleapis/api v0.0.0-20240826202546-f6391c0de4c7 + google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7 + google.golang.org/grpc v1.65.0 + google.golang.org/protobuf v1.34.2 +) + +require ( + golang.org/x/net v0.26.0 // indirect + golang.org/x/sys v0.21.0 // indirect + golang.org/x/text v0.16.0 // indirect +) + +replace cel.dev/expr => ./.. diff --git a/tests/go.sum b/tests/go.sum index e69de29b..c9eb9ba0 100644 --- a/tests/go.sum +++ b/tests/go.sum @@ -0,0 +1,16 @@ +github.com/bazelbuild/rules_go v0.49.0 h1:5vCbuvy8Q11g41lseGJDc5vxhDjJtfxr6nM/IC4VmqM= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= +golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= +golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= +golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= +golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= +google.golang.org/genproto/googleapis/api v0.0.0-20240826202546-f6391c0de4c7 h1:YcyjlL1PRr2Q17/I0dPk2JmYS5CDXfcdb2Z3YRioEbw= +google.golang.org/genproto/googleapis/api v0.0.0-20240826202546-f6391c0de4c7/go.mod h1:OCdP9MfskevB/rbYvHTsXTtKC+3bHWajPdoKgjcYkfo= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7 h1:2035KHhUv+EpyB+hWgJnaWKJOdX1E95w2S8Rr4uWKTs= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU= +google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= +google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= +google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= +google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= diff --git a/tests/simple/BUILD.bazel b/tests/simple/BUILD.bazel index 6939bbc3..78d8cead 100644 --- a/tests/simple/BUILD.bazel +++ b/tests/simple/BUILD.bazel @@ -13,7 +13,7 @@ go_library( srcs = [ "simple.go", ], - importpath = "github.com/google/cel-spec/tests/simple", + importpath = "cel.dev/expr/tests/simple", deps = [ "//proto/test/v1:testpb_go_proto", "//tools/celrpc:go_default_library", diff --git a/tests/simple/simple.go b/tests/simple/simple.go index 9692ed45..eba7893a 100644 --- a/tests/simple/simple.go +++ b/tests/simple/simple.go @@ -32,7 +32,6 @@ Example test data: expr: "1 + 1 == 2" } } - */ package simple @@ -41,11 +40,11 @@ import ( "context" "fmt" - "github.com/google/cel-spec/tools/celrpc" + "cel.dev/expr/tools/celrpc" "google.golang.org/protobuf/encoding/prototext" - spb "github.com/google/cel-spec/proto/test/v1/testpb" + spb "cel.dev/expr/proto/test/v1/testpb" confpb "google.golang.org/genproto/googleapis/api/expr/conformance/v1alpha1" exprpb "google.golang.org/genproto/googleapis/api/expr/v1alpha1" @@ -99,8 +98,8 @@ func Match(t *spb.SimpleTest, actual *exprpb.ExprValue) error { // MatchValue returns whether the actual value is equal to the // expected value, modulo the following normalization: -// 1) All floating-point NaN values are equal. -// 2) Map comparisons ignore order. +// 1. All floating-point NaN values are equal. +// 2. Map comparisons ignore order. func MatchValue(tag string, expected *exprpb.Value, actual *exprpb.Value) error { // TODO: make floating point NaN values compare equal. switch expected.GetKind().(type) { diff --git a/tests/simple/simple_test.go b/tests/simple/simple_test.go index 68d79e69..ba07ad10 100644 --- a/tests/simple/simple_test.go +++ b/tests/simple/simple_test.go @@ -12,19 +12,19 @@ import ( "google.golang.org/protobuf/encoding/prototext" "google.golang.org/protobuf/proto" - "github.com/google/cel-spec/tools/celrpc" + "cel.dev/expr/tools/celrpc" anypb "google.golang.org/protobuf/types/known/anypb" structpb "google.golang.org/protobuf/types/known/structpb" - spb "github.com/google/cel-spec/proto/test/v1/testpb" + spb "cel.dev/expr/proto/test/v1/testpb" exprpb "google.golang.org/genproto/googleapis/api/expr/v1alpha1" // The following are needed to link in these proto libraries // which are needed dynamically, despite not being explicitly // used in the Go source. - _ "github.com/google/cel-spec/proto/test/v1/proto2/test_all_types" - _ "github.com/google/cel-spec/proto/test/v1/proto3/test_all_types" + _ "cel.dev/expr/proto/test/v1/proto2/test_all_types" + _ "cel.dev/expr/proto/test/v1/proto3/test_all_types" ) type stringArray []string diff --git a/tools/celrpc/BUILD.bazel b/tools/celrpc/BUILD.bazel index 17182842..b4ca21f3 100644 --- a/tools/celrpc/BUILD.bazel +++ b/tools/celrpc/BUILD.bazel @@ -9,7 +9,7 @@ go_library( srcs = [ "celrpc.go", ], - importpath = "github.com/google/cel-spec/tools/celrpc", + importpath = "cel.dev/expr/tools/celrpc", deps = [ "@org_golang_google_genproto_googleapis_api//expr/conformance/v1alpha1:go_default_library", "@org_golang_google_grpc//:go_default_library",