balki/pgweb
1
0
Fork 0
Code Pull Requests Activity

Switch to dep for dependency management

Browse Source
This commit is contained in:
Dan Sosedoff
2018-08-31 21:49:24 -05:00
parent 847f47c5d3
commit ad81f666a5
537 changed files with 167100 additions and 34410 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/api/api_test.go
View File

@@ -17,7 +17,8 @@ func Test_assetContentType(t *testing.T) {
"foo.gif": "image/gif",
"foo.eot": "application/vnd.ms-fontobject",
"foo.svg": "image/svg+xml",
"foo.ttf": "application/x-font-ttf",
"foo.ttf": "font/ttf",
"foo.woff": "font/woff",
"foo.foo": "text/plain; charset=utf-8",
"foo": "text/plain; charset=utf-8",
}
@@ -25,9 +26,4 @@ func Test_assetContentType(t *testing.T) {
for name, expected := range samples {
assert.Equal(t, expected, assetContentType(name))
}
result := assetContentType("foo.woff")
if result != "application/x-font-woff" && result != "application/font-woff" {
t.Errorf("Expected: application/x-font-woff, Got: %s", result)
}
}

2
pkg/bookmarks/bookmarks_test.go
View File

@@ -14,7 +14,7 @@ func Test_Invalid_Bookmark_Files(t *testing.T) {
_, err = readServerConfig("../../data/invalid.toml")
assert.Error(t, err)
assert.Equal(t, "Near line 1, key 'invalid encoding': Near line 2: Expected key separator '=', but got '\\n' instead.", err.Error())
assert.Equal(t, "Near line 1 (last key parsed 'invalid'): expected key separator '=', but got 'e' instead", err.Error())
}
func Test_Bookmark(t *testing.T) {

14
pkg/command/options.go
View File

@@ -10,7 +10,7 @@ import (
type Options struct {
Version bool `short:"v" long:"version" description:"Print version"`
Debug bool `short:"d" long:"debug" description:"Enable debugging mode" default:"false"`
Debug bool `short:"d" long:"debug" description:"Enable debugging mode"`
Url string `long:"url" description:"Database connection string"`
Host string `long:"host" description:"Server hostname or IP"`
Port int `long:"port" description:"Server port" default:"5432"`
@@ -23,20 +23,20 @@ type Options struct {
AuthUser string `long:"auth-user" description:"HTTP basic auth user"`
AuthPass string `long:"auth-pass" description:"HTTP basic auth password"`
SkipOpen bool `short:"s" long:"skip-open" description:"Skip browser open on start"`
Sessions bool `long:"sessions" description:"Enable multiple database sessions" default:"false"`
Sessions bool `long:"sessions" description:"Enable multiple database sessions"`
Prefix string `long:"prefix" description:"Add a url prefix"`
ReadOnly bool `long:"readonly" description:"Run database connection in readonly mode"`
LockSession bool `long:"lock-session" description:"Lock session to a single database connection" default:"false"`
LockSession bool `long:"lock-session" description:"Lock session to a single database connection"`
Bookmark string `short:"b" long:"bookmark" description:"Bookmark to use for connection. Bookmark files are stored under $HOME/.pgweb/bookmarks/*.toml" default:""`
BookmarksDir string `long:"bookmarks-dir" description:"Overrides default directory for bookmark files to search" default:""`
DisablePrettyJson bool `long:"no-pretty-json" description:"Disable JSON formatting feature for result export" default:"false"`
DisableSSH bool `long:"no-ssh" description:"Disable database connections via SSH" default:"false"`
DisablePrettyJson bool `long:"no-pretty-json" description:"Disable JSON formatting feature for result export"`
DisableSSH bool `long:"no-ssh" description:"Disable database connections via SSH"`
ConnectBackend string `long:"connect-backend" description:"Enable database authentication through a third party backend"`
ConnectToken string `long:"connect-token" description:"Authentication token for the third-party connect backend"`
ConnectHeaders string `long:"connect-headers" description:"List of headers to pass to the connect backend"`
DisableConnectionIdleTimeout bool `long:"no-idle-timeout" description:"Disable connection idle timeout" default:"false"`
DisableConnectionIdleTimeout bool `long:"no-idle-timeout" description:"Disable connection idle timeout"`
ConnectionIdleTimeout int `long:"idle-timeout" description:"Set connection idle timeout in minutes" default:"180"`
Cors bool `long:"cors" description:"Enable Cross-Origin Resource Sharing (CORS)" default:"false"`
Cors bool `long:"cors" description:"Enable Cross-Origin Resource Sharing (CORS)"`
CorsOrigin string `long:"cors-origin" description:"Allowed CORS origins" default:"*"`
}

4
pkg/data/bindata.go
View File

@@ -301,7 +301,7 @@ func staticIndexHtml() (*asset, error) {
return nil, err
}
info := bindataFileInfo{name: "static/index.html", size: 12082, mode: os.FileMode(420), modTime: time.Unix(1534815706, 0)}
info := bindataFileInfo{name: "static/index.html", size: 12082, mode: os.FileMode(420), modTime: time.Unix(1534816460, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
@@ -361,7 +361,7 @@ func staticJsAppJs() (*asset, error) {
return nil, err
}
info := bindataFileInfo{name: "static/js/app.js", size: 35123, mode: os.FileMode(420), modTime: time.Unix(1534815716, 0)}
info := bindataFileInfo{name: "static/js/app.js", size: 35123, mode: os.FileMode(420), modTime: time.Unix(1534816460, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}