Skip to content

feat(generator): support parameters named "options" #8283

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
coryan merged 5 commits into from
Feb 7, 2022
Merged

feat(generator): support parameters named "options" #8283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3d45a75
feat(generator): support parameters named "options"
coryan Feb 7, 2022
7853389
Update golden files
coryan Feb 7, 2022
0bbe1a9
Update generated libraries
coryan Feb 7, 2022
2f6e81f
Address review comments
coryan Feb 7, 2022
963ccf5
Regenerate after addressing review comments
coryan Feb 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 31 additions & 31 deletions generator/integration_tests/golden/golden_kitchen_sink_client.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ namespace cloud {
namespace golden {
GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN

GoldenKitchenSinkClient::GoldenKitchenSinkClient(std::shared_ptr<GoldenKitchenSinkConnection> connection, Options options) : connection_(std::move(connection)), options_(internal::MergeOptions(std::move(options), golden_internal::GoldenKitchenSinkDefaultOptions(connection_->options()))) {}
GoldenKitchenSinkClient::GoldenKitchenSinkClient(std::shared_ptr<GoldenKitchenSinkConnection> connection, Options opts) : connection_(std::move(connection)), options_(internal::MergeOptions(std::move(opts), golden_internal::GoldenKitchenSinkDefaultOptions(connection_->options()))) {}
GoldenKitchenSinkClient::~GoldenKitchenSinkClient() = default;

StatusOr<google::test::admin::database::v1::GenerateAccessTokenResponse>
GoldenKitchenSinkClient::GenerateAccessToken(std::string const& name, std::vector<std::string> const& delegates, std::vector<std::string> const& scope, google::protobuf::Duration const& lifetime, Options options) {
internal::OptionsSpan span(internal::MergeOptions(std::move(options), options_));
GoldenKitchenSinkClient::GenerateAccessToken(std::string const& name, std::vector<std::string> const& delegates, std::vector<std::string> const& scope, google::protobuf::Duration const& lifetime, Options opts) {
internal::OptionsSpan span(internal::MergeOptions(std::move(opts), options_));
google::test::admin::database::v1::GenerateAccessTokenRequest request;
request.set_name(name);
*request.mutable_delegates() = {delegates.begin(), delegates.end()};
Expand All @@ -40,14 +40,14 @@ GoldenKitchenSinkClient::GenerateAccessToken(std::string const& name, std::vecto
}

StatusOr<google::test::admin::database::v1::GenerateAccessTokenResponse>
GoldenKitchenSinkClient::GenerateAccessToken(google::test::admin::database::v1::GenerateAccessTokenRequest const& request, Options options) {
internal::OptionsSpan span(internal::MergeOptions(std::move(options), options_));
GoldenKitchenSinkClient::GenerateAccessToken(google::test::admin::database::v1::GenerateAccessTokenRequest const& request, Options opts) {
internal::OptionsSpan span(internal::MergeOptions(std::move(opts), options_));
return connection_->GenerateAccessToken(request);
}

StatusOr<google::test::admin::database::v1::GenerateIdTokenResponse>
GoldenKitchenSinkClient::GenerateIdToken(std::string const& name, std::vector<std::string> const& delegates, std::string const& audience, bool include_email, Options options) {
internal::OptionsSpan span(internal::MergeOptions(std::move(options), options_));
GoldenKitchenSinkClient::GenerateIdToken(std::string const& name, std::vector<std::string> const& delegates, std::string const& audience, bool include_email, Options opts) {
internal::OptionsSpan span(internal::MergeOptions(std::move(opts), options_));
google::test::admin::database::v1::GenerateIdTokenRequest request;
request.set_name(name);
*request.mutable_delegates() = {delegates.begin(), delegates.end()};
Expand All @@ -57,88 +57,88 @@ GoldenKitchenSinkClient::GenerateIdToken(std::string const& name, std::vector<st
}

StatusOr<google::test::admin::database::v1::GenerateIdTokenResponse>
GoldenKitchenSinkClient::GenerateIdToken(google::test::admin::database::v1::GenerateIdTokenRequest const& request, Options options) {
internal::OptionsSpan span(internal::MergeOptions(std::move(options), options_));
GoldenKitchenSinkClient::GenerateIdToken(google::test::admin::database::v1::GenerateIdTokenRequest const& request, Options opts) {
internal::OptionsSpan span(internal::MergeOptions(std::move(opts), options_));
return connection_->GenerateIdToken(request);
}

StatusOr<google::test::admin::database::v1::WriteLogEntriesResponse>
GoldenKitchenSinkClient::WriteLogEntries(std::string const& log_name, std::map<std::string, std::string> const& labels, Options options) {
internal::OptionsSpan span(internal::MergeOptions(std::move(options), options_));
GoldenKitchenSinkClient::WriteLogEntries(std::string const& log_name, std::map<std::string, std::string> const& labels, Options opts) {
internal::OptionsSpan span(internal::MergeOptions(std::move(opts), options_));
google::test::admin::database::v1::WriteLogEntriesRequest request;
request.set_log_name(log_name);
*request.mutable_labels() = {labels.begin(), labels.end()};
return connection_->WriteLogEntries(request);
}

StatusOr<google::test::admin::database::v1::WriteLogEntriesResponse>
GoldenKitchenSinkClient::WriteLogEntries(google::test::admin::database::v1::WriteLogEntriesRequest const& request, Options options) {
internal::OptionsSpan span(internal::MergeOptions(std::move(options), options_));
GoldenKitchenSinkClient::WriteLogEntries(google::test::admin::database::v1::WriteLogEntriesRequest const& request, Options opts) {
internal::OptionsSpan span(internal::MergeOptions(std::move(opts), options_));
return connection_->WriteLogEntries(request);
}

StreamRange<std::string>
GoldenKitchenSinkClient::ListLogs(std::string const& parent, Options options) {
internal::OptionsSpan span(internal::MergeOptions(std::move(options), options_));
GoldenKitchenSinkClient::ListLogs(std::string const& parent, Options opts) {
internal::OptionsSpan span(internal::MergeOptions(std::move(opts), options_));
google::test::admin::database::v1::ListLogsRequest request;
request.set_parent(parent);
return connection_->ListLogs(request);
}

StreamRange<std::string>
GoldenKitchenSinkClient::ListLogs(google::test::admin::database::v1::ListLogsRequest request, Options options) {
internal::OptionsSpan span(internal::MergeOptions(std::move(options), options_));
GoldenKitchenSinkClient::ListLogs(google::test::admin::database::v1::ListLogsRequest request, Options opts) {
internal::OptionsSpan span(internal::MergeOptions(std::move(opts), options_));
return connection_->ListLogs(std::move(request));
}

StreamRange<google::test::admin::database::v1::TailLogEntriesResponse>
GoldenKitchenSinkClient::TailLogEntries(std::vector<std::string> const& resource_names, Options options) {
internal::OptionsSpan span(internal::MergeOptions(std::move(options), options_));
GoldenKitchenSinkClient::TailLogEntries(std::vector<std::string> const& resource_names, Options opts) {
internal::OptionsSpan span(internal::MergeOptions(std::move(opts), options_));
google::test::admin::database::v1::TailLogEntriesRequest request;
*request.mutable_resource_names() = {resource_names.begin(), resource_names.end()};
return connection_->TailLogEntries(request);
}

StreamRange<google::test::admin::database::v1::TailLogEntriesResponse>
GoldenKitchenSinkClient::TailLogEntries(google::test::admin::database::v1::TailLogEntriesRequest const& request, Options options) {
internal::OptionsSpan span(internal::MergeOptions(std::move(options), options_));
GoldenKitchenSinkClient::TailLogEntries(google::test::admin::database::v1::TailLogEntriesRequest const& request, Options opts) {
internal::OptionsSpan span(internal::MergeOptions(std::move(opts), options_));
return connection_->TailLogEntries(request);
}

StatusOr<google::test::admin::database::v1::ListServiceAccountKeysResponse>
GoldenKitchenSinkClient::ListServiceAccountKeys(std::string const& name, std::vector<google::test::admin::database::v1::ListServiceAccountKeysRequest::KeyType> const& key_types, Options options) {
internal::OptionsSpan span(internal::MergeOptions(std::move(options), options_));
GoldenKitchenSinkClient::ListServiceAccountKeys(std::string const& name, std::vector<google::test::admin::database::v1::ListServiceAccountKeysRequest::KeyType> const& key_types, Options opts) {
internal::OptionsSpan span(internal::MergeOptions(std::move(opts), options_));
google::test::admin::database::v1::ListServiceAccountKeysRequest request;
request.set_name(name);
*request.mutable_key_types() = {key_types.begin(), key_types.end()};
return connection_->ListServiceAccountKeys(request);
}

StatusOr<google::test::admin::database::v1::ListServiceAccountKeysResponse>
GoldenKitchenSinkClient::ListServiceAccountKeys(google::test::admin::database::v1::ListServiceAccountKeysRequest const& request, Options options) {
internal::OptionsSpan span(internal::MergeOptions(std::move(options), options_));
GoldenKitchenSinkClient::ListServiceAccountKeys(google::test::admin::database::v1::ListServiceAccountKeysRequest const& request, Options opts) {
internal::OptionsSpan span(internal::MergeOptions(std::move(opts), options_));
return connection_->ListServiceAccountKeys(request);
}

Status
GoldenKitchenSinkClient::DoNothing(Options options) {
internal::OptionsSpan span(internal::MergeOptions(std::move(options), options_));
GoldenKitchenSinkClient::DoNothing(Options opts) {
internal::OptionsSpan span(internal::MergeOptions(std::move(opts), options_));
google::protobuf::Empty request;
return connection_->DoNothing(request);
}

Status
GoldenKitchenSinkClient::DoNothing(google::protobuf::Empty const& request, Options options) {
internal::OptionsSpan span(internal::MergeOptions(std::move(options), options_));
GoldenKitchenSinkClient::DoNothing(google::protobuf::Empty const& request, Options opts) {
internal::OptionsSpan span(internal::MergeOptions(std::move(opts), options_));
return connection_->DoNothing(request);
}

std::unique_ptr<::google::cloud::AsyncStreamingReadWriteRpc<
google::test::admin::database::v1::AppendRowsRequest,
google::test::admin::database::v1::AppendRowsResponse>>
GoldenKitchenSinkClient::AsyncAppendRows(Options options) {
GoldenKitchenSinkClient::AsyncAppendRows(Options opts) {
internal::OptionsSpan span(
internal::MergeOptions(std::move(options), options_));
internal::MergeOptions(std::move(opts), options_));
return connection_->AsyncAppendRows();
}

Expand Down
Loading