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

Jump to bottom

fix: Corrects ability to disable all blocking from the CLI by not providing any groups #1373

Merged
merged 6 commits into from
Feb 10, 2024
Merged

fix: Corrects ability to disable all blocking from the CLI by not providing any groups #1373

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
03c6035
fix: Corrects ability to disable all blocking from the CLI by not pro…
BenMcH Feb 10, 2024
17b3546
fix: More appropriately correct the issue preventing disabled blockin…
BenMcH Feb 10, 2024
f1a3cff
Use the same length logic previously seen
BenMcH Feb 10, 2024
546bc7b
Code reviewcomments
BenMcH Feb 10, 2024
8f996ba
Remove redundant check
BenMcH Feb 10, 2024
cee6075
Revert nil check removal; Removing this broke tests
BenMcH Feb 10, 2024
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
4 changes: 3 additions & 1 deletion api/api_interface_impl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,10 @@ func (i *OpenAPIInterfaceImpl) DisableBlocking(ctx context.Context,
}
}

if request.Params.Groups != nil {
if request.Params.Groups != nil && len(*request.Params.Groups) > 0 {
groups = strings.Split(*request.Params.Groups, ",")
} else {
groups = []string{}
ThinkChaos marked this conversation as resolved.
Show resolved Hide resolved
}

err = i.control.DisableBlocking(ctx, duration, groups)
Expand Down
16 changes: 16 additions & 0 deletions api/api_interface_impl_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,22 @@ var _ = Describe("API implementation tests", func() {

Describe("Control blocking status via API", func() {
When("Disable blocking is called", func() {
It("should return a success when receiving no groups", func() {
blockingControlMock.On("DisableBlocking", 3*time.Second, []string{}).Return(nil)
duration := "3s"
grroups := ""

resp, err := sut.DisableBlocking(ctx, DisableBlockingRequestObject{
Params: DisableBlockingParams{
Duration: &duration,
Groups: &grroups,
},
})
Expect(err).Should(Succeed())
var resp200 DisableBlocking200Response
Expect(resp).Should(BeAssignableToTypeOf(resp200))
})

It("should return 200 on success", func() {
blockingControlMock.On("DisableBlocking", 3*time.Second, []string{"gr1", "gr2"}).Return(nil)
duration := "3s"
Expand Down
Loading