diff options
author | Joram Wilander <jwawilander@gmail.com> | 2017-03-13 12:49:19 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-03-13 12:49:19 -0400 |
commit | 59d06b5c56f487570867cdc8b87b2e29c04d450f (patch) | |
tree | bbefc2d11719fe778e9c07cb3bffd159a806373b | |
parent | 27d2c1f6febdc6b80f60837086ebe0c08f975147 (diff) | |
download | chat-59d06b5c56f487570867cdc8b87b2e29c04d450f.tar.gz chat-59d06b5c56f487570867cdc8b87b2e29c04d450f.tar.bz2 chat-59d06b5c56f487570867cdc8b87b2e29c04d450f.zip |
Implement GET /cluster/status endpoint for APIv4 (#5732)
-rw-r--r-- | api4/api.go | 12 | ||||
-rw-r--r-- | api4/cluster.go | 29 | ||||
-rw-r--r-- | api4/cluster_test.go | 22 | ||||
-rw-r--r-- | i18n/en.json | 4 | ||||
-rw-r--r-- | model/client4.go | 16 |
5 files changed, 77 insertions, 6 deletions
diff --git a/api4/api.go b/api4/api.go index fb0ca2758..d5a44731f 100644 --- a/api4/api.go +++ b/api4/api.go @@ -59,13 +59,11 @@ type Routes struct { OutgoingHooks *mux.Router // 'api/v4/hooks/outgoing' OutgoingHook *mux.Router // 'api/v4/hooks/outgoing/{hook_id:[A-Za-z0-9]+}' - OAuth *mux.Router // 'api/v4/oauth' - - SAML *mux.Router // 'api/v4/saml' - - Admin *mux.Router // 'api/v4/admin' - + Admin *mux.Router // 'api/v4/admin' + OAuth *mux.Router // 'api/v4/oauth' + SAML *mux.Router // 'api/v4/saml' Compliance *mux.Router // 'api/v4/compliance' + Cluster *mux.Router // 'api/v4/cluster' System *mux.Router // 'api/v4/system' @@ -137,6 +135,7 @@ func InitApi(full bool) { BaseRoutes.OAuth = BaseRoutes.ApiRoot.PathPrefix("/oauth").Subrouter() BaseRoutes.Admin = BaseRoutes.ApiRoot.PathPrefix("/admin").Subrouter() BaseRoutes.Compliance = BaseRoutes.ApiRoot.PathPrefix("/compliance").Subrouter() + BaseRoutes.Cluster = BaseRoutes.ApiRoot.PathPrefix("/cluster").Subrouter() BaseRoutes.System = BaseRoutes.ApiRoot.PathPrefix("/system").Subrouter() BaseRoutes.Preferences = BaseRoutes.User.PathPrefix("/preferences").Subrouter() BaseRoutes.License = BaseRoutes.ApiRoot.PathPrefix("/license").Subrouter() @@ -157,6 +156,7 @@ func InitApi(full bool) { InitPreference() InitSaml() InitCompliance() + InitCluster() app.Srv.Router.Handle("/api/v4/{anything:.*}", http.HandlerFunc(Handle404)) diff --git a/api4/cluster.go b/api4/cluster.go new file mode 100644 index 000000000..dbf198590 --- /dev/null +++ b/api4/cluster.go @@ -0,0 +1,29 @@ +// Copyright (c) 2017 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 InitCluster() { + l4g.Debug(utils.T("api.cluster.init.debug")) + + BaseRoutes.Cluster.Handle("/status", ApiSessionRequired(getClusterStatus)).Methods("GET") +} + +func getClusterStatus(c *Context, w http.ResponseWriter, r *http.Request) { + if !app.SessionHasPermissionTo(c.Session, model.PERMISSION_MANAGE_SYSTEM) { + c.SetPermissionError(model.PERMISSION_MANAGE_SYSTEM) + return + } + + infos := app.GetClusterStatus() + w.Write([]byte(model.ClusterInfosToJson(infos))) +} diff --git a/api4/cluster_test.go b/api4/cluster_test.go new file mode 100644 index 000000000..6d44ca209 --- /dev/null +++ b/api4/cluster_test.go @@ -0,0 +1,22 @@ +// Copyright (c) 2017 Mattermost, Inc. All Rights Reserved. +// See License.txt for license information. + +package api4 + +import ( + "testing" +) + +func TestGetClusterStatus(t *testing.T) { + th := Setup().InitBasic().InitSystemAdmin() + + _, resp := th.Client.GetClusterStatus() + CheckForbiddenStatus(t, resp) + + infos, resp := th.SystemAdminClient.GetClusterStatus() + CheckNoError(t, resp) + + if infos == nil { + t.Fatal("should not be nil") + } +} diff --git a/i18n/en.json b/i18n/en.json index bfb2017e9..a3254a4ce 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -72,6 +72,10 @@ "translation": "Error reading log file" }, { + "id": "api.cluster.init.debug", + "translation": "Initializing cluster API routes" + }, + { "id": "api.admin.get_brand_image.not_available.app_error", "translation": "Custom branding is not configured or supported on this server" }, diff --git a/model/client4.go b/model/client4.go index 4c46d6d57..758a9e42f 100644 --- a/model/client4.go +++ b/model/client4.go @@ -154,6 +154,10 @@ func (c *Client4) GetDatabaseRoute() string { return fmt.Sprintf("/database") } +func (c *Client4) GetClusterRoute() string { + return fmt.Sprintf("/cluster") +} + func (c *Client4) GetIncomingWebhooksRoute() string { return fmt.Sprintf("/hooks/incoming") } @@ -1414,3 +1418,15 @@ func (c *Client4) DownloadComplianceReport(reportId string) ([]byte, *Response) return data, BuildResponse(rp) } } + +// Cluster Section + +// GetClusterStatus returns the status of all the configured cluster nodes. +func (c *Client4) GetClusterStatus() ([]*ClusterInfo, *Response) { + if r, err := c.DoApiGet(c.GetClusterRoute()+"/status", ""); err != nil { + return nil, &Response{StatusCode: r.StatusCode, Error: err} + } else { + defer closeBody(r) + return ClusterInfosFromJson(r.Body), BuildResponse(r) + } +} |