Skip to content

Commit

Permalink
Merge pull request #1244 from redpanda-data/backend/incompatible_redp…
Browse files Browse the repository at this point in the history
…anda_version_error

Backend: incompatible redpanda version error
  • Loading branch information
bojand committed May 10, 2024
2 parents 08363a3 + 688f95a commit 04a89b0
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 6 deletions.
2 changes: 1 addition & 1 deletion backend/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.22.2

require (
buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.33.0-20240401165935-b983156c5e99.1
buf.build/gen/go/redpandadata/common/protocolbuffers/go v1.33.0-20240321121335-26480f50072a.1
buf.build/gen/go/redpandadata/common/protocolbuffers/go v1.33.0-20240508150812-e0d0fbd58f25.1
connectrpc.com/connect v1.16.1
connectrpc.com/grpcreflect v1.2.0
github.com/aws/aws-sdk-go-v2/config v1.27.11
Expand Down
4 changes: 2 additions & 2 deletions backend/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ buf.build/gen/go/connectrpc/eliza/connectrpc/go v1.15.0-20230913231627-233fca715
buf.build/gen/go/connectrpc/eliza/connectrpc/go v1.15.0-20230913231627-233fca715f49.1/go.mod h1:OZPBPnAuuFcUf5WHYm5pIXkUhIy7Pp6dzV4W2Zbc2/c=
buf.build/gen/go/connectrpc/eliza/protocolbuffers/go v1.33.0-20230913231627-233fca715f49.1 h1:bHffCjg+jKMaDnUeYjBJXHAlH659fX4N1YExnWl5wFU=
buf.build/gen/go/connectrpc/eliza/protocolbuffers/go v1.33.0-20230913231627-233fca715f49.1/go.mod h1:v0PWlly2hqVEW2IZSPlvPHELTvdHD5hBsA0+KlCfTQk=
buf.build/gen/go/redpandadata/common/protocolbuffers/go v1.33.0-20240321121335-26480f50072a.1 h1:8YzYWQuWs1a4Lt/O7aJyrw38bkJ6T63/OGCVvZgG8OQ=
buf.build/gen/go/redpandadata/common/protocolbuffers/go v1.33.0-20240321121335-26480f50072a.1/go.mod h1:NDWpeU3ohHVIKP3DhrDOtnLrmrjz8il/5SH+1/B6TNM=
buf.build/gen/go/redpandadata/common/protocolbuffers/go v1.33.0-20240508150812-e0d0fbd58f25.1 h1:X8EeeFlNCt0g77OP8kuOcdWKTTafQoW5iHD3D5SP3bY=
buf.build/gen/go/redpandadata/common/protocolbuffers/go v1.33.0-20240508150812-e0d0fbd58f25.1/go.mod h1:NDWpeU3ohHVIKP3DhrDOtnLrmrjz8il/5SH+1/B6TNM=
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
connectrpc.com/connect v1.16.1 h1:rOdrK/RTI/7TVnn3JsVxt3n028MlTRwmK5Q4heSpjis=
Expand Down
21 changes: 18 additions & 3 deletions backend/pkg/api/connect/errors/common_errors.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,8 @@ package errors
import (
"errors"

commonv1alpha1 "buf.build/gen/go/redpandadata/common/protocolbuffers/go/redpanda/api/common/v1alpha1"
"connectrpc.com/connect"

v1alpha1 "github.com/redpanda-data/console/backend/pkg/protogen/redpanda/api/dataplane/v1alpha1"
)

// NewRedpandaAdminAPINotConfiguredError is a standard error to return if an endpoint
Expand All @@ -23,7 +22,23 @@ func NewRedpandaAdminAPINotConfiguredError() *connect.Error {
return NewConnectError(
connect.CodeUnimplemented,
errors.New("the redpanda admin api must be configured to use this endpoint"),
NewErrorInfo(v1alpha1.Reason_REASON_FEATURE_NOT_CONFIGURED.String()),
NewErrorInfo(commonv1alpha1.Reason_REASON_FEATURE_NOT_CONFIGURED.String()),
NewHelp(NewHelpLinkConsoleReferenceConfig()),
)
}

// NewRedpandaFeatureNotSupportedError is a standard error to return if an endpoint
// requires the Redpanda feature that is not supported with current running version and instance.
func NewRedpandaFeatureNotSupportedError(feature string) *connect.Error {
return NewConnectError(
connect.CodeUnimplemented,
errors.New("redpanda version does not support feature: "+feature),
NewErrorInfo(commonv1alpha1.Reason_REASON_FEATURE_NOT_SUPPORTED.String(), []KeyVal{
{
Key: "feature",
Value: feature,
},
}...),
NewHelp(NewHelpLinkConsoleReferenceConfig()),
)
}

0 comments on commit 04a89b0

Please sign in to comment.