Update go package references and artifacts on cel-spec

google · Aug 27, 2024 · 63d85fc · 63d85fc
1 parent 5299974
commit 63d85fc
Show file tree

Hide file tree

Showing 23 changed files with 476 additions and 61 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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";