From dc9727bfefc2efa0065814d5d74b987c1041d446 Mon Sep 17 00:00:00 2001 From: Ingo Oppermann Date: Tue, 25 Jul 2023 17:13:10 +0200 Subject: [PATCH] Update dependencies --- go.mod | 2 +- go.sum | 2 ++ .../datarhei/core-client-go/v16/api/cluster.go | 1 + vendor/github.com/datarhei/core-client-go/v16/api/fs.go | 9 +++++++++ .../datarhei/core-client-go/v16/api/session.go | 1 + vendor/modules.txt | 2 +- 6 files changed, 15 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 2e9dfdd4..6564d1eb 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/atrox/haikunatorgo/v2 v2.0.1 github.com/caddyserver/certmagic v0.19.0 github.com/casbin/casbin/v2 v2.72.0 - github.com/datarhei/core-client-go/v16 v16.11.1-0.20230721094901-3748188282ea + github.com/datarhei/core-client-go/v16 v16.11.1-0.20230725151052-26252f73d23b github.com/datarhei/gosrt v0.5.2 github.com/datarhei/joy4 v0.0.0-20230505074825-fde05957445a github.com/fujiwara/shapeio v1.0.0 diff --git a/go.sum b/go.sum index b3e28e52..0668d836 100644 --- a/go.sum +++ b/go.sum @@ -56,6 +56,8 @@ github.com/datarhei/core-client-go/v16 v16.11.1-0.20230721082756-e22b6cdac41f h1 github.com/datarhei/core-client-go/v16 v16.11.1-0.20230721082756-e22b6cdac41f/go.mod h1:3eKfwhPKoW7faTn+luShRVNMqcIskvlIKjRJ7ShjyL8= github.com/datarhei/core-client-go/v16 v16.11.1-0.20230721094901-3748188282ea h1:kkT23Ev6fn3tPCVJMZt+QALN8w6Hatv6tntZRYPjK/M= github.com/datarhei/core-client-go/v16 v16.11.1-0.20230721094901-3748188282ea/go.mod h1:3eKfwhPKoW7faTn+luShRVNMqcIskvlIKjRJ7ShjyL8= +github.com/datarhei/core-client-go/v16 v16.11.1-0.20230725151052-26252f73d23b h1:b8TWP11Tx9QwZ8lEPoyv9L2hfkH8YaUkAc0bGxRLYmg= +github.com/datarhei/core-client-go/v16 v16.11.1-0.20230725151052-26252f73d23b/go.mod h1:3eKfwhPKoW7faTn+luShRVNMqcIskvlIKjRJ7ShjyL8= github.com/datarhei/gosrt v0.5.2 h1:eagqZwEIiGPNJW0rLep3gwceObyaZ17+iKRc+l4VEpc= github.com/datarhei/gosrt v0.5.2/go.mod h1:0308GQhAu5hxe2KYdbss901aKceSSKXnwCr8Vs++eiw= github.com/datarhei/joy4 v0.0.0-20230505074825-fde05957445a h1:Tf4DSHY1xruBglr+yYP5Wct7czM86GKMYgbXH8a7OFo= diff --git a/vendor/github.com/datarhei/core-client-go/v16/api/cluster.go b/vendor/github.com/datarhei/core-client-go/v16/api/cluster.go index 08e8a48e..39179c85 100644 --- a/vendor/github.com/datarhei/core-client-go/v16/api/cluster.go +++ b/vendor/github.com/datarhei/core-client-go/v16/api/cluster.go @@ -36,6 +36,7 @@ type ClusterNodeResources struct { CPULimit float64 `json:"cpu_limit"` // percent 0-100*npcu Mem uint64 `json:"memory_used_bytes"` // bytes MemLimit uint64 `json:"memory_limit_bytes"` // bytes + Error string `json:"error"` } type ClusterRaft struct { diff --git a/vendor/github.com/datarhei/core-client-go/v16/api/fs.go b/vendor/github.com/datarhei/core-client-go/v16/api/fs.go index 152288b2..a0acb1e1 100644 --- a/vendor/github.com/datarhei/core-client-go/v16/api/fs.go +++ b/vendor/github.com/datarhei/core-client-go/v16/api/fs.go @@ -5,6 +5,7 @@ type FileInfo struct { Name string `json:"name" jsonschema:"minLength=1"` Size int64 `json:"size_bytes" jsonschema:"minimum=0"` LastMod int64 `json:"last_modified" jsonschema:"minimum=0"` + CoreID string `json:"core_id,omitempty"` } type FilesystemInfo struct { @@ -12,3 +13,11 @@ type FilesystemInfo struct { Type string `json:"type"` Mount string `json:"mount"` } + +// FilesystemOperation represents a file operation on one or more filesystems +type FilesystemOperation struct { + Operation string `json:"operation" validate:"required" enums:"copy,move" jsonschema:"enum=copy,enum=move"` + Source string `json:"source"` + Target string `json:"target"` + RateLimit uint64 `json:"bandwidth_limit_kbit"` // kbit/s +} diff --git a/vendor/github.com/datarhei/core-client-go/v16/api/session.go b/vendor/github.com/datarhei/core-client-go/v16/api/session.go index a3ca19b9..c9a1d063 100644 --- a/vendor/github.com/datarhei/core-client-go/v16/api/session.go +++ b/vendor/github.com/datarhei/core-client-go/v16/api/session.go @@ -63,5 +63,6 @@ type SessionTokenRequest struct { Match string `json:"match"` Remote []string `json:"remote"` Extra map[string]interface{} `json:"extra"` + TTL int64 `json:"ttl_sec"` // seconds Token string `json:"token,omitempty"` } diff --git a/vendor/modules.txt b/vendor/modules.txt index 6c19cf4c..19c2da3e 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -78,7 +78,7 @@ github.com/cespare/xxhash/v2 # github.com/cpuguy83/go-md2man/v2 v2.0.2 ## explicit; go 1.11 github.com/cpuguy83/go-md2man/v2/md2man -# github.com/datarhei/core-client-go/v16 v16.11.1-0.20230721094901-3748188282ea +# github.com/datarhei/core-client-go/v16 v16.11.1-0.20230725151052-26252f73d23b ## explicit; go 1.18 github.com/datarhei/core-client-go/v16 github.com/datarhei/core-client-go/v16/api