WIP: Migrating Go module to in-toto (#101)

* changing module name and imports * Change archivista api usage to in-toto/archivista/pkg/api Signed-off-by: John Kjell <[email protected]> --------- Signed-off-by: chaosinthecrd <[email protected]> Signed-off-by: John Kjell <[email protected]> Co-authored-by: John Kjell <[email protected]>
in-toto · Dec 14, 2023 · 5b5647c · 5b5647c
1 parent c555ac6
commit 5b5647c
Show file tree

Hide file tree

Showing 60 changed files with 165 additions and 162 deletions.
diff --git a/README.md b/README.md
@@ -19,7 +19,7 @@ This library is currently pre-1.0 and therefore the API may be subject to breaki
 - A selection of attestation sources to search for attestation collections
 
 ## Documentation
-For more detail regarding the library itself, we recommend viewing [pkg.go.dev](https://pkg.go.dev/github.com/testifysec/go-witness). For
+For more detail regarding the library itself, we recommend viewing [pkg.go.dev](https://pkg.go.dev/github.com/in-toto/go-witness). For
 the documentation of the witness project, please view [the main witness repository](https://github.com/in-toto/witness/tree/main/docs).
 
 ## Requirements

diff --git a/archivista/download.go b/archivista/download.go
@@ -17,8 +17,8 @@ package archivista
 import (
 	"context"
 
-	archivistaapi "github.com/testifysec/archivista-api"
-	"github.com/testifysec/go-witness/dsse"
+	archivistaapi "github.com/in-toto/archivista/pkg/api"
+	"github.com/in-toto/go-witness/dsse"
 )
 
 func (c *Client) Download(ctx context.Context, gitoid string) (dsse.Envelope, error) {

diff --git a/archivista/searchgitoids.go b/archivista/searchgitoids.go
@@ -17,7 +17,7 @@ package archivista
 import (
 	"context"
 
-	archivistaapi "github.com/testifysec/archivista-api"
+	archivistaapi "github.com/in-toto/archivista/pkg/api"
 )
 
 type searchGitoidResponse struct {

diff --git a/archivista/store.go b/archivista/store.go
@@ -17,8 +17,8 @@ package archivista
 import (
 	"context"
 
-	archivistaapi "github.com/testifysec/archivista-api"
-	"github.com/testifysec/go-witness/dsse"
+	archivistaapi "github.com/in-toto/archivista/pkg/api"
+	"github.com/in-toto/go-witness/dsse"
 )
 
 func (c *Client) Store(ctx context.Context, env dsse.Envelope) (string, error) {

diff --git a/attestation/aws-iid/aws-iid.go b/attestation/aws-iid/aws-iid.go
@@ -27,9 +27,9 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/ec2metadata"
 	"github.com/aws/aws-sdk-go/aws/session"
-	"github.com/testifysec/go-witness/attestation"
-	"github.com/testifysec/go-witness/cryptoutil"
-	"github.com/testifysec/go-witness/log"
+	"github.com/in-toto/go-witness/attestation"
+	"github.com/in-toto/go-witness/cryptoutil"
+	"github.com/in-toto/go-witness/log"
 )
 
 const (
@@ -42,8 +42,8 @@ const (
 const (
 	docPath = "instance-identity/document"
 	sigPath = "instance-identity/signature"
-	//https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/verify-signature.html
-	//The following AWS public certificate is for all AWS Regions, except Hong Kong, Bahrain, China, and GovCloud.
+	// https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/verify-signature.html
+	// The following AWS public certificate is for all AWS Regions, except Hong Kong, Bahrain, China, and GovCloud.
 	awsCACertPEM = `-----BEGIN CERTIFICATE-----
 MIIDIjCCAougAwIBAgIJAKnL4UEDMN/FMA0GCSqGSIb3DQEBBQUAMGoxCzAJBgNV
 BAYTAlVTMRMwEQYDVQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdTZWF0dGxlMRgw

diff --git a/attestation/aws-iid/aws-iid_test.go b/attestation/aws-iid/aws-iid_test.go
@@ -24,9 +24,9 @@ import (
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/session"
+	"github.com/in-toto/go-witness/attestation"
+	"github.com/in-toto/go-witness/cryptoutil"
 	"github.com/stretchr/testify/require"
-	"github.com/testifysec/go-witness/attestation"
-	"github.com/testifysec/go-witness/cryptoutil"
 )
 
 const iid = `{

diff --git a/attestation/collection.go b/attestation/collection.go
@@ -19,7 +19,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/testifysec/go-witness/cryptoutil"
+	"github.com/in-toto/go-witness/cryptoutil"
 )
 
 const CollectionType = "https://witness.testifysec.com/attestation-collection/v0.1"

diff --git a/attestation/commandrun/commandrun.go b/attestation/commandrun/commandrun.go
@@ -20,9 +20,9 @@ import (
 	"os"
 	"os/exec"
 
-	"github.com/testifysec/go-witness/attestation"
-	"github.com/testifysec/go-witness/attestation/environment"
-	"github.com/testifysec/go-witness/cryptoutil"
+	"github.com/in-toto/go-witness/attestation"
+	"github.com/in-toto/go-witness/attestation/environment"
+	"github.com/in-toto/go-witness/cryptoutil"
 )
 
 const (

diff --git a/attestation/commandrun/tracing_linux.go b/attestation/commandrun/tracing_linux.go
@@ -26,10 +26,10 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/testifysec/go-witness/attestation"
-	"github.com/testifysec/go-witness/attestation/environment"
-	"github.com/testifysec/go-witness/cryptoutil"
-	"github.com/testifysec/go-witness/log"
+	"github.com/in-toto/go-witness/attestation"
+	"github.com/in-toto/go-witness/attestation/environment"
+	"github.com/in-toto/go-witness/cryptoutil"
+	"github.com/in-toto/go-witness/log"
 	"golang.org/x/sys/unix"
 )
 

diff --git a/attestation/commandrun/tracing_unsupported.go b/attestation/commandrun/tracing_unsupported.go
@@ -20,7 +20,7 @@ import (
 	"errors"
 	"os/exec"
 
-	"github.com/testifysec/go-witness/attestation"
+	"github.com/in-toto/go-witness/attestation"
 )
 
 func enableTracing(c *exec.Cmd) {

diff --git a/attestation/context.go b/attestation/context.go
@@ -21,8 +21,8 @@ import (
 	"os"
 	"time"
 
-	"github.com/testifysec/go-witness/cryptoutil"
-	"github.com/testifysec/go-witness/log"
+	"github.com/in-toto/go-witness/cryptoutil"
+	"github.com/in-toto/go-witness/log"
 )
 
 type RunType string

diff --git a/attestation/environment/environment.go b/attestation/environment/environment.go
@@ -20,7 +20,7 @@ import (
 	"runtime"
 	"strings"
 
-	"github.com/testifysec/go-witness/attestation"
+	"github.com/in-toto/go-witness/attestation"
 )
 
 const (

diff --git a/attestation/environment/environment_test.go b/attestation/environment/environment_test.go
@@ -18,8 +18,8 @@ import (
 	"os"
 	"testing"
 
+	"github.com/in-toto/go-witness/attestation"
 	"github.com/stretchr/testify/require"
-	"github.com/testifysec/go-witness/attestation"
 )
 
 func TestEnvironment(t *testing.T) {

diff --git a/attestation/factory.go b/attestation/factory.go
@@ -17,8 +17,8 @@ package attestation
 import (
 	"fmt"
 
-	"github.com/testifysec/go-witness/cryptoutil"
-	"github.com/testifysec/go-witness/registry"
+	"github.com/in-toto/go-witness/cryptoutil"
+	"github.com/in-toto/go-witness/registry"
 )
 
 var (

diff --git a/attestation/file/file.go b/attestation/file/file.go
@@ -21,8 +21,8 @@ import (
 	"path/filepath"
 
 	"github.com/edwarnicke/gitoid"
-	"github.com/testifysec/go-witness/cryptoutil"
-	"github.com/testifysec/go-witness/log"
+	"github.com/in-toto/go-witness/cryptoutil"
+	"github.com/in-toto/go-witness/log"
 )
 
 // recordArtifacts will walk basePath and record the digests of each file with each of the functions in hashes.

diff --git a/attestation/file/file_test.go b/attestation/file/file_test.go
@@ -20,8 +20,8 @@ import (
 	"path/filepath"
 	"testing"
 
+	"github.com/in-toto/go-witness/cryptoutil"
 	"github.com/stretchr/testify/require"
-	"github.com/testifysec/go-witness/cryptoutil"
 )
 
 func TestBrokenSymlink(t *testing.T) {

diff --git a/attestation/gcp-iit/gcp-iit.go b/attestation/gcp-iit/gcp-iit.go
@@ -22,10 +22,10 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/testifysec/go-witness/attestation"
-	"github.com/testifysec/go-witness/attestation/jwt"
-	"github.com/testifysec/go-witness/cryptoutil"
-	"github.com/testifysec/go-witness/log"
+	"github.com/in-toto/go-witness/attestation"
+	"github.com/in-toto/go-witness/attestation/jwt"
+	"github.com/in-toto/go-witness/cryptoutil"
+	"github.com/in-toto/go-witness/log"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 )

diff --git a/attestation/git/git.go b/attestation/git/git.go
@@ -23,8 +23,8 @@ import (
 	"github.com/go-git/go-git/v5"
 	"github.com/go-git/go-git/v5/plumbing"
 	"github.com/go-git/go-git/v5/plumbing/object"
-	"github.com/testifysec/go-witness/attestation"
-	"github.com/testifysec/go-witness/cryptoutil"
+	"github.com/in-toto/go-witness/attestation"
+	"github.com/in-toto/go-witness/cryptoutil"
 )
 
 const (

diff --git a/attestation/git/git_test.go b/attestation/git/git_test.go
@@ -26,8 +26,8 @@ import (
 	"github.com/go-git/go-git/v5"
 	"github.com/go-git/go-git/v5/plumbing"
 	"github.com/go-git/go-git/v5/plumbing/object"
+	"github.com/in-toto/go-witness/attestation"
 	"github.com/stretchr/testify/require"
-	"github.com/testifysec/go-witness/attestation"
 )
 
 func TestNew(t *testing.T) {

diff --git a/attestation/github/github.go b/attestation/github/github.go
@@ -26,10 +26,10 @@ import (
 	"strings"
 
 	"github.com/davecgh/go-spew/spew"
-	"github.com/testifysec/go-witness/attestation"
-	"github.com/testifysec/go-witness/attestation/jwt"
-	"github.com/testifysec/go-witness/cryptoutil"
-	"github.com/testifysec/go-witness/log"
+	"github.com/in-toto/go-witness/attestation"
+	"github.com/in-toto/go-witness/attestation/jwt"
+	"github.com/in-toto/go-witness/cryptoutil"
+	"github.com/in-toto/go-witness/log"
 )
 
 const (

diff --git a/attestation/gitlab/gitlab.go b/attestation/gitlab/gitlab.go
@@ -20,10 +20,10 @@ import (
 	"os"
 	"strings"
 
-	"github.com/testifysec/go-witness/attestation"
-	"github.com/testifysec/go-witness/attestation/jwt"
-	"github.com/testifysec/go-witness/cryptoutil"
-	"github.com/testifysec/go-witness/log"
+	"github.com/in-toto/go-witness/attestation"
+	"github.com/in-toto/go-witness/attestation/jwt"
+	"github.com/in-toto/go-witness/cryptoutil"
+	"github.com/in-toto/go-witness/log"
 )
 
 const (

diff --git a/attestation/jwt/jwt.go b/attestation/jwt/jwt.go
@@ -19,7 +19,7 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/testifysec/go-witness/attestation"
+	"github.com/in-toto/go-witness/attestation"
 	"gopkg.in/square/go-jose.v2"
 	"gopkg.in/square/go-jose.v2/jwt"
 )

diff --git a/attestation/material/material.go b/attestation/material/material.go
@@ -17,9 +17,9 @@ package material
 import (
 	"encoding/json"
 
-	"github.com/testifysec/go-witness/attestation"
-	"github.com/testifysec/go-witness/attestation/file"
-	"github.com/testifysec/go-witness/cryptoutil"
+	"github.com/in-toto/go-witness/attestation"
+	"github.com/in-toto/go-witness/attestation/file"
+	"github.com/in-toto/go-witness/cryptoutil"
 )
 
 const (

diff --git a/attestation/maven/maven.go b/attestation/maven/maven.go
@@ -21,9 +21,9 @@ import (
 	"io"
 	"os"
 
-	"github.com/testifysec/go-witness/attestation"
-	"github.com/testifysec/go-witness/cryptoutil"
-	"github.com/testifysec/go-witness/log"
+	"github.com/in-toto/go-witness/attestation"
+	"github.com/in-toto/go-witness/cryptoutil"
+	"github.com/in-toto/go-witness/log"
 )
 
 const (

diff --git a/attestation/maven/maven_test.go b/attestation/maven/maven_test.go
@@ -19,9 +19,9 @@ import (
 	"path/filepath"
 	"testing"
 
+	"github.com/in-toto/go-witness/attestation"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/testifysec/go-witness/attestation"
 )
 
 func writeTempPomXml(t *testing.T) (string, error) {

diff --git a/attestation/oci/oci.go b/attestation/oci/oci.go
@@ -26,9 +26,9 @@ import (
 	"os"
 	"strings"
 
-	"github.com/testifysec/go-witness/attestation"
-	"github.com/testifysec/go-witness/cryptoutil"
-	"github.com/testifysec/go-witness/log"
+	"github.com/in-toto/go-witness/attestation"
+	"github.com/in-toto/go-witness/cryptoutil"
+	"github.com/in-toto/go-witness/log"
 )
 
 const (

diff --git a/attestation/oci/oci_test.go b/attestation/oci/oci_test.go
@@ -20,9 +20,9 @@ import (
 	"os"
 	"testing"
 
+	"github.com/in-toto/go-witness/attestation"
+	"github.com/in-toto/go-witness/cryptoutil"
 	"github.com/stretchr/testify/require"
-	"github.com/testifysec/go-witness/attestation"
-	"github.com/testifysec/go-witness/cryptoutil"
 )
 
 type testProducter struct {

diff --git a/attestation/product/product.go b/attestation/product/product.go
@@ -24,10 +24,10 @@ import (
 	"path/filepath"
 
 	"github.com/gobwas/glob"
-	"github.com/testifysec/go-witness/attestation"
-	"github.com/testifysec/go-witness/attestation/file"
-	"github.com/testifysec/go-witness/cryptoutil"
-	"github.com/testifysec/go-witness/registry"
+	"github.com/in-toto/go-witness/attestation"
+	"github.com/in-toto/go-witness/attestation/file"
+	"github.com/in-toto/go-witness/cryptoutil"
+	"github.com/in-toto/go-witness/registry"
 )
 
 const (

diff --git a/attestation/product/product_test.go b/attestation/product/product_test.go
@@ -23,10 +23,10 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/in-toto/go-witness/attestation"
+	"github.com/in-toto/go-witness/cryptoutil"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/testifysec/go-witness/attestation"
-	"github.com/testifysec/go-witness/cryptoutil"
 )
 
 func TestFromDigestMap(t *testing.T) {

diff --git a/attestation/sarif/sarif.go b/attestation/sarif/sarif.go
@@ -21,10 +21,10 @@ import (
 	"os"
 	"strings"
 
+	"github.com/in-toto/go-witness/attestation"
+	"github.com/in-toto/go-witness/cryptoutil"
+	"github.com/in-toto/go-witness/log"
 	"github.com/owenrumney/go-sarif/sarif"
-	"github.com/testifysec/go-witness/attestation"
-	"github.com/testifysec/go-witness/cryptoutil"
-	"github.com/testifysec/go-witness/log"
 )
 
 const (

diff --git a/dsse/dsse_test.go b/dsse/dsse_test.go
@@ -28,9 +28,9 @@ import (
 	"testing"
 	"time"
 
+	"github.com/in-toto/go-witness/cryptoutil"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/testifysec/go-witness/cryptoutil"
 )
 
 func createRsaKey() (*rsa.PrivateKey, *rsa.PublicKey, error) {

diff --git a/dsse/sign.go b/dsse/sign.go
@@ -21,7 +21,7 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/testifysec/go-witness/cryptoutil"
+	"github.com/in-toto/go-witness/cryptoutil"
 )
 
 type Timestamper interface {

diff --git a/dsse/verify.go b/dsse/verify.go
@@ -21,7 +21,7 @@ import (
 	"io"
 	"time"
 
-	"github.com/testifysec/go-witness/cryptoutil"
+	"github.com/in-toto/go-witness/cryptoutil"
 )
 
 type TimestampVerifier interface {
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,7 +19,7 @@ import ( @@
     	"fmt"
     	"time"
-    	"github.com/testifysec/go-witness/cryptoutil"
+    	"github.com/in-toto/go-witness/cryptoutil"
     )
     const CollectionType = "https://witness.testifysec.com/attestation-collection/v0.1"
@@ Expand Down @@