diff --git a/archivist/client.go b/archivista/client.go similarity index 97% rename from archivist/client.go rename to archivista/client.go index 051019fc..ff61a01c 100644 --- a/archivist/client.go +++ b/archivista/client.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package archivist +package archivista type Client struct { url string diff --git a/archivist/download.go b/archivista/download.go similarity index 85% rename from archivist/download.go rename to archivista/download.go index 03bf4934..5550d45a 100644 --- a/archivist/download.go +++ b/archivista/download.go @@ -12,15 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -package archivist +package archivista import ( "context" - archivistapi "github.com/testifysec/archivist-api" + archivistaapi "github.com/testifysec/archivista-api" "github.com/testifysec/go-witness/dsse" ) func (c *Client) Download(ctx context.Context, gitoid string) (dsse.Envelope, error) { - return archivistapi.Download(ctx, c.url, gitoid) + return archivistaapi.Download(ctx, c.url, gitoid) } diff --git a/archivist/searchgitoids.go b/archivista/searchgitoids.go similarity index 91% rename from archivist/searchgitoids.go rename to archivista/searchgitoids.go index 7e6ff253..851840dc 100644 --- a/archivist/searchgitoids.go +++ b/archivista/searchgitoids.go @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -package archivist +package archivista import ( "context" - archivistapi "github.com/testifysec/archivist-api" + archivistaapi "github.com/testifysec/archivista-api" ) type searchGitoidResponse struct { @@ -65,7 +65,7 @@ func (c *Client) SearchGitoids(ctx context.Context, vars SearchGitoidVariables) } }` - response, err := archivistapi.GraphQlQuery[searchGitoidResponse](ctx, c.url, query, vars) + response, err := archivistaapi.GraphQlQuery[searchGitoidResponse](ctx, c.url, query, vars) if err != nil { return nil, err } diff --git a/archivist/store.go b/archivista/store.go similarity index 86% rename from archivist/store.go rename to archivista/store.go index 79fa48dd..0b6f682a 100644 --- a/archivist/store.go +++ b/archivista/store.go @@ -12,17 +12,17 @@ // See the License for the specific language governing permissions and // limitations under the License. -package archivist +package archivista import ( "context" - archivistapi "github.com/testifysec/archivist-api" + archivistaapi "github.com/testifysec/archivista-api" "github.com/testifysec/go-witness/dsse" ) func (c *Client) Store(ctx context.Context, env dsse.Envelope) (string, error) { - resp, err := archivistapi.Store(ctx, c.url, env) + resp, err := archivistaapi.Store(ctx, c.url, env) if err != nil { return "", err } diff --git a/go.mod b/go.mod index b89d2584..991930df 100644 --- a/go.mod +++ b/go.mod @@ -15,7 +15,6 @@ require ( github.com/spdx/spdx-sbom-generator v0.0.15 github.com/spiffe/go-spiffe/v2 v2.1.1 github.com/stretchr/testify v1.8.0 - github.com/testifysec/archivist-api v0.0.0-20221115001947-07357e56e17e golang.org/x/sys v0.0.0-20220908164124-27713097b956 google.golang.org/grpc v1.49.0 gopkg.in/square/go-jose.v2 v2.6.0 @@ -106,6 +105,7 @@ require ( github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 // indirect github.com/spdx/tools-golang v0.3.0 // indirect github.com/tchap/go-patricia/v2 v2.3.1 // indirect + github.com/testifysec/archivista-api v0.0.0-20230220215059-632b84b82b76 // indirect github.com/titanous/rocacheck v0.0.0-20171023193734-afe73141d399 // indirect github.com/ulikunitz/xz v0.5.10 // indirect github.com/vbatts/go-mtree v0.5.2 // indirect diff --git a/go.sum b/go.sum index cc8dc548..82367795 100644 --- a/go.sum +++ b/go.sum @@ -1202,6 +1202,8 @@ github.com/tchap/go-patricia/v2 v2.3.1 h1:6rQp39lgIYZ+MHmdEq4xzuk1t7OdC35z/xm0BG github.com/tchap/go-patricia/v2 v2.3.1/go.mod h1:VZRHKAb53DLaG+nA9EaYYiaEx6YztwDlLElMsnSHD4k= github.com/testifysec/archivist-api v0.0.0-20221115001947-07357e56e17e h1:8a4H9umqvUX/TUk3mwYCMb2tYoiqHl9usEH/iG6n9VI= github.com/testifysec/archivist-api v0.0.0-20221115001947-07357e56e17e/go.mod h1:4BAH0+DBqP7QQRfJuUw4Tm+LNrptYa0qOjJNcN0Lf7Q= +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/thales-e-security/pool v0.0.2 h1:RAPs4q2EbWsTit6tpzuvTFlgFRJ3S8Evf5gtvVDbmPg= github.com/thales-e-security/pool v0.0.2/go.mod h1:qtpMm2+thHtqhLzTwgDBj/OuNnMpupY8mv0Phz0gjhU= github.com/theupdateframework/go-tuf v0.0.0-20211203210025-7ded50136bf9/go.mod h1:n2n6wwC9BEnYS/C/APAtNln0eM5zYAYOkOTx6VEG/mA= diff --git a/source/archivist.go b/source/archivista.go similarity index 75% rename from source/archivist.go rename to source/archivista.go index 5107398e..66c4ec32 100644 --- a/source/archivist.go +++ b/source/archivista.go @@ -17,23 +17,23 @@ package source import ( "context" - "github.com/testifysec/go-witness/archivist" + "github.com/testifysec/go-witness/archivista" ) -type ArchivistSource struct { - client *archivist.Client +type ArchivistaSource struct { + client *archivista.Client seenGitoids []string } -func NewArchvistSource(client *archivist.Client) *ArchivistSource { - return &ArchivistSource{ +func NewArchvistSource(client *archivista.Client) *ArchivistaSource { + return &ArchivistaSource{ client: client, seenGitoids: make([]string, 0), } } -func (s *ArchivistSource) Search(ctx context.Context, collectionName string, subjectDigests, attestations []string) ([]CollectionEnvelope, error) { - gitoids, err := s.client.SearchGitoids(ctx, archivist.SearchGitoidVariables{ +func (s *ArchivistaSource) Search(ctx context.Context, collectionName string, subjectDigests, attestations []string) ([]CollectionEnvelope, error) { + gitoids, err := s.client.SearchGitoids(ctx, archivista.SearchGitoidVariables{ CollectionName: collectionName, SubjectDigests: subjectDigests, Attestations: attestations,