-
Notifications
You must be signed in to change notification settings - Fork 3.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Results cache fix improvements (#7444)
Move middleware to someplace more sensible and incorporate feedback missed in the review for this.
- Loading branch information
1 parent
b59277b
commit c1bccac
Showing
9 changed files
with
107 additions
and
36 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
package queryrangebase | ||
|
||
import ( | ||
"net/http" | ||
|
||
"github.com/grafana/dskit/tenant" | ||
"github.com/weaveworks/common/middleware" | ||
) | ||
|
||
const ( | ||
// ResultsCacheGenNumberHeaderName holds name of the header we want to set in http response | ||
ResultsCacheGenNumberHeaderName = "Results-Cache-Gen-Number" | ||
) | ||
|
||
func CacheGenNumberHeaderSetterMiddleware(cacheGenNumbersLoader CacheGenNumberLoader) middleware.Interface { | ||
return middleware.Func(func(next http.Handler) http.Handler { | ||
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { | ||
userIDs, err := tenant.TenantIDs(r.Context()) | ||
if err != nil { | ||
http.Error(w, err.Error(), http.StatusUnauthorized) | ||
return | ||
} | ||
|
||
cacheGenNumber := cacheGenNumbersLoader.GetResultsCacheGenNumber(userIDs) | ||
|
||
w.Header().Set(ResultsCacheGenNumberHeaderName, cacheGenNumber) | ||
next.ServeHTTP(w, r) | ||
}) | ||
}) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
package queryrangebase | ||
|
||
import ( | ||
"context" | ||
"net/http" | ||
"net/http/httptest" | ||
"testing" | ||
|
||
"github.com/weaveworks/common/user" | ||
|
||
"github.com/stretchr/testify/assert" | ||
) | ||
|
||
func TestCacheGenNumberHeaderSetterMiddleware(t *testing.T) { | ||
ctx := user.InjectOrgID(context.Background(), "fake") | ||
req, _ := http.NewRequestWithContext(ctx, "GET", "http://testing.com", nil) | ||
w := httptest.NewRecorder() | ||
loader := &fakeGenNumberLoader{genNumber: "test-header-value"} | ||
|
||
mware := CacheGenNumberHeaderSetterMiddleware(loader). | ||
Wrap(http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {})) | ||
mware.ServeHTTP(w, req) | ||
|
||
assert.Equal(t, w.Header().Get(ResultsCacheGenNumberHeaderName), "test-header-value") | ||
} | ||
|
||
type fakeGenNumberLoader struct { | ||
genNumber string | ||
} | ||
|
||
func (l *fakeGenNumberLoader) GetResultsCacheGenNumber(tenantIDs []string) string { | ||
return l.genNumber | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters