Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
arkavo
Browse files Browse the repository at this point in the history
arkavo-com committed Feb 17, 2024
1 parent 4578c16 commit cec879c
Showing 17 changed files with 29 additions and 33 deletions.
4 changes: 2 additions & 2 deletions cmd/content.go
Original file line number Diff line number Diff line change
@@ -11,8 +11,8 @@ import (
"os"
"time"

"github.com/opentdf/backend-go/pkg/oidc"
tdf3 "github.com/opentdf/backend-go/pkg/tdf3/client"
"github.com/arkavo/backend-go/pkg/oidc"
tdf3 "github.com/arkavo/backend-go/pkg/tdf3/client"
"github.com/pelletier/go-toml/v2"
"github.com/spf13/cobra"
"github.com/spf13/viper"
4 changes: 2 additions & 2 deletions cmd/generate.go
Original file line number Diff line number Diff line change
@@ -12,8 +12,8 @@ import (
"strings"
"time"

"github.com/opentdf/backend-go/pkg/tdf3"
tdfClient "github.com/opentdf/backend-go/pkg/tdf3/client"
"github.com/arkavo/backend-go/pkg/tdf3"
tdfClient "github.com/arkavo/backend-go/pkg/tdf3/client"
"github.com/pelletier/go-toml/v2"
"github.com/spf13/cobra"
"github.com/spf13/viper"
5 changes: 2 additions & 3 deletions cmd/login.go
Original file line number Diff line number Diff line change
@@ -8,12 +8,11 @@ import (
"log"
"os"

tdfCrypto "github.com/arkavo/backend-go/internal/crypto"
"github.com/arkavo/backend-go/pkg/oidc"
"github.com/pelletier/go-toml/v2"
"github.com/spf13/cobra"
"github.com/spf13/viper"

tdfCrypto "github.com/opentdf/backend-go/internal/crypto"
"github.com/opentdf/backend-go/pkg/oidc"
"golang.org/x/oauth2"
)

2 changes: 1 addition & 1 deletion cmd/manifest.go
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ import (
"os"
"time"

tdf3 "github.com/opentdf/backend-go/pkg/tdf3/client"
tdf3 "github.com/arkavo/backend-go/pkg/tdf3/client"
"github.com/spf13/cobra"
)

4 changes: 2 additions & 2 deletions cmd/metadata.go
Original file line number Diff line number Diff line change
@@ -10,8 +10,8 @@ import (
"os"
"time"

"github.com/opentdf/backend-go/pkg/oidc"
tdf3 "github.com/opentdf/backend-go/pkg/tdf3/client"
"github.com/arkavo/backend-go/pkg/oidc"
tdf3 "github.com/arkavo/backend-go/pkg/tdf3/client"
"github.com/pelletier/go-toml/v2"
"github.com/spf13/cobra"
"github.com/spf13/viper"
8 changes: 4 additions & 4 deletions cmd/microservice/main.go
Original file line number Diff line number Diff line change
@@ -16,13 +16,13 @@ import (
"strconv"
"time"

"github.com/arkavo/backend-go/pkg/access"
"github.com/arkavo/backend-go/pkg/keys"
"github.com/arkavo/backend-go/pkg/p11"
"github.com/arkavo/backend-go/pkg/wellknown"
"github.com/coreos/go-oidc/v3/oidc"
"github.com/lestrrat-go/jwx/v2/jwk"
"github.com/miekg/pkcs11"
"github.com/opentdf/backend-go/pkg/access"
"github.com/opentdf/backend-go/pkg/keys"
"github.com/opentdf/backend-go/pkg/p11"
"github.com/opentdf/backend-go/pkg/wellknown"
"golang.org/x/oauth2"
)

6 changes: 3 additions & 3 deletions cmd/opentdf/main.go
Original file line number Diff line number Diff line change
@@ -18,11 +18,11 @@ import (
"os"
"strings"

"github.com/arkavo/backend-go/pkg/archive/manifest"
"github.com/arkavo/backend-go/pkg/tdf3"
"github.com/arkavo/backend-go/pkg/wellknown"
"github.com/coreos/go-oidc/v3/oidc"
"github.com/lestrrat-go/jwx/v2/jwk"
"github.com/opentdf/backend-go/pkg/archive/manifest"
"github.com/opentdf/backend-go/pkg/tdf3"
"github.com/opentdf/backend-go/pkg/wellknown"
"golang.org/x/oauth2/clientcredentials"
)

3 changes: 0 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
@@ -2,8 +2,6 @@ module github.com/arkavo/backend-go

go 1.22

replace github.com/opentdf/backend-go => ./

require (
dario.cat/mergo v1.0.0
github.com/charmbracelet/bubbles v0.18.0
@@ -51,7 +49,6 @@ require (
github.com/muesli/cancelreader v0.2.2 // indirect
github.com/muesli/reflow v0.3.0 // indirect
github.com/muesli/termenv v0.15.2 // indirect
github.com/opentdf/backend-go v0.1.14 // indirect
github.com/rivo/uniseg v0.4.7 // indirect
github.com/sagikazarmark/locafero v0.4.0 // indirect
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
4 changes: 2 additions & 2 deletions internal/kas/client.go
Original file line number Diff line number Diff line change
@@ -12,10 +12,10 @@ import (
"net/url"
"time"

tdfCrypto "github.com/arkavo/backend-go/internal/crypto"
"github.com/arkavo/backend-go/pkg/tdf3"
"github.com/lestrrat-go/jwx/v2/jwa"
"github.com/lestrrat-go/jwx/v2/jwt"
tdfCrypto "github.com/opentdf/backend-go/internal/crypto"
"github.com/opentdf/backend-go/pkg/tdf3"
)

const (
2 changes: 1 addition & 1 deletion internal/version/version.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package version

import "github.com/opentdf/backend-go/internal/conf"
import "github.com/arkavo/backend-go/internal/conf"

type Stat struct {
Version string `json:"version"`
2 changes: 1 addition & 1 deletion main.go
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ Copyright © 2023 OpenTDF [email protected]
*/
package main

import "github.com/opentdf/backend-go/cmd"
import "github.com/arkavo/backend-go/cmd"

func main() {
cmd.Execute()
2 changes: 1 addition & 1 deletion pkg/access/provider.go
Original file line number Diff line number Diff line change
@@ -6,8 +6,8 @@ import (
"crypto/x509"
"net/url"

"github.com/arkavo/backend-go/pkg/p11"
"github.com/coreos/go-oidc/v3/oidc"
"github.com/opentdf/backend-go/pkg/p11"
// "golang.org/x/oauth2"
)

4 changes: 2 additions & 2 deletions pkg/access/rewrap.go
Original file line number Diff line number Diff line change
@@ -8,9 +8,9 @@ import (
"encoding/json"
"encoding/pem"
"fmt"
"github.com/arkavo/backend-go/pkg/p11"
"github.com/arkavo/backend-go/pkg/tdf3"
"github.com/go-jose/go-jose/v3/jwt"
"github.com/opentdf/backend-go/pkg/p11"
"github.com/opentdf/backend-go/pkg/tdf3"
"log"
"net/http"
"strings"
2 changes: 1 addition & 1 deletion pkg/archive/manifest/object.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package manifest

import "github.com/opentdf/backend-go/pkg/tdf3"
import "github.com/arkavo/backend-go/pkg/tdf3"

type Object struct {
EncryptionInformation tdf3.EncryptionInformation `json:"encryptionInformation"`
2 changes: 1 addition & 1 deletion pkg/oidc/oidc.go
Original file line number Diff line number Diff line change
@@ -4,8 +4,8 @@ import (
"fmt"
"net/http"

"github.com/arkavo/backend-go/internal/auth"
"github.com/goccy/go-json"
"github.com/opentdf/backend-go/internal/auth"
"golang.org/x/oauth2"
"golang.org/x/oauth2/clientcredentials"
)
6 changes: 3 additions & 3 deletions pkg/tdf3/client/client.go
Original file line number Diff line number Diff line change
@@ -14,10 +14,10 @@ import (
"net/url"

"dario.cat/mergo"
tdfCrypto "github.com/arkavo/backend-go/internal/crypto"
"github.com/arkavo/backend-go/internal/kas"
"github.com/arkavo/backend-go/pkg/tdf3"
"github.com/google/uuid"
tdfCrypto "github.com/opentdf/backend-go/internal/crypto"
"github.com/opentdf/backend-go/internal/kas"
"github.com/opentdf/backend-go/pkg/tdf3"
)

const (
2 changes: 1 addition & 1 deletion pkg/tdf3/integrity.go
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ import (
"errors"
"fmt"

tdfCrypto "github.com/opentdf/backend-go/internal/crypto"
tdfCrypto "github.com/arkavo/backend-go/internal/crypto"
)

const segmentSize int = 1024 * 1024

0 comments on commit cec879c

Please sign in to comment.