Home Original page

Misc codelab cleanup: by copybara-service[bot] · Pull Request #1458 · google/cel-cpp

4 changes: 3 additions & 1 deletion codelab/BUILD

Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ cc_test(
deps = [
":exercise1",
"//internal:testing",
"@com_google_absl//absl/status",
],
)

Expand Down Expand Up @@ -92,6 +93,7 @@ cc_test(
deps = [
":exercise2",
"//internal:testing",
"@com_google_absl//absl/status",
"@com_google_googleapis//google/rpc/context:attribute_context_cc_proto",
"@com_google_protobuf//:protobuf",
],
Expand All @@ -103,8 +105,8 @@ cc_test(
tags = EXERCISE_TEST_TAGS,
deps = [
":exercise2",
"//internal:status_macros",
"//internal:testing",
"@com_google_absl//absl/status",
"@com_google_absl//absl/status:statusor",
"@com_google_absl//absl/strings",
"@com_google_googleapis//google/rpc/context:attribute_context_cc_proto",
Expand Down

6 changes: 4 additions & 2 deletions codelab/exercise1.cc

Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#include "cel/expr/syntax.pb.h"
#include "google/protobuf/arena.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
#include "absl/strings/str_cat.h"
#include "absl/strings/string_view.h"
#include "eval/public/activation.h"
Expand All @@ -30,8 +31,9 @@
#include "eval/public/cel_value.h"
#include "internal/status_macros.h"
#include "parser/parser.h"
#include "google/protobuf/arena.h"

namespace google::api::expr::codelab {
namespace cel_codelab {
namespace {

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

} // namespace google::api::expr::codelab
} // namespace cel_codelab

4 changes: 2 additions & 2 deletions codelab/exercise1.h

Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@
#include "absl/status/statusor.h"
#include "absl/strings/string_view.h"

namespace google::api::expr::codelab {
namespace cel_codelab {

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

} // namespace google::api::expr::codelab
} // namespace cel_codelab

#endif // THIRD_PARTY_CEL_CPP_CODELAB_EXERCISE1_H_

5 changes: 3 additions & 2 deletions codelab/exercise1_test.cc

Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,10 @@

#include "codelab/exercise1.h"

#include "absl/status/status.h"
#include "internal/testing.h"

namespace google::api::expr::codelab {
namespace cel_codelab {
namespace {

using ::absl_testing::IsOkAndHolds;
Expand All @@ -39,4 +40,4 @@ TEST(Exercise1, Conditional) {
}

} // namespace
} // namespace google::api::expr::codelab
} // namespace cel_codelab

6 changes: 4 additions & 2 deletions codelab/exercise2.cc

Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
#include "google/rpc/context/attribute_context.pb.h"
#include "google/protobuf/arena.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
#include "absl/strings/str_cat.h"
#include "absl/strings/string_view.h"
#include "eval/public/activation.h"
Expand All @@ -31,8 +32,9 @@
#include "eval/public/cel_value.h"
#include "internal/status_macros.h"
#include "parser/parser.h"
#include "google/protobuf/arena.h"

namespace google::api::expr::codelab {
namespace cel_codelab {
namespace {

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

} // namespace google::api::expr::codelab
} // namespace cel_codelab

9 changes: 4 additions & 5 deletions codelab/exercise2.h

Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,11 @@
#ifndef THIRD_PARTY_CEL_CPP_CODELAB_EXERCISE1_H_
#define THIRD_PARTY_CEL_CPP_CODELAB_EXERCISE1_H_

#include <string>

#include "google/rpc/context/attribute_context.pb.h"
#include "absl/status/statusor.h"
#include "absl/strings/string_view.h"

namespace google::api::expr::codelab {
namespace cel_codelab {

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

} // namespace google::api::expr::codelab
} // namespace cel_codelab

#endif // THIRD_PARTY_CEL_CPP_CODELAB_EXERCISE1_H_

5 changes: 3 additions & 2 deletions codelab/exercise2_test.cc

Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,11 @@
#include "codelab/exercise2.h"

#include "google/rpc/context/attribute_context.pb.h"
#include "absl/status/status.h"
#include "internal/testing.h"
#include "google/protobuf/text_format.h"

namespace google::api::expr::codelab {
namespace cel_codelab {
namespace {

using ::absl_testing::IsOkAndHolds;
Expand Down Expand Up @@ -70,4 +71,4 @@ TEST(Exercise2Context, WrongTypeResultError) {
}

} // namespace
} // namespace google::api::expr::codelab
} // namespace cel_codelab

6 changes: 3 additions & 3 deletions codelab/exercise3_test.cc

Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
// limitations under the License.

#include "google/rpc/context/attribute_context.pb.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
#include "absl/strings/string_view.h"
#include "codelab/exercise2.h"
#include "internal/status_macros.h"
#include "internal/testing.h"

namespace google::api::expr::codelab {
namespace cel_codelab {
namespace {

using ::absl_testing::IsOkAndHolds;
Expand Down Expand Up @@ -108,4 +108,4 @@ TEST(Exercise3, BadFieldAccess) {
}

} // namespace
} // namespace google::api::expr::codelab
} // namespace cel_codelab

5 changes: 3 additions & 2 deletions codelab/solutions/BUILD

Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ cc_test(
deps = [
":exercise1",
"//internal:testing",
"@com_google_absl//absl/status",
],
)

Expand Down Expand Up @@ -75,6 +76,7 @@ cc_test(
deps = [
":exercise2",
"//internal:testing",
"@com_google_absl//absl/status",
"@com_google_googleapis//google/rpc/context:attribute_context_cc_proto",
"@com_google_protobuf//:protobuf",
],
Expand All @@ -85,12 +87,11 @@ cc_test(
srcs = ["exercise3_test.cc"],
deps = [
":exercise2",
"//internal:status_macros",
"//internal:testing",
"@com_google_absl//absl/status",
"@com_google_absl//absl/status:statusor",
"@com_google_absl//absl/strings",
"@com_google_googleapis//google/rpc/context:attribute_context_cc_proto",
"@com_google_protobuf//:protobuf",
],
)

Expand Down

7 changes: 4 additions & 3 deletions codelab/solutions/exercise1.cc

Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
#include <string>

#include "cel/expr/syntax.pb.h"
#include "google/protobuf/arena.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
#include "absl/strings/str_cat.h"
#include "absl/strings/string_view.h"
#include "eval/public/activation.h"
Expand All @@ -30,8 +30,9 @@
#include "eval/public/cel_value.h"
#include "internal/status_macros.h"
#include "parser/parser.h"
#include "google/protobuf/arena.h"

namespace google::api::expr::codelab {
namespace cel_codelab {
namespace {

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

} // namespace google::api::expr::codelab
} // namespace cel_codelab

8 changes: 4 additions & 4 deletions codelab/solutions/exercise2.cc

Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,10 @@
#include "codelab/exercise2.h"

#include <memory>
#include <string>

#include "cel/expr/syntax.pb.h"
#include "google/protobuf/arena.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
#include "absl/strings/str_cat.h"
#include "absl/strings/string_view.h"
#include "eval/public/activation.h"
Expand All @@ -31,8 +30,9 @@
#include "eval/public/cel_value.h"
#include "internal/status_macros.h"
#include "parser/parser.h"
#include "google/protobuf/arena.h"

namespace google::api::expr::codelab {
namespace cel_codelab {
namespace {

using ::cel::expr::ParsedExpr;
Expand Down Expand Up @@ -104,4 +104,4 @@ absl::StatusOr<bool> ParseAndEvaluate(absl::string_view cel_expr,
return ParseAndEvaluate(cel_expr, activation, &arena);
}

} // namespace google::api::expr::codelab
} // namespace cel_codelab

6 changes: 3 additions & 3 deletions codelab/solutions/exercise3_test.cc

Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
// limitations under the License.

#include "google/rpc/context/attribute_context.pb.h"
#include "absl/status/status.h"
#include "absl/status/statusor.h"
#include "absl/strings/string_view.h"
#include "codelab/exercise2.h"
#include "internal/status_macros.h"
#include "internal/testing.h"

namespace google::api::expr::codelab {
namespace cel_codelab {
namespace {

using ::absl_testing::IsOkAndHolds;
Expand Down Expand Up @@ -92,4 +92,4 @@ TEST(Exercise3Context, BadFieldAccess) {
}

} // namespace
} // namespace google::api::expr::codelab
} // namespace cel_codelab