Skip to content

Commit 3e44019

Browse files
coryancoryan
authored
refactor(GCS+gRPC): move plugin to a subdirectory (#12253)
1 parent 0f154a3 commit 3e44019

83 files changed

Lines changed: 247 additions & 241 deletions

File tree

Some content is hidden

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

‎ci/cloudbuild/builds/cmake-install.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ expected_dirs+=(
113113
./include/google/cloud/secretmanager/logging
114114
./include/google/cloud/secretmanager/logging/v1
115115
./include/google/cloud/spanner/mocks
116+
./include/google/cloud/storage/internal/grpc
116117
./include/google/cloud/storage/oauth2
117118
./include/google/cloud/storage/testing
118119
# no gRPC services in google/cloud/workflows/type.

‎google/cloud/storage/async_client.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
#include "google/cloud/storage/async_client.h"
1616
#include "google/cloud/storage/internal/async_connection_impl.h"
17-
#include "google/cloud/storage/internal/grpc_client.h"
17+
#include "google/cloud/storage/internal/grpc/client.h"
1818
#include "google/cloud/grpc_options.h"
1919

2020
namespace google {

‎google/cloud/storage/benchmarks/throughput_experiment.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include "google/cloud/storage/benchmarks/throughput_experiment.h"
1616
#include "google/cloud/storage/benchmarks/benchmark_utils.h"
1717
#include "google/cloud/storage/client.h"
18-
#include "google/cloud/storage/internal/grpc_ctype_cord_workaround.h"
18+
#include "google/cloud/storage/internal/grpc/ctype_cord_workaround.h"
1919
#include "google/cloud/grpc_error_delegate.h"
2020
#include <google/storage/v2/storage.grpc.pb.h>
2121
#include <curl/curl.h>

‎google/cloud/storage/google_cloud_cpp_storage_grpc.bzl‎

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -23,28 +23,28 @@ google_cloud_cpp_storage_grpc_hdrs = [
2323
"internal/async_accumulate_read_object.h",
2424
"internal/async_connection.h",
2525
"internal/async_connection_impl.h",
26-
"internal/grpc_bucket_access_control_parser.h",
27-
"internal/grpc_bucket_metadata_parser.h",
28-
"internal/grpc_bucket_name.h",
29-
"internal/grpc_bucket_request_parser.h",
30-
"internal/grpc_buffer_read_object_data.h",
31-
"internal/grpc_channel_refresh.h",
32-
"internal/grpc_client.h",
33-
"internal/grpc_configure_client_context.h",
34-
"internal/grpc_ctype_cord_workaround.h",
35-
"internal/grpc_hmac_key_metadata_parser.h",
36-
"internal/grpc_hmac_key_request_parser.h",
37-
"internal/grpc_notification_metadata_parser.h",
38-
"internal/grpc_notification_request_parser.h",
39-
"internal/grpc_object_access_control_parser.h",
40-
"internal/grpc_object_metadata_parser.h",
41-
"internal/grpc_object_read_source.h",
42-
"internal/grpc_object_request_parser.h",
43-
"internal/grpc_owner_parser.h",
44-
"internal/grpc_service_account_parser.h",
45-
"internal/grpc_sign_blob_request_parser.h",
46-
"internal/grpc_split_write_object_data.h",
47-
"internal/grpc_synthetic_self_link.h",
26+
"internal/grpc/bucket_access_control_parser.h",
27+
"internal/grpc/bucket_metadata_parser.h",
28+
"internal/grpc/bucket_name.h",
29+
"internal/grpc/bucket_request_parser.h",
30+
"internal/grpc/buffer_read_object_data.h",
31+
"internal/grpc/channel_refresh.h",
32+
"internal/grpc/client.h",
33+
"internal/grpc/configure_client_context.h",
34+
"internal/grpc/ctype_cord_workaround.h",
35+
"internal/grpc/hmac_key_metadata_parser.h",
36+
"internal/grpc/hmac_key_request_parser.h",
37+
"internal/grpc/notification_metadata_parser.h",
38+
"internal/grpc/notification_request_parser.h",
39+
"internal/grpc/object_access_control_parser.h",
40+
"internal/grpc/object_metadata_parser.h",
41+
"internal/grpc/object_read_source.h",
42+
"internal/grpc/object_request_parser.h",
43+
"internal/grpc/owner_parser.h",
44+
"internal/grpc/service_account_parser.h",
45+
"internal/grpc/sign_blob_request_parser.h",
46+
"internal/grpc/split_write_object_data.h",
47+
"internal/grpc/synthetic_self_link.h",
4848
"internal/hybrid_client.h",
4949
"internal/storage_auth_decorator.h",
5050
"internal/storage_logging_decorator.h",
@@ -60,27 +60,27 @@ google_cloud_cpp_storage_grpc_srcs = [
6060
"grpc_plugin.cc",
6161
"internal/async_accumulate_read_object.cc",
6262
"internal/async_connection_impl.cc",
63-
"internal/grpc_bucket_access_control_parser.cc",
64-
"internal/grpc_bucket_metadata_parser.cc",
65-
"internal/grpc_bucket_name.cc",
66-
"internal/grpc_bucket_request_parser.cc",
67-
"internal/grpc_buffer_read_object_data.cc",
68-
"internal/grpc_channel_refresh.cc",
69-
"internal/grpc_client.cc",
70-
"internal/grpc_configure_client_context.cc",
71-
"internal/grpc_hmac_key_metadata_parser.cc",
72-
"internal/grpc_hmac_key_request_parser.cc",
73-
"internal/grpc_notification_metadata_parser.cc",
74-
"internal/grpc_notification_request_parser.cc",
75-
"internal/grpc_object_access_control_parser.cc",
76-
"internal/grpc_object_metadata_parser.cc",
77-
"internal/grpc_object_read_source.cc",
78-
"internal/grpc_object_request_parser.cc",
79-
"internal/grpc_owner_parser.cc",
80-
"internal/grpc_service_account_parser.cc",
81-
"internal/grpc_sign_blob_request_parser.cc",
82-
"internal/grpc_split_write_object_data.cc",
83-
"internal/grpc_synthetic_self_link.cc",
63+
"internal/grpc/bucket_access_control_parser.cc",
64+
"internal/grpc/bucket_metadata_parser.cc",
65+
"internal/grpc/bucket_name.cc",
66+
"internal/grpc/bucket_request_parser.cc",
67+
"internal/grpc/buffer_read_object_data.cc",
68+
"internal/grpc/channel_refresh.cc",
69+
"internal/grpc/client.cc",
70+
"internal/grpc/configure_client_context.cc",
71+
"internal/grpc/hmac_key_metadata_parser.cc",
72+
"internal/grpc/hmac_key_request_parser.cc",
73+
"internal/grpc/notification_metadata_parser.cc",
74+
"internal/grpc/notification_request_parser.cc",
75+
"internal/grpc/object_access_control_parser.cc",
76+
"internal/grpc/object_metadata_parser.cc",
77+
"internal/grpc/object_read_source.cc",
78+
"internal/grpc/object_request_parser.cc",
79+
"internal/grpc/owner_parser.cc",
80+
"internal/grpc/service_account_parser.cc",
81+
"internal/grpc/sign_blob_request_parser.cc",
82+
"internal/grpc/split_write_object_data.cc",
83+
"internal/grpc/synthetic_self_link.cc",
8484
"internal/hybrid_client.cc",
8585
"internal/storage_auth_decorator.cc",
8686
"internal/storage_logging_decorator.cc",

‎google/cloud/storage/google_cloud_cpp_storage_grpc.cmake‎

Lines changed: 68 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -41,49 +41,49 @@ else ()
4141
internal/async_connection.h
4242
internal/async_connection_impl.cc
4343
internal/async_connection_impl.h
44-
internal/grpc_bucket_access_control_parser.cc
45-
internal/grpc_bucket_access_control_parser.h
46-
internal/grpc_bucket_metadata_parser.cc
47-
internal/grpc_bucket_metadata_parser.h
48-
internal/grpc_bucket_name.cc
49-
internal/grpc_bucket_name.h
50-
internal/grpc_bucket_request_parser.cc
51-
internal/grpc_bucket_request_parser.h
52-
internal/grpc_buffer_read_object_data.cc
53-
internal/grpc_buffer_read_object_data.h
54-
internal/grpc_channel_refresh.cc
55-
internal/grpc_channel_refresh.h
56-
internal/grpc_client.cc
57-
internal/grpc_client.h
58-
internal/grpc_configure_client_context.cc
59-
internal/grpc_configure_client_context.h
60-
internal/grpc_ctype_cord_workaround.h
61-
internal/grpc_hmac_key_metadata_parser.cc
62-
internal/grpc_hmac_key_metadata_parser.h
63-
internal/grpc_hmac_key_request_parser.cc
64-
internal/grpc_hmac_key_request_parser.h
65-
internal/grpc_notification_metadata_parser.cc
66-
internal/grpc_notification_metadata_parser.h
67-
internal/grpc_notification_request_parser.cc
68-
internal/grpc_notification_request_parser.h
69-
internal/grpc_object_access_control_parser.cc
70-
internal/grpc_object_access_control_parser.h
71-
internal/grpc_object_metadata_parser.cc
72-
internal/grpc_object_metadata_parser.h
73-
internal/grpc_object_read_source.cc
74-
internal/grpc_object_read_source.h
75-
internal/grpc_object_request_parser.cc
76-
internal/grpc_object_request_parser.h
77-
internal/grpc_owner_parser.cc
78-
internal/grpc_owner_parser.h
79-
internal/grpc_service_account_parser.cc
80-
internal/grpc_service_account_parser.h
81-
internal/grpc_sign_blob_request_parser.cc
82-
internal/grpc_sign_blob_request_parser.h
83-
internal/grpc_split_write_object_data.cc
84-
internal/grpc_split_write_object_data.h
85-
internal/grpc_synthetic_self_link.cc
86-
internal/grpc_synthetic_self_link.h
44+
internal/grpc/bucket_access_control_parser.cc
45+
internal/grpc/bucket_access_control_parser.h
46+
internal/grpc/bucket_metadata_parser.cc
47+
internal/grpc/bucket_metadata_parser.h
48+
internal/grpc/bucket_name.cc
49+
internal/grpc/bucket_name.h
50+
internal/grpc/bucket_request_parser.cc
51+
internal/grpc/bucket_request_parser.h
52+
internal/grpc/buffer_read_object_data.cc
53+
internal/grpc/buffer_read_object_data.h
54+
internal/grpc/channel_refresh.cc
55+
internal/grpc/channel_refresh.h
56+
internal/grpc/client.cc
57+
internal/grpc/client.h
58+
internal/grpc/configure_client_context.cc
59+
internal/grpc/configure_client_context.h
60+
internal/grpc/ctype_cord_workaround.h
61+
internal/grpc/hmac_key_metadata_parser.cc
62+
internal/grpc/hmac_key_metadata_parser.h
63+
internal/grpc/hmac_key_request_parser.cc
64+
internal/grpc/hmac_key_request_parser.h
65+
internal/grpc/notification_metadata_parser.cc
66+
internal/grpc/notification_metadata_parser.h
67+
internal/grpc/notification_request_parser.cc
68+
internal/grpc/notification_request_parser.h
69+
internal/grpc/object_access_control_parser.cc
70+
internal/grpc/object_access_control_parser.h
71+
internal/grpc/object_metadata_parser.cc
72+
internal/grpc/object_metadata_parser.h
73+
internal/grpc/object_read_source.cc
74+
internal/grpc/object_read_source.h
75+
internal/grpc/object_request_parser.cc
76+
internal/grpc/object_request_parser.h
77+
internal/grpc/owner_parser.cc
78+
internal/grpc/owner_parser.h
79+
internal/grpc/service_account_parser.cc
80+
internal/grpc/service_account_parser.h
81+
internal/grpc/sign_blob_request_parser.cc
82+
internal/grpc/sign_blob_request_parser.h
83+
internal/grpc/split_write_object_data.cc
84+
internal/grpc/split_write_object_data.h
85+
internal/grpc/synthetic_self_link.cc
86+
internal/grpc/synthetic_self_link.h
8787
internal/hybrid_client.cc
8888
internal/hybrid_client.h
8989
internal/storage_auth_decorator.cc
@@ -188,31 +188,31 @@ if (BUILD_TESTING AND GOOGLE_CLOUD_CPP_STORAGE_ENABLE_GRPC)
188188
grpc_plugin_test.cc
189189
internal/async_accumulate_read_object_test.cc
190190
internal/async_connection_impl_test.cc
191-
internal/grpc_bucket_access_control_parser_test.cc
192-
internal/grpc_bucket_metadata_parser_test.cc
193-
internal/grpc_bucket_name_test.cc
194-
internal/grpc_bucket_request_parser_test.cc
195-
internal/grpc_buffer_read_object_data_test.cc
196-
internal/grpc_client_acl_test.cc
197-
internal/grpc_client_failures_test.cc
198-
internal/grpc_client_insert_object_media_test.cc
199-
internal/grpc_client_read_object_test.cc
200-
internal/grpc_client_test.cc
201-
internal/grpc_client_upload_chunk_test.cc
202-
internal/grpc_configure_client_context_test.cc
203-
internal/grpc_hmac_key_metadata_parser_test.cc
204-
internal/grpc_hmac_key_request_parser_test.cc
205-
internal/grpc_notification_metadata_parser_test.cc
206-
internal/grpc_notification_request_parser_test.cc
207-
internal/grpc_object_access_control_parser_test.cc
208-
internal/grpc_object_metadata_parser_test.cc
209-
internal/grpc_object_read_source_test.cc
210-
internal/grpc_object_request_parser_test.cc
211-
internal/grpc_owner_parser_test.cc
212-
internal/grpc_service_account_parser_test.cc
213-
internal/grpc_sign_blob_request_parser_test.cc
214-
internal/grpc_split_write_object_data_test.cc
215-
internal/grpc_synthetic_self_link_test.cc
191+
internal/grpc/bucket_access_control_parser_test.cc
192+
internal/grpc/bucket_metadata_parser_test.cc
193+
internal/grpc/bucket_name_test.cc
194+
internal/grpc/bucket_request_parser_test.cc
195+
internal/grpc/buffer_read_object_data_test.cc
196+
internal/grpc/client_acl_test.cc
197+
internal/grpc/client_failures_test.cc
198+
internal/grpc/client_insert_object_media_test.cc
199+
internal/grpc/client_read_object_test.cc
200+
internal/grpc/client_test.cc
201+
internal/grpc/client_upload_chunk_test.cc
202+
internal/grpc/configure_client_context_test.cc
203+
internal/grpc/hmac_key_metadata_parser_test.cc
204+
internal/grpc/hmac_key_request_parser_test.cc
205+
internal/grpc/notification_metadata_parser_test.cc
206+
internal/grpc/notification_request_parser_test.cc
207+
internal/grpc/object_access_control_parser_test.cc
208+
internal/grpc/object_metadata_parser_test.cc
209+
internal/grpc/object_read_source_test.cc
210+
internal/grpc/object_request_parser_test.cc
211+
internal/grpc/owner_parser_test.cc
212+
internal/grpc/service_account_parser_test.cc
213+
internal/grpc/sign_blob_request_parser_test.cc
214+
internal/grpc/split_write_object_data_test.cc
215+
internal/grpc/synthetic_self_link_test.cc
216216
internal/storage_stub_factory_test.cc)
217217

218218
foreach (fname ${storage_client_grpc_unit_tests})

‎google/cloud/storage/grpc_plugin.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
// limitations under the License.
1414

1515
#include "google/cloud/storage/grpc_plugin.h"
16-
#include "google/cloud/storage/internal/grpc_client.h"
16+
#include "google/cloud/storage/internal/grpc/client.h"
1717
#include "google/cloud/storage/internal/hybrid_client.h"
1818
#include "google/cloud/internal/getenv.h"
1919

‎google/cloud/storage/grpc_plugin_test.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
// limitations under the License.
1414

1515
#include "google/cloud/storage/grpc_plugin.h"
16-
#include "google/cloud/storage/internal/grpc_client.h"
16+
#include "google/cloud/storage/internal/grpc/client.h"
1717
#include "google/cloud/storage/internal/hybrid_client.h"
1818
#include "google/cloud/storage/internal/rest_client.h"
1919
#include "google/cloud/storage/internal/retry_client.h"

‎google/cloud/storage/internal/async_accumulate_read_object.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414

1515
#include "google/cloud/storage/internal/async_accumulate_read_object.h"
1616
#include "google/cloud/storage/internal/crc32c.h"
17-
#include "google/cloud/storage/internal/grpc_ctype_cord_workaround.h"
18-
#include "google/cloud/storage/internal/grpc_object_metadata_parser.h"
17+
#include "google/cloud/storage/internal/grpc/ctype_cord_workaround.h"
18+
#include "google/cloud/storage/internal/grpc/object_metadata_parser.h"
1919
#include <iterator>
2020
#include <numeric>
2121
#include <sstream>

‎google/cloud/storage/internal/async_accumulate_read_object_test.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
// limitations under the License.
1414

1515
#include "google/cloud/storage/internal/async_accumulate_read_object.h"
16-
#include "google/cloud/storage/internal/grpc_ctype_cord_workaround.h"
16+
#include "google/cloud/storage/internal/grpc/ctype_cord_workaround.h"
1717
#include "google/cloud/storage/testing/mock_storage_stub.h"
1818
#include "google/cloud/testing_util/async_sequencer.h"
1919
#include "google/cloud/testing_util/is_proto_equal.h"

‎google/cloud/storage/internal/async_connection_impl.cc‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414

1515
#include "google/cloud/storage/internal/async_connection_impl.h"
1616
#include "google/cloud/storage/internal/async_accumulate_read_object.h"
17-
#include "google/cloud/storage/internal/grpc_channel_refresh.h"
18-
#include "google/cloud/storage/internal/grpc_client.h"
19-
#include "google/cloud/storage/internal/grpc_configure_client_context.h"
20-
#include "google/cloud/storage/internal/grpc_object_metadata_parser.h"
21-
#include "google/cloud/storage/internal/grpc_object_request_parser.h"
17+
#include "google/cloud/storage/internal/grpc/channel_refresh.h"
18+
#include "google/cloud/storage/internal/grpc/client.h"
19+
#include "google/cloud/storage/internal/grpc/configure_client_context.h"
20+
#include "google/cloud/storage/internal/grpc/object_metadata_parser.h"
21+
#include "google/cloud/storage/internal/grpc/object_request_parser.h"
2222
#include "google/cloud/storage/internal/storage_stub.h"
2323
#include "google/cloud/storage/internal/storage_stub_factory.h"
2424
#include "google/cloud/storage/options.h"

0 commit comments

Comments
 (0)