fixes to circular dependeices pointer to forked repo

open-privacy · May 1, 2024 · e893241 · e893241
1 parent 77f4665
commit e893241
Show file tree

Hide file tree

Showing 69 changed files with 148 additions and 151 deletions.
diff --git a/cmd/controlplane/main.go b/cmd/controlplane/main.go
@@ -3,11 +3,11 @@ package main
 import (
 	"fmt"
 
-	controlplanedocs "github.com/open-privacy/opv/cmd/controlplane/docs" // docs is generated by Swag CLI, you have to import it.
+	controlplanedocs "github.com/roney492/opv/cmd/controlplane/docs" // docs is generated by Swag CLI, you have to import it.
 	echoSwagger "github.com/swaggo/echo-swagger"
 
-	"github.com/open-privacy/opv/pkg/config"
-	"github.com/open-privacy/opv/pkg/controlplane"
+	"github.com/roney492/opv/pkg/config"
+	"github.com/roney492/opv/pkg/controlplane"
 	"github.com/tj/go-gracefully"
 )
 

diff --git a/cmd/dataplane/main.go b/cmd/dataplane/main.go
@@ -3,11 +3,11 @@ package main
 import (
 	"fmt"
 
-	dataplanedocs "github.com/open-privacy/opv/cmd/dataplane/docs" // docs is generated by Swag CLI, you have to import it.
+	dataplanedocs "github.com/roney492/opv/cmd/dataplane/docs" // docs is generated by Swag CLI, you have to import it.
 	echoSwagger "github.com/swaggo/echo-swagger"
 
-	"github.com/open-privacy/opv/pkg/config"
-	"github.com/open-privacy/opv/pkg/dataplane"
+	"github.com/roney492/opv/pkg/config"
+	"github.com/roney492/opv/pkg/dataplane"
 	"github.com/tj/go-gracefully"
 )
 

diff --git a/cmd/proxyplane/main.go b/cmd/proxyplane/main.go
@@ -1,8 +1,8 @@
 package main
 
 import (
-	"github.com/open-privacy/opv/pkg/config"
-	"github.com/open-privacy/opv/pkg/proxyplane"
+	"github.com/roney492/opv/pkg/config"
+	"github.com/roney492/opv/pkg/proxyplane"
 	"github.com/tj/go-gracefully"
 )
 

diff --git a/cmd/proxyplane/opv-proxyplane-http.example.json b/cmd/proxyplane/opv-proxyplane-http.example.json
@@ -33,7 +33,7 @@
           "encoding": "no-op",
           "extra_config": {
 
-            "github.com/open-privacy/opv": {
+            "github.com/roney492/opv": {
               "opv.body.Modifier": {
                 "scope": [
                   "request"
@@ -109,7 +109,7 @@
           "url_pattern": "/post",
           "encoding": "no-op",
           "extra_config": {
-            "github.com/open-privacy/opv": {
+            "github.com/roney492/opv": {
               "opv.body.Modifier": {
                 "scope": [
                   "request"

diff --git a/docs/openprivacy.io/content/docs/development/playground.md b/docs/openprivacy.io/content/docs/development/playground.md
@@ -26,7 +26,6 @@ Playground demo of tokenization and detokenization via the Data Plane: `https://
 
 Playground demo of sending API requests to Checkr via the Proxy Plane: `proxy-playground.openprivacy.io`.
 
-- The definition of the proxy routing can be found at [opv-proxyplane-http.example.json](https://github.com/open-privacy/opv/blob/53eb70c1ce9aaaa897863982efb468df487ce7c0/cmd/proxyplane/opv-proxyplane-http.example.json#L105).
 - We simulated that once the internal system have tokenzied `facts` (i.e. sensitive PIIs), it can talks to a dedicated proxy plane route for automated detokenization when sending the requests to external vendors like [Checkr API](https://api.checkr.com).
 - You can also inspect the network requests directly from your browser (tldr - press `F12`) to check the actual payload.
 

diff --git a/functional_test/crud_fact_test.go b/functional_test/crud_fact_test.go
@@ -11,7 +11,7 @@ import (
 	. "github.com/Eun/go-hit"
 	"github.com/avast/retry-go"
 	"github.com/dchest/uniuri"
-	"github.com/open-privacy/opv/pkg/config"
+	"github.com/roney492/opv/pkg/config"
 )
 
 func generateScopeID() string {

diff --git a/functional_test/functional_test.go b/functional_test/functional_test.go
@@ -8,10 +8,10 @@ import (
 	"time"
 
 	"github.com/caarlos0/env/v6"
-	"github.com/open-privacy/opv/pkg/config"
-	"github.com/open-privacy/opv/pkg/controlplane"
-	"github.com/open-privacy/opv/pkg/dataplane"
-	"github.com/open-privacy/opv/pkg/proxyplane"
+	"github.com/roney492/opv/pkg/config"
+	"github.com/roney492/opv/pkg/controlplane"
+	"github.com/roney492/opv/pkg/dataplane"
+	"github.com/roney492/opv/pkg/proxyplane"
 )
 
 // TESTENV is the env configuration for functional testing

diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module github.com/open-privacy/opv
+module github.com/roney492/opv
 
 go 1.22
 

diff --git a/go.sum b/go.sum
@@ -572,8 +572,6 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 github.com/zclconf/go-cty v1.13.2 h1:4GvrUxe/QUDYuJKAav4EYqdM47/kZa672LwmXFmEKT0=
 github.com/zclconf/go-cty v1.13.2/go.mod h1:YKQzy/7pZ7iq2jNFzy5go57xdxdWoLLpaEp4u238AE0=
-github.com/zhouzhuojie/iso8601ms v0.1.0 h1:6InZGTu4YM+2fNO7jhACyFd71XCTU7C/vmMFYsqoMBk=
-github.com/zhouzhuojie/iso8601ms v0.1.0/go.mod h1:4t5F1H6mzxsFB9CCFhj1pUlK8TPwRGmQ/Js+zMK32mY=
 go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
 go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=

diff --git a/pkg/apimodel/grant_token.go b/pkg/apimodel/grant_token.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/dchest/uniuri"
 	"github.com/labstack/echo/v4"
-	"github.com/open-privacy/opv/pkg/crypto"
+	"github.com/roney492/opv/pkg/crypto"
 )
 
 // GrantToken represents a secret token

diff --git a/pkg/apimodel/httperror.go b/pkg/apimodel/httperror.go
@@ -6,7 +6,7 @@ import (
 	"github.com/asaskevich/govalidator"
 	"github.com/go-playground/validator/v10"
 	"github.com/labstack/echo/v4"
-	"github.com/open-privacy/opv/pkg/repo"
+	"github.com/roney492/opv/pkg/repo"
 )
 
 // NewHTTPError creates a new echo.HTTPError from the given error

diff --git a/pkg/controlplane/controlplane.go b/pkg/controlplane/controlplane.go
@@ -9,9 +9,9 @@ import (
 	"github.com/labstack/echo/v4"
 	"github.com/labstack/echo/v4/middleware"
 	"github.com/labstack/gommon/log"
-	"github.com/open-privacy/opv/pkg/config"
-	"github.com/open-privacy/opv/pkg/crypto"
-	"github.com/open-privacy/opv/pkg/repo"
+	"github.com/roney492/opv/pkg/config"
+	"github.com/roney492/opv/pkg/crypto"
+	"github.com/roney492/opv/pkg/repo"
 )
 
 // ControlPlane is the control plane for OPV

diff --git a/pkg/controlplane/crud_api_audit.go b/pkg/controlplane/crud_api_audit.go
@@ -5,9 +5,9 @@ import (
 	"time"
 
 	"github.com/labstack/echo/v4"
-	"github.com/open-privacy/opv/pkg/apimodel"
-	"github.com/open-privacy/opv/pkg/ent"
-	"github.com/open-privacy/opv/pkg/repo"
+	"github.com/roney492/opv/pkg/apimodel"
+	"github.com/roney492/opv/pkg/ent"
+	"github.com/roney492/opv/pkg/repo"
 )
 
 // QueryAPIAudits is the endpoint for querying a list of api audit logs

diff --git a/pkg/controlplane/crud_grant.go b/pkg/controlplane/crud_grant.go
@@ -4,8 +4,8 @@ import (
 	"net/http"
 
 	"github.com/labstack/echo/v4"
-	"github.com/open-privacy/opv/pkg/apimodel"
-	"github.com/open-privacy/opv/pkg/repo"
+	"github.com/roney492/opv/pkg/apimodel"
+	"github.com/roney492/opv/pkg/repo"
 )
 
 // CreateGrant is the endpoint for creating a new grant

diff --git a/pkg/controlplane/healthz.go b/pkg/controlplane/healthz.go
@@ -4,7 +4,7 @@ import (
 	"net/http"
 
 	"github.com/labstack/echo/v4"
-	"github.com/open-privacy/opv/pkg/apimodel"
+	"github.com/roney492/opv/pkg/apimodel"
 )
 
 // Healthz godoc

diff --git a/pkg/controlplane/middleware.go b/pkg/controlplane/middleware.go
@@ -4,7 +4,7 @@ import (
 	"context"
 
 	"github.com/labstack/echo/v4"
-	"github.com/open-privacy/opv/pkg/repo"
+	"github.com/roney492/opv/pkg/repo"
 )
 
 type auditLogContext struct {

diff --git a/pkg/crypto/encryptor.go b/pkg/crypto/encryptor.go
@@ -6,7 +6,7 @@ import (
 
 	"golang.org/x/crypto/nacl/secretbox"
 
-	"github.com/open-privacy/opv/pkg/config"
+	"github.com/roney492/opv/pkg/config"
 )
 
 const (

diff --git a/pkg/crypto/hasher.go b/pkg/crypto/hasher.go
@@ -4,7 +4,7 @@ import (
 	"encoding/base64"
 	"fmt"
 
-	"github.com/open-privacy/opv/pkg/config"
+	"github.com/roney492/opv/pkg/config"
 	"golang.org/x/crypto/scrypt"
 	"golang.org/x/crypto/sha3"
 )

diff --git a/pkg/dataplane/crud_fact.go b/pkg/dataplane/crud_fact.go
@@ -8,8 +8,8 @@ import (
 
 	"github.com/asaskevich/govalidator"
 	"github.com/labstack/echo/v4"
-	"github.com/open-privacy/opv/pkg/apimodel"
-	"github.com/open-privacy/opv/pkg/repo"
+	"github.com/roney492/opv/pkg/apimodel"
+	"github.com/roney492/opv/pkg/repo"
 )
 
 // ShowFact godoc

diff --git a/pkg/dataplane/crud_facttype.go b/pkg/dataplane/crud_facttype.go
@@ -5,8 +5,8 @@ import (
 	"net/http"
 
 	"github.com/labstack/echo/v4"
-	"github.com/open-privacy/opv/pkg/apimodel"
-	"github.com/open-privacy/opv/pkg/repo"
+	"github.com/roney492/opv/pkg/apimodel"
+	"github.com/roney492/opv/pkg/repo"
 )
 
 // QueryFactTypes godoc

diff --git a/pkg/dataplane/crud_scope.go b/pkg/dataplane/crud_scope.go
@@ -4,8 +4,8 @@ import (
 	"net/http"
 
 	"github.com/labstack/echo/v4"
-	"github.com/open-privacy/opv/pkg/apimodel"
-	"github.com/open-privacy/opv/pkg/repo"
+	"github.com/roney492/opv/pkg/apimodel"
+	"github.com/roney492/opv/pkg/repo"
 )
 
 // QueryScopes godoc

diff --git a/pkg/dataplane/dataplane.go b/pkg/dataplane/dataplane.go
@@ -9,9 +9,9 @@ import (
 	"github.com/labstack/echo/v4"
 	"github.com/labstack/echo/v4/middleware"
 	"github.com/labstack/gommon/log"
-	"github.com/open-privacy/opv/pkg/config"
-	"github.com/open-privacy/opv/pkg/crypto"
-	"github.com/open-privacy/opv/pkg/repo"
+	"github.com/roney492/opv/pkg/config"
+	"github.com/roney492/opv/pkg/crypto"
+	"github.com/roney492/opv/pkg/repo"
 )
 
 // DataPlane represents the data plane struct

diff --git a/pkg/dataplane/healthz.go b/pkg/dataplane/healthz.go
@@ -4,7 +4,7 @@ import (
 	"net/http"
 
 	"github.com/labstack/echo/v4"
-	"github.com/open-privacy/opv/pkg/apimodel"
+	"github.com/roney492/opv/pkg/apimodel"
 )
 
 // Healthz godoc

diff --git a/pkg/dataplane/middleware.go b/pkg/dataplane/middleware.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/labstack/echo/v4"
 	"github.com/labstack/echo/v4/middleware"
-	"github.com/open-privacy/opv/pkg/apimodel"
-	"github.com/open-privacy/opv/pkg/repo"
+	"github.com/roney492/opv/pkg/apimodel"
+	"github.com/roney492/opv/pkg/repo"
 )
 
 const (

diff --git a/pkg/ent/apiaudit.go b/pkg/ent/apiaudit.go
diff --git a/pkg/ent/apiaudit/where.go b/pkg/ent/apiaudit/where.go
diff --git a/pkg/ent/apiaudit_create.go b/pkg/ent/apiaudit_create.go
diff --git a/pkg/ent/apiaudit_delete.go b/pkg/ent/apiaudit_delete.go
diff --git a/pkg/ent/apiaudit_query.go b/pkg/ent/apiaudit_query.go
diff --git a/pkg/ent/apiaudit_update.go b/pkg/ent/apiaudit_update.go
diff --git a/pkg/ent/client.go b/pkg/ent/client.go
diff --git a/pkg/ent/entql.go b/pkg/ent/entql.go
diff --git a/pkg/ent/enttest/enttest.go b/pkg/ent/enttest/enttest.go
diff --git a/pkg/ent/fact.go b/pkg/ent/fact.go
diff --git a/pkg/ent/fact/where.go b/pkg/ent/fact/where.go