Chiebot-Mirror
/
grpc
mirror of https://github.com/grpc/grpc.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

[CEL] Fix dependency issue (#34062)

Browse Source 
The types `google::api::expr::v1alpha1` are available in
`"@com_google_googleapis//google/api/expr/v1alpha1:expr_proto"` and not
`"google_type_expr_upb"`

<!--

If you know who should review your pull request, please assign it to
that
person, otherwise the pull request would get assigned randomly.

If your pull request is for a specific language, please add the
appropriate
lang label.

-->
pull/34074/head
Yash Tibrewal 2 years ago committed by GitHub
parent 78087c519e
commit 2a036ce1de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 5 additions and 201 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      BUILD
  2. 1
      CMakeLists.txt
  3. 2
      build_autogenerated.yaml
  4. 55
      src/core/ext/upb-generated/google/type/expr.upb.c
  5. 138
      src/core/ext/upb-generated/google/type/expr.upb.h
  6. 2
      tools/distrib/fix_build_deps.py

8
BUILD
Unescape View File

@ -1015,7 +1015,7 @@ grpc_cc_library(
language = "c++",
deps = [
"envoy_config_rbac_upb",
"google_type_expr_upb",
"google_api_expr_v1alpha1_syntax_upb",
"gpr",
"grpc_mock_cel",
"//src/core:grpc_authorization_base",
@ -3677,7 +3677,7 @@ grpc_cc_library(
],
language = "c++",
deps = [
"google_type_expr_upb",
"google_api_expr_v1alpha1_syntax_upb",
"gpr_public_hdrs",
],
)
@ -4262,8 +4262,8 @@ grpc_upb_proto_reflection_library(
)
grpc_upb_proto_library(
name = "google_type_expr_upb",
deps = ["@com_google_googleapis//google/type:expr_proto"],
name = "google_api_expr_v1alpha1_syntax_upb",
deps = ["@com_google_googleapis//google/api/expr/v1alpha1:syntax_proto"],
)
grpc_upb_proto_library(

1
CMakeLists.txt generated
Unescape View File

@ -7964,7 +7964,6 @@ add_executable(cel_authorization_engine_test
src/core/ext/upb-generated/google/protobuf/timestamp.upb.c
src/core/ext/upb-generated/google/protobuf/wrappers.upb.c
src/core/ext/upb-generated/google/rpc/status.upb.c
src/core/ext/upb-generated/google/type/expr.upb.c
src/core/ext/upb-generated/udpa/annotations/migrate.upb.c
src/core/ext/upb-generated/udpa/annotations/security.upb.c
src/core/ext/upb-generated/udpa/annotations/sensitive.upb.c

2
build_autogenerated.yaml generated
Unescape View File

@ -5674,7 +5674,6 @@ targets:
- src/core/ext/upb-generated/google/protobuf/timestamp.upb.h
- src/core/ext/upb-generated/google/protobuf/wrappers.upb.h
- src/core/ext/upb-generated/google/rpc/status.upb.h
- src/core/ext/upb-generated/google/type/expr.upb.h
- src/core/ext/upb-generated/udpa/annotations/migrate.upb.h
- src/core/ext/upb-generated/udpa/annotations/security.upb.h
- src/core/ext/upb-generated/udpa/annotations/sensitive.upb.h
@ -5782,7 +5781,6 @@ targets:
- src/core/ext/upb-generated/google/protobuf/timestamp.upb.c
- src/core/ext/upb-generated/google/protobuf/wrappers.upb.c
- src/core/ext/upb-generated/google/rpc/status.upb.c
- src/core/ext/upb-generated/google/type/expr.upb.c
- src/core/ext/upb-generated/udpa/annotations/migrate.upb.c
- src/core/ext/upb-generated/udpa/annotations/security.upb.c
- src/core/ext/upb-generated/udpa/annotations/sensitive.upb.c

55
src/core/ext/upb-generated/google/type/expr.upb.c generated
Unescape View File

@ -1,55 +0,0 @@
/* This file was generated by upbc (the upb compiler) from the input
* file:
*
* google/type/expr.proto
*
* Do not edit -- your changes will be discarded when the file is
* regenerated. */
#include <stddef.h>
#include "upb/collections/array_internal.h"
#include "upb/message/internal.h"
#include "upb/mini_table/enum_internal.h"
#include "google/type/expr.upb.h"
// Must be last.
#include "upb/port/def.inc"
static const upb_MiniTableField google_type_Expr__fields[4] = {
{1, 0, 0, kUpb_NoSub, 9, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
{2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
{3, UPB_SIZE(16, 32), 0, kUpb_NoSub, 9, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
{4, UPB_SIZE(24, 48), 0, kUpb_NoSub, 9, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
};
const upb_MiniTable google_type_Expr_msg_init = {
NULL,
&google_type_Expr__fields[0],
UPB_SIZE(32, 64), 4, kUpb_ExtMode_NonExtendable, 4, UPB_FASTTABLE_MASK(56), 0,
UPB_FASTTABLE_INIT({
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
{0x000000003f00000a, &upb_pss_1bt},
{0x001000003f000012, &upb_pss_1bt},
{0x002000003f00001a, &upb_pss_1bt},
{0x003000003f000022, &upb_pss_1bt},
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
{0x0000000000000000, &_upb_FastDecoder_DecodeGeneric},
})
};
static const upb_MiniTable *messages_layout[1] = {
&google_type_Expr_msg_init,
};
const upb_MiniTableFile google_type_expr_proto_upb_file_layout = {
messages_layout,
NULL,
NULL,
1,
0,
0,
};
#include "upb/port/undef.inc"

138
src/core/ext/upb-generated/google/type/expr.upb.h generated
Unescape View File

@ -1,138 +0,0 @@
/* This file was generated by upbc (the upb compiler) from the input
* file:
*
* google/type/expr.proto
*
* Do not edit -- your changes will be discarded when the file is
* regenerated. */
#ifndef GOOGLE_TYPE_EXPR_PROTO_UPB_H_
#define GOOGLE_TYPE_EXPR_PROTO_UPB_H_
#include "upb/collections/array_internal.h"
#include "upb/collections/map_gencode_util.h"
#include "upb/message/accessors.h"
#include "upb/message/internal.h"
#include "upb/mini_table/enum_internal.h"
#include "upb/wire/decode.h"
#include "upb/wire/decode_fast.h"
#include "upb/wire/encode.h"
// Must be last.
#include "upb/port/def.inc"
#ifdef __cplusplus
extern "C" {
#endif
typedef struct google_type_Expr google_type_Expr;
extern const upb_MiniTable google_type_Expr_msg_init;
/* google.type.Expr */
UPB_INLINE google_type_Expr* google_type_Expr_new(upb_Arena* arena) {
return (google_type_Expr*)_upb_Message_New(&google_type_Expr_msg_init, arena);
}
UPB_INLINE google_type_Expr* google_type_Expr_parse(const char* buf, size_t size, upb_Arena* arena) {
google_type_Expr* ret = google_type_Expr_new(arena);
if (!ret) return NULL;
if (upb_Decode(buf, size, ret, &google_type_Expr_msg_init, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
return NULL;
}
return ret;
}
UPB_INLINE google_type_Expr* google_type_Expr_parse_ex(const char* buf, size_t size,
const upb_ExtensionRegistry* extreg,
int options, upb_Arena* arena) {
google_type_Expr* ret = google_type_Expr_new(arena);
if (!ret) return NULL;
if (upb_Decode(buf, size, ret, &google_type_Expr_msg_init, extreg, options, arena) !=
kUpb_DecodeStatus_Ok) {
return NULL;
}
return ret;
}
UPB_INLINE char* google_type_Expr_serialize(const google_type_Expr* msg, upb_Arena* arena, size_t* len) {
char* ptr;
(void)upb_Encode(msg, &google_type_Expr_msg_init, 0, arena, &ptr, len);
return ptr;
}
UPB_INLINE char* google_type_Expr_serialize_ex(const google_type_Expr* msg, int options,
upb_Arena* arena, size_t* len) {
char* ptr;
(void)upb_Encode(msg, &google_type_Expr_msg_init, options, arena, &ptr, len);
return ptr;
}
UPB_INLINE void google_type_Expr_clear_expression(google_type_Expr* msg) {
const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
_upb_Message_ClearNonExtensionField(msg, &field);
}
UPB_INLINE upb_StringView google_type_Expr_expression(const google_type_Expr* msg) {
upb_StringView default_val = upb_StringView_FromString("");
upb_StringView ret;
const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
_upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
return ret;
}
UPB_INLINE void google_type_Expr_clear_title(google_type_Expr* msg) {
const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
_upb_Message_ClearNonExtensionField(msg, &field);
}
UPB_INLINE upb_StringView google_type_Expr_title(const google_type_Expr* msg) {
upb_StringView default_val = upb_StringView_FromString("");
upb_StringView ret;
const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
_upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
return ret;
}
UPB_INLINE void google_type_Expr_clear_description(google_type_Expr* msg) {
const upb_MiniTableField field = {3, UPB_SIZE(16, 32), 0, kUpb_NoSub, 9, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
_upb_Message_ClearNonExtensionField(msg, &field);
}
UPB_INLINE upb_StringView google_type_Expr_description(const google_type_Expr* msg) {
upb_StringView default_val = upb_StringView_FromString("");
upb_StringView ret;
const upb_MiniTableField field = {3, UPB_SIZE(16, 32), 0, kUpb_NoSub, 9, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
_upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
return ret;
}
UPB_INLINE void google_type_Expr_clear_location(google_type_Expr* msg) {
const upb_MiniTableField field = {4, UPB_SIZE(24, 48), 0, kUpb_NoSub, 9, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
_upb_Message_ClearNonExtensionField(msg, &field);
}
UPB_INLINE upb_StringView google_type_Expr_location(const google_type_Expr* msg) {
upb_StringView default_val = upb_StringView_FromString("");
upb_StringView ret;
const upb_MiniTableField field = {4, UPB_SIZE(24, 48), 0, kUpb_NoSub, 9, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
_upb_Message_GetNonExtensionField(msg, &field, &default_val, &ret);
return ret;
}
UPB_INLINE void google_type_Expr_set_expression(google_type_Expr *msg, upb_StringView value) {
const upb_MiniTableField field = {1, 0, 0, kUpb_NoSub, 9, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
_upb_Message_SetNonExtensionField(msg, &field, &value);
}
UPB_INLINE void google_type_Expr_set_title(google_type_Expr *msg, upb_StringView value) {
const upb_MiniTableField field = {2, UPB_SIZE(8, 16), 0, kUpb_NoSub, 9, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
_upb_Message_SetNonExtensionField(msg, &field, &value);
}
UPB_INLINE void google_type_Expr_set_description(google_type_Expr *msg, upb_StringView value) {
const upb_MiniTableField field = {3, UPB_SIZE(16, 32), 0, kUpb_NoSub, 9, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
_upb_Message_SetNonExtensionField(msg, &field, &value);
}
UPB_INLINE void google_type_Expr_set_location(google_type_Expr *msg, upb_StringView value) {
const upb_MiniTableField field = {4, UPB_SIZE(24, 48), 0, kUpb_NoSub, 9, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)};
_upb_Message_SetNonExtensionField(msg, &field, &value);
}
extern const upb_MiniTableFile google_type_expr_proto_upb_file_layout;
#ifdef __cplusplus
} /* extern "C" */
#endif
#include "upb/port/undef.inc"
#endif /* GOOGLE_TYPE_EXPR_PROTO_UPB_H_ */

2
tools/distrib/fix_build_deps.py
Unescape View File

@ -167,7 +167,7 @@ INTERNAL_DEPS = {
),
"test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.pb.h": "//test/core/event_engine/fuzzing_event_engine:fuzzing_event_engine_proto",
"test/core/experiments/test_experiments.h": "//test/core/experiments:test_experiments_lib",
"google/api/expr/v1alpha1/syntax.upb.h": "google_type_expr_upb",
"google/api/expr/v1alpha1/syntax.upb.h": "google_api_expr_v1alpha1_syntax_upb",
"google/rpc/status.upb.h": "google_rpc_status_upb",
"google/protobuf/any.upb.h": "protobuf_any_upb",
"google/protobuf/duration.upb.h": "protobuf_duration_upb",

Write Preview
Loading…
Cancel
Save