projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '19166-gateway-tunnel'
[arvados.git]
/
lib
/
controller
/
federation
/
conn.go
diff --git
a/lib/controller/federation/conn.go
b/lib/controller/federation/conn.go
index 1b8ec9e64a6e01138a1bfc58a599a78eb2f0e44b..ffb150bf26aa148b511f4bbde98305469ffef5df 100644
(file)
--- a/
lib/controller/federation/conn.go
+++ b/
lib/controller/federation/conn.go
@@
-375,10
+375,14
@@
func (conn *Conn) ContainerUnlock(ctx context.Context, options arvados.GetOption
return conn.chooseBackend(options.UUID).ContainerUnlock(ctx, options)
}
return conn.chooseBackend(options.UUID).ContainerUnlock(ctx, options)
}
-func (conn *Conn) ContainerSSH(ctx context.Context, options arvados.ContainerSSHOptions) (arvados.Con
tainerSSHConnection
, error) {
+func (conn *Conn) ContainerSSH(ctx context.Context, options arvados.ContainerSSHOptions) (arvados.Con
nectionResponse
, error) {
return conn.chooseBackend(options.UUID).ContainerSSH(ctx, options)
}
return conn.chooseBackend(options.UUID).ContainerSSH(ctx, options)
}
+func (conn *Conn) ContainerGatewayTunnel(ctx context.Context, options arvados.ContainerGatewayTunnelOptions) (arvados.ConnectionResponse, error) {
+ return conn.chooseBackend(options.UUID).ContainerGatewayTunnel(ctx, options)
+}
+
func (conn *Conn) ContainerRequestList(ctx context.Context, options arvados.ListOptions) (arvados.ContainerRequestList, error) {
return conn.generated_ContainerRequestList(ctx, options)
}
func (conn *Conn) ContainerRequestList(ctx context.Context, options arvados.ListOptions) (arvados.ContainerRequestList, error) {
return conn.generated_ContainerRequestList(ctx, options)
}
@@
-553,6
+557,8
@@
var userAttrsCachedFromLoginCluster = map[string]bool{
"owner_uuid": false,
"uuid": false,
"writable_by": false,
"owner_uuid": false,
"uuid": false,
"writable_by": false,
+ "can_write": false,
+ "can_manage": false,
}
func (conn *Conn) batchUpdateUsers(ctx context.Context,
}
func (conn *Conn) batchUpdateUsers(ctx context.Context,