Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit f1dcf76

Browse filesBrowse files
jnthntatumcopybara-github
jnthntatum
authored and
copybara-github
committed
Misc codelab cleanup:
- Update codelab exercises to use cel_codelab as the namespace to avoid overlapping with CEL code. - IWYU fixes PiperOrigin-RevId: 751171702
1 parent a8d5b1b commit f1dcf76
Copy full SHA for f1dcf76

File tree

Expand file treeCollapse file tree

12 files changed

+40
-31
lines changed
Filter options
Expand file treeCollapse file tree

12 files changed

+40
-31
lines changed

‎codelab/BUILD

Copy file name to clipboardExpand all lines: codelab/BUILD
+3-1Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ cc_test(
6060
deps = [
6161
":exercise1",
6262
"//internal:testing",
63+
"@com_google_absl//absl/status",
6364
],
6465
)
6566

@@ -92,6 +93,7 @@ cc_test(
9293
deps = [
9394
":exercise2",
9495
"//internal:testing",
96+
"@com_google_absl//absl/status",
9597
"@com_google_googleapis//google/rpc/context:attribute_context_cc_proto",
9698
"@com_google_protobuf//:protobuf",
9799
],
@@ -103,8 +105,8 @@ cc_test(
103105
tags = EXERCISE_TEST_TAGS,
104106
deps = [
105107
":exercise2",
106-
"//internal:status_macros",
107108
"//internal:testing",
109+
"@com_google_absl//absl/status",
108110
"@com_google_absl//absl/status:statusor",
109111
"@com_google_absl//absl/strings",
110112
"@com_google_googleapis//google/rpc/context:attribute_context_cc_proto",

‎codelab/exercise1.cc

Copy file name to clipboardExpand all lines: codelab/exercise1.cc
+4-2Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
#include "cel/expr/syntax.pb.h"
2121
#include "google/protobuf/arena.h"
2222
#include "absl/status/status.h"
23+
#include "absl/status/statusor.h"
2324
#include "absl/strings/str_cat.h"
2425
#include "absl/strings/string_view.h"
2526
#include "eval/public/activation.h"
@@ -30,8 +31,9 @@
3031
#include "eval/public/cel_value.h"
3132
#include "internal/status_macros.h"
3233
#include "parser/parser.h"
34+
#include "google/protobuf/arena.h"
3335

34-
namespace google::api::expr::codelab {
36+
namespace cel_codelab {
3537
namespace {
3638

3739
using ::google::api::expr::runtime::Activation;
@@ -80,4 +82,4 @@ absl::StatusOr<std::string> ParseAndEvaluate(absl::string_view cel_expr) {
8082
// === End Codelab ===
8183
}
8284

83-
} // namespace google::api::expr::codelab
85+
} // namespace cel_codelab

‎codelab/exercise1.h

Copy file name to clipboardExpand all lines: codelab/exercise1.h
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@
2020
#include "absl/status/statusor.h"
2121
#include "absl/strings/string_view.h"
2222

23-
namespace google::api::expr::codelab {
23+
namespace cel_codelab {
2424

2525
// Parse a cel expression and evaluate it. This assumes no special setup for
2626
// the evaluation environment, and that the expression results in a string
2727
// value.
2828
absl::StatusOr<std::string> ParseAndEvaluate(absl::string_view cel_expr);
2929

30-
} // namespace google::api::expr::codelab
30+
} // namespace cel_codelab
3131

3232
#endif // THIRD_PARTY_CEL_CPP_CODELAB_EXERCISE1_H_

‎codelab/exercise1_test.cc

Copy file name to clipboardExpand all lines: codelab/exercise1_test.cc
+3-2Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,10 @@
1414

1515
#include "codelab/exercise1.h"
1616

17+
#include "absl/status/status.h"
1718
#include "internal/testing.h"
1819

19-
namespace google::api::expr::codelab {
20+
namespace cel_codelab {
2021
namespace {
2122

2223
using ::absl_testing::IsOkAndHolds;
@@ -39,4 +40,4 @@ TEST(Exercise1, Conditional) {
3940
}
4041

4142
} // namespace
42-
} // namespace google::api::expr::codelab
43+
} // namespace cel_codelab

‎codelab/exercise2.cc

Copy file name to clipboardExpand all lines: codelab/exercise2.cc
+4-2Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
#include "google/rpc/context/attribute_context.pb.h"
2222
#include "google/protobuf/arena.h"
2323
#include "absl/status/status.h"
24+
#include "absl/status/statusor.h"
2425
#include "absl/strings/str_cat.h"
2526
#include "absl/strings/string_view.h"
2627
#include "eval/public/activation.h"
@@ -31,8 +32,9 @@
3132
#include "eval/public/cel_value.h"
3233
#include "internal/status_macros.h"
3334
#include "parser/parser.h"
35+
#include "google/protobuf/arena.h"
3436

35-
namespace google::api::expr::codelab {
37+
namespace cel_codelab {
3638
namespace {
3739

3840
using ::cel::expr::ParsedExpr;
@@ -101,4 +103,4 @@ absl::StatusOr<bool> ParseAndEvaluate(absl::string_view cel_expr,
101103
return ParseAndEvaluate(cel_expr, activation, &arena);
102104
}
103105

104-
} // namespace google::api::expr::codelab
106+
} // namespace cel_codelab

‎codelab/exercise2.h

Copy file name to clipboardExpand all lines: codelab/exercise2.h
+4-5Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,11 @@
1515
#ifndef THIRD_PARTY_CEL_CPP_CODELAB_EXERCISE1_H_
1616
#define THIRD_PARTY_CEL_CPP_CODELAB_EXERCISE1_H_
1717

18-
#include <string>
19-
2018
#include "google/rpc/context/attribute_context.pb.h"
2119
#include "absl/status/statusor.h"
2220
#include "absl/strings/string_view.h"
2321

24-
namespace google::api::expr::codelab {
22+
namespace cel_codelab {
2523

2624
// Parse a cel expression and evaluate it. Binds a simple boolean to the
2725
// activation as 'bool_var' for use in the expression.
@@ -34,8 +32,9 @@ absl::StatusOr<bool> ParseAndEvaluate(absl::string_view cel_expr,
3432
// Parse a cel expression and evaluate it. Binds an instance of the
3533
// AttributeContext message to the activation (binding the subfields directly).
3634
absl::StatusOr<bool> ParseAndEvaluate(
37-
absl::string_view cel_expr, const rpc::context::AttributeContext& context);
35+
absl::string_view cel_expr,
36+
const google::rpc::context::AttributeContext& context);
3837

39-
} // namespace google::api::expr::codelab
38+
} // namespace cel_codelab
4039

4140
#endif // THIRD_PARTY_CEL_CPP_CODELAB_EXERCISE1_H_

‎codelab/exercise2_test.cc

Copy file name to clipboardExpand all lines: codelab/exercise2_test.cc
+3-2Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,11 @@
1515
#include "codelab/exercise2.h"
1616

1717
#include "google/rpc/context/attribute_context.pb.h"
18+
#include "absl/status/status.h"
1819
#include "internal/testing.h"
1920
#include "google/protobuf/text_format.h"
2021

21-
namespace google::api::expr::codelab {
22+
namespace cel_codelab {
2223
namespace {
2324

2425
using ::absl_testing::IsOkAndHolds;
@@ -70,4 +71,4 @@ TEST(Exercise2Context, WrongTypeResultError) {
7071
}
7172

7273
} // namespace
73-
} // namespace google::api::expr::codelab
74+
} // namespace cel_codelab

‎codelab/exercise3_test.cc

Copy file name to clipboardExpand all lines: codelab/exercise3_test.cc
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313
// limitations under the License.
1414

1515
#include "google/rpc/context/attribute_context.pb.h"
16+
#include "absl/status/status.h"
1617
#include "absl/status/statusor.h"
1718
#include "absl/strings/string_view.h"
1819
#include "codelab/exercise2.h"
19-
#include "internal/status_macros.h"
2020
#include "internal/testing.h"
2121

22-
namespace google::api::expr::codelab {
22+
namespace cel_codelab {
2323
namespace {
2424

2525
using ::absl_testing::IsOkAndHolds;
@@ -108,4 +108,4 @@ TEST(Exercise3, BadFieldAccess) {
108108
}
109109

110110
} // namespace
111-
} // namespace google::api::expr::codelab
111+
} // namespace cel_codelab

‎codelab/solutions/BUILD

Copy file name to clipboardExpand all lines: codelab/solutions/BUILD
+3-2Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ cc_test(
4343
deps = [
4444
":exercise1",
4545
"//internal:testing",
46+
"@com_google_absl//absl/status",
4647
],
4748
)
4849

@@ -75,6 +76,7 @@ cc_test(
7576
deps = [
7677
":exercise2",
7778
"//internal:testing",
79+
"@com_google_absl//absl/status",
7880
"@com_google_googleapis//google/rpc/context:attribute_context_cc_proto",
7981
"@com_google_protobuf//:protobuf",
8082
],
@@ -85,12 +87,11 @@ cc_test(
8587
srcs = ["exercise3_test.cc"],
8688
deps = [
8789
":exercise2",
88-
"//internal:status_macros",
8990
"//internal:testing",
91+
"@com_google_absl//absl/status",
9092
"@com_google_absl//absl/status:statusor",
9193
"@com_google_absl//absl/strings",
9294
"@com_google_googleapis//google/rpc/context:attribute_context_cc_proto",
93-
"@com_google_protobuf//:protobuf",
9495
],
9596
)
9697

‎codelab/solutions/exercise1.cc

Copy file name to clipboardExpand all lines: codelab/solutions/exercise1.cc
+4-3Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
#include <string>
1919

2020
#include "cel/expr/syntax.pb.h"
21-
#include "google/protobuf/arena.h"
2221
#include "absl/status/status.h"
22+
#include "absl/status/statusor.h"
2323
#include "absl/strings/str_cat.h"
2424
#include "absl/strings/string_view.h"
2525
#include "eval/public/activation.h"
@@ -30,8 +30,9 @@
3030
#include "eval/public/cel_value.h"
3131
#include "internal/status_macros.h"
3232
#include "parser/parser.h"
33+
#include "google/protobuf/arena.h"
3334

34-
namespace google::api::expr::codelab {
35+
namespace cel_codelab {
3536
namespace {
3637

3738
using ::cel::expr::ParsedExpr;
@@ -103,4 +104,4 @@ absl::StatusOr<std::string> ParseAndEvaluate(absl::string_view cel_expr) {
103104
// === End Codelab ===
104105
}
105106

106-
} // namespace google::api::expr::codelab
107+
} // namespace cel_codelab

‎codelab/solutions/exercise2.cc

Copy file name to clipboardExpand all lines: codelab/solutions/exercise2.cc
+4-4Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,10 @@
1515
#include "codelab/exercise2.h"
1616

1717
#include <memory>
18-
#include <string>
1918

2019
#include "cel/expr/syntax.pb.h"
21-
#include "google/protobuf/arena.h"
2220
#include "absl/status/status.h"
21+
#include "absl/status/statusor.h"
2322
#include "absl/strings/str_cat.h"
2423
#include "absl/strings/string_view.h"
2524
#include "eval/public/activation.h"
@@ -31,8 +30,9 @@
3130
#include "eval/public/cel_value.h"
3231
#include "internal/status_macros.h"
3332
#include "parser/parser.h"
33+
#include "google/protobuf/arena.h"
3434

35-
namespace google::api::expr::codelab {
35+
namespace cel_codelab {
3636
namespace {
3737

3838
using ::cel::expr::ParsedExpr;
@@ -104,4 +104,4 @@ absl::StatusOr<bool> ParseAndEvaluate(absl::string_view cel_expr,
104104
return ParseAndEvaluate(cel_expr, activation, &arena);
105105
}
106106

107-
} // namespace google::api::expr::codelab
107+
} // namespace cel_codelab

‎codelab/solutions/exercise3_test.cc

Copy file name to clipboardExpand all lines: codelab/solutions/exercise3_test.cc
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313
// limitations under the License.
1414

1515
#include "google/rpc/context/attribute_context.pb.h"
16+
#include "absl/status/status.h"
1617
#include "absl/status/statusor.h"
1718
#include "absl/strings/string_view.h"
1819
#include "codelab/exercise2.h"
19-
#include "internal/status_macros.h"
2020
#include "internal/testing.h"
2121

22-
namespace google::api::expr::codelab {
22+
namespace cel_codelab {
2323
namespace {
2424

2525
using ::absl_testing::IsOkAndHolds;
@@ -92,4 +92,4 @@ TEST(Exercise3Context, BadFieldAccess) {
9292
}
9393

9494
} // namespace
95-
} // namespace google::api::expr::codelab
95+
} // namespace cel_codelab

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.