TrueCloudLab/frostfs-s3-gw
17
3
Fork 19
Code Issues 28 Pull requests 7 Projects Releases 17 Packages Activity Actions

bugfix/306-use_APE_instead_eACL #310

Merged
alexvanin merged 1 commit from dkirillov/frostfs-s3-gw:bugfix/306-use_APE_instead_eACL into master 2024-09-04 19:51:13 +00:00
Conversation 1 Commits 1 Files changed 1 +9 -22
1 changed files with 9 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
api/router_test.go
View file

@ -57,7 +57,7 @@ func prepareRouter(t *testing.T) *routerMock {
Limit: 10, Limit: 10,
BacklogTimeout: 30 * time.Second, BacklogTimeout: 30 * time.Second,
}, },
Handler: &handlerMock{t: t, cfg: middlewareSettings, buckets: map[string]*data.BucketInfo{}}, Handler: &handlerMock{t: t, cfg: middlewareSettings, buckets: map[string]*data.BucketInfo{}},
Center: &centerMock{t: t}, Center: &centerMock{t: t},
Log: logger, Log: logger,
Metrics: metrics.NewAppMetrics(metricsConfig), Metrics: metrics.NewAppMetrics(metricsConfig),
@ -442,33 +442,24 @@ func putObjectBase(router *routerMock, namespace, bktName, objName string) *http
func TestOwnerIDRetrieving(t *testing.T) { func TestOwnerIDRetrieving(t *testing.T) {
chiRouter := prepareRouter(t) chiRouter := prepareRouter(t)
w := httptest.NewRecorder() ns, bktName, objName := "", "test-bucket", "test-object"
r := httptest.NewRequest(http.MethodGet, "/test-bucket", nil)
chiRouter.ServeHTTP(w, r) createBucket(chiRouter, ns, bktName)
resp := readResponse(t, w)
resp := putObject(chiRouter, ns, bktName, objName)
require.NotEqual(t, "anon", resp.ReqInfo.User) require.NotEqual(t, "anon", resp.ReqInfo.User)
w = httptest.NewRecorder()
r = httptest.NewRequest(http.MethodGet, "/test-bucket", nil)
chiRouter.cfg.Center.(*centerMock).anon = true chiRouter.cfg.Center.(*centerMock).anon = true
resp = putObject(chiRouter, ns, bktName, objName)
chiRouter.ServeHTTP(w, r)
resp = readResponse(t, w)
require.Equal(t, "anon", resp.ReqInfo.User) require.Equal(t, "anon", resp.ReqInfo.User)
} }
func TestBillingMetrics(t *testing.T) { func TestBillingMetrics(t *testing.T) {
chiRouter := prepareRouter(t) chiRouter := prepareRouter(t)
bktName, objName := "test-bucket", "test-object" ns, bktName, objName := "", "test-bucket", "test-object"
target := fmt.Sprintf("/%s/%s", bktName, objName)
w := httptest.NewRecorder() createBucket(chiRouter, ns, bktName)
r := httptest.NewRequest(http.MethodPut, target, nil)
chiRouter.ServeHTTP(w, r)
dump := chiRouter.cfg.Metrics.UsersAPIStats().DumpMetrics() dump := chiRouter.cfg.Metrics.UsersAPIStats().DumpMetrics()
require.Len(t, dump.Requests, 1) require.Len(t, dump.Requests, 1)
require.NotEqual(t, "anon", dump.Requests[0].User) require.NotEqual(t, "anon", dump.Requests[0].User)
@ -477,11 +468,7 @@ func TestBillingMetrics(t *testing.T) {
require.Equal(t, 1, dump.Requests[0].Requests) require.Equal(t, 1, dump.Requests[0].Requests)
chiRouter.cfg.Center.(*centerMock).anon = true chiRouter.cfg.Center.(*centerMock).anon = true
putObject(chiRouter, ns, bktName, objName)
w = httptest.NewRecorder()
r = httptest.NewRequest(http.MethodPut, target, nil)
chiRouter.ServeHTTP(w, r)
dump = chiRouter.cfg.Metrics.UsersAPIStats().DumpMetrics() dump = chiRouter.cfg.Metrics.UsersAPIStats().DumpMetrics()
require.Len(t, dump.Requests, 1) require.Len(t, dump.Requests, 1)
require.Equal(t, "anon", dump.Requests[0].User) require.Equal(t, "anon", dump.Requests[0].User)