Skip to content

fix(artifact): return not found as error #135

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

Merged
luoliwoshang merged 1 commit into from
Jul 3, 2026
Merged

fix(artifact): return not found as error #135

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
9 changes: 7 additions & 2 deletions internal/artifact/artifact.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
package artifact

import "context"
import (
"context"
"errors"
)

var ErrNotFound = errors.New("artifact not found")

type Key struct {
Module string
Expand All @@ -21,7 +26,7 @@ type Artifact struct {
}

type Store interface {
Get(ctx context.Context, key Key) (Artifact, bool, error)
Get(ctx context.Context, key Key) (Artifact, error)
Put(ctx context.Context, key Key, artifact Artifact) (Artifact, error)
Delete(ctx context.Context, key Key) error
}
10 changes: 5 additions & 5 deletions internal/artifact/gorm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ func NewGormStore(db *gorm.DB) (*GormStore, error) {
return &GormStore{db: db}, nil
}

func (s *GormStore) Get(ctx context.Context, key Key) (Artifact, bool, error) {
func (s *GormStore) Get(ctx context.Context, key Key) (Artifact, error) {
return s.get(ctx, key)
}

Expand Down Expand Up @@ -83,18 +83,18 @@ func (s *GormStore) Delete(ctx context.Context, key Key) error {
return nil
}

func (s *GormStore) get(ctx context.Context, key Key) (Artifact, bool, error) {
func (s *GormStore) get(ctx context.Context, key Key) (Artifact, error) {
var record artifactRecord
err := s.db.WithContext(ctx).
Where("module = ? AND version = ? AND matrix_str = ?", key.Module, key.Version, key.MatrixStr).
First(&record).Error
if errors.Is(err, gorm.ErrRecordNotFound) {
return Artifact{}, false, nil
return Artifact{}, ErrNotFound
}
if err != nil {
return Artifact{}, false, fmt.Errorf("get artifact: %w", err)
return Artifact{}, fmt.Errorf("get artifact: %w", err)
}
return record.artifact(), true, nil
return record.artifact(), nil
}

func (r artifactRecord) artifact() Artifact {
Expand Down
22 changes: 7 additions & 15 deletions internal/artifact/gorm_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package artifact
import (
"context"
"database/sql"
"errors"
"strings"
"sync"
"testing"
Expand All @@ -25,12 +26,8 @@ func TestGormStoreGetMissAndPut(t *testing.T) {
Checksum: "abc",
}

got, ok, err := store.Get(ctx, key)
if err != nil {
t.Fatalf("Get miss: %v", err)
}
if ok {
t.Fatalf("Get miss ok = true, artifact = %+v", got)
if got, err := store.Get(ctx, key); !errors.Is(err, ErrNotFound) {
t.Fatalf("Get miss = %+v, %v; want ErrNotFound", got, err)
}

inserted, err := store.Put(ctx, key, want)
Expand All @@ -41,13 +38,10 @@ func TestGormStoreGetMissAndPut(t *testing.T) {
t.Fatalf("Put = %+v, want %+v", inserted, want)
}

got, ok, err = store.Get(ctx, key)
got, err := store.Get(ctx, key)
if err != nil {
t.Fatalf("Get hit: %v", err)
}
if !ok {
t.Fatalf("Get hit ok = false")
}
if got != want {
t.Fatalf("Get = %+v, want %+v", got, want)
}
Expand Down Expand Up @@ -149,10 +143,8 @@ func TestGormStoreDelete(t *testing.T) {
if err := store.Delete(ctx, key); err != nil {
t.Fatalf("Delete: %v", err)
}
if got, ok, err := store.Get(ctx, key); err != nil {
t.Fatalf("Get after Delete: %v", err)
} else if ok {
t.Fatalf("Get after Delete ok = true, artifact = %+v", got)
if got, err := store.Get(ctx, key); !errors.Is(err, ErrNotFound) {
t.Fatalf("Get after Delete = %+v, %v; want ErrNotFound", got, err)
}
}

Expand Down Expand Up @@ -183,7 +175,7 @@ func TestGormStoreDatabaseErrors(t *testing.T) {
Metadata: "-lz",
Checksum: "abc",
}
if _, _, err := store.Get(ctx, key); err == nil {
if _, err := store.Get(ctx, key); err == nil {
t.Fatal("Get with closed database = nil, want error")
}
if _, err := store.Put(ctx, key, value); err == nil {
Expand Down
11 changes: 5 additions & 6 deletions internal/artifact/kodo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import (
"encoding/base64"
"encoding/json"
"errors"
"fmt"
"strings"

qiniuclient "github.com/qiniu/go-sdk/v7/client"
Expand Down Expand Up @@ -43,20 +42,20 @@ func NewKodoArtifact(cfg KodoArtifactConfig) Store {
}
}

func (s *kodoArtifact) Get(ctx context.Context, key Key) (Artifact, bool, error) {
func (s *kodoArtifact) Get(ctx context.Context, key Key) (Artifact, error) {
objectName := s.objectName(key)
object, err := s.objects.Bucket(s.bucket).Object(objectName).Stat().Call(ctx)
if err != nil {
if kodoArtifactObjectNotFound(err) {
return Artifact{}, false, nil
return Artifact{}, ErrNotFound
}
return Artifact{}, false, err
return Artifact{}, err
}
got, ok := kodoArtifactFromMetadata(object.Metadata)
if !ok {
return Artifact{}, false, fmt.Errorf("read kodo artifact metadata for %s", objectName)
return Artifact{}, ErrNotFound
}
return got, true, nil
return got, nil
}

func (s *kodoArtifact) Put(ctx context.Context, key Key, art Artifact) (Artifact, error) {
Expand Down
23 changes: 7 additions & 16 deletions internal/artifact/kodo_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"context"
"encoding/base64"
"encoding/json"
"errors"
"fmt"
"net/http"
"net/http/httptest"
Expand Down Expand Up @@ -102,13 +103,10 @@ func TestKodoArtifactGetPutDeleteWithFakeKodo(t *testing.T) {
t.Fatalf("Put = %+v, want %+v", got, want)
}

got, ok, err := store.Get(context.Background(), key)
got, err = store.Get(context.Background(), key)
if err != nil {
t.Fatalf("Get: %v", err)
}
if !ok {
t.Fatal("Get missed object")
}
if got != want {
t.Fatalf("Get = %+v, want %+v", got, want)
}
Expand All @@ -126,12 +124,8 @@ func TestKodoArtifactGetErrors(t *testing.T) {
defer server.Close()
store := newFakeKodoArtifactStore(server.URL, "bucket", "")

got, ok, err := store.Get(context.Background(), key)
if err != nil {
t.Fatalf("Get: %v", err)
}
if ok {
t.Fatalf("Get = %+v, true; want miss", got)
if got, err := store.Get(context.Background(), key); !errors.Is(err, ErrNotFound) {
t.Fatalf("Get = %+v, %v; want ErrNotFound", got, err)
}
})

Expand All @@ -141,8 +135,8 @@ func TestKodoArtifactGetErrors(t *testing.T) {
defer server.Close()
store := newFakeKodoArtifactStore(server.URL, "bucket", "")

if got, ok, err := store.Get(context.Background(), key); err == nil {
t.Fatalf("Get = %+v, %v, nil; want metadata error", got, ok)
if got, err := store.Get(context.Background(), key); !errors.Is(err, ErrNotFound) {
t.Fatalf("Get = %+v, %v; want ErrNotFound", got, err)
}
})
}
Expand Down Expand Up @@ -235,13 +229,10 @@ func TestKodoArtifactE2E(t *testing.T) {
t.Fatalf("Put = %+v, want %+v", got, want)
}

got, ok, err := store.Get(ctx, key)
got, err = store.Get(ctx, key)
if err != nil {
t.Fatalf("Get: %v", err)
}
if !ok {
t.Fatal("Get missed uploaded object")
}
if got != want {
t.Fatalf("Get = %+v, want %+v", got, want)
}
Expand Down
Loading