Use templates to set the datasource

5731la · 5731la · commit e8d2607c9c1f · 2022-07-17T17:26:28.000-04:00
diff --git a/guac_connection_groups.go b/guac_connection_groups.go
@@ -6,7 +6,7 @@ import (
 )
 
 func (g *Guac) GetConnectionTree() (GuacConnectionGroup, error) {
-	body, err := g.Call("GET", "/api/session/data/mysql/connectionGroups/ROOT/tree", nil, nil)
+	body, err := g.Call("GET", "/api/session/data/{{ .Datasource }}/connectionGroups/ROOT/tree", nil, nil)
 	if err != nil {
 		return GuacConnectionGroup{}, err
 	}
@@ -43,7 +43,7 @@ func flatten(nested []GuacConnectionGroup) ([]GuacConnection, []GuacConnectionGr
 
 func (g *Guac) CreateConnectionGroup(conn *GuacConnectionGroup) (GuacConnectionGroup, error) {
 	ret := GuacConnectionGroup{}
-	resp, err := g.Call("POST", "/api/session/data/mysql/connectionGroups", nil, conn)
+	resp, err := g.Call("POST", "/api/session/data/{{ .Datasource }}/connectionGroups", nil, conn)
 	if err != nil {
 		return GuacConnectionGroup{}, err
 	}
@@ -57,7 +57,7 @@ func (g *Guac) CreateConnectionGroup(conn *GuacConnectionGroup) (GuacConnectionG
 
 func (g *Guac) ReadConnectionGroup(conn *GuacConnectionGroup) (GuacConnectionGroup, error) {
 	ret := GuacConnectionGroup{}
-	resp, err := g.Call("GET", "/api/session/data/mysql/connectionGroups/"+conn.Identifier, nil, nil)
+	resp, err := g.Call("GET", "/api/session/data/{{ .Datasource }}/connectionGroups/"+conn.Identifier, nil, nil)
 	if err != nil {
 		return GuacConnectionGroup{}, err
 	}
@@ -71,7 +71,7 @@ func (g *Guac) ReadConnectionGroup(conn *GuacConnectionGroup) (GuacConnectionGro
 }
 
 func (g *Guac) UpdateConnectionGroup(conn *GuacConnectionGroup) error {
-	_, err := g.Call("PUT", "/api/session/data/mysql/connectionGroups/"+conn.Identifier, nil, conn)
+	_, err := g.Call("PUT", "/api/session/data/{{ .Datasource }}/connectionGroups/"+conn.Identifier, nil, conn)
 	if err != nil {
 		return err
 	} else {
@@ -81,7 +81,7 @@ func (g *Guac) UpdateConnectionGroup(conn *GuacConnectionGroup) error {
 }
 
 func (g *Guac) DeleteConnectionGroup(conn *GuacConnectionGroup) error {
-	_, err := g.Call("DELETE", "/api/session/data/mysql/connectionGroups/"+conn.Identifier, nil, conn)
+	_, err := g.Call("DELETE", "/api/session/data/{{ .Datasource }}/connectionGroups/"+conn.Identifier, nil, conn)
 	if err != nil {
 		return err
 	} else {
diff --git a/guac_connections.go b/guac_connections.go
@@ -9,7 +9,7 @@ import (
 
 func (g *Guac) CreateConnection(conn *GuacConnection) (GuacConnection, error) {
 	ret := GuacConnection{}
-	resp, err := g.Call("POST", "/api/session/data/mysql/connections", nil, conn)
+	resp, err := g.Call("POST", "/api/session/data/{{ .Datasource }}/connections", nil, conn)
 	if err != nil {
 		return ret, err
 	}
@@ -24,7 +24,7 @@ func (g *Guac) ReadConnection(conn *GuacConnection) (GuacConnection, error) {
 	ret := GuacConnection{}
 	retParams := GuacConnectionParameters{}
 
-	connData, err := g.Call("GET", "/api/session/data/mysql/connections/"+conn.Identifier, nil, nil)
+	connData, err := g.Call("GET", "/api/session/data/{{ .Datasource }}/connections/"+conn.Identifier, nil, nil)
 	if err != nil {
 		return GuacConnection{}, err
 	}
@@ -33,7 +33,7 @@ func (g *Guac) ReadConnection(conn *GuacConnection) (GuacConnection, error) {
 		return GuacConnection{}, err
 	}
 
-	connParams, err := g.Call("GET", "/api/session/data/mysql/connections/"+conn.Identifier+"/parameters", nil, nil)
+	connParams, err := g.Call("GET", "/api/session/data/{{ .Datasource }}/connections/"+conn.Identifier+"/parameters", nil, nil)
 	if err != nil {
 		return GuacConnection{}, err
 	}
@@ -52,15 +52,15 @@ func (g *Guac) ReadConnection(conn *GuacConnection) (GuacConnection, error) {
 }
 
 func (g *Guac) UpdateConnection(conn *GuacConnection) error {
-	_, err := g.Call("PUT", "/api/session/data/mysql/connections/"+conn.Identifier, nil, conn)
+	_, err := g.Call("PUT", "/api/session/data/{{ .Datasource }}/connections/"+conn.Identifier, nil, conn)
 	if err != nil {
 		return err
 	}
 	return nil
 }
 
 func (g *Guac) DeleteConnection(conn *GuacConnection) error {
-	_, err := g.Call("DELETE", "/api/session/data/mysql/connections/"+conn.Identifier, nil, nil)
+	_, err := g.Call("DELETE", "/api/session/data/{{ .Datasource }}/connections/"+conn.Identifier, nil, nil)
 	if err != nil {
 		return err
 	}
diff --git a/guac_user_groups.go b/guac_user_groups.go
@@ -7,7 +7,7 @@ import (
 
 func (g *Guac) CreateUserGroup(group *GuacUserGroup) (GuacUserGroup, error) {
 	ret := GuacUserGroup{}
-	resp, err := g.Call("POST", "/api/session/data/mysql/userGroups", nil, group)
+	resp, err := g.Call("POST", "/api/session/data/{{ .Datasource }}/userGroups", nil, group)
 	if err != nil {
 		return ret, err
 	}
@@ -20,7 +20,7 @@ func (g *Guac) CreateUserGroup(group *GuacUserGroup) (GuacUserGroup, error) {
 
 func (g *Guac) ReadUserGroup(group *GuacUserGroup) (GuacUserGroup, error) {
 	ret := GuacUserGroup{}
-	resp, err := g.Call("GET", "/api/session/data/mysql/userGroups/"+group.Identifier, nil, nil)
+	resp, err := g.Call("GET", "/api/session/data/{{ .Datasource }}/userGroups/"+group.Identifier, nil, nil)
 	if err != nil {
 		return GuacUserGroup{}, err
 	}
@@ -32,15 +32,15 @@ func (g *Guac) ReadUserGroup(group *GuacUserGroup) (GuacUserGroup, error) {
 }
 
 func (g *Guac) UpdateUserGroup(group *GuacUserGroup) error {
-	_, err := g.Call("PUT", "/api/session/data/mysql/userGroups/"+group.Identifier, nil, group)
+	_, err := g.Call("PUT", "/api/session/data/{{ .Datasource }}/userGroups/"+group.Identifier, nil, group)
 	if err != nil {
 		return err
 	}
 	return nil
 }
 
 func (g *Guac) DeleteUserGroup(group *GuacUserGroup) error {
-	_, err := g.Call("DELETE", "/api/session/data/mysql/userGroups/"+group.Identifier, nil, nil)
+	_, err := g.Call("DELETE", "/api/session/data/{{ .Datasource }}/userGroups/"+group.Identifier, nil, nil)
 	if err != nil {
 		return err
 	}
@@ -50,7 +50,7 @@ func (g *Guac) DeleteUserGroup(group *GuacUserGroup) error {
 func (g *Guac) ListUserGroups() ([]GuacUserGroup, error) {
 	ret := []GuacUserGroup{}
 	marshalledResponse := map[string]GuacUserGroup{}
-	grp_tree, err := g.Call("GET", "/api/session/data/mysql/userGroups", nil, nil)
+	grp_tree, err := g.Call("GET", "/api/session/data/{{ .Datasource }}/userGroups", nil, nil)
 	if err != nil {
 		return []GuacUserGroup{}, err
 	}
diff --git a/guac_users.go b/guac_users.go
@@ -7,7 +7,7 @@ import (
 
 func (g *Guac) CreateUser(user *GuacUser) (GuacUser, error) {
 	ret := GuacUser{}
-	resp, err := g.Call("POST", "/api/session/data/mysql/users", nil, user)
+	resp, err := g.Call("POST", "/api/session/data/{{ .Datasource }}/users", nil, user)
 	if err != nil {
 		return ret, err
 	}
@@ -20,7 +20,7 @@ func (g *Guac) CreateUser(user *GuacUser) (GuacUser, error) {
 
 func (g *Guac) ReadUser(user *GuacUser) (GuacUser, error) {
 	ret := GuacUser{}
-	resp, err := g.Call("GET", "/api/session/data/mysql/users/"+user.Username, nil, nil)
+	resp, err := g.Call("GET", "/api/session/data/{{ .Datasource }}/users/"+user.Username, nil, nil)
 	if err != nil {
 		return GuacUser{}, err
 	}
@@ -32,15 +32,15 @@ func (g *Guac) ReadUser(user *GuacUser) (GuacUser, error) {
 }
 
 func (g *Guac) UpdateUser(user *GuacUser) error {
-	_, err := g.Call("PUT", "/api/session/data/mysql/users/"+user.Username, nil, user)
+	_, err := g.Call("PUT", "/api/session/data/{{ .Datasource }}/users/"+user.Username, nil, user)
 	if err != nil {
 		return err
 	}
 	return nil
 }
 
 func (g *Guac) DeleteUser(user *GuacUser) error {
-	_, err := g.Call("DELETE", "/api/session/data/mysql/users/"+user.Username, nil, nil)
+	_, err := g.Call("DELETE", "/api/session/data/{{ .Datasource }}/users/"+user.Username, nil, nil)
 	if err != nil {
 		return err
 	}
@@ -51,7 +51,7 @@ func (g *Guac) DeleteUser(user *GuacUser) error {
 func (g *Guac) ListUsers() ([]GuacUser, error) {
 	ret := []GuacUser{}
 	marshalledResponse := map[string]GuacUser{}
-	user_tree, err := g.Call("GET", "/api/session/data/mysql/users", nil, nil)
+	user_tree, err := g.Call("GET", "/api/session/data/{{ .Datasource }}/users", nil, nil)
 	if err != nil {
 		return []GuacUser{}, err
 	}
diff --git a/sessiontoken.go b/sessiontoken.go
@@ -8,16 +8,21 @@ import (
 	"net/http"
 	"net/url"
 	"strconv"
-
+	"text/template"
 )
 
 type Guac struct {
-	URI      string
-	Username string
-	Password string
-	Token    string
+	URI        string
+	Username   string
+	Password   string
+	Token      string
+	Datasource string
 }
 
+var (
+	callTemplate = template.New("call")
+)
+
 func (g *Guac) Connect() error {
 	resp, err := http.PostForm(g.URI+"/api/tokens",
 		url.Values{
@@ -38,6 +43,7 @@ func (g *Guac) Connect() error {
 		return err
 	}
 	g.Token = tokenresp.AuthToken
+	g.Datasource = tokenresp.Datasource
 	return nil
 }
 
@@ -64,7 +70,20 @@ func (g *Guac) RefreshToken() error {
 }
 
 func (g *Guac) Call(m, u string, xq map[string]string, b interface{}) ([]byte, error) {
-	err := g.RefreshToken()
+	ut, err := callTemplate.Parse(u)
+	if err != nil {
+		return nil, err
+	}
+
+	var buf bytes.Buffer
+
+	err = ut.Execute(&buf, xq)
+	if err != nil {
+		return nil, err
+	}
+	u = buf.String()
+
+	err = g.RefreshToken()
 	if err != nil {
 		return nil, err
 	}
@@ -115,5 +134,6 @@ func (g *Guac) Call(m, u string, xq map[string]string, b interface{}) ([]byte, e
 	if err != nil {
 		return nil, err
 	}
+
 	return body, nil
 }
diff --git a/user_connection_permissions.go b/user_connection_permissions.go
@@ -5,7 +5,7 @@ import (
 )
 
 func (g *Guac) SendUserConnectionPermissionChanges(user string, p []GuacPermissionItem) error {
-	url := "/api/session/data/mysql/users/" + user + "/permissions"
+	url := "/api/session/data/{{ .Datasource }}/users/" + user + "/permissions"
 	_, err := g.Call("PATCH", url, nil, p)
 	if err != nil {
 		return err
@@ -15,7 +15,7 @@ func (g *Guac) SendUserConnectionPermissionChanges(user string, p []GuacPermissi
 
 func (g *Guac) GetUserConnectionPermissions(user string) (GuacPermissionData, error) {
 	ret := GuacPermissionData{}
-	url := "/api/session/data/mysql/users/" + user + "/permissions"
+	url := "/api/session/data/{{ .Datasource }}/users/" + user + "/permissions"
 	resp, err := g.Call("GET", url, nil, nil)
 	if err != nil {
 		return GuacPermissionData{}, err

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ import (`
`9`	`9`
`10`	`10`	`func (g Guac) CreateConnection(conn GuacConnection) (GuacConnection, error) {`
`11`	`11`	`ret := GuacConnection{}`
`12`		`- resp, err := g.Call("POST", "/api/session/data/mysql/connections", nil, conn)`
	`12`	`+ resp, err := g.Call("POST", "/api/session/data/{{ .Datasource }}/connections", nil, conn)`
`13`	`13`	`if err != nil {`
`14`	`14`	`return ret, err`
`15`	`15`	`}`
`@@ -24,7 +24,7 @@ func (g Guac) ReadConnection(conn GuacConnection) (GuacConnection, error) {`
`24`	`24`	`ret := GuacConnection{}`
`25`	`25`	`retParams := GuacConnectionParameters{}`
`26`	`26`
`27`		`- connData, err := g.Call("GET", "/api/session/data/mysql/connections/"+conn.Identifier, nil, nil)`
	`27`	`+ connData, err := g.Call("GET", "/api/session/data/{{ .Datasource }}/connections/"+conn.Identifier, nil, nil)`
`28`	`28`	`if err != nil {`
`29`	`29`	`return GuacConnection{}, err`
`30`	`30`	`}`
`@@ -33,7 +33,7 @@ func (g Guac) ReadConnection(conn GuacConnection) (GuacConnection, error) {`
`33`	`33`	`return GuacConnection{}, err`
`34`	`34`	`}`
`35`	`35`
`36`		`- connParams, err := g.Call("GET", "/api/session/data/mysql/connections/"+conn.Identifier+"/parameters", nil, nil)`
	`36`	`+ connParams, err := g.Call("GET", "/api/session/data/{{ .Datasource }}/connections/"+conn.Identifier+"/parameters", nil, nil)`
`37`	`37`	`if err != nil {`
`38`	`38`	`return GuacConnection{}, err`
`39`	`39`	`}`
`@@ -52,15 +52,15 @@ func (g Guac) ReadConnection(conn GuacConnection) (GuacConnection, error) {`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`func (g Guac) UpdateConnection(conn GuacConnection) error {`
`55`		`- _, err := g.Call("PUT", "/api/session/data/mysql/connections/"+conn.Identifier, nil, conn)`
	`55`	`+ _, err := g.Call("PUT", "/api/session/data/{{ .Datasource }}/connections/"+conn.Identifier, nil, conn)`
`56`	`56`	`if err != nil {`
`57`	`57`	`return err`
`58`	`58`	`}`
`59`	`59`	`return nil`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`func (g Guac) DeleteConnection(conn GuacConnection) error {`
`63`		`- _, err := g.Call("DELETE", "/api/session/data/mysql/connections/"+conn.Identifier, nil, nil)`
	`63`	`+ _, err := g.Call("DELETE", "/api/session/data/{{ .Datasource }}/connections/"+conn.Identifier, nil, nil)`
`64`	`64`	`if err != nil {`
`65`	`65`	`return err`
`66`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ import (`
`7`	`7`
`8`	`8`	`func (g Guac) CreateUserGroup(group GuacUserGroup) (GuacUserGroup, error) {`
`9`	`9`	`ret := GuacUserGroup{}`
`10`		`- resp, err := g.Call("POST", "/api/session/data/mysql/userGroups", nil, group)`
	`10`	`+ resp, err := g.Call("POST", "/api/session/data/{{ .Datasource }}/userGroups", nil, group)`
`11`	`11`	`if err != nil {`
`12`	`12`	`return ret, err`
`13`	`13`	`}`
`@@ -20,7 +20,7 @@ func (g Guac) CreateUserGroup(group GuacUserGroup) (GuacUserGroup, error) {`
`20`	`20`
`21`	`21`	`func (g Guac) ReadUserGroup(group GuacUserGroup) (GuacUserGroup, error) {`
`22`	`22`	`ret := GuacUserGroup{}`
`23`		`- resp, err := g.Call("GET", "/api/session/data/mysql/userGroups/"+group.Identifier, nil, nil)`
	`23`	`+ resp, err := g.Call("GET", "/api/session/data/{{ .Datasource }}/userGroups/"+group.Identifier, nil, nil)`
`24`	`24`	`if err != nil {`
`25`	`25`	`return GuacUserGroup{}, err`
`26`	`26`	`}`
`@@ -32,15 +32,15 @@ func (g Guac) ReadUserGroup(group GuacUserGroup) (GuacUserGroup, error) {`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`func (g Guac) UpdateUserGroup(group GuacUserGroup) error {`
`35`		`- _, err := g.Call("PUT", "/api/session/data/mysql/userGroups/"+group.Identifier, nil, group)`
	`35`	`+ _, err := g.Call("PUT", "/api/session/data/{{ .Datasource }}/userGroups/"+group.Identifier, nil, group)`
`36`	`36`	`if err != nil {`
`37`	`37`	`return err`
`38`	`38`	`}`
`39`	`39`	`return nil`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`func (g Guac) DeleteUserGroup(group GuacUserGroup) error {`
`43`		`- _, err := g.Call("DELETE", "/api/session/data/mysql/userGroups/"+group.Identifier, nil, nil)`
	`43`	`+ _, err := g.Call("DELETE", "/api/session/data/{{ .Datasource }}/userGroups/"+group.Identifier, nil, nil)`
`44`	`44`	`if err != nil {`
`45`	`45`	`return err`
`46`	`46`	`}`
`@@ -50,7 +50,7 @@ func (g Guac) DeleteUserGroup(group GuacUserGroup) error {`
`50`	`50`	`func (g *Guac) ListUserGroups() ([]GuacUserGroup, error) {`
`51`	`51`	`ret := []GuacUserGroup{}`
`52`	`52`	`marshalledResponse := map[string]GuacUserGroup{}`
`53`		`- grp_tree, err := g.Call("GET", "/api/session/data/mysql/userGroups", nil, nil)`
	`53`	`+ grp_tree, err := g.Call("GET", "/api/session/data/{{ .Datasource }}/userGroups", nil, nil)`
`54`	`54`	`if err != nil {`
`55`	`55`	`return []GuacUserGroup{}, err`
`56`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ import (`
`7`	`7`
`8`	`8`	`func (g Guac) CreateUser(user GuacUser) (GuacUser, error) {`
`9`	`9`	`ret := GuacUser{}`
`10`		`- resp, err := g.Call("POST", "/api/session/data/mysql/users", nil, user)`
	`10`	`+ resp, err := g.Call("POST", "/api/session/data/{{ .Datasource }}/users", nil, user)`
`11`	`11`	`if err != nil {`
`12`	`12`	`return ret, err`
`13`	`13`	`}`
`@@ -20,7 +20,7 @@ func (g Guac) CreateUser(user GuacUser) (GuacUser, error) {`
`20`	`20`
`21`	`21`	`func (g Guac) ReadUser(user GuacUser) (GuacUser, error) {`
`22`	`22`	`ret := GuacUser{}`
`23`		`- resp, err := g.Call("GET", "/api/session/data/mysql/users/"+user.Username, nil, nil)`
	`23`	`+ resp, err := g.Call("GET", "/api/session/data/{{ .Datasource }}/users/"+user.Username, nil, nil)`
`24`	`24`	`if err != nil {`
`25`	`25`	`return GuacUser{}, err`
`26`	`26`	`}`
`@@ -32,15 +32,15 @@ func (g Guac) ReadUser(user GuacUser) (GuacUser, error) {`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`func (g Guac) UpdateUser(user GuacUser) error {`
`35`		`- _, err := g.Call("PUT", "/api/session/data/mysql/users/"+user.Username, nil, user)`
	`35`	`+ _, err := g.Call("PUT", "/api/session/data/{{ .Datasource }}/users/"+user.Username, nil, user)`
`36`	`36`	`if err != nil {`
`37`	`37`	`return err`
`38`	`38`	`}`
`39`	`39`	`return nil`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`func (g Guac) DeleteUser(user GuacUser) error {`
`43`		`- _, err := g.Call("DELETE", "/api/session/data/mysql/users/"+user.Username, nil, nil)`
	`43`	`+ _, err := g.Call("DELETE", "/api/session/data/{{ .Datasource }}/users/"+user.Username, nil, nil)`
`44`	`44`	`if err != nil {`
`45`	`45`	`return err`
`46`	`46`	`}`
`@@ -51,7 +51,7 @@ func (g Guac) DeleteUser(user GuacUser) error {`
`51`	`51`	`func (g *Guac) ListUsers() ([]GuacUser, error) {`
`52`	`52`	`ret := []GuacUser{}`
`53`	`53`	`marshalledResponse := map[string]GuacUser{}`
`54`		`- user_tree, err := g.Call("GET", "/api/session/data/mysql/users", nil, nil)`
	`54`	`+ user_tree, err := g.Call("GET", "/api/session/data/{{ .Datasource }}/users", nil, nil)`
`55`	`55`	`if err != nil {`
`56`	`56`	`return []GuacUser{}, err`
`57`	`57`	`}`