Skip to content

fix(gateway): return InvalidArgument for unknown land strategy #997

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

Open
DivyanshGarg380 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(gateway): return InvalidArgument for unknown land strategy #997

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 0 deletions service/submitqueue/gateway/server/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,10 @@ go_test(
srcs = ["main_test.go"],
embed = [":gateway_lib"], # keep
deps = [
"//api/base/mergestrategy/protopb:go_default_library",
"//api/submitqueue/gateway/protopb:go_default_library",
"//platform/errs:go_default_library",
"//service/submitqueue/gateway/server/mapper:go_default_library",
"//submitqueue/entity:go_default_library",
"//submitqueue/extension/queueconfig/mock:go_default_library",
"//submitqueue/gateway/controller:go_default_library",
Expand Down
11 changes: 11 additions & 0 deletions service/submitqueue/gateway/server/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,10 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/uber-go/tally"
mergestrategypb "github.com/uber/submitqueue/api/base/mergestrategy/protopb"
pb "github.com/uber/submitqueue/api/submitqueue/gateway/protopb"
"github.com/uber/submitqueue/platform/errs"
"github.com/uber/submitqueue/service/submitqueue/gateway/server/mapper"
"github.com/uber/submitqueue/submitqueue/entity"
qcmock "github.com/uber/submitqueue/submitqueue/extension/queueconfig/mock"
"github.com/uber/submitqueue/submitqueue/gateway/controller"
Expand Down Expand Up @@ -137,3 +139,12 @@ func TestGatewayStatusError(t *testing.T) {
infraErr := errors.New("storage unavailable")
assert.Equal(t, infraErr, gatewayStatusError(infraErr))
}

func TestGatewayStatusErrorUnknownLandStrategy(t *testing.T) {
_, err := mapper.ProtoToLandRequest(&pb.LandRequest{
Queue: "test-queue",
Strategy: mergestrategypb.Strategy(9999),
})
require.Error(t, err)
assert.Equal(t, codes.InvalidArgument, status.Code(gatewayStatusError(err)))
}
2 changes: 2 additions & 0 deletions service/submitqueue/gateway/server/mapper/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ go_library(
"//api/submitqueue/gateway/protopb:go_default_library",
"//platform/base/change:go_default_library",
"//platform/base/mergestrategy:go_default_library",
"//platform/errs:go_default_library",
"//submitqueue/entity:go_default_library",
],
)
Expand All @@ -37,6 +38,7 @@ go_test(
"//api/submitqueue/gateway/protopb:go_default_library",
"//platform/base/change:go_default_library",
"//platform/base/mergestrategy:go_default_library",
"//platform/errs:go_default_library",
"//submitqueue/entity:go_default_library",
"@com_github_stretchr_testify//assert:go_default_library",
"@com_github_stretchr_testify//require:go_default_library",
Expand Down
3 changes: 2 additions & 1 deletion service/submitqueue/gateway/server/mapper/land.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import (
pb "github.com/uber/submitqueue/api/submitqueue/gateway/protopb"
"github.com/uber/submitqueue/platform/base/change"
"github.com/uber/submitqueue/platform/base/mergestrategy"
"github.com/uber/submitqueue/platform/errs"
"github.com/uber/submitqueue/submitqueue/entity"
)

Expand All @@ -38,7 +39,7 @@ var errUnknownStrategy = errors.New("unknown land strategy in proto message")
func ProtoToLandRequest(req *pb.LandRequest) (entity.LandRequest, error) {
strategy, err := resolveLandStrategy(req.GetStrategy())
if err != nil {
return entity.LandRequest{}, fmt.Errorf("failed to map land strategy: %w", err)
return entity.LandRequest{}, errs.NewUserError(fmt.Errorf("failed to map land strategy: %w", err))
}
return entity.LandRequest{
Queue: req.GetQueue(),
Expand Down
2 changes: 2 additions & 0 deletions service/submitqueue/gateway/server/mapper/land_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import (
pb "github.com/uber/submitqueue/api/submitqueue/gateway/protopb"
"github.com/uber/submitqueue/platform/base/change"
"github.com/uber/submitqueue/platform/base/mergestrategy"
"github.com/uber/submitqueue/platform/errs"
"github.com/uber/submitqueue/submitqueue/entity"
)

Expand Down Expand Up @@ -75,6 +76,7 @@ func TestProtoToLandRequest(t *testing.T) {
got, err := ProtoToLandRequest(tt.req)
if tt.expectedErr != nil {
require.ErrorIs(t, err, tt.expectedErr)
assert.True(t, errs.IsUserError(err))
return
}
require.NoError(t, err)
Expand Down