Skip to content

Commit 6bf2bb3

Browse files
qiwzhangqiwzhang
authored
Merge pull request istio#3 from qiwzhang/build_for_esp
Add contrib/endpoints prefix to all includes.
2 parents 11472b5 + 7e3477e commit 6bf2bb3

File tree

105 files changed

+270
-270
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

105 files changed

+270
-270
lines changed

‎contrib/endpoints/BUILD renamed to ‎BUILD

File renamed without changes.

‎contrib/endpoints/WORKSPACE renamed to ‎WORKSPACE

File renamed without changes.

‎contrib/endpoints/include/BUILD

+5-6
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,15 @@
1414
#
1515
################################################################################
1616
#
17-
exports_files(["version"])
1817

19-
cc_inc_library(
18+
cc_library(
2019
name = "api_manager",
2120
hdrs = [
2221
":headers",
2322
],
2423
visibility = ["//visibility:public"],
2524
deps = [
26-
"//src/api_manager",
25+
"//contrib/endpoints/src/api_manager",
2726
],
2827
)
2928

@@ -33,7 +32,7 @@ cc_library(
3332
":headers",
3433
],
3534
visibility = [
36-
"//src/api_manager:__subpackages__",
35+
"//contrib/endpoints/src/api_manager:__subpackages__",
3736
],
3837
)
3938

@@ -65,8 +64,8 @@ genrule(
6564
outs = [
6665
"api_manager/version.h",
6766
],
68-
cmd = "$(location //tools:create_version) $(location :version) > $@",
67+
cmd = "$(location //contrib/endpoints/tools:create_version) $(location :version) > $@",
6968
tools = [
70-
"//tools:create_version",
69+
"//contrib/endpoints/tools:create_version",
7170
],
7271
)

‎contrib/endpoints/include/api_manager/api_manager.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020
#include <memory>
2121
#include <string>
2222

23+
#include "contrib/endpoints/include/api_manager/env_interface.h"
24+
#include "contrib/endpoints/include/api_manager/request.h"
25+
#include "contrib/endpoints/include/api_manager/request_handler_interface.h"
26+
#include "contrib/endpoints/include/api_manager/service_control.h"
2327
#include "google/api/service.pb.h"
24-
#include "include/api_manager/env_interface.h"
25-
#include "include/api_manager/request.h"
26-
#include "include/api_manager/request_handler_interface.h"
27-
#include "include/api_manager/service_control.h"
2828

