Skip to content
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

Bump google.golang.org/protobuf from 1.28.1 to 1.29.0 in /attestation-container #41

Closed
wants to merge 2 commits into from
Closed

Bump google.golang.org/protobuf from 1.28.1 to 1.29.0 in /attestation-container #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f8f172
todo
achamayou Mar 9, 2023
e4e413b
Bump google.golang.org/protobuf in /attestation-container
dependabot[bot] Mar 9, 2023
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
2 changes: 1 addition & 1 deletion attestation-container/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.20
require (
golang.org/x/sys v0.6.0
google.golang.org/grpc v1.53.0
google.golang.org/protobuf v1.28.1
google.golang.org/protobuf v1.29.0
)

require (
Expand Down
4 changes: 2 additions & 2 deletions attestation-container/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ google.golang.org/grpc v1.53.0 h1:LAv2ds7cmFV/XTS3XG1NneeENYrXGmorPxsBbptIjNc=
google.golang.org/grpc v1.53.0/go.mod h1:OnIrk0ipVdj4N5d9IUoFUx72/VlD7+jUsHwZgwSMQpw=
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=
google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
google.golang.org/protobuf v1.29.0 h1:44S3JjaKmLEE4YIkjzexaP+NzZsudE3Zin5Njn/pYX0=
google.golang.org/protobuf v1.29.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
9 changes: 9 additions & 0 deletions src/node/rpc/frontend.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -521,6 +521,7 @@ namespace ccf
HTTP_STATUS_INTERNAL_SERVER_ERROR,
ccf::errors::InternalError,
"Illegal endpoint implementation");
// TODO: clear headers
return;
}
// else args owns a valid Tx relating to a non-pending response, which
Expand Down Expand Up @@ -574,6 +575,7 @@ namespace ccf
fmt::format(
"Failed to execute local commit handler func: {}",
e.what()));
// TODO: clear headers
}
catch (...)
{
Expand All @@ -584,6 +586,7 @@ namespace ccf
HTTP_STATUS_INTERNAL_SERVER_ERROR,
ccf::errors::InternalError,
"Failed to execute local commit handler func");
// TODO: clear headers
}
}

Expand All @@ -609,6 +612,7 @@ namespace ccf
HTTP_STATUS_SERVICE_UNAVAILABLE,
ccf::errors::TransactionReplicationFailed,
"Transaction failed to replicate.");
// TODO: clear headers
update_metrics(ctx);
return;
}
Expand All @@ -625,20 +629,23 @@ namespace ccf
catch (RpcException& e)
{
ctx->set_error(std::move(e.error));
// TODO: clear headers
update_metrics(ctx);
return;
}
catch (const JsonParseError& e)
{
ctx->set_error(
HTTP_STATUS_BAD_REQUEST, ccf::errors::InvalidInput, e.describe());
// TODO: clear headers
update_metrics(ctx);
return;
}
catch (const nlohmann::json::exception& e)
{
ctx->set_error(
HTTP_STATUS_BAD_REQUEST, ccf::errors::InvalidInput, e.what());
// TODO: clear headers
update_metrics(ctx);
return;
}
Expand All @@ -657,6 +664,7 @@ namespace ccf
HTTP_STATUS_INTERNAL_SERVER_ERROR,
ccf::errors::InternalError,
e.what());
// TODO: clear headers
update_metrics(ctx);
return;
}
Expand All @@ -669,6 +677,7 @@ namespace ccf
"Transaction continued to conflict after {} attempts. Retry "
"later.",
max_attempts));
// TODO: clear headers
static constexpr size_t retry_after_seconds = 3;
ctx->set_response_header(http::headers::RETRY_AFTER, retry_after_seconds);

Expand Down