Create db and kube web handlers #6672
Merged
Conversation
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
kimlisa
force-pushed
the
lisa/db-kube-web-handle
branch
from
b8afe5e to
fc932db
Compare
r0mant
approved these changes
Apr 30, 2021
lib/web/apiserver.go
Outdated
| @@ -305,6 +305,12 @@ func NewHandler(cfg Config, opts ...HandlerOption) (*RewritingHandler, error) { | |||
| // web context | |||
| h.GET("/webapi/sites/:site/context", h.WithClusterAuth(h.getUserContext)) | |||
|
|
|||
| // Database access handlers. | |||
| h.GET("/webapi/sites/:site/databases", h.WithClusterAuth(h.siteDatabasesGet)) | |||
There was a problem hiding this comment.
"site" is obsolete terminology - ok to keep it in handler paths but let's name functions clusterDatabasesGet and clusterKubesGet.
lib/web/ui/server.go
Outdated
| Desc string `json:"desc"` | ||
| // Procotol is the database description. | ||
| Procotol string `json:"protocol"` | ||
| // Type is the database type, self-hosted or AWS RDS. |
There was a problem hiding this comment.
Nit: Instead of "or AWS RDS" I would just say "or cloud-hosted" which would cover RDS, Redshift, Cloud SQL and anything we'll add in future.
lib/web/ui/usercontext.go
Outdated
| @@ -66,6 +67,10 @@ type userACL struct { | |||
| Nodes access `json:"nodes"` | |||
| // AppServers defines access to application servers | |||
| AppServers access `json:"appServers"` | |||
| // DbServers defines access to database servers. | |||
| DbServers access `json:"dbServers"` | |||
There was a problem hiding this comment.
Nit: DBServers for consistency with how it's capitalized in other places.
kimlisa
force-pushed
the
lisa/db-kube-web-handle
branch
from
f9753d9 to
099fd45
Compare
alex-kovoy
approved these changes
Apr 30, 2021
awly
approved these changes
May 4, 2021
|
|
||
| // MakeKubes creates ui kube objects and returns a list.. | ||
| func MakeKubes(clusterName string, servers []types.Server) []Kube { | ||
| uiKubeClusters := []Kube{} |
There was a problem hiding this comment.
Suggested change
| uiKubeClusters := []Kube{} | |
| uiKubeClusters := make([]Kube, 0, len(servers)) |
There was a problem hiding this comment.
i didn't make this change, b/c the len is determine by how many kube clusters there are in each server
lib/web/ui/server.go
Outdated
|
|
||
| // MakeDatabases creates server database objects. | ||
| func MakeDatabases(clusterName string, servers []types.DatabaseServer) []Database { | ||
| uiServers := []Database{} |
There was a problem hiding this comment.
Suggested change
| uiServers := []Database{} | |
| uiServers := make([]Database, 0, len(servers)) |
- rename handler name prefix "site" to "cluster" - rename DbServers to DBServers - removed URI field b/c it is not needed in front - update test
kimlisa
force-pushed
the
lisa/db-kube-web-handle
branch
from
0deff3c to
a3e9b25
Compare
kimlisa
added a commit
that referenced
this pull request
May 5, 2021
kimlisa
added a commit
that referenced
this pull request
May 6, 2021
…#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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
part of #6466
part of #5086
Description