2929
namespace google {
3030
namespace api_manager {

‎contrib/endpoints/include/api_manager/env_interface.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
#include <functional>
2222
#include <memory>
2323

24-
#include "include/api_manager/http_request.h"
25-
#include "include/api_manager/periodic_timer.h"
26-
#include "include/api_manager/utils/status.h"
24+
#include "contrib/endpoints/include/api_manager/http_request.h"
25+
#include "contrib/endpoints/include/api_manager/periodic_timer.h"
26+
#include "contrib/endpoints/include/api_manager/utils/status.h"
2727

2828
namespace google {
2929
namespace api_manager {

‎contrib/endpoints/include/api_manager/http_request.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include <functional>
1919
#include <string>
2020

21-
#include "include/api_manager/utils/status.h"
21+
#include "contrib/endpoints/include/api_manager/utils/status.h"
2222

2323
namespace google {
2424
namespace api_manager {

‎contrib/endpoints/include/api_manager/method_call_info.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include <string>
1919
#include <vector>
2020

21-
#include "include/api_manager/method.h"
21+
#include "contrib/endpoints/include/api_manager/method.h"
2222

2323
namespace google {
2424
namespace api_manager {

‎contrib/endpoints/include/api_manager/periodic_timer.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#ifndef API_MANAGER_PERIODIC_TIMER_H_
1616
#define API_MANAGER_PERIODIC_TIMER_H_
1717

18-
#include "include/api_manager/utils/status.h"
18+
#include "contrib/endpoints/include/api_manager/utils/status.h"
1919

2020
namespace google {
2121
namespace api_manager {

‎contrib/endpoints/include/api_manager/request.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
#include <map>
1919
#include <string>
2020

21-
#include "include/api_manager/protocol.h"
22-
#include "include/api_manager/utils/status.h"
21+
#include "contrib/endpoints/include/api_manager/protocol.h"
22+
#include "contrib/endpoints/include/api_manager/utils/status.h"
2323

2424
namespace google {
2525
namespace api_manager {

‎contrib/endpoints/include/api_manager/request_handler_interface.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
#ifndef API_MANAGER_REQUEST_HANDLER_INTERFACE_H_
1616
#define API_MANAGER_REQUEST_HANDLER_INTERFACE_H_
1717

18-
#include "include/api_manager/method.h"
19-
#include "include/api_manager/method_call_info.h"
20-
#include "include/api_manager/response.h"
21-
#include "include/api_manager/utils/status.h"
18+
#include "contrib/endpoints/include/api_manager/method.h"
19+
#include "contrib/endpoints/include/api_manager/method_call_info.h"
20+
#include "contrib/endpoints/include/api_manager/response.h"
21+
#include "contrib/endpoints/include/api_manager/utils/status.h"
2222

2323
namespace google {
2424
namespace api_manager {

‎contrib/endpoints/include/api_manager/response.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
#include <map>
1919
#include <string>
2020

21-
#include "include/api_manager/protocol.h"
22-
#include "include/api_manager/service_control.h"
23-
#include "include/api_manager/utils/status.h"
21+
#include "contrib/endpoints/include/api_manager/protocol.h"
22+
#include "contrib/endpoints/include/api_manager/service_control.h"
23+
#include "contrib/endpoints/include/api_manager/utils/status.h"
2424

2525
namespace google {
2626
namespace api_manager {

‎contrib/endpoints/src/api_manager/BUILD

+10-9
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,17 @@ cc_proto_library(
2525
],
2626
default_runtime = "//external:protobuf",
2727
protoc = "//external:protoc",
28+
visibility = ["//visibility:public"],
2829
)
2930

3031
cc_proto_library(
3132
name = "status_proto",
3233
srcs = [
3334
"proto/api_manager_status.proto",
3435
],
35-
include = ".",
3636
default_runtime = "//external:protobuf",
3737
protoc = "//external:protoc",
38+
visibility = ["//visibility:public"],
3839
)
3940

4041
cc_library(
@@ -57,7 +58,7 @@ cc_library(
5758
"request_handler.h",
5859
],
5960
deps = [
60-
"//include:headers_only",
61+
"//contrib/endpoints/include:headers_only",
6162
],
6263
)
6364

@@ -90,12 +91,17 @@ cc_library(
9091
],
9192
}),
9293
visibility = [
93-
"//include:__subpackages__",
94+
"//visibility:public",
9495
],
9596
deps = [
9697
":auth_headers",
9798
":impl_headers",
9899
":server_config_proto",
100+
"//contrib/endpoints/src/api_manager/auth",
101+
"//contrib/endpoints/src/api_manager/cloud_trace",
102+
"//contrib/endpoints/src/api_manager/context",
103+
"//contrib/endpoints/src/api_manager/service_control",
104+
"//contrib/endpoints/src/api_manager/utils",
99105
"//external:cc_wkt_protos",
100106
"//external:cloud_trace",
101107
"//external:googletest_prod",
@@ -104,11 +110,6 @@ cc_library(
104110
"//external:service_config",
105111
"//external:servicecontrol",
106112
"//external:servicecontrol_client",
107-
"//src/api_manager/auth",
108-
"//src/api_manager/cloud_trace",
109-
"//src/api_manager/context",
110-
"//src/api_manager/service_control",
111-
"//src/api_manager/utils",
112113
],
113114
)
114115

@@ -221,7 +222,7 @@ cc_test(
221222
],
222223
)
223224

224-
cc_inc_library(
225+
cc_library(
225226
name = "mock_api_manager_environment",
226227
testonly = True,
227228
hdrs = [

‎contrib/endpoints/src/api_manager/api_manager_impl.cc

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
//
1515
////////////////////////////////////////////////////////////////////////////////
1616
//
17-
#include "src/api_manager/api_manager_impl.h"
17+
#include "contrib/endpoints/src/api_manager/api_manager_impl.h"
1818

19-
#include "src/api_manager/check_workflow.h"
20-
#include "src/api_manager/request_handler.h"
19+
#include "contrib/endpoints/src/api_manager/check_workflow.h"
20+
#include "contrib/endpoints/src/api_manager/request_handler.h"
2121

2222
using ::google::api_manager::proto::ServerConfig;
2323

‎contrib/endpoints/src/api_manager/api_manager_impl.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
#ifndef API_MANAGER_API_MANAGER_IMPL_H_
1616
#define API_MANAGER_API_MANAGER_IMPL_H_
1717

18-
#include "include/api_manager/api_manager.h"
19-
#include "src/api_manager/context/service_context.h"
20-
#include "src/api_manager/service_control/interface.h"
18+
#include "contrib/endpoints/include/api_manager/api_manager.h"
19+
#include "contrib/endpoints/src/api_manager/context/service_context.h"
20+
#include "contrib/endpoints/src/api_manager/service_control/interface.h"
2121

2222
namespace google {
2323
namespace api_manager {

‎contrib/endpoints/src/api_manager/api_manager_test.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
//
1515
////////////////////////////////////////////////////////////////////////////////
1616
//
17-
#include "include/api_manager/api_manager.h"
17+
#include "contrib/endpoints/include/api_manager/api_manager.h"
18+
#include "contrib/endpoints/src/api_manager/mock_api_manager_environment.h"
1819
#include "gtest/gtest.h"
19-
#include "src/api_manager/mock_api_manager_environment.h"
2020

2121
#include <memory>
2222

‎contrib/endpoints/src/api_manager/auth/BUILD

+8-8
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#
1515
################################################################################
1616
#
17-
package(default_visibility = ["//src/api_manager:__subpackages__"])
17+
package(default_visibility = ["//contrib/endpoints/src/api_manager:__subpackages__"])
1818

1919
cc_library(
2020
name = "auth",
@@ -33,11 +33,11 @@ cc_library(
3333
],
3434
}),
3535
deps = [
36+
"//contrib/endpoints/src/api_manager:auth_headers",
37+
"//contrib/endpoints/src/api_manager/auth/lib",
38+
"//contrib/endpoints/src/api_manager/utils",
3639
"//external:googletest_prod",
3740
"//external:servicecontrol_client",
38-
"//src/api_manager:auth_headers",
39-
"//src/api_manager/auth/lib",
40-
"//src/api_manager/utils",
4141
],
4242
)
4343

@@ -57,10 +57,10 @@ cc_library(
5757
],
5858
}),
5959
deps = [
60+
"//contrib/endpoints/include:headers_only",
61+
"//contrib/endpoints/src/api_manager/auth/lib",
62+
"//contrib/endpoints/src/api_manager/utils",
6063
"//external:grpc++",
61-
"//include:headers_only",
62-
"//src/api_manager/auth/lib",
63-
"//src/api_manager/utils",
6464
],
6565
)
6666

@@ -86,7 +86,7 @@ cc_test(
8686
linkstatic = 1,
8787
deps = [
8888
":service_account_token",
89+
"//contrib/endpoints/src/api_manager:mock_api_manager_environment",
8990
"//external:googletest_main",
90-
"//src/api_manager:mock_api_manager_environment",
9191
],
9292
)

‎contrib/endpoints/src/api_manager/auth/jwt_cache.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
//
1515
////////////////////////////////////////////////////////////////////////////////
1616
//
17-
#include "src/api_manager/auth/jwt_cache.h"
17+
#include "contrib/endpoints/src/api_manager/auth/jwt_cache.h"
1818

1919
using ::google::service_control_client::SimpleLRUCache;
2020
using std::chrono::system_clock;

‎contrib/endpoints/src/api_manager/auth/jwt_cache.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include <chrono>
1919
#include <string>
2020

21-
#include "src/api_manager/auth.h"
21+
#include "contrib/endpoints/src/api_manager/auth.h"
2222
#include "utils/simple_lru_cache_inl.h"
2323

2424
namespace google {

‎contrib/endpoints/src/api_manager/auth/jwt_cache_test.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
//
1515
////////////////////////////////////////////////////////////////////////////////
1616
//
17-
#include "src/api_manager/auth/jwt_cache.h"
17+
#include "contrib/endpoints/src/api_manager/auth/jwt_cache.h"
1818
#include <memory>
1919
#include "gtest/gtest.h"
2020

‎contrib/endpoints/src/api_manager/auth/lib/BUILD

+3-3
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ cc_library(
3333
],
3434
visibility = ["//visibility:public"],
3535
deps = [
36+
"//contrib/endpoints/include:headers_only",
37+
"//contrib/endpoints/src/api_manager:auth_headers",
38+
"//contrib/endpoints/src/api_manager/utils",
3639
"//external:grpc",
3740
"//external:protobuf",
38-
"//include:headers_only",
39-
"//src/api_manager:auth_headers",
40-
"//src/api_manager/utils",
4141
],
4242
)
4343

‎contrib/endpoints/src/api_manager/auth/lib/auth_jwt_validator.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
//
1515
////////////////////////////////////////////////////////////////////////////////
1616
//
17-
#include "src/api_manager/auth/lib/auth_jwt_validator.h"
17+
#include "contrib/endpoints/src/api_manager/auth/lib/auth_jwt_validator.h"
1818

1919
// Implementation of JWT token verification.
2020

@@ -66,7 +66,7 @@ extern "C" {
6666
#include <set>
6767
#include <string>
6868

69-
#include "src/api_manager/auth/lib/json_util.h"
69+
#include "contrib/endpoints/src/api_manager/auth/lib/json_util.h"
7070

7171
using std::string;
7272
using std::chrono::system_clock;

‎contrib/endpoints/src/api_manager/auth/lib/auth_jwt_validator.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
#include <cstdlib>
2020
#include <memory>
2121

22-
#include "include/api_manager/utils/status.h"
23-
#include "src/api_manager/auth.h"
22+
#include "contrib/endpoints/include/api_manager/utils/status.h"
23+
#include "contrib/endpoints/src/api_manager/auth.h"
2424

2525
using ::google::api_manager::utils::Status;
2626

‎contrib/endpoints/src/api_manager/auth/lib/auth_jwt_validator_test.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
//
1515
////////////////////////////////////////////////////////////////////////////////
1616
//
17-
#include "src/api_manager/auth/lib/auth_jwt_validator.h"
17+
#include "contrib/endpoints/src/api_manager/auth/lib/auth_jwt_validator.h"
1818

19+
#include "contrib/endpoints/src/api_manager/auth/lib/auth_token.h"
1920
#include "gtest/gtest.h"
20-
#include "src/api_manager/auth/lib/auth_token.h"
2121

2222
#include <cstring>
2323

‎contrib/endpoints/src/api_manager/auth/lib/auth_token.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
//
1515
////////////////////////////////////////////////////////////////////////////////
1616
//
17-
#include "src/api_manager/auth/lib/auth_token.h"
18-
#include "src/api_manager/auth/lib/json_util.h"
17+
#include "contrib/endpoints/src/api_manager/auth/lib/auth_token.h"
18+
#include "contrib/endpoints/src/api_manager/auth/lib/json_util.h"
1919

2020
#include <openssl/hmac.h>
2121
#include <openssl/pem.h>

‎contrib/endpoints/src/api_manager/auth/lib/auth_token_test.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
//
1515
////////////////////////////////////////////////////////////////////////////////
1616
//
17-
#include "src/api_manager/auth/lib/auth_token.h"
17+
#include "contrib/endpoints/src/api_manager/auth/lib/auth_token.h"
1818
#include "gtest/gtest.h"
1919

2020
#include <string.h>

0 commit comments

Comments
 (0)