-
Notifications
You must be signed in to change notification settings - Fork 1.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Create db/kube handler and check cloud feature for web billing access (…
…#6754) * Create GET db and kube list web handlers (#6672) * Check cloud feature before setting billing access for web (#6537) - Init web handler with auth server feature flags on proxy init - Retrieve auth server features by calling Ping when connecting to auth svc which contains the server feature flags in the response
- Loading branch information
Showing
10 changed files
with
331 additions
and
38 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1806,6 +1806,89 @@ func (m *testModules) Features() modules.Features { | |
| } | ||
| } | ||
|
|
||
| func TestClusterDatabasesGet(t *testing.T) { | ||
| env := newWebPack(t, 1) | ||
|
|
||
| proxy := env.proxies[0] | ||
| pack := proxy.authPack(t, "[email protected]") | ||
|
|
||
| endpoint := pack.clt.Endpoint("webapi", "sites", env.server.ClusterName(), "databases") | ||
| re, err := pack.clt.Get(context.Background(), endpoint, url.Values{}) | ||
| require.NoError(t, err) | ||
|
|
||
| // No db registered. | ||
| dbs := []ui.Database{} | ||
| require.NoError(t, json.Unmarshal(re.Bytes(), &dbs)) | ||
| require.Len(t, dbs, 0) | ||
|
|
||
| // Register a database. | ||
| db := types.NewDatabaseServerV3("test-db-name", map[string]string{"test-field": "test-value"}, types.DatabaseServerSpecV3{ | ||
| Description: "test-description", | ||
| Protocol: "test-protocol", | ||
| URI: "test-uri", | ||
| Hostname: "test-hostname", | ||
| HostID: "test-hostID", | ||
| }) | ||
|
|
||
| _, err = env.server.Auth().UpsertDatabaseServer(context.Background(), db) | ||
| require.NoError(t, err) | ||
|
|
||
| re, err = pack.clt.Get(context.Background(), endpoint, url.Values{}) | ||
| require.NoError(t, err) | ||
|
|
||
| dbs = []ui.Database{} | ||
| require.NoError(t, json.Unmarshal(re.Bytes(), &dbs)) | ||
| require.Len(t, dbs, 1) | ||
| require.EqualValues(t, ui.Database{ | ||
| Name: "test-db-name", | ||
| Desc: "test-description", | ||
| Protocol: "test-protocol", | ||
| Type: types.DatabaseTypeSelfHosted, | ||
| Labels: []ui.Label{{Name: "test-field", Value: "test-value"}}, | ||
| }, dbs[0]) | ||
| } | ||
|
|
||
| func TestClusterKubesGet(t *testing.T) { | ||
| env := newWebPack(t, 1) | ||
|
|
||
| proxy := env.proxies[0] | ||
| pack := proxy.authPack(t, "[email protected]") | ||
|
|
||
| endpoint := pack.clt.Endpoint("webapi", "sites", env.server.ClusterName(), "kubernetes") | ||
| re, err := pack.clt.Get(context.Background(), endpoint, url.Values{}) | ||
| require.NoError(t, err) | ||
|
|
||
| // No kube registered. | ||
| kbs := []ui.Kube{} | ||
| require.NoError(t, json.Unmarshal(re.Bytes(), &kbs)) | ||
| require.Len(t, kbs, 0) | ||
|
|
||
| // Register a kube service. | ||
| err = env.server.Auth().UpsertKubeService(context.Background(), &services.ServerV2{ | ||
| Metadata: services.Metadata{Name: "test-kube"}, | ||
| Kind: services.KindKubeService, | ||
| Version: services.V2, | ||
| Spec: services.ServerSpecV2{ | ||
| KubernetesClusters: []*services.KubernetesCluster{{ | ||
| Name: "test-kube-name", | ||
| StaticLabels: map[string]string{"test-field": "test-value"}, | ||
| }}, | ||
| }, | ||
| }) | ||
| require.NoError(t, err) | ||
|
|
||
| re, err = pack.clt.Get(context.Background(), endpoint, url.Values{}) | ||
| require.NoError(t, err) | ||
|
|
||
| kbs = []ui.Kube{} | ||
| require.NoError(t, json.Unmarshal(re.Bytes(), &kbs)) | ||
| require.Len(t, kbs, 1) | ||
| require.EqualValues(t, ui.Kube{ | ||
| Name: "test-kube-name", | ||
| Labels: []ui.Label{{Name: "test-field", Value: "test-value"}}, | ||
| }, kbs[0]) | ||
| } | ||
|
|
||
| // TestApplicationAccessDisabled makes sure application access can be disabled | ||
| // via modules. | ||
| func TestApplicationAccessDisabled(t *testing.T) { | ||
|
|
||
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,59 @@ | ||
| /** | ||
| * Copyright 2021 Gravitational, Inc. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package web | ||
|
|
||
| import ( | ||
| "net/http" | ||
|
|
||
| "github.com/gravitational/teleport/lib/defaults" | ||
| "github.com/gravitational/teleport/lib/reversetunnel" | ||
| "github.com/gravitational/teleport/lib/web/ui" | ||
| "github.com/gravitational/trace" | ||
| "github.com/julienschmidt/httprouter" | ||
| ) | ||
|
|
||
| // clusterKubesGet returns a list of kube clusters in a form the UI can present. | ||
| func (h *Handler) clusterKubesGet(w http.ResponseWriter, r *http.Request, p httprouter.Params, ctx *SessionContext, site reversetunnel.RemoteSite) (interface{}, error) { | ||
| clt, err := ctx.GetUserClient(site) | ||
| if err != nil { | ||
| return nil, trace.Wrap(err) | ||
| } | ||
|
|
||
| // Get a list of kube servers. | ||
| kubeServers, err := clt.GetKubeServices(r.Context()) | ||
| if err != nil { | ||
| return nil, trace.Wrap(err) | ||
| } | ||
|
|
||
| return ui.MakeKubes(h.auth.clusterName, kubeServers), nil | ||
| } | ||
|
|
||
| // clusterDatabasesGet returns a list of db servers in a form the UI can present. | ||
| func (h *Handler) clusterDatabasesGet(w http.ResponseWriter, r *http.Request, p httprouter.Params, ctx *SessionContext, site reversetunnel.RemoteSite) (interface{}, error) { | ||
| clt, err := ctx.GetUserClient(site) | ||
| if err != nil { | ||
| return nil, trace.Wrap(err) | ||
| } | ||
|
|
||
| // Get a list of database servers. | ||
| dbServers, err := clt.GetDatabaseServers(r.Context(), defaults.Namespace) | ||
| if err != nil { | ||
| return nil, trace.Wrap(err) | ||
| } | ||
|
|
||
| return ui.MakeDatabases(h.auth.clusterName, dbServers), nil | ||
| } |
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
Oops, something went wrong.