mirrors/object-browser
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move heal and watch to tenant details view on operator-ui (#449)

Browse Source 
Use insecure: true in the meantime so the wss/watch endpoint works while
we add support for custotm TLS transport in the S3 client library.
Removed "InsecureSkipVerify: true" from s3AdminClient and s3Client HTTP clients
This commit is contained in:
Cesar N
2020-11-30 12:41:58 -08:00
committed by GitHub
parent 59b43884ff
commit 4a27ef4b2c
35 changed files with 1320 additions and 539 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
restapi/admin_console.go
View File

@@ -98,22 +98,26 @@ func getLogTime(lt string) string {
// getConsoleLogOptionsFromReq return tenant name from url
// path come as : `/console/<namespace>/<tenantName>`
func getConsoleLogOptionsFromReq(req *http.Request) (namespace, tenant string) {
func getConsoleLogOptionsFromReq(req *http.Request) (namespace, tenant string, err error) {
re := regexp.MustCompile(`(/console/)(.*?)/(.*?)(\?.*?$|$)`)
matches := re.FindAllSubmatch([]byte(req.URL.Path), -1)
// len matches is always 4
if len(matches) == 0 || len(matches[0]) < 4 {
return "", "", fmt.Errorf("invalid url: %s", req.URL.Path)
}
namespace = strings.TrimSpace(string(matches[0][2]))
tenant = strings.TrimSpace(string(matches[0][3]))
return namespace, tenant
return namespace, tenant, nil
}
// getTraceOptionsFromReq return tenant name from url
// path come as : `/trace/<namespace>/<tenantName>`
func getTraceOptionsFromReq(req *http.Request) (namespace, tenant string) {
func getTraceOptionsFromReq(req *http.Request) (namespace, tenant string, err error) {
re := regexp.MustCompile(`(/trace/)(.*?)/(.*?)(\?.*?$|$)`)
matches := re.FindAllSubmatch([]byte(req.URL.Path), -1)
// len matches is always 4
if len(matches) == 0 || len(matches[0]) < 4 {
return "", "", fmt.Errorf("invalid url: %s", req.URL.Path)
}
namespace = strings.TrimSpace(string(matches[0][2]))
tenant = strings.TrimSpace(string(matches[0][3]))
return namespace, tenant
return namespace, tenant, nil
}