dstepanov-yadro/frostfs-api-go
1
0
Fork 0
forked from TrueCloudLab/frostfs-api-go
Code Issues Pull requests Projects Releases Packages Wiki Activity

[#198] sdk/client: Use XHeader type

Browse source 
Signed-off-by: Leonard Lyubich <leonard@nspcc.ru>
This commit is contained in:
Leonard Lyubich 2020-11-16 12:31:25 +03:00 committed by Alex Vanin
parent 5452554b58
commit fe336fd5ba
1 changed files with 4 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
pkg/client/opts.go
View file

@ -21,13 +21,9 @@ type (
apply(*clientOptions) apply(*clientOptions)
} }
xHeader struct {
v2session.XHeader
}
callOptions struct { callOptions struct {
version *pkg.Version version *pkg.Version
xHeaders []xHeader xHeaders []*pkg.XHeader
ttl uint32 ttl uint32
epoch uint64 epoch uint64
session *token.SessionToken session *token.SessionToken
@ -81,15 +77,9 @@ func newFuncCallOption(f func(option *callOptions)) *funcCallOption {
} }
} }
func WithXHeader(key, value string) CallOption { func WithXHeader(x *pkg.XHeader) CallOption {
return newFuncCallOption(func(option *callOptions) { return newFuncCallOption(func(option *callOptions) {
xhdr := new(v2session.XHeader) option.xHeaders = append(option.xHeaders, x)
xhdr.SetKey(key)
xhdr.SetValue(value)
option.xHeaders = append(option.xHeaders, xHeader{
XHeader: *xhdr,
})
}) })
} }
@ -125,7 +115,7 @@ func v2MetaHeaderFromOpts(options callOptions) *v2session.RequestMetaHeader {
xhdrs := make([]*v2session.XHeader, len(options.xHeaders)) xhdrs := make([]*v2session.XHeader, len(options.xHeaders))
for i := range options.xHeaders { for i := range options.xHeaders {
xhdrs[i] = &options.xHeaders[i].XHeader xhdrs[i] = options.xHeaders[i].ToV2()
} }
meta.SetXHeaders(xhdrs) meta.SetXHeaders(xhdrs)