changing go-witness back for now, makes more sense

in-toto · Dec 13, 2023 · c7e725e · c7e725e
1 parent a9c82b0
commit c7e725e
Show file tree

Hide file tree

Showing 15 changed files with 51 additions and 51 deletions.
diff --git a/cmd/config.go b/cmd/config.go
@@ -20,11 +20,11 @@ import (
 	"os"
 	"strings"
 
-	"github.com/in-toto/go-witness/log"
 	"github.com/in-toto/witness/options"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 	"github.com/spf13/viper"
+	"github.com/testifysec/go-witness/log"
 )
 
 func initConfig(rootCmd *cobra.Command, rootOptions *options.RootOptions) error {

diff --git a/cmd/keyloader.go b/cmd/keyloader.go
@@ -19,11 +19,11 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/in-toto/go-witness/cryptoutil"
-	"github.com/in-toto/go-witness/log"
-	"github.com/in-toto/go-witness/signer"
 	"github.com/in-toto/witness/options"
 	"github.com/spf13/pflag"
+	"github.com/testifysec/go-witness/cryptoutil"
+	"github.com/testifysec/go-witness/log"
+	"github.com/testifysec/go-witness/signer"
 )
 
 // signerProvidersFromFlags looks at all flags that were set by the user to determine which signer providers we should use

diff --git a/cmd/root.go b/cmd/root.go
@@ -18,9 +18,9 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/in-toto/go-witness/log"
 	"github.com/in-toto/witness/options"
 	"github.com/spf13/cobra"
+	"github.com/testifysec/go-witness/log"
 )
 
 var ro = &options.RootOptions{}

diff --git a/cmd/root_test.go b/cmd/root_test.go
@@ -26,12 +26,12 @@ import (
 	"testing"
 	"time"
 
-	"github.com/in-toto/go-witness/cryptoutil"
-	"github.com/in-toto/go-witness/signer"
-	"github.com/in-toto/go-witness/signer/file"
 	"github.com/in-toto/witness/options"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"github.com/testifysec/go-witness/cryptoutil"
+	"github.com/testifysec/go-witness/signer"
+	"github.com/testifysec/go-witness/signer/file"
 )
 
 const (

diff --git a/cmd/run.go b/cmd/run.go
@@ -20,19 +20,19 @@ import (
 	"encoding/json"
 	"fmt"
 
-	witness "github.com/in-toto/go-witness"
-	"github.com/in-toto/go-witness/archivista"
-	"github.com/in-toto/go-witness/attestation"
-	"github.com/in-toto/go-witness/attestation/commandrun"
-	"github.com/in-toto/go-witness/attestation/material"
-	"github.com/in-toto/go-witness/attestation/product"
-	"github.com/in-toto/go-witness/cryptoutil"
-	"github.com/in-toto/go-witness/dsse"
-	"github.com/in-toto/go-witness/log"
-	"github.com/in-toto/go-witness/registry"
-	"github.com/in-toto/go-witness/timestamp"
 	"github.com/in-toto/witness/options"
 	"github.com/spf13/cobra"
+	witness "github.com/testifysec/go-witness"
+	"github.com/testifysec/go-witness/archivista"
+	"github.com/testifysec/go-witness/attestation"
+	"github.com/testifysec/go-witness/attestation/commandrun"
+	"github.com/testifysec/go-witness/attestation/material"
+	"github.com/testifysec/go-witness/attestation/product"
+	"github.com/testifysec/go-witness/cryptoutil"
+	"github.com/testifysec/go-witness/dsse"
+	"github.com/testifysec/go-witness/log"
+	"github.com/testifysec/go-witness/registry"
+	"github.com/testifysec/go-witness/timestamp"
 )
 
 func RunCmd() *cobra.Command {

diff --git a/cmd/run_test.go b/cmd/run_test.go
@@ -24,13 +24,13 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/in-toto/go-witness/cryptoutil"
-	"github.com/in-toto/go-witness/dsse"
-	"github.com/in-toto/go-witness/signer"
-	"github.com/in-toto/go-witness/signer/file"
 	"github.com/in-toto/witness/options"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"github.com/testifysec/go-witness/cryptoutil"
+	"github.com/testifysec/go-witness/dsse"
+	"github.com/testifysec/go-witness/signer"
+	"github.com/testifysec/go-witness/signer/file"
 )
 
 func TestRunRSAKeyPair(t *testing.T) {

diff --git a/cmd/sign.go b/cmd/sign.go
@@ -19,12 +19,12 @@ import (
 	"fmt"
 	"os"
 
-	witness "github.com/in-toto/go-witness"
-	"github.com/in-toto/go-witness/cryptoutil"
-	"github.com/in-toto/go-witness/dsse"
-	"github.com/in-toto/go-witness/timestamp"
 	"github.com/in-toto/witness/options"
 	"github.com/spf13/cobra"
+	witness "github.com/testifysec/go-witness"
+	"github.com/testifysec/go-witness/cryptoutil"
+	"github.com/testifysec/go-witness/dsse"
+	"github.com/testifysec/go-witness/timestamp"
 )
 
 func SignCmd() *cobra.Command {

diff --git a/cmd/sign_test.go b/cmd/sign_test.go
@@ -22,10 +22,10 @@ import (
 	"os"
 	"testing"
 
-	"github.com/in-toto/go-witness/cryptoutil"
 	"github.com/in-toto/witness/options"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"github.com/testifysec/go-witness/cryptoutil"
 )
 
 func Test_runSignPolicyRSA(t *testing.T) {

diff --git a/cmd/verify.go b/cmd/verify.go
@@ -22,14 +22,14 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/in-toto/go-witness"
-	"github.com/in-toto/go-witness/archivista"
-	"github.com/in-toto/go-witness/cryptoutil"
-	"github.com/in-toto/go-witness/dsse"
-	"github.com/in-toto/go-witness/log"
-	"github.com/in-toto/go-witness/source"
 	"github.com/in-toto/witness/options"
 	"github.com/spf13/cobra"
+	witness "github.com/testifysec/go-witness"
+	"github.com/testifysec/go-witness/archivista"
+	"github.com/testifysec/go-witness/cryptoutil"
+	"github.com/testifysec/go-witness/dsse"
+	"github.com/testifysec/go-witness/log"
+	"github.com/testifysec/go-witness/source"
 )
 
 func VerifyCmd() *cobra.Command {

diff --git a/cmd/verify_test.go b/cmd/verify_test.go
@@ -28,15 +28,15 @@ import (
 	"testing"
 	"time"
 
-	witness "github.com/in-toto/go-witness"
-	"github.com/in-toto/go-witness/attestation/commandrun"
-	"github.com/in-toto/go-witness/cryptoutil"
-	"github.com/in-toto/go-witness/dsse"
-	"github.com/in-toto/go-witness/policy"
-	"github.com/in-toto/go-witness/signer"
-	"github.com/in-toto/go-witness/signer/file"
 	"github.com/in-toto/witness/options"
 	"github.com/stretchr/testify/require"
+	witness "github.com/testifysec/go-witness"
+	"github.com/testifysec/go-witness/attestation/commandrun"
+	"github.com/testifysec/go-witness/cryptoutil"
+	"github.com/testifysec/go-witness/dsse"
+	"github.com/testifysec/go-witness/policy"
+	"github.com/testifysec/go-witness/signer"
+	"github.com/testifysec/go-witness/signer/file"
 )
 
 func TestRunVerifyCA(t *testing.T) {

diff --git a/go.mod b/go.mod
@@ -8,7 +8,7 @@ require (
 	github.com/spf13/pflag v1.0.5
 	github.com/spf13/viper v1.15.0
 	github.com/stretchr/testify v1.8.4
-	github.com/in-toto/go-witness v0.1.17
+	github.com/testifysec/go-witness v0.1.17
 )
 
 require (

diff --git a/go.sum b/go.sum
@@ -329,10 +329,10 @@ github.com/subosito/gotenv v1.4.2 h1:X1TuBLAMDFbaTAChgCBLu3DU3UPyELpnF2jjJ2cz/S8
 github.com/subosito/gotenv v1.4.2/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0=
 github.com/tchap/go-patricia/v2 v2.3.1 h1:6rQp39lgIYZ+MHmdEq4xzuk1t7OdC35z/xm0BGhTkes=
 github.com/tchap/go-patricia/v2 v2.3.1/go.mod h1:VZRHKAb53DLaG+nA9EaYYiaEx6YztwDlLElMsnSHD4k=
-github.com/in-toto/archivista-api v0.0.0-20230220215059-632b84b82b76 h1:GAUgHyg4ss2DDTIYG9RuVxap2smkAGtzpXcOvNxlLic=
-github.com/in-toto/archivista-api v0.0.0-20230220215059-632b84b82b76/go.mod h1:6OYeTa1OOoVuqo9i8t6GAHtwg0CgofZVfwgVt7DgrwI=
-github.com/in-toto/go-witness v0.1.17 h1:T8GX9ejQVCioPgORH4Nr1Zc7+Nlx1SIk8YZYftNlw+M=
-github.com/in-toto/go-witness v0.1.17/go.mod h1:ljKDAQFb949IQMmch/B7kb1pYz1tJ10sSNjqM+HNijQ=
+github.com/testifysec/archivista-api v0.0.0-20230220215059-632b84b82b76 h1:GAUgHyg4ss2DDTIYG9RuVxap2smkAGtzpXcOvNxlLic=
+github.com/testifysec/archivista-api v0.0.0-20230220215059-632b84b82b76/go.mod h1:6OYeTa1OOoVuqo9i8t6GAHtwg0CgofZVfwgVt7DgrwI=
+github.com/testifysec/go-witness v0.1.17 h1:4saMtJJBfFd0CiZqBljysHawhFh/5MjqwQZPxMU9nNA=
+github.com/testifysec/go-witness v0.1.17/go.mod h1:ljKDAQFb949IQMmch/B7kb1pYz1tJ10sSNjqM+HNijQ=
 github.com/theupdateframework/go-tuf v0.5.2-0.20220930112810-3890c1e7ace4 h1:1i/Afw3rmaR1gF3sfVkG2X6ldkikQwA9zY380LrR5YI=
 github.com/theupdateframework/go-tuf v0.5.2-0.20220930112810-3890c1e7ace4/go.mod h1:vAqWV3zEs89byeFsAYoh/Q14vJTgJkHwnnRCWBBBINY=
 github.com/titanous/rocacheck v0.0.0-20171023193734-afe73141d399 h1:e/5i7d4oYZ+C1wj2THlRK+oAhjeS/TRQwMfkIuet3w0=

diff --git a/options/options.go b/options/options.go
@@ -18,9 +18,9 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/in-toto/go-witness/log"
-	"github.com/in-toto/go-witness/registry"
 	"github.com/spf13/cobra"
+	"github.com/testifysec/go-witness/log"
+	"github.com/testifysec/go-witness/registry"
 )
 
 type Interface interface {

diff --git a/options/run.go b/options/run.go
@@ -15,9 +15,9 @@
 package options
 
 import (
-	"github.com/in-toto/go-witness/attestation"
-	"github.com/in-toto/go-witness/log"
 	"github.com/spf13/cobra"
+	"github.com/testifysec/go-witness/attestation"
+	"github.com/testifysec/go-witness/log"
 )
 
 type RunOptions struct {

diff --git a/options/signers.go b/options/signers.go
@@ -15,8 +15,8 @@
 package options
 
 import (
-	"github.com/in-toto/go-witness/signer"
 	"github.com/spf13/cobra"
+	"github.com/testifysec/go-witness/signer"
 )
 
 type SignerOptions map[string][]func(signer.SignerProvider) (signer.SignerProvider, error)