diff options
author | George Goldberg <george@gberg.me> | 2017-06-29 22:40:14 +0100 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2017-06-29 17:40:14 -0400 |
commit | f2898927f1b92d3c8cd9e7c63ce27dee7e6ae88f (patch) | |
tree | f29a8058cf581d128502b2da532fc551aa1101b9 /api4 | |
parent | a4f363a50b7807de9ac086ee0e62442a7645f5e8 (diff) | |
download | chat-f2898927f1b92d3c8cd9e7c63ce27dee7e6ae88f.tar.gz chat-f2898927f1b92d3c8cd9e7c63ce27dee7e6ae88f.tar.bz2 chat-f2898927f1b92d3c8cd9e7c63ce27dee7e6ae88f.zip |
PLT-6474: Server: Add elasticsearch/test endpoint to API. (#6792)
Diffstat (limited to 'api4')
-rw-r--r-- | api4/api.go | 4 | ||||
-rw-r--r-- | api4/elasticsearch.go | 33 | ||||
-rw-r--r-- | api4/elasticsearch_test.go | 19 |
3 files changed, 56 insertions, 0 deletions
diff --git a/api4/api.go b/api4/api.go index a636581d7..be957d63b 100644 --- a/api4/api.go +++ b/api4/api.go @@ -77,6 +77,8 @@ type Routes struct { LDAP *mux.Router // 'api/v4/ldap' + Elasticsearch *mux.Router // 'api/v4/elasticsearch' + Brand *mux.Router // 'api/v4/brand' System *mux.Router // 'api/v4/system' @@ -171,6 +173,7 @@ func InitApi(full bool) { BaseRoutes.Public = BaseRoutes.ApiRoot.PathPrefix("/public").Subrouter() BaseRoutes.Reactions = BaseRoutes.ApiRoot.PathPrefix("/reactions").Subrouter() BaseRoutes.Jobs = BaseRoutes.ApiRoot.PathPrefix("/jobs").Subrouter() + BaseRoutes.Elasticsearch = BaseRoutes.ApiRoot.PathPrefix("/elasticsearch").Subrouter() BaseRoutes.Emojis = BaseRoutes.ApiRoot.PathPrefix("/emoji").Subrouter() BaseRoutes.Emoji = BaseRoutes.Emojis.PathPrefix("/{emoji_id:[A-Za-z0-9]+}").Subrouter() @@ -193,6 +196,7 @@ func InitApi(full bool) { InitCompliance() InitCluster() InitLdap() + InitElasticsearch() InitBrand() InitJob() InitCommand() diff --git a/api4/elasticsearch.go b/api4/elasticsearch.go new file mode 100644 index 000000000..05ef1f539 --- /dev/null +++ b/api4/elasticsearch.go @@ -0,0 +1,33 @@ +// Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved. +// See License.txt for license information. + +package api4 + +import ( + "net/http" + + l4g "github.com/alecthomas/log4go" + "github.com/mattermost/platform/app" + "github.com/mattermost/platform/model" + "github.com/mattermost/platform/utils" +) + +func InitElasticsearch() { + l4g.Debug(utils.T("api.elasticsearch.init.debug")) + + BaseRoutes.Elasticsearch.Handle("/test", ApiSessionRequired(testElasticsearch)).Methods("POST") +} + +func testElasticsearch(c *Context, w http.ResponseWriter, r *http.Request) { + if !app.SessionHasPermissionTo(c.Session, model.PERMISSION_MANAGE_SYSTEM) { + c.SetPermissionError(model.PERMISSION_MANAGE_SYSTEM) + return + } + + if err := app.TestElasticsearch(); err != nil { + c.Err = err + return + } + + ReturnStatusOK(w) +} diff --git a/api4/elasticsearch_test.go b/api4/elasticsearch_test.go new file mode 100644 index 000000000..1478f052f --- /dev/null +++ b/api4/elasticsearch_test.go @@ -0,0 +1,19 @@ +// Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved. +// See License.txt for license information. + +package api4 + +import ( + "testing" +) + +func TestElasticsearchTest(t *testing.T) { + th := Setup().InitBasic().InitSystemAdmin() + defer TearDown() + + _, resp := th.Client.TestElasticsearch() + CheckForbiddenStatus(t, resp) + + _, resp = th.SystemAdminClient.TestElasticsearch() + CheckNotImplementedStatus(t, resp) +} |