Skip to content

Commit c90c889

Browse files
authored
chore(storage): Remove references to notification / hmac / service ac… (#14768)
* chore(storage): Remove references to notification / hmac / service account ops from internal * omit rpcs * fix typo * break into multiple lines
1 parent ce02666 commit c90c889

21 files changed

+12
-1264
lines changed

generator/generator_config.textproto

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3683,6 +3683,18 @@ service {
36833683
"WriteObject"
36843684
]
36853685
omit_repo_metadata: true
3686+
omitted_rpcs: [
3687+
"GetServiceAccount",
3688+
"CreateHmacKey",
3689+
"DeleteHmacKey",
3690+
"GetHmacKey",
3691+
"ListHmacKeys",
3692+
"UpdateHmacKey",
3693+
"DeleteNotificationConfig",
3694+
"GetNotificationConfig",
3695+
"CreateNotificationConfig",
3696+
"ListNotificationConfigs"
3697+
]
36863698
}
36873699
36883700
# Storage Control

google/cloud/storage/google_cloud_cpp_storage_grpc.bzl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ google_cloud_cpp_storage_grpc_hdrs = [
7171
"internal/grpc/metrics_histograms.h",
7272
"internal/grpc/metrics_meter_provider.h",
7373
"internal/grpc/monitoring_project.h",
74-
"internal/grpc/notification_metadata_parser.h",
7574
"internal/grpc/object_access_control_parser.h",
7675
"internal/grpc/object_metadata_parser.h",
7776
"internal/grpc/object_read_source.h",
@@ -133,7 +132,6 @@ google_cloud_cpp_storage_grpc_srcs = [
133132
"internal/grpc/metrics_histograms.cc",
134133
"internal/grpc/metrics_meter_provider.cc",
135134
"internal/grpc/monitoring_project.cc",
136-
"internal/grpc/notification_metadata_parser.cc",
137135
"internal/grpc/object_access_control_parser.cc",
138136
"internal/grpc/object_metadata_parser.cc",
139137
"internal/grpc/object_read_source.cc",

google/cloud/storage/google_cloud_cpp_storage_grpc.cmake

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,6 @@ add_library(
163163
internal/grpc/metrics_meter_provider.h
164164
internal/grpc/monitoring_project.cc
165165
internal/grpc/monitoring_project.h
166-
internal/grpc/notification_metadata_parser.cc
167-
internal/grpc/notification_metadata_parser.h
168166
internal/grpc/object_access_control_parser.cc
169167
internal/grpc/object_access_control_parser.h
170168
internal/grpc/object_metadata_parser.cc
@@ -440,7 +438,6 @@ set(storage_client_grpc_unit_tests
440438
internal/grpc/metrics_histograms_test.cc
441439
internal/grpc/metrics_meter_provider_test.cc
442440
internal/grpc/monitoring_project_test.cc
443-
internal/grpc/notification_metadata_parser_test.cc
444441
internal/grpc/object_access_control_parser_test.cc
445442
internal/grpc/object_metadata_parser_test.cc
446443
internal/grpc/object_read_source_test.cc

google/cloud/storage/internal/grpc/notification_metadata_parser.cc

Lines changed: 0 additions & 72 deletions
This file was deleted.

google/cloud/storage/internal/grpc/notification_metadata_parser.h

Lines changed: 0 additions & 39 deletions
This file was deleted.

google/cloud/storage/internal/grpc/notification_metadata_parser_test.cc

Lines changed: 0 additions & 71 deletions
This file was deleted.

google/cloud/storage/internal/grpc/stub.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
#include "google/cloud/storage/internal/grpc/configure_client_context.h"
2222
#include "google/cloud/storage/internal/grpc/ctype_cord_workaround.h"
2323
#include "google/cloud/storage/internal/grpc/default_options.h"
24-
#include "google/cloud/storage/internal/grpc/notification_metadata_parser.h"
2524
#include "google/cloud/storage/internal/grpc/object_access_control_parser.h"
2625
#include "google/cloud/storage/internal/grpc/object_metadata_parser.h"
2726
#include "google/cloud/storage/internal/grpc/object_read_source.h"

google/cloud/storage/internal/storage_auth_decorator.cc

Lines changed: 0 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -235,89 +235,6 @@ StorageAuth::QueryWriteStatus(
235235
return child_->QueryWriteStatus(context, options, request);
236236
}
237237

238-
StatusOr<google::storage::v2::ServiceAccount> StorageAuth::GetServiceAccount(
239-
grpc::ClientContext& context, Options const& options,
240-
google::storage::v2::GetServiceAccountRequest const& request) {
241-
auto status = auth_->ConfigureContext(context);
242-
if (!status.ok()) return status;
243-
return child_->GetServiceAccount(context, options, request);
244-
}
245-
246-
StatusOr<google::storage::v2::CreateHmacKeyResponse> StorageAuth::CreateHmacKey(
247-
grpc::ClientContext& context, Options const& options,
248-
google::storage::v2::CreateHmacKeyRequest const& request) {
249-
auto status = auth_->ConfigureContext(context);
250-
if (!status.ok()) return status;
251-
return child_->CreateHmacKey(context, options, request);
252-
}
253-
254-
Status StorageAuth::DeleteHmacKey(
255-
grpc::ClientContext& context, Options const& options,
256-
google::storage::v2::DeleteHmacKeyRequest const& request) {
257-
auto status = auth_->ConfigureContext(context);
258-
if (!status.ok()) return status;
259-
return child_->DeleteHmacKey(context, options, request);
260-
}
261-
262-
StatusOr<google::storage::v2::HmacKeyMetadata> StorageAuth::GetHmacKey(
263-
grpc::ClientContext& context, Options const& options,
264-
google::storage::v2::GetHmacKeyRequest const& request) {
265-
auto status = auth_->ConfigureContext(context);
266-
if (!status.ok()) return status;
267-
return child_->GetHmacKey(context, options, request);
268-
}
269-
270-
StatusOr<google::storage::v2::ListHmacKeysResponse> StorageAuth::ListHmacKeys(
271-
grpc::ClientContext& context, Options const& options,
272-
google::storage::v2::ListHmacKeysRequest const& request) {
273-
auto status = auth_->ConfigureContext(context);
274-
if (!status.ok()) return status;
275-
return child_->ListHmacKeys(context, options, request);
276-
}
277-
278-
StatusOr<google::storage::v2::HmacKeyMetadata> StorageAuth::UpdateHmacKey(
279-
grpc::ClientContext& context, Options const& options,
280-
google::storage::v2::UpdateHmacKeyRequest const& request) {
281-
auto status = auth_->ConfigureContext(context);
282-
if (!status.ok()) return status;
283-
return child_->UpdateHmacKey(context, options, request);
284-
}
285-
286-
Status StorageAuth::DeleteNotificationConfig(
287-
grpc::ClientContext& context, Options const& options,
288-
google::storage::v2::DeleteNotificationConfigRequest const& request) {
289-
auto status = auth_->ConfigureContext(context);
290-
if (!status.ok()) return status;
291-
return child_->DeleteNotificationConfig(context, options, request);
292-
}
293-
294-
StatusOr<google::storage::v2::NotificationConfig>
295-
StorageAuth::GetNotificationConfig(
296-
grpc::ClientContext& context, Options const& options,
297-
google::storage::v2::GetNotificationConfigRequest const& request) {
298-
auto status = auth_->ConfigureContext(context);
299-
if (!status.ok()) return status;
300-
return child_->GetNotificationConfig(context, options, request);
301-
}
302-
303-
StatusOr<google::storage::v2::NotificationConfig>
304-
StorageAuth::CreateNotificationConfig(
305-
grpc::ClientContext& context, Options const& options,
306-
google::storage::v2::CreateNotificationConfigRequest const& request) {
307-
auto status = auth_->ConfigureContext(context);
308-
if (!status.ok()) return status;
309-
return child_->CreateNotificationConfig(context, options, request);
310-
}
311-
312-
StatusOr<google::storage::v2::ListNotificationConfigsResponse>
313-
StorageAuth::ListNotificationConfigs(
314-
grpc::ClientContext& context, Options const& options,
315-
google::storage::v2::ListNotificationConfigsRequest const& request) {
316-
auto status = auth_->ConfigureContext(context);
317-
if (!status.ok()) return status;
318-
return child_->ListNotificationConfigs(context, options, request);
319-
}
320-
321238
future<StatusOr<google::storage::v2::Object>> StorageAuth::AsyncComposeObject(
322239
google::cloud::CompletionQueue& cq,
323240
std::shared_ptr<grpc::ClientContext> context,

google/cloud/storage/internal/storage_auth_decorator.h

Lines changed: 0 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -137,51 +137,6 @@ class StorageAuth : public StorageStub {
137137
grpc::ClientContext& context, Options const& options,
138138
google::storage::v2::QueryWriteStatusRequest const& request) override;
139139

140-
StatusOr<google::storage::v2::ServiceAccount> GetServiceAccount(
141-
grpc::ClientContext& context, Options const& options,
142-
google::storage::v2::GetServiceAccountRequest const& request) override;
143-
144-
StatusOr<google::storage::v2::CreateHmacKeyResponse> CreateHmacKey(
145-
grpc::ClientContext& context, Options const& options,
146-
google::storage::v2::CreateHmacKeyRequest const& request) override;
147-
148-
Status DeleteHmacKey(
149-
grpc::ClientContext& context, Options const& options,
150-
google::storage::v2::DeleteHmacKeyRequest const& request) override;
151-
152-
StatusOr<google::storage::v2::HmacKeyMetadata> GetHmacKey(
153-
grpc::ClientContext& context, Options const& options,
154-
google::storage::v2::GetHmacKeyRequest const& request) override;
155-
156-
StatusOr<google::storage::v2::ListHmacKeysResponse> ListHmacKeys(
157-
grpc::ClientContext& context, Options const& options,
158-
google::storage::v2::ListHmacKeysRequest const& request) override;
159-
160-
StatusOr<google::storage::v2::HmacKeyMetadata> UpdateHmacKey(
161-
grpc::ClientContext& context, Options const& options,
162-
google::storage::v2::UpdateHmacKeyRequest const& request) override;
163-
164-
Status DeleteNotificationConfig(
165-
grpc::ClientContext& context, Options const& options,
166-
google::storage::v2::DeleteNotificationConfigRequest const& request)
167-
override;
168-
169-
StatusOr<google::storage::v2::NotificationConfig> GetNotificationConfig(
170-
grpc::ClientContext& context, Options const& options,
171-
google::storage::v2::GetNotificationConfigRequest const& request)
172-
override;
173-
174-
StatusOr<google::storage::v2::NotificationConfig> CreateNotificationConfig(
175-
grpc::ClientContext& context, Options const& options,
176-
google::storage::v2::CreateNotificationConfigRequest const& request)
177-
override;
178-
179-
StatusOr<google::storage::v2::ListNotificationConfigsResponse>
180-
ListNotificationConfigs(
181-
grpc::ClientContext& context, Options const& options,
182-
google::storage::v2::ListNotificationConfigsRequest const& request)
183-
override;
184-
185140
future<StatusOr<google::storage::v2::Object>> AsyncComposeObject(
186141
google::cloud::CompletionQueue& cq,
187142
std::shared_ptr<grpc::ClientContext> context,

0 commit comments

Comments
 (0)