diff --git a/internal/clients/policy/client.go b/internal/clients/policy/client.go
index 3231f366df9d85f57e3d7b8914cd6c838486802b..651b31b95645d86759f0e8d8283c475644705cf1 100644
--- a/internal/clients/policy/client.go
+++ b/internal/clients/policy/client.go
@@ -8,11 +8,15 @@ import (
"io"
"net/http"
"net/url"
+ "strconv"
"gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/golib/errors"
)
-const headerEvaluationID = "x-evaluation-id"
+const (
+ headerEvaluationID = "x-evaluation-id"
+ headerCacheTTL = "x-cache-ttl"
+)
type Client struct {
addr string
@@ -36,7 +40,7 @@ func New(addr string, opts ...ClientOption) *Client {
// The policy is expected as a string path uniquely identifying the
// policy that has to be evaluated. For example, with policy = `gaiax/didResolve/1.0`,
// the client will do HTTP request to http://policyhost/policy/gaiax/didResolve/1.0/evaluation.
-func (c *Client) Evaluate(ctx context.Context, policy string, data interface{}, evaluationID string) ([]byte, error) {
+func (c *Client) Evaluate(ctx context.Context, policy string, data interface{}, evaluationID string, cacheTTL *int) ([]byte, error) {
uri := c.addr + "/policy/" + policy + "/evaluation"
policyURL, err := url.ParseRequestURI(uri)
if err != nil {
@@ -57,6 +61,10 @@ func (c *Client) Evaluate(ctx context.Context, policy string, data interface{},
req.Header.Set(headerEvaluationID, evaluationID)
}
+ if cacheTTL != nil {
+ req.Header.Set(headerCacheTTL, strconv.Itoa(*cacheTTL))
+ }
+
resp, err := c.httpClient.Do(req.WithContext(ctx))
if err != nil {
return nil, err
diff --git a/internal/service/infohub/infohubfakes/fake_credentials.go b/internal/service/infohub/infohubfakes/fake_credentials.go
index d06091d7faad34e6cf0830c890ddd7fbf7bcd501..a66c24875dedb1748d9b4772f30693c332214397 100644
--- a/internal/service/infohub/infohubfakes/fake_credentials.go
+++ b/internal/service/infohub/infohubfakes/fake_credentials.go
@@ -4,8 +4,8 @@ package infohubfakes
import (
"sync"
- "gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/infohub/internal/service/infohub"
"github.com/hyperledger/aries-framework-go/pkg/doc/verifiable"
+ "gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/infohub/internal/service/infohub"
)
type FakeCredentials struct {
diff --git a/internal/service/infohub/infohubfakes/fake_policy.go b/internal/service/infohub/infohubfakes/fake_policy.go
index 916504b0db7d042c3fb296c400fb4839effcaf6c..cdd4e13d0c59e2690ce6bcaf99e890eaa4e31595 100644
--- a/internal/service/infohub/infohubfakes/fake_policy.go
+++ b/internal/service/infohub/infohubfakes/fake_policy.go
@@ -9,13 +9,14 @@ import (
)
type FakePolicy struct {
- EvaluateStub func(context.Context, string, interface{}, string) ([]byte, error)
+ EvaluateStub func(context.Context, string, interface{}, string, *int) ([]byte, error)
evaluateMutex sync.RWMutex
evaluateArgsForCall []struct {
arg1 context.Context
arg2 string
arg3 interface{}
arg4 string
+ arg5 *int
}
evaluateReturns struct {
result1 []byte
@@ -29,7 +30,7 @@ type FakePolicy struct {
invocationsMutex sync.RWMutex
}
-func (fake *FakePolicy) Evaluate(arg1 context.Context, arg2 string, arg3 interface{}, arg4 string) ([]byte, error) {
+func (fake *FakePolicy) Evaluate(arg1 context.Context, arg2 string, arg3 interface{}, arg4 string, arg5 *int) ([]byte, error) {
fake.evaluateMutex.Lock()
ret, specificReturn := fake.evaluateReturnsOnCall[len(fake.evaluateArgsForCall)]
fake.evaluateArgsForCall = append(fake.evaluateArgsForCall, struct {
@@ -37,13 +38,14 @@ func (fake *FakePolicy) Evaluate(arg1 context.Context, arg2 string, arg3 interfa
arg2 string
arg3 interface{}
arg4 string
- }{arg1, arg2, arg3, arg4})
+ arg5 *int
+ }{arg1, arg2, arg3, arg4, arg5})
stub := fake.EvaluateStub
fakeReturns := fake.evaluateReturns
- fake.recordInvocation("Evaluate", []interface{}{arg1, arg2, arg3, arg4})
+ fake.recordInvocation("Evaluate", []interface{}{arg1, arg2, arg3, arg4, arg5})
fake.evaluateMutex.Unlock()
if stub != nil {
- return stub(arg1, arg2, arg3, arg4)
+ return stub(arg1, arg2, arg3, arg4, arg5)
}
if specificReturn {
return ret.result1, ret.result2
@@ -57,17 +59,17 @@ func (fake *FakePolicy) EvaluateCallCount() int {
return len(fake.evaluateArgsForCall)
}
-func (fake *FakePolicy) EvaluateCalls(stub func(context.Context, string, interface{}, string) ([]byte, error)) {
+func (fake *FakePolicy) EvaluateCalls(stub func(context.Context, string, interface{}, string, *int) ([]byte, error)) {
fake.evaluateMutex.Lock()
defer fake.evaluateMutex.Unlock()
fake.EvaluateStub = stub
}
-func (fake *FakePolicy) EvaluateArgsForCall(i int) (context.Context, string, interface{}, string) {
+func (fake *FakePolicy) EvaluateArgsForCall(i int) (context.Context, string, interface{}, string, *int) {
fake.evaluateMutex.RLock()
defer fake.evaluateMutex.RUnlock()
argsForCall := fake.evaluateArgsForCall[i]
- return argsForCall.arg1, argsForCall.arg2, argsForCall.arg3, argsForCall.arg4
+ return argsForCall.arg1, argsForCall.arg2, argsForCall.arg3, argsForCall.arg4, argsForCall.arg5
}
func (fake *FakePolicy) EvaluateReturns(result1 []byte, result2 error) {
diff --git a/internal/service/infohub/infohubfakes/fake_signer.go b/internal/service/infohub/infohubfakes/fake_signer.go
index ba8abb59abf6947c3f83a4088dacec48524da6f9..db2c0e1e4937a7162d9e6b180f833fefcf5e5712 100644
--- a/internal/service/infohub/infohubfakes/fake_signer.go
+++ b/internal/service/infohub/infohubfakes/fake_signer.go
@@ -5,8 +5,8 @@ import (
"context"
"sync"
- "gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/infohub/internal/service/infohub"
"github.com/hyperledger/aries-framework-go/pkg/doc/verifiable"
+ "gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/infohub/internal/service/infohub"
)
type FakeSigner struct {
diff --git a/internal/service/infohub/service.go b/internal/service/infohub/service.go
index 00ad890187627059e5d8341457d7ad938d0bc7fe..f21a0ef33629bcd0bf262ecb7c12fa1cae26dea4 100644
--- a/internal/service/infohub/service.go
+++ b/internal/service/infohub/service.go
@@ -3,7 +3,6 @@ package infohub
import (
"context"
"encoding/json"
-
"github.com/google/uuid"
"github.com/hyperledger/aries-framework-go/pkg/doc/verifiable"
"go.uber.org/zap"
@@ -26,7 +25,7 @@ type Storage interface {
}
type Policy interface {
- Evaluate(ctx context.Context, policy string, data interface{}, evaluationID string) ([]byte, error)
+ Evaluate(ctx context.Context, policy string, data interface{}, evaluationID string, ttl *int) ([]byte, error)
}
type Cache interface {
@@ -207,7 +206,7 @@ func (s *Service) triggerExport(ctx context.Context, exportCfg *storage.ExportCo
s.logger.Info("export triggered", zap.String("exportName", exportCfg.ExportName))
for policy, input := range exportCfg.Policies {
cacheKey := exportCacheKey(exportCfg.ExportName, policy)
- _, err := s.policy.Evaluate(ctx, policy, input, cacheKey)
+ _, err := s.policy.Evaluate(ctx, policy, input, cacheKey, exportCfg.CacheTTL)
if err != nil {
return err
}
diff --git a/internal/service/infohub/service_test.go b/internal/service/infohub/service_test.go
index c17520b4b9a43380d3064898f3eed8c05a287f5a..c585ea29797dd4d57b2bfa3c644085b5b16db801 100644
--- a/internal/service/infohub/service_test.go
+++ b/internal/service/infohub/service_test.go
@@ -9,6 +9,7 @@ import (
"go.uber.org/zap"
"gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/golib/errors"
+ "gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/golib/ptr"
goasigner "gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/infohub/gen/infohub"
"gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/infohub/internal/service/infohub"
"gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/infohub/internal/service/infohub/infohubfakes"
@@ -85,6 +86,7 @@ func TestService_Export(t *testing.T) {
ExportName: "testexport",
Contexts: []string{"https://www.w3.org/2018/credentials/examples/v1"},
Policies: map[string]interface{}{"test/test/1.0": map[string]interface{}{"hello": "test world"}},
+ CacheTTL: ptr.Int(60),
}, nil
},
},
@@ -94,7 +96,7 @@ func TestService_Export(t *testing.T) {
},
},
policy: &infohubfakes.FakePolicy{
- EvaluateStub: func(ctx context.Context, policy string, input interface{}, cachekey string) ([]byte, error) {
+ EvaluateStub: func(ctx context.Context, policy string, input interface{}, cachekey string, ttl *int) ([]byte, error) {
return nil, errors.New("error evaluation policy")
},
},
@@ -119,7 +121,32 @@ func TestService_Export(t *testing.T) {
},
},
policy: &infohubfakes.FakePolicy{
- EvaluateStub: func(ctx context.Context, policy string, input interface{}, cachekey string) ([]byte, error) {
+ EvaluateStub: func(ctx context.Context, policy string, input interface{}, cachekey string, ttl *int) ([]byte, error) {
+ return []byte(`{"allow":"true"}`), nil
+ },
+ },
+ res: map[string]interface{}{"result": "export request is accepted"},
+ },
+ {
+ name: "export triggering successfully with TTL provided in export configuration",
+ req: &goasigner.ExportRequest{ExportName: "testexport"},
+ storage: &infohubfakes.FakeStorage{
+ ExportConfigurationStub: func(ctx context.Context, s string) (*storage.ExportConfiguration, error) {
+ return &storage.ExportConfiguration{
+ ExportName: "testexport",
+ Contexts: []string{"https://www.w3.org/2018/credentials/examples/v1"},
+ Policies: map[string]interface{}{"test/test/1.0": map[string]interface{}{"hello": "test world"}},
+ CacheTTL: ptr.Int(60),
+ }, nil
+ },
+ },
+ cache: &infohubfakes.FakeCache{
+ GetStub: func(ctx context.Context, key string, namespace string, scope string) ([]byte, error) {
+ return nil, errors.New(errors.NotFound, "no data")
+ },
+ },
+ policy: &infohubfakes.FakePolicy{
+ EvaluateStub: func(ctx context.Context, policy string, input interface{}, cachekey string, ttl *int) ([]byte, error) {
return []byte(`{"allow":"true"}`), nil
},
},
diff --git a/internal/storage/storage.go b/internal/storage/storage.go
index c4955941f3d3de99b5300e4acd1eb2c20e78aa1d..5c6072c86f0ccafe31c50dd33ae993b2d9975fdc 100644
--- a/internal/storage/storage.go
+++ b/internal/storage/storage.go
@@ -15,6 +15,7 @@ type ExportConfiguration struct {
ExportName string
Contexts []string
Policies map[string]interface{}
+ CacheTTL *int
}
type Storage struct {
diff --git a/vendor/gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/golib/ptr/ptr.go b/vendor/gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/golib/ptr/ptr.go
new file mode 100644
index 0000000000000000000000000000000000000000..fd522b7a70d7449dccc01ee3b2b3181eb9e7600e
Binary files /dev/null and b/vendor/gitlab.com/gaia-x/data-infrastructure-federation-services/tsa/golib/ptr/ptr.go differ
diff --git a/vendor/modules.txt b/vendor/modules.txt
index a0eed4fc9ee4a11624086e5ea747f3230c82a674..806589fdd47cf06c1f06e8e69d6fdd8fdc8ff58e 100644
Binary files a/vendor/modules.txt and b/vendor/modules.txt differ