From 1e3608571ec216391fb8f9479826eeb585ca0880 Mon Sep 17 00:00:00 2001 From: DanB Date: Wed, 21 Mar 2018 19:15:31 +0100 Subject: [PATCH] SessionSv1.AuthorizeEventWithDigest returning MaxUsage as float64 instead of duration, thanks @razvanc --- apier/v1/sessionsv1_it_test.go | 2 +- sessions/sessions.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apier/v1/sessionsv1_it_test.go b/apier/v1/sessionsv1_it_test.go index 3ae9b0dd4..ca595fe32 100644 --- a/apier/v1/sessionsv1_it_test.go +++ b/apier/v1/sessionsv1_it_test.go @@ -210,7 +210,7 @@ func TestSSv1ItAuthWithDigest(t *testing.T) { if err := sSv1BiRpc.Call(utils.SessionSv1AuthorizeEventWithDigest, args, &rply); err != nil { t.Error(err) } - if *rply.MaxUsage != authUsage { + if *rply.MaxUsage != authUsage.Seconds() { t.Errorf("Unexpected MaxUsage: %v", rply.MaxUsage) } if *rply.ResourceAllocation == "" { diff --git a/sessions/sessions.go b/sessions/sessions.go index 27af0f291..70703d985 100644 --- a/sessions/sessions.go +++ b/sessions/sessions.go @@ -1456,7 +1456,7 @@ func (smg *SMGeneric) BiRPCv1AuthorizeEvent(clnt rpcclient.RpcClientConnection, type V1AuthorizeReplyWithDigest struct { AttributesDigest *string ResourceAllocation *string - MaxUsage *time.Duration + MaxUsage *float64 // special treat returning time.Duration.Seconds() SuppliersDigest *string } @@ -1479,7 +1479,7 @@ func (smg *SMGeneric) BiRPCv1AuthorizeEventWithDigest(clnt rpcclient.RpcClientCo authReply.ResourceAllocation = initAuthRply.ResourceAllocation } if args.GetMaxUsage { - authReply.MaxUsage = initAuthRply.MaxUsage + authReply.MaxUsage = utils.Float64Pointer(initAuthRply.MaxUsage.Seconds()) } if args.GetSuppliers { authReply.SuppliersDigest = utils.StringPointer(initAuthRply.Suppliers.Digest())