This is an automated email from the ASF dual-hosted git repository.
mani pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/yunikorn-core.git
The following commit(s) were added to refs/heads/master by this push:
new 8a05d78d [YUNIKORN-1980] Return 410 gone in deprecated log REST calls
(#653)
8a05d78d is described below
commit 8a05d78d5d3543b8ca681db503254841b6c52d23
Author: brandboat <[email protected]>
AuthorDate: Tue Oct 3 17:17:05 2023 +0530
[YUNIKORN-1980] Return 410 gone in deprecated log REST calls (#653)
Closes: #653
Signed-off-by: Manikandan R <[email protected]>
---
pkg/webservice/handlers.go | 13 -------------
pkg/webservice/handlers_test.go | 26 --------------------------
pkg/webservice/routes.go | 12 ------------
3 files changed, 51 deletions(-)
diff --git a/pkg/webservice/handlers.go b/pkg/webservice/handlers.go
index 34d177f8..9b30f884 100644
--- a/pkg/webservice/handlers.go
+++ b/pkg/webservice/handlers.go
@@ -630,19 +630,6 @@ func getApplication(w http.ResponseWriter, r
*http.Request) {
}
}
-func setLogLevel(w http.ResponseWriter, r *http.Request) {
- writeHeaders(w)
- log.Log(log.Deprecation).Warn("Setting log levels via the REST API is
deprecated. The /ws/v1/loglevel endpoint will be removed in a future release.")
-}
-
-func getLogLevel(w http.ResponseWriter, r *http.Request) {
- writeHeaders(w)
- log.Log(log.Deprecation).Warn("Getting log levels via the REST API is
deprecated. The /ws/v1/loglevel endpoint will be removed in a future release.")
- if _, err := w.Write([]byte("info")); err != nil {
- buildJSONErrorResponse(w, err.Error(),
http.StatusInternalServerError)
- }
-}
-
func getPartitionInfoDAO(lists map[string]*scheduler.PartitionContext)
[]*dao.PartitionInfo {
var result []*dao.PartitionInfo
diff --git a/pkg/webservice/handlers_test.go b/pkg/webservice/handlers_test.go
index 0ab38ed2..5dc978c6 100644
--- a/pkg/webservice/handlers_test.go
+++ b/pkg/webservice/handlers_test.go
@@ -1314,32 +1314,6 @@ func TestFullStateDumpPath(t *testing.T) {
verifyStateDumpJSON(t, &aggregated)
}
-func TestGetLoggerLevel(t *testing.T) {
- req, err := http.NewRequest("GET", "/ws/v1/loglevel",
strings.NewReader(""))
- assert.NilError(t, err)
-
- rr := httptest.NewRecorder()
- handler := http.HandlerFunc(getLogLevel)
- handler.ServeHTTP(rr, req)
-
- expected := "info"
- assert.Equal(t, rr.Body.String(), expected,
- fmt.Sprintf("handler returned unexpected body: got %v want %v",
rr.Body.String(), expected))
- assert.Equal(t, rr.Code, http.StatusOK)
-}
-
-func TestSetLoggerLevel(t *testing.T) {
- req, err := http.NewRequest("PUT", "/ws/v1/loglevel",
strings.NewReader(""))
- assert.NilError(t, err)
- req = req.WithContext(context.WithValue(req.Context(),
httprouter.ParamsKey, httprouter.Params{
- httprouter.Param{Key: "level", Value: "error"},
- }))
- rr := httptest.NewRecorder()
- handler := http.HandlerFunc(setLogLevel)
- handler.ServeHTTP(rr, req)
- assert.Equal(t, rr.Code, http.StatusOK)
-}
-
func TestSpecificUserAndGroupResourceUsage(t *testing.T) {
prepareUserAndGroupContext(t)
// Test user name is missing
diff --git a/pkg/webservice/routes.go b/pkg/webservice/routes.go
index bbe1629c..e4df1c18 100644
--- a/pkg/webservice/routes.go
+++ b/pkg/webservice/routes.go
@@ -98,18 +98,6 @@ var webRoutes = routes{
"/ws/v1/partition/:partition/queues",
getPartitionQueues,
},
- route{
- "Scheduler",
- "PUT",
- "/ws/v1/loglevel/:level",
- setLogLevel,
- },
- route{
- "Scheduler",
- "GET",
- "/ws/v1/loglevel",
- getLogLevel,
- },
route{
"Scheduler",
"GET",
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
