From 6e6cde1bfb00b1ccce6afdabc4339e5eea676c14 Mon Sep 17 00:00:00 2001
From: Yordan Kinkov <yordan.kinkov@vereign.com>
Date: Mon, 9 May 2022 10:20:57 +0300
Subject: [PATCH] #18 merge request comments
---
cmd/policy/main.go | 4 ++--
internal/config/config.go | 4 ++--
internal/regofunc/did_resolver.go | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/cmd/policy/main.go b/cmd/policy/main.go
index 9d2076fb..d85ff216 100644
--- a/cmd/policy/main.go
+++ b/cmd/policy/main.go
@@ -74,10 +74,10 @@ func main() {
// register rego extension functions
{
cacheFuncs := regofunc.NewCacheFuncs(cfg.Cache.Addr, httpClient())
- DIDResolverFuncs := regofunc.NewDIDResolverFuncs(cfg.DIDResolver.Addr, httpClient())
+ didResolverFuncs := regofunc.NewDIDResolverFuncs(cfg.DIDResolver.Addr, httpClient())
regofunc.Register("cacheGet", rego.Function3(cacheFuncs.CacheGetFunc()))
regofunc.Register("cacheSet", rego.Function4(cacheFuncs.CacheSetFunc()))
- regofunc.Register("DIDResolve", rego.Function1(DIDResolverFuncs.Resolve()))
+ regofunc.Register("didResolve", rego.Function1(didResolverFuncs.Resolve()))
regofunc.Register("strictBuiltinErrors", rego.StrictBuiltinErrors(true))
}
diff --git a/internal/config/config.go b/internal/config/config.go
index bf534396..9a52c10a 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -6,7 +6,7 @@ type Config struct {
HTTP httpConfig
Mongo mongoConfig
Cache cacheConfig
- DIDResolver DIDResolverConfig
+ DIDResolver didResolverConfig
LogLevel string `envconfig:"LOG_LEVEL" default:"INFO"`
}
@@ -23,7 +23,7 @@ type cacheConfig struct {
Addr string `envconfig:"CACHE_ADDR" required:"true"`
}
-type DIDResolverConfig struct {
+type didResolverConfig struct {
Addr string `envconfig:"DID_RESOLVER_ADDR" required:"true"`
}
diff --git a/internal/regofunc/did_resolver.go b/internal/regofunc/did_resolver.go
index 2494245c..45a7d264 100644
--- a/internal/regofunc/did_resolver.go
+++ b/internal/regofunc/did_resolver.go
@@ -36,7 +36,7 @@ func (dr *DIDResolverFuncs) Resolve() (*rego.Function, rego.Builtin1) {
return nil, fmt.Errorf("invalid DID: %s", err)
}
if DID == "" {
- return nil, errors.New("DID can not be empty")
+ return nil, errors.New("DID cannot be empty")
}
req, err := http.NewRequest("GET", dr.resolverAddr+"/1.0/identifiers/"+DID, nil)
--
GitLab