Merge pull request #1 from arkavo-org/feat/fork-import

feat(all): fork import path update
arkavo-org · Apr 6, 2024 · 7539196 · 7539196
2 parents 7cd4f26 + d453a98
commit 7539196
Show file tree

Hide file tree

Showing 95 changed files with 283 additions and 294 deletions.
diff --git a/.github/workflows/checks.yaml b/.github/workflows/checks.yaml
@@ -149,7 +149,7 @@ jobs:
         continue-on-error: true
         with:
           input: service
-          against: "https://github.com/opentdf/platform.git#branch=main,subdir=service"
+          against: "https://github.com/arkavo-org/opentdf-platform.git#branch=main,subdir=service"
       - uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491
         with:
           go-version: "1.21.8"

diff --git a/README.md b/README.md
@@ -1,10 +1,4 @@
-# OpenTDF Enhancements POC
-
-![CI](https://github.com/opentdf/platform/actions/workflows/checks.yaml/badge.svg?branch=main)
-
-![lint](https://github.com/opentdf/platform/actions/workflows/lint-all.yaml/badge.svg?branch=main)
-
-![Vulnerability Check](https://github.com/opentdf/platform/actions/workflows/vulnerability-check.yaml/badge.svg?branch=main)
+# OpenTDF Platform (Fork of)
 
 ## Documentation
 
@@ -51,20 +45,20 @@ On macOS, these can be installed with [brew](https://docs.brew.sh/Installation)
 > [!NOTE]
 > Migrations are handled automatically by the server. This can be disabled via the config file, as
 > needed. They can also be run manually using the `migrate` command
-> (`make go.work`;`go run github.com/opentdf/platform/service migrate up`).
+> (`make go.work`;`go run github.com/arkavo-org/opentdf-platform/service migrate up`).
 
 1. `docker-compose up`
 2. Create an OpenTDF config file: `opentdf.yaml`
    1. The `opentdf-example.yaml` file is a good starting point, but you may need to modify it to match your environment.
    2. The `opentdf-example-no-kas.yaml` file configures the platform to run insecurely without KAS and without endpoint auth.
-3. Provision keycloak `go run github.com/opentdf/platform/service provision keycloak`
+3. Provision keycloak `go run github.com/arkavo-org/opentdf-platform/service provision keycloak`
 4. Configure KAS keys and your HSM with `.github/scripts/hsm-init-temporary-keys.sh`
-5. Run the server `go run github.com/opentdf/platform/service start`
+5. Run the server `go run github.com/arkavo-org/opentdf-platform/service start`
    1. _Alt_ use the hot-reload development environment `air`
 6. The server is now running on `localhost:8080` (or the port specified in the config file)
 
 Note: support was added to provision a set of fixture data into the database.
-Run `go run github.com/opentdf/platform/service provision fixtures -h` for more information.
+Run `go run github.com/arkavo-org/opentdf-platform/service provision fixtures -h` for more information.
 
 ### Generation
 
@@ -117,4 +111,4 @@ To see how to generate key pairs that KAS can use, review the [the temp keys ini
 ### Policy
 
 The policy service is responsible for managing policy configurations. It provides a gRPC API for
-creating, updating, and deleting policy configurations. [Docs](https://github.com/opentdf/platform/tree/main/docs)
+creating, updating, and deleting policy configurations. [Docs](https://github.com/arkavo-org/opentdf-platform/tree/main/docs)
diff --git a/buf.gen.grpc.docs.yaml b/buf.gen.grpc.docs.yaml
@@ -2,7 +2,7 @@ version: v1
 managed:
   enabled: true
   go_package_prefix:
-    default: github.com/opentdf/platform/protocol/go
+    default: github.com/arkavo-org/opentdf-platform/protocol/go
     except:
       - buf.build/bufbuild/protovalidate
       - buf.build/googleapis/googleapis

diff --git a/buf.gen.openapi.docs.yaml b/buf.gen.openapi.docs.yaml
@@ -2,7 +2,7 @@ version: v1
 managed:
   enabled: true
   go_package_prefix:
-    default: github.com/opentdf/platform/protocol/go
+    default: github.com/arkavo-org/opentdf-platform/protocol/go
     except:
       - buf.build/bufbuild/protovalidate
       - buf.build/googleapis/googleapis

diff --git a/buf.gen.yaml b/buf.gen.yaml
@@ -2,7 +2,7 @@ version: v1
 managed:
   enabled: true
   go_package_prefix:
-    default: github.com/opentdf/platform/protocol/go
+    default: github.com/arkavo-org/opentdf-platform/protocol/go
     except:
       - buf.build/bufbuild/protovalidate
       - buf.build/googleapis/googleapis

diff --git a/examples/cmd/attributes.go b/examples/cmd/attributes.go
@@ -5,10 +5,10 @@ import (
 	"fmt"
 	"log/slog"
 
-	"github.com/opentdf/platform/protocol/go/policy"
-	"github.com/opentdf/platform/protocol/go/policy/attributes"
-	"github.com/opentdf/platform/protocol/go/policy/namespaces"
-	"github.com/opentdf/platform/sdk"
+	"github.com/arkavo-org/opentdf-platform/protocol/go/policy"
+	"github.com/arkavo-org/opentdf-platform/protocol/go/policy/attributes"
+	"github.com/arkavo-org/opentdf-platform/protocol/go/policy/namespaces"
+	"github.com/arkavo-org/opentdf-platform/sdk"
 	"github.com/spf13/cobra"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"

diff --git a/examples/cmd/authorization.go b/examples/cmd/authorization.go
@@ -5,9 +5,9 @@ import (
 	"fmt"
 	"log/slog"
 
-	"github.com/opentdf/platform/protocol/go/authorization"
-	"github.com/opentdf/platform/protocol/go/policy"
-	"github.com/opentdf/platform/sdk"
+	"github.com/arkavo-org/opentdf-platform/protocol/go/authorization"
+	"github.com/arkavo-org/opentdf-platform/protocol/go/policy"
+	"github.com/arkavo-org/opentdf-platform/sdk"
 	"github.com/spf13/cobra"
 	"google.golang.org/protobuf/encoding/protojson"
 )

diff --git a/examples/cmd/decrypt.go b/examples/cmd/decrypt.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/opentdf/platform/sdk"
+	"github.com/arkavo-org/opentdf-platform/sdk"
 	"github.com/spf13/cobra"
 )
 

diff --git a/examples/cmd/encrypt.go b/examples/cmd/encrypt.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/opentdf/platform/sdk"
+	"github.com/arkavo-org/opentdf-platform/sdk"
 	"github.com/spf13/cobra"
 )
 

diff --git a/examples/go.mod b/examples/go.mod
@@ -1,19 +1,17 @@
-module github.com/opentdf/platform/examples
+module github.com/arkavo-org/opentdf-platform/examples
 
-go 1.21.8
+go 1.22.2
 
 require (
-	github.com/opentdf/platform/protocol/go v0.0.0-00010101000000-000000000000
-	github.com/opentdf/platform/sdk v0.0.0-00010101000000-000000000000
 	github.com/spf13/cobra v1.8.0
 	google.golang.org/grpc v1.62.1
 	google.golang.org/protobuf v1.33.0
 )
 
 replace (
-	github.com/opentdf/platform/lib/ocrypto => ../lib/ocrypto
-	github.com/opentdf/platform/protocol/go => ../protocol/go
-	github.com/opentdf/platform/sdk => ../sdk
+	github.com/arkavo-org/opentdf-platform/lib/ocrypto => ../lib/ocrypto
+	github.com/arkavo-org/opentdf-platform/protocol/go => ../protocol/go
+	github.com/arkavo-org/opentdf-platform/sdk => ../sdk
 )
 
 require (
@@ -32,7 +30,6 @@ require (
 	github.com/lestrrat-go/iter v1.0.2 // indirect
 	github.com/lestrrat-go/jwx/v2 v2.0.21 // indirect
 	github.com/lestrrat-go/option v1.0.1 // indirect
-	github.com/opentdf/platform/lib/ocrypto v0.0.0-00010101000000-000000000000 // indirect
 	github.com/rogpeppe/go-internal v1.12.0 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/segmentio/asm v1.2.0 // indirect

diff --git a/examples/main.go b/examples/main.go
@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/opentdf/platform/examples/cmd"
+	"github.com/arkavo-org/opentdf-platform/examples/cmd"
 )
 
 func main() {

diff --git a/lib/ocrypto/go.mod b/lib/ocrypto/go.mod
@@ -1,3 +1,3 @@
-module github.com/opentdf/platform/lib/ocrypto
+module github.com/arkavo-org/opentdf-platform/lib/ocrypto
 
-go 1.21.8
+go 1.22.2
diff --git a/protocol/go/authorization/authorization.pb.go b/protocol/go/authorization/authorization.pb.go
diff --git a/protocol/go/go.mod b/protocol/go/go.mod
diff --git a/protocol/go/kasregistry/key_access_server_registry.pb.go b/protocol/go/kasregistry/key_access_server_registry.pb.go
diff --git a/protocol/go/policy/attributes/attributes.pb.go b/protocol/go/policy/attributes/attributes.pb.go
diff --git a/protocol/go/policy/namespaces/namespaces.pb.go b/protocol/go/policy/namespaces/namespaces.pb.go
diff --git a/protocol/go/policy/objects.pb.go b/protocol/go/policy/objects.pb.go
diff --git a/protocol/go/policy/resourcemapping/resource_mapping.pb.go b/protocol/go/policy/resourcemapping/resource_mapping.pb.go
diff --git a/protocol/go/policy/subjectmapping/subject_mapping.pb.go b/protocol/go/policy/subjectmapping/subject_mapping.pb.go
diff --git a/sdk/README.md b/sdk/README.md
@@ -12,7 +12,7 @@ import bytes
 import io
 import os
 import strings
-import "github.com/opentdf/platform/sdk"
+import "github.com/arkavo-org/opentdf-platform/sdk"
 
 
 func main() {

diff --git a/sdk/auth/token_adding_interceptor_test.go b/sdk/auth/token_adding_interceptor_test.go
@@ -13,11 +13,11 @@ import (
 	"slices"
 	"testing"
 
+	"github.com/arkavo-org/opentdf-platform/protocol/go/kas"
 	"github.com/lestrrat-go/jwx/v2/jwa"
 	"github.com/lestrrat-go/jwx/v2/jwk"
 	"github.com/lestrrat-go/jwx/v2/jws"
 	"github.com/lestrrat-go/jwx/v2/jwt"
-	"github.com/opentdf/platform/protocol/go/kas"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/credentials/insecure"

diff --git a/sdk/auth_config.go b/sdk/auth_config.go
@@ -12,8 +12,8 @@ import (
 	"strings"
 	"time"
 
+	"github.com/arkavo-org/opentdf-platform/lib/ocrypto"
 	"github.com/golang-jwt/jwt/v4"
-	"github.com/opentdf/platform/lib/ocrypto"
 )
 
 type AuthConfig struct {

diff --git a/sdk/go.mod b/sdk/go.mod
@@ -1,23 +1,21 @@
-module github.com/opentdf/platform/sdk
+module github.com/arkavo-org/opentdf-platform/sdk
 
-go 1.21.8
+go 1.22.2
 
 require (
 	github.com/docker/go-connections v0.5.0
 	github.com/golang-jwt/jwt/v4 v4.5.0
 	github.com/google/uuid v1.6.0
 	github.com/lestrrat-go/jwx/v2 v2.0.21
-	github.com/opentdf/platform/lib/ocrypto v0.0.0-00010101000000-000000000000
-	github.com/opentdf/platform/protocol/go v0.0.0-00010101000000-000000000000
 	github.com/stretchr/testify v1.9.0
 	github.com/testcontainers/testcontainers-go v0.28.0
 	google.golang.org/grpc v1.62.1
 	google.golang.org/protobuf v1.33.0
 )
 
 replace (
-	github.com/opentdf/platform/lib/ocrypto => ../lib/ocrypto
-	github.com/opentdf/platform/protocol/go => ../protocol/go
+	github.com/arkavo-org/opentdf-platform/lib/ocrypto => ../lib/ocrypto
+	github.com/arkavo-org/opentdf-platform/protocol/go => ../protocol/go
 )
 
 require (

diff --git a/sdk/idp_access_token_source.go b/sdk/idp_access_token_source.go
@@ -11,11 +11,11 @@ import (
 	"strings"
 	"sync"
 
+	"github.com/arkavo-org/opentdf-platform/lib/ocrypto"
+	"github.com/arkavo-org/opentdf-platform/sdk/auth"
+	"github.com/arkavo-org/opentdf-platform/sdk/internal/oauth"
 	"github.com/lestrrat-go/jwx/v2/jwa"
 	"github.com/lestrrat-go/jwx/v2/jwk"
-	"github.com/opentdf/platform/lib/ocrypto"
-	"github.com/opentdf/platform/sdk/auth"
-	"github.com/opentdf/platform/sdk/internal/oauth"
 )
 
 const (

diff --git a/sdk/kas_client.go b/sdk/kas_client.go
@@ -7,11 +7,11 @@ import (
 	"net/url"
 	"time"
 
+	"github.com/arkavo-org/opentdf-platform/lib/ocrypto"
+	"github.com/arkavo-org/opentdf-platform/protocol/go/kas"
+	"github.com/arkavo-org/opentdf-platform/sdk/auth"
 	"github.com/lestrrat-go/jwx/v2/jwk"
 	"github.com/lestrrat-go/jwx/v2/jwt"
-	"github.com/opentdf/platform/lib/ocrypto"
-	"github.com/opentdf/platform/protocol/go/kas"
-	"github.com/opentdf/platform/sdk/auth"
 	"google.golang.org/grpc"
 )
 

diff --git a/sdk/kas_client_test.go b/sdk/kas_client_test.go
@@ -6,11 +6,11 @@ import (
 
 	"google.golang.org/grpc"
 
+	"github.com/arkavo-org/opentdf-platform/lib/ocrypto"
+	"github.com/arkavo-org/opentdf-platform/sdk/auth"
 	"github.com/lestrrat-go/jwx/v2/jwa"
 	"github.com/lestrrat-go/jwx/v2/jwk"
 	"github.com/lestrrat-go/jwx/v2/jwt"
-	"github.com/opentdf/platform/lib/ocrypto"
-	"github.com/opentdf/platform/sdk/auth"
 )
 
 type FakeAccessTokenSource struct {

diff --git a/sdk/options.go b/sdk/options.go
@@ -1,7 +1,7 @@
 package sdk
 
 import (
-	"github.com/opentdf/platform/sdk/internal/oauth"
+	"github.com/arkavo-org/opentdf-platform/sdk/internal/oauth"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"
 )

diff --git a/sdk/sdk.go b/sdk/sdk.go
@@ -5,13 +5,13 @@ import (
 	"errors"
 	"log/slog"
 
-	"github.com/opentdf/platform/protocol/go/authorization"
-	"github.com/opentdf/platform/protocol/go/kasregistry"
-	"github.com/opentdf/platform/protocol/go/policy/attributes"
-	"github.com/opentdf/platform/protocol/go/policy/namespaces"
-	"github.com/opentdf/platform/protocol/go/policy/resourcemapping"
-	"github.com/opentdf/platform/protocol/go/policy/subjectmapping"
-	"github.com/opentdf/platform/sdk/auth"
+	"github.com/arkavo-org/opentdf-platform/protocol/go/authorization"
+	"github.com/arkavo-org/opentdf-platform/protocol/go/kasregistry"
+	"github.com/arkavo-org/opentdf-platform/protocol/go/policy/attributes"
+	"github.com/arkavo-org/opentdf-platform/protocol/go/policy/namespaces"
+	"github.com/arkavo-org/opentdf-platform/protocol/go/policy/resourcemapping"
+	"github.com/arkavo-org/opentdf-platform/protocol/go/policy/subjectmapping"
+	"github.com/arkavo-org/opentdf-platform/sdk/auth"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
 )