Skip to content

Commit 2c99250

Browse files
yuval-ksoloio-bulldozer[bot]
authored andcommitted
Transform cleanup (#21)
* transformation cleanup * formatfix * more cleanup
1 parent 6af384e commit 2c99250

33 files changed

+332
-259
lines changed

WORKSPACE

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,21 @@
1-
workspace(name="envoy_gloo")
1+
workspace(name = "envoy_gloo")
22

33
load("//bazel:repositories.bzl", "envoy_gloo_dependencies")
44

55
envoy_gloo_dependencies()
66

77
load("@envoy//bazel:api_binding.bzl", "envoy_api_binding")
8+
89
envoy_api_binding()
910

1011
load("@envoy//bazel:api_repositories.bzl", "envoy_api_dependencies")
12+
1113
envoy_api_dependencies()
1214

1315
load("@envoy//bazel:repositories.bzl", "envoy_dependencies")
16+
1417
envoy_dependencies()
1518

1619
load("@envoy//bazel:dependency_imports.bzl", "envoy_dependency_imports")
20+
1721
envoy_dependency_imports()

api/envoy/config/filter/http/aws_lambda/v2/aws_lambda.proto

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ syntax = "proto3";
22

33
package envoy.config.filter.http.aws_lambda.v2;
44

5+
option java_package = "io.envoyproxy.envoy.config.filter.http.aws_lambda.v2";
6+
option java_outer_classname = "AwsLambdaProto";
7+
option java_multiple_files = true;
58
import "google/protobuf/wrappers.proto";
69
import "validate/validate.proto";
710

api/envoy/config/filter/http/nats/streaming/v2/nats_streaming.proto

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ syntax = "proto3";
22

33
package envoy.config.filter.http.nats.streaming.v2;
44

5+
option java_package = "io.envoyproxy.envoy.config.filter.http.nats.streaming.v2";
6+
option java_outer_classname = "NatsStreamingProto";
7+
option java_multiple_files = true;
58
import "google/protobuf/duration.proto";
69
import "validate/validate.proto";
710

api/envoy/config/filter/http/nats/streaming/v2/payload.proto

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
syntax = "proto3";
22
package pb;
33

4+
option java_package = "io.envoyproxy.pb";
5+
option java_outer_classname = "PayloadProto";
6+
option java_multiple_files = true;
47
message Payload {
58
map<string, string> headers = 1;
69
bytes body = 2;

api/envoy/config/filter/http/transformation/v2/transformation_filter.proto

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ syntax = "proto3";
22

33
package envoy.api.v2.filter.http;
44

5+
option java_package = "io.envoyproxy.envoy.api.v2.filter.http";
6+
option java_outer_classname = "TransformationFilterProto";
7+
option java_multiple_files = true;
58
option go_package = "transformation";
69

710
message RouteTransformations {

api/envoy/config/filter/network/consul_connect/v2/authorize.proto

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ syntax = "proto3";
22

33
package agent.connect.authorize.v1;
44

5+
option java_package = "io.envoyproxy.agent.connect.authorize.v1";
6+
option java_outer_classname = "AuthorizeProto";
7+
option java_multiple_files = true;
58
import "google/protobuf/duration.proto";
69

710
// [#protodoc-title: Authorize]

api/envoy/config/filter/network/consul_connect/v2/consul_connect.proto

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ syntax = "proto3";
22

33
package envoy.config.filter.network.consul_connect.v2;
44

5+
option java_package = "io.envoyproxy.envoy.config.filter.network.consul_connect.v2";
6+
option java_outer_classname = "ConsulConnectProto";
7+
option java_multiple_files = true;
58
import "google/protobuf/duration.proto";
69

710
import "validate/validate.proto";

bazel/envoy_test.bzl

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
1-
21
# Copied from @envoy/bazel/envoy_test.bzl and uses public visibility for tests
32
# So we can target them to use our coverage.
43

54
load(
65
"@envoy//bazel:envoy_build_system.bzl",
76
"envoy_cc_test_library",
87
)
9-
108
load(
119
"@envoy//bazel:envoy_internal.bzl",
1210
"envoy_copts",
13-
"envoy_select_force_libcpp",
1411
"envoy_linkstatic",
12+
"envoy_select_force_libcpp",
1513
"tcmalloc_external_dep",
1614
)
1715

@@ -32,7 +30,7 @@ def _envoy_test_linkopts():
3230
# TODO(mattklein123): It's not great that we universally link against the following libs.
3331
# In particular, -latomic and -lrt are not needed on all platforms. Make this more granular.
3432
"//conditions:default": ["-pthread", "-lrt", "-ldl"],
35-
}) + envoy_select_force_libcpp(["-lc++fs"], ["-lstdc++fs", "-latomic"])
33+
}) + envoy_select_force_libcpp([], ["-lstdc++fs", "-latomic"])
3634

3735
# Envoy C++ test targets should be specified with this function.
3836
def envoy_gloo_cc_test(

bazel/external/BUILD

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
licenses(["notice"]) # Apache 2

bazel/external/inja.BUILD

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1+
licenses(["notice"]) # Apache 2
2+
13
cc_library(
24
name = "inja-lib",
35
hdrs = ["single_include/inja/inja.hpp"],
4-
visibility = ["//visibility:public"],
56
strip_include_prefix = "single_include/",
7+
visibility = ["//visibility:public"],
68
)

0 commit comments

Comments
 (0)