projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '16314-testuserdb'
[arvados.git]
/
sdk
/
go
/
arvados
/
config.go
diff --git
a/sdk/go/arvados/config.go
b/sdk/go/arvados/config.go
index 029e223218b2a5136b8eac2238b088e2ce4fb983..c87f880e5e56365e4bbec06c211a72cee9e0ee7c 100644
(file)
--- a/
sdk/go/arvados/config.go
+++ b/
sdk/go/arvados/config.go
@@
-121,11
+121,13
@@
type Cluster struct {
TrashSweepInterval Duration
TrustAllContent bool
ForwardSlashNameSubstitution string
TrashSweepInterval Duration
TrustAllContent bool
ForwardSlashNameSubstitution string
+ S3FolderObjects bool
BlobMissingReport string
BalancePeriod Duration
BalanceCollectionBatch int
BalanceCollectionBuffers int
BlobMissingReport string
BalancePeriod Duration
BalanceCollectionBatch int
BalanceCollectionBuffers int
+ BalanceTimeout Duration
WebDAVCache WebDAVCacheConfig
}
WebDAVCache WebDAVCacheConfig
}
@@
-175,6
+177,10
@@
type Cluster struct {
ProviderAppID string
ProviderAppSecret string
}
ProviderAppID string
ProviderAppSecret string
}
+ Test struct {
+ Enable bool
+ Users map[string]TestUser
+ }
LoginCluster string
RemoteTokenRefresh Duration
}
LoginCluster string
RemoteTokenRefresh Duration
}
@@
-276,6
+282,7
@@
type S3VolumeDriverParameters struct {
Bucket string
LocationConstraint bool
V2Signature bool
Bucket string
LocationConstraint bool
V2Signature bool
+ UseAWSS3v2Driver bool
IndexPageSize int
ConnectTimeout Duration
ReadTimeout Duration
IndexPageSize int
ConnectTimeout Duration
ReadTimeout Duration
@@
-312,7
+319,6
@@
type Services struct {
Keepbalance Service
Keepproxy Service
Keepstore Service
Keepbalance Service
Keepproxy Service
Keepstore Service
- Nodemanager Service
RailsAPI Service
SSO Service
WebDAVDownload Service
RailsAPI Service
SSO Service
WebDAVDownload Service
@@
-328,6
+334,11
@@
type Service struct {
ExternalURL URL
}
ExternalURL URL
}
+type TestUser struct {
+ Email string
+ Password string
+}
+
// URL is a url.URL that is also usable as a JSON key/value.
type URL url.URL
// URL is a url.URL that is also usable as a JSON key/value.
type URL url.URL
@@
-551,7
+562,7
@@
func (ss *StringSet) UnmarshalJSON(data []byte) error {
return err
}
*ss = make(map[string]struct{}, len(hash))
return err
}
*ss = make(map[string]struct{}, len(hash))
- for t
, _
:= range hash {
+ for t := range hash {
(*ss)[t] = struct{}{}
}
(*ss)[t] = struct{}{}
}
@@
-565,7
+576,6
@@
const (
ServiceNameController ServiceName = "arvados-controller"
ServiceNameDispatchCloud ServiceName = "arvados-dispatch-cloud"
ServiceNameHealth ServiceName = "arvados-health"
ServiceNameController ServiceName = "arvados-controller"
ServiceNameDispatchCloud ServiceName = "arvados-dispatch-cloud"
ServiceNameHealth ServiceName = "arvados-health"
- ServiceNameNodemanager ServiceName = "arvados-node-manager"
ServiceNameWorkbench1 ServiceName = "arvados-workbench1"
ServiceNameWorkbench2 ServiceName = "arvados-workbench2"
ServiceNameWebsocket ServiceName = "arvados-ws"
ServiceNameWorkbench1 ServiceName = "arvados-workbench1"
ServiceNameWorkbench2 ServiceName = "arvados-workbench2"
ServiceNameWebsocket ServiceName = "arvados-ws"
@@
-583,7
+593,6
@@
func (svcs Services) Map() map[ServiceName]Service {
ServiceNameController: svcs.Controller,
ServiceNameDispatchCloud: svcs.DispatchCloud,
ServiceNameHealth: svcs.Health,
ServiceNameController: svcs.Controller,
ServiceNameDispatchCloud: svcs.DispatchCloud,
ServiceNameHealth: svcs.Health,
- ServiceNameNodemanager: svcs.Nodemanager,
ServiceNameWorkbench1: svcs.Workbench1,
ServiceNameWorkbench2: svcs.Workbench2,
ServiceNameWebsocket: svcs.Websocket,
ServiceNameWorkbench1: svcs.Workbench1,
ServiceNameWorkbench2: svcs.Workbench2,
ServiceNameWebsocket: svcs.Websocket,