From f4b271690bda78a338816357b3f4557c45e0bd96 Mon Sep 17 00:00:00 2001
From: Yordan Kinkov <yordan.kinkov@vereign.com>
Date: Wed, 19 Oct 2022 16:52:24 +0300
Subject: [PATCH] Rename file and struct for DID:WEB to URL transformation
---
cmd/policy/main.go | 6 +++---
.../{did_transformer.go => did_web.go} | 18 +++++++++---------
...did_transformer_test.go => did_web_test.go} | 8 ++++----
3 files changed, 16 insertions(+), 16 deletions(-)
rename internal/regofunc/{did_transformer.go => did_web.go} (87%)
rename internal/regofunc/{did_transformer_test.go => did_web_test.go} (94%)
diff --git a/cmd/policy/main.go b/cmd/policy/main.go
index f718301b..b3c9ff27 100644
--- a/cmd/policy/main.go
+++ b/cmd/policy/main.go
@@ -87,7 +87,7 @@ func main() {
taskFuncs := regofunc.NewTaskFuncs(cfg.Task.Addr, httpClient)
ocmFuncs := regofunc.NewOcmFuncs(cfg.OCM.Addr, httpClient)
signerFuncs := regofunc.NewSignerFuncs(cfg.Signer.Addr, httpClient)
- didTransformerFuncs := regofunc.NewDIDTransformerFuncs()
+ didTransformerFuncs := regofunc.NewDIDWebFuncs()
regofunc.Register("cacheGet", rego.Function3(cacheFuncs.CacheGetFunc()))
regofunc.Register("cacheSet", rego.Function4(cacheFuncs.CacheSetFunc()))
regofunc.Register("didResolve", rego.Function1(didResolverFuncs.ResolveFunc()))
@@ -100,8 +100,8 @@ func main() {
regofunc.Register("verifyProof", rego.Function1(signerFuncs.VerifyProof()))
regofunc.Register("ocmLoginProofInvitation", rego.Function2(ocmFuncs.GetLoginProofInvitation()))
regofunc.Register("ocmLoginProofResult", rego.Function1(ocmFuncs.GetLoginProofResult()))
- regofunc.Register("didToURL", rego.Function1(didTransformerFuncs.ToURLFunc()))
- regofunc.Register("urlToDID", rego.Function1(didTransformerFuncs.FromURLFunc()))
+ regofunc.Register("didToURL", rego.Function1(didTransformerFuncs.DIDToURLFunc()))
+ regofunc.Register("urlToDID", rego.Function1(didTransformerFuncs.URLToDIDFunc()))
}
// subscribe the cache for policy data changes
diff --git a/internal/regofunc/did_transformer.go b/internal/regofunc/did_web.go
similarity index 87%
rename from internal/regofunc/did_transformer.go
rename to internal/regofunc/did_web.go
index 565d2a10..207f345e 100644
--- a/internal/regofunc/did_transformer.go
+++ b/internal/regofunc/did_web.go
@@ -17,7 +17,7 @@ const (
defaultURLPath = ".well-known"
)
-type DIDTransformerFuncs struct{}
+type DIDWebFuncs struct{}
type DID struct {
scheme string // scheme is always "did"
@@ -25,11 +25,11 @@ type DID struct {
path string // path is the unique URI assigned by the DID method
}
-func NewDIDTransformerFuncs() *DIDTransformerFuncs {
- return &DIDTransformerFuncs{}
+func NewDIDWebFuncs() *DIDWebFuncs {
+ return &DIDWebFuncs{}
}
-func (dt *DIDTransformerFuncs) ToURLFunc() (*rego.Function, rego.Builtin1) {
+func (dw *DIDWebFuncs) DIDToURLFunc() (*rego.Function, rego.Builtin1) {
return ®o.Function{
Name: "url_from_did",
Decl: types.NewFunction(types.Args(types.S), types.A),
@@ -45,7 +45,7 @@ func (dt *DIDTransformerFuncs) ToURLFunc() (*rego.Function, rego.Builtin1) {
return nil, errors.New("DID cannot be empty")
}
- u, err := dt.didToURL(did)
+ u, err := dw.didToURL(did)
if err != nil {
return nil, err
}
@@ -54,7 +54,7 @@ func (dt *DIDTransformerFuncs) ToURLFunc() (*rego.Function, rego.Builtin1) {
}
}
-func (dt *DIDTransformerFuncs) FromURLFunc() (*rego.Function, rego.Builtin1) {
+func (dw *DIDWebFuncs) URLToDIDFunc() (*rego.Function, rego.Builtin1) {
return ®o.Function{
Name: "did_from_url",
Decl: types.NewFunction(types.Args(types.S), types.A),
@@ -77,7 +77,7 @@ func (dt *DIDTransformerFuncs) FromURLFunc() (*rego.Function, rego.Builtin1) {
return nil, errors.New("invalid URL for did:web method")
}
- did := dt.urlToDID(uri)
+ did := dw.urlToDID(uri)
return ast.StringTerm(did.String()), nil
}
@@ -85,7 +85,7 @@ func (dt *DIDTransformerFuncs) FromURLFunc() (*rego.Function, rego.Builtin1) {
// didToURL transforms a valid DID, created by the "did:web" Method Specification, to a URL.
// Documentation can be found here: https://w3c-ccg.github.io/did-method-web/
-func (dt *DIDTransformerFuncs) didToURL(DID string) (*url.URL, error) {
+func (dw *DIDWebFuncs) didToURL(DID string) (*url.URL, error) {
ss := strings.Split(DID, didSeparator)
if len(ss) < 3 {
return nil, errors.New("invalid DID, host is not found")
@@ -117,7 +117,7 @@ func (dt *DIDTransformerFuncs) didToURL(DID string) (*url.URL, error) {
// urlToDID transforms a valid URL to a DID created following the "did:web" Method Specification.
// Documentation can be found here: https://w3c-ccg.github.io/did-method-web/
-func (dt *DIDTransformerFuncs) urlToDID(uri *url.URL) *DID {
+func (dw *DIDWebFuncs) urlToDID(uri *url.URL) *DID {
p := strings.TrimSuffix(uri.Path, "did.json")
sp := strings.Split(p, urlSeparator)
diff --git a/internal/regofunc/did_transformer_test.go b/internal/regofunc/did_web_test.go
similarity index 94%
rename from internal/regofunc/did_transformer_test.go
rename to internal/regofunc/did_web_test.go
index 4fed242c..31083acd 100644
--- a/internal/regofunc/did_transformer_test.go
+++ b/internal/regofunc/did_web_test.go
@@ -53,11 +53,11 @@ func TestToURLFunc(t *testing.T) {
for _, test := range tests {
t.Run(test.name, func(t *testing.T) {
- DIDTransformerFuncs := regofunc.NewDIDTransformerFuncs()
+ DIDTransformerFuncs := regofunc.NewDIDWebFuncs()
r := rego.New(
rego.Query(test.regoQuery),
- rego.Function1(DIDTransformerFuncs.ToURLFunc()),
+ rego.Function1(DIDTransformerFuncs.DIDToURLFunc()),
rego.StrictBuiltinErrors(true),
)
resultSet, err := r.Eval(context.Background())
@@ -121,11 +121,11 @@ func TestFromURLFunc(t *testing.T) {
for _, test := range tests {
t.Run(test.name, func(t *testing.T) {
- DIDTransformerFuncs := regofunc.NewDIDTransformerFuncs()
+ DIDTransformerFuncs := regofunc.NewDIDWebFuncs()
r := rego.New(
rego.Query(test.regoQuery),
- rego.Function1(DIDTransformerFuncs.FromURLFunc()),
+ rego.Function1(DIDTransformerFuncs.URLToDIDFunc()),
rego.StrictBuiltinErrors(true),
)
resultSet, err := r.Eval(context.Background())
--
GitLab