From 6934ae378ab5743da80a5995fc74d167502187b1 Mon Sep 17 00:00:00 2001 From: kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com> Date: Tue, 12 Jul 2022 08:32:20 +0100 Subject: [chore] improved router logging, recovery and error handling (#705) * move panic recovery to logging middleware, improve logging + panic recovery logic Signed-off-by: kim * remove dead code Signed-off-by: kim * remove skip paths code Signed-off-by: kim * re-enable log quoting Signed-off-by: kim * use human-friendly bytesize in logging body size Signed-off-by: kim * only disable quoting in debug builds Signed-off-by: kim * use logrus level instead of debug.DEBUG() to enable/disable quoting Signed-off-by: kim * shutup linter Signed-off-by: kim * fix instance tests Signed-off-by: kim * fix gin test contexts created with missing engine HTML renderer Signed-off-by: kim * add note regarding not logging query parameters Signed-off-by: kim * better explain 'DisableQuoting' logic Signed-off-by: kim * add license text Signed-off-by: kim --- internal/api/client/instance/instance_test.go | 28 ++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) (limited to 'internal/api/client/instance/instance_test.go') diff --git a/internal/api/client/instance/instance_test.go b/internal/api/client/instance/instance_test.go index 645e70474..efdf86523 100644 --- a/internal/api/client/instance/instance_test.go +++ b/internal/api/client/instance/instance_test.go @@ -98,27 +98,29 @@ func (suite *InstanceStandardTestSuite) TearDownTest() { testrig.StandardStorageTeardown(suite.storage) } -func (suite *InstanceStandardTestSuite) newContext(recorder *httptest.ResponseRecorder, requestMethod string, requestBody []byte, requestPath string, bodyContentType string) *gin.Context { - ctx, _ := gin.CreateTestContext(recorder) - - ctx.Set(oauth.SessionAuthorizedAccount, suite.testAccounts["admin_account"]) - ctx.Set(oauth.SessionAuthorizedToken, oauth.DBTokenToToken(suite.testTokens["admin_account"])) - ctx.Set(oauth.SessionAuthorizedApplication, suite.testApplications["admin_account"]) - ctx.Set(oauth.SessionAuthorizedUser, suite.testUsers["admin_account"]) - +func (suite *InstanceStandardTestSuite) newContext(recorder *httptest.ResponseRecorder, method string, path string, body []byte, contentType string, auth bool) *gin.Context { protocol := config.GetProtocol() host := config.GetHost() baseURI := fmt.Sprintf("%s://%s", protocol, host) - requestURI := fmt.Sprintf("%s/%s", baseURI, requestPath) + requestURI := fmt.Sprintf("%s/%s", baseURI, path) - ctx.Request = httptest.NewRequest(requestMethod, requestURI, bytes.NewReader(requestBody)) // the endpoint we're hitting + req := httptest.NewRequest(method, requestURI, bytes.NewReader(body)) // the endpoint we're hitting - if bodyContentType != "" { - ctx.Request.Header.Set("Content-Type", bodyContentType) + if contentType != "" { + req.Header.Set("Content-Type", contentType) } - ctx.Request.Header.Set("accept", "application/json") + req.Header.Set("accept", "application/json") + + ctx, _ := testrig.CreateGinTestContext(recorder, req) + + if auth { + ctx.Set(oauth.SessionAuthorizedAccount, suite.testAccounts["admin_account"]) + ctx.Set(oauth.SessionAuthorizedToken, oauth.DBTokenToToken(suite.testTokens["admin_account"])) + ctx.Set(oauth.SessionAuthorizedApplication, suite.testApplications["admin_account"]) + ctx.Set(oauth.SessionAuthorizedUser, suite.testUsers["admin_account"]) + } return ctx } -- cgit v1.2.3