Skip to content

fix: resolve serveHandlerWithBody signature conflict in shim placement tests #782

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
PhilippMatthes merged 1 commit into from
Apr 30, 2026
Merged

fix: resolve serveHandlerWithBody signature conflict in shim placement tests #782

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
11 changes: 6 additions & 5 deletions internal/shim/placement/handle_resource_provider_aggregates_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ package placement
import (
"encoding/json"
"net/http"
"strings"
"testing"

hv1 "github.com/cobaltcore-dev/openstack-hypervisor-operator/api/v1"
Expand Down Expand Up @@ -170,7 +171,7 @@ func TestHandleResourceProviderAggregates_CRDMode(t *testing.T) {
body := `{"aggregates":["new-uuid-1","new-uuid-2"],"resource_provider_generation":0}`
w := serveHandlerWithBody(t, "PUT", "/resource_providers/{uuid}/aggregates",
sPut.HandleUpdateResourceProviderAggregates,
"/resource_providers/c1c2c3c4-d5d6-e7e8-f9f0-a1a2a3a4a5a6/aggregates", body)
"/resource_providers/c1c2c3c4-d5d6-e7e8-f9f0-a1a2a3a4a5a6/aggregates", strings.NewReader(body))
if w.Code != http.StatusOK {
t.Fatalf("status = %d, want %d; body: %s", w.Code, http.StatusOK, w.Body.String())
}
Expand Down Expand Up @@ -201,7 +202,7 @@ func TestHandleResourceProviderAggregates_CRDMode(t *testing.T) {
body := `{"aggregates":["u1"],"resource_provider_generation":999}`
w := serveHandlerWithBody(t, "PUT", "/resource_providers/{uuid}/aggregates",
sConflict.HandleUpdateResourceProviderAggregates,
"/resource_providers/d1d2d3d4-e5e6-f7f8-a9a0-b1b2b3b4b5b6/aggregates", body)
"/resource_providers/d1d2d3d4-e5e6-f7f8-a9a0-b1b2b3b4b5b6/aggregates", strings.NewReader(body))
if w.Code != http.StatusConflict {
t.Fatalf("status = %d, want %d", w.Code, http.StatusConflict)
}
Expand All @@ -211,7 +212,7 @@ func TestHandleResourceProviderAggregates_CRDMode(t *testing.T) {
body := `{"aggregates":["u1"],"resource_provider_generation":0}`
w := serveHandlerWithBody(t, "PUT", "/resource_providers/{uuid}/aggregates",
s.HandleUpdateResourceProviderAggregates,
"/resource_providers/e1e2e3e4-f5f6-a7a8-b9b0-c1c2c3c4c5c6/aggregates", body)
"/resource_providers/e1e2e3e4-f5f6-a7a8-b9b0-c1c2c3c4c5c6/aggregates", strings.NewReader(body))
if w.Code != http.StatusNotFound {
t.Fatalf("status = %d, want %d", w.Code, http.StatusNotFound)
}
Expand All @@ -228,7 +229,7 @@ func TestHandleResourceProviderAggregates_CRDMode(t *testing.T) {
body := `{"aggregates":[],"resource_provider_generation":0}`
w := serveHandlerWithBody(t, "PUT", "/resource_providers/{uuid}/aggregates",
sClear.HandleUpdateResourceProviderAggregates,
"/resource_providers/e1e2e3e4-f5f6-a7a8-b9b0-c1c2c3c4c5c6/aggregates", body)
"/resource_providers/e1e2e3e4-f5f6-a7a8-b9b0-c1c2c3c4c5c6/aggregates", strings.NewReader(body))
if w.Code != http.StatusOK {
t.Fatalf("status = %d, want %d; body: %s", w.Code, http.StatusOK, w.Body.String())
}
Expand All @@ -253,7 +254,7 @@ func TestHandleResourceProviderAggregates_CRDMode(t *testing.T) {
t.Run("PUT returns 400 for malformed body", func(t *testing.T) {
w := serveHandlerWithBody(t, "PUT", "/resource_providers/{uuid}/aggregates",
s.HandleUpdateResourceProviderAggregates,
"/resource_providers/"+validUUID+"/aggregates", "not json")
"/resource_providers/"+validUUID+"/aggregates", strings.NewReader("not json"))
if w.Code != http.StatusBadRequest {
t.Fatalf("status = %d, want %d", w.Code, http.StatusBadRequest)
}
Expand Down
24 changes: 4 additions & 20 deletions internal/shim/placement/handle_resource_provider_traits_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ package placement
import (
"encoding/json"
"net/http"
"net/http/httptest"
"strings"
"testing"

Expand All @@ -23,21 +22,6 @@ func testHypervisorWithGroups(name, openstackID string, groups []hv1.Group) *hv1
}
}

func serveHandlerWithBody(t *testing.T, method, pattern string, handler http.HandlerFunc, reqPath, body string) *httptest.ResponseRecorder { //nolint:unparam
t.Helper()
mux := http.NewServeMux()
mux.HandleFunc(method+" "+pattern, handler)
var req *http.Request
if body != "" {
req = httptest.NewRequest(method, reqPath, strings.NewReader(body))
} else {
req = httptest.NewRequest(method, reqPath, http.NoBody)
}
w := httptest.NewRecorder()
mux.ServeHTTP(w, req)
return w
}

func TestHandleListResourceProviderTraits(t *testing.T) {
t.Run("valid uuid", func(t *testing.T) {
s := newTestShim(t, http.StatusOK, "{}", nil)
Expand Down Expand Up @@ -229,7 +213,7 @@ func TestHandleResourceProviderTraits_CRDMode(t *testing.T) {
body := `{"traits":["NEW_TRAIT_1","NEW_TRAIT_2"],"resource_provider_generation":0}`
w := serveHandlerWithBody(t, "PUT", "/resource_providers/{uuid}/traits",
sPut.HandleUpdateResourceProviderTraits,
"/resource_providers/c1c2c3c4-d5d6-e7e8-f9f0-a1a2a3a4a5a6/traits", body)
"/resource_providers/c1c2c3c4-d5d6-e7e8-f9f0-a1a2a3a4a5a6/traits", strings.NewReader(body))
if w.Code != http.StatusOK {
t.Fatalf("status = %d, want %d; body: %s", w.Code, http.StatusOK, w.Body.String())
}
Expand Down Expand Up @@ -260,7 +244,7 @@ func TestHandleResourceProviderTraits_CRDMode(t *testing.T) {
body := `{"traits":["T1"],"resource_provider_generation":999}`
w := serveHandlerWithBody(t, "PUT", "/resource_providers/{uuid}/traits",
sConflict.HandleUpdateResourceProviderTraits,
"/resource_providers/d1d2d3d4-e5e6-f7f8-a9a0-b1b2b3b4b5b6/traits", body)
"/resource_providers/d1d2d3d4-e5e6-f7f8-a9a0-b1b2b3b4b5b6/traits", strings.NewReader(body))
if w.Code != http.StatusConflict {
t.Fatalf("status = %d, want %d", w.Code, http.StatusConflict)
}
Expand All @@ -270,7 +254,7 @@ func TestHandleResourceProviderTraits_CRDMode(t *testing.T) {
body := `{"traits":["T1"],"resource_provider_generation":0}`
w := serveHandlerWithBody(t, "PUT", "/resource_providers/{uuid}/traits",
s.HandleUpdateResourceProviderTraits,
"/resource_providers/e1e2e3e4-f5f6-a7a8-b9b0-c1c2c3c4c5c6/traits", body)
"/resource_providers/e1e2e3e4-f5f6-a7a8-b9b0-c1c2c3c4c5c6/traits", strings.NewReader(body))
if w.Code != http.StatusNotFound {
t.Fatalf("status = %d, want %d", w.Code, http.StatusNotFound)
}
Expand All @@ -279,7 +263,7 @@ func TestHandleResourceProviderTraits_CRDMode(t *testing.T) {
t.Run("PUT returns 400 for malformed body", func(t *testing.T) {
w := serveHandlerWithBody(t, "PUT", "/resource_providers/{uuid}/traits",
s.HandleUpdateResourceProviderTraits,
"/resource_providers/"+validUUID+"/traits", "not json")
"/resource_providers/"+validUUID+"/traits", strings.NewReader("not json"))
if w.Code != http.StatusBadRequest {
t.Fatalf("status = %d, want %d", w.Code, http.StatusBadRequest)
}
Expand Down
Loading