Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: update archivst -> archivista #34

Merged
merged 1 commit into from
Feb 21, 2023
Merged

chore: update archivst -> archivista #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion archivist/client.go → archivista/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions archivist/download.go → archivista/download.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
6 changes: 3 additions & 3 deletions archivist/searchgitoids.go → archivista/searchgitoids.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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
}
Expand Down
6 changes: 3 additions & 3 deletions archivist/store.go → archivista/store.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down
14 changes: 7 additions & 7 deletions source/archivist.go → source/archivista.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down