mirrors/at-container-registry
1
0
Fork 0
mirror of https://tangled.org/evan.jarrett.net/at-container-registry synced 2026-09-03 08:46:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix lint and unit tests

Browse Source
This commit is contained in:
Evan Jarrett
2026-02-09 22:39:38 -06:00
parent 7ba42080c5
commit aad9ebfc8b
11 changed files with 41 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/atproto/client.go
+6 -6
View File
@@ -104,7 +104,7 @@ func NewClient(pdsEndpoint, did, accessToken string) *Client {
pdsEndpoint: pdsEndpoint,
did: did,
clientProvider: NewBasicAuthClientProvider(pdsEndpoint, did, accessToken),
httpClient: &http.Client{},
httpClient: &http.Client{Timeout: 30 * time.Second},
}
}
@@ -121,7 +121,7 @@ func NewClientWithSessionProvider(pdsEndpoint, did string, sessionProvider Sessi
pdsEndpoint: pdsEndpoint,
did: did,
clientProvider: NewOAuthClientProvider(sessionProvider),
httpClient: &http.Client{},
httpClient: &http.Client{Timeout: 30 * time.Second},
}
}
@@ -259,7 +259,7 @@ func (c *Client) UploadBlob(ctx context.Context, data []byte, mimeType string) (
// Note: This is a sync endpoint that returns raw binary data
func (c *Client) GetBlob(ctx context.Context, cid string) ([]byte, error) {
// Public endpoint - no auth required
client := &xrpc.Client{Host: c.pdsEndpoint}
client := &xrpc.Client{Host: c.pdsEndpoint, Client: c.httpClient}
data, err := comatproto.SyncGetBlob(ctx, client, cid, c.did)
if err != nil {
var xrpcErr *xrpc.Error
@@ -294,7 +294,7 @@ func (c *Client) ListReposByCollection(ctx context.Context, collection string, l
}
// Public endpoint - no auth required
client := &xrpc.Client{Host: c.pdsEndpoint}
client := &xrpc.Client{Host: c.pdsEndpoint, Client: c.httpClient}
var result ListReposByCollectionResult
err := client.LexDo(ctx, "GET", "", "com.atproto.sync.listReposByCollection", params, nil, &result)
if err != nil {
@@ -318,7 +318,7 @@ func (c *Client) ListRecordsForRepo(ctx context.Context, repoDID, collection str
}
// Public endpoint - no auth required
client := &xrpc.Client{Host: c.pdsEndpoint}
client := &xrpc.Client{Host: c.pdsEndpoint, Client: c.httpClient}
var result struct {
Records []Record `json:"records"`
Cursor string `json:"cursor,omitempty"`
@@ -352,7 +352,7 @@ type ProfileRecord struct {
// The actor parameter can be a DID or handle
func (c *Client) GetActorProfile(ctx context.Context, actor string) (*ActorProfile, error) {
// Public endpoint - doesn't require auth
client := &xrpc.Client{Host: c.pdsEndpoint}
client := &xrpc.Client{Host: c.pdsEndpoint, Client: c.httpClient}
resp, err := appbsky.ActorGetProfile(ctx, client, actor)
if err != nil {
pkg/hold/admin/auth.go
-16
View File
@@ -112,19 +112,3 @@ func (ui *AdminUI) renderTemplate(w http.ResponseWriter, name string, data any)
http.Error(w, "Internal server error", http.StatusInternalServerError)
}
}
// renderError renders an error page
func (ui *AdminUI) renderError(w http.ResponseWriter, r *http.Request, message string, statusCode int) {
w.Header().Set("Content-Type", "text/html; charset=utf-8")
w.WriteHeader(statusCode)
data := struct {
PageData
Error string
}{
PageData: ui.newPageData(r, "Error", ""),
Error: message,
}
ui.renderTemplate(w, "pages/error.html", data)
}
pkg/hold/admin/handlers_crew_io.go
+4 -1
View File
@@ -67,7 +67,10 @@ func (ui *AdminUI) handleCrewExport(w http.ResponseWriter, r *http.Request) {
enc := json.NewEncoder(w)
enc.SetIndent("", " ")
enc.Encode(export)
if err := enc.Encode(export); err != nil {
slog.Error("Failed to encode crew export", "error", err)
return
}
session := getSessionFromContext(ctx)
slog.Info("Crew exported via admin panel",
pkg/hold/config.go
-1
View File
@@ -292,4 +292,3 @@ func buildStorageConfigFromFields(sc StorageConfig) configuration.Storage {
return storageCfg
}
pkg/hold/config_test.go
+6
View File
@@ -8,6 +8,12 @@ import (
"time"
)
func init() {
// Point metadata endpoint to a closed listener so it fails instantly instead of
// waiting 2s for the real 169.254.169.254 to timeout on non-cloud machines.
metadataEndpoint = "http://127.0.0.1:1"
}
// setupEnv sets environment variables for testing and returns a cleanup function
func setupEnv(t *testing.T, vars map[string]string) func() {
// Save original env
pkg/hold/metadata.go
+4 -1
View File
@@ -13,6 +13,9 @@ type CloudMetadata struct {
Region string
}
// metadataEndpoint is the cloud metadata service URL. Package-level var for test override.
var metadataEndpoint = "http://169.254.169.254"
// DetectCloudMetadata queries the instance metadata service (169.254.169.254)
// Currently supports UpCloud. Others can be added via PR.
func DetectCloudMetadata(ctx context.Context) (*CloudMetadata, error) {
@@ -32,7 +35,7 @@ func DetectCloudMetadata(ctx context.Context) (*CloudMetadata, error) {
// detectUpCloud queries UpCloud's metadata service
func detectUpCloud(ctx context.Context) (*CloudMetadata, error) {
req, err := http.NewRequestWithContext(ctx, "GET", "http://169.254.169.254/metadata/v1.json", nil)
req, err := http.NewRequestWithContext(ctx, "GET", metadataEndpoint+"/metadata/v1.json", nil)
if err != nil {
return nil, err
}
pkg/hold/pds/captain_test.go
+1
View File
@@ -40,6 +40,7 @@ func setupTestPDS(t *testing.T) (*HoldPDS, context.Context) {
t.Fatalf("Failed to initialize test repo: %v", err)
}
t.Cleanup(func() { pds.Close() })
return pds, ctx
}
pkg/hold/pds/delete_test.go
+4 -8
View File
@@ -150,8 +150,7 @@ func TestPostMentionsUser(t *testing.T) {
func TestDeleteBlueskyPosts_NoPosts(t *testing.T) {
// Create a test PDS with records index
pds, cleanup := setupTestPDSWithIndex(t, "did:plc:testowner")
defer cleanup()
pds := setupTestPDSWithIndex(t, "did:plc:testowner")
ctx := sharedCtx
@@ -168,8 +167,7 @@ func TestDeleteBlueskyPosts_NoPosts(t *testing.T) {
func TestListBlueskyPostsForUser_NoPosts(t *testing.T) {
// Create a test PDS with records index
pds, cleanup := setupTestPDSWithIndex(t, "did:plc:testowner")
defer cleanup()
pds := setupTestPDSWithIndex(t, "did:plc:testowner")
ctx := sharedCtx
@@ -186,8 +184,7 @@ func TestListBlueskyPostsForUser_NoPosts(t *testing.T) {
func TestDeleteAndListBlueskyPosts_WithPosts(t *testing.T) {
// Create a test PDS with records index
pds, cleanup := setupTestPDSWithIndex(t, "did:plc:testowner")
defer cleanup()
pds := setupTestPDSWithIndex(t, "did:plc:testowner")
ctx := sharedCtx
@@ -276,8 +273,7 @@ func TestDeleteAndListBlueskyPosts_WithPosts(t *testing.T) {
func TestDeleteUserData_IncludesPosts(t *testing.T) {
// Create a test PDS with records index
pds, cleanup := setupTestPDSWithIndex(t, "did:plc:testowner")
defer cleanup()
pds := setupTestPDSWithIndex(t, "did:plc:testowner")
ctx := sharedCtx
pkg/hold/pds/layer_test.go
+9 -18
View File
@@ -287,7 +287,7 @@ func TestLayerRecord_FieldValidation(t *testing.T) {
// setupTestPDSWithIndex creates a PDS with file-based database (enables RecordsIndex)
// and bootstraps it with the given owner. Required for quota tests.
func setupTestPDSWithIndex(t *testing.T, ownerDID string) (*HoldPDS, func()) {
func setupTestPDSWithIndex(t *testing.T, ownerDID string) *HoldPDS {
t.Helper()
ctx := sharedCtx
@@ -321,11 +321,8 @@ func setupTestPDSWithIndex(t *testing.T, ownerDID string) (*HoldPDS, func()) {
t.Fatalf("Failed to backfill records index: %v", err)
}
cleanup := func() {
pds.Close()
}
return pds, cleanup
t.Cleanup(func() { pds.Close() })
return pds
}
// addCrewMemberWithTier adds a crew member with a specific tier
@@ -349,8 +346,7 @@ func addCrewMemberWithTier(t *testing.T, pds *HoldPDS, memberDID, role string, p
func TestGetQuotaForUserWithTier_OwnerUnlimited(t *testing.T) {
ownerDID := "did:plc:owner123"
pds, cleanup := setupTestPDSWithIndex(t, ownerDID)
defer cleanup()
pds := setupTestPDSWithIndex(t, ownerDID)
ctx := sharedCtx
@@ -423,8 +419,7 @@ defaults:
func TestGetQuotaForUserWithTier_CrewWithDefaultTier(t *testing.T) {
ownerDID := "did:plc:owner456"
crewDID := "did:plc:crew123"
pds, cleanup := setupTestPDSWithIndex(t, ownerDID)
defer cleanup()
pds := setupTestPDSWithIndex(t, ownerDID)
ctx := sharedCtx
@@ -498,8 +493,7 @@ defaults:
func TestGetQuotaForUserWithTier_CrewWithExplicitTier(t *testing.T) {
ownerDID := "did:plc:owner789"
crewDID := "did:plc:bosuncrew456"
pds, cleanup := setupTestPDSWithIndex(t, ownerDID)
defer cleanup()
pds := setupTestPDSWithIndex(t, ownerDID)
ctx := sharedCtx
@@ -566,8 +560,7 @@ defaults:
func TestGetQuotaForUserWithTier_NoQuotaManager(t *testing.T) {
ownerDID := "did:plc:ownerabc"
crewDID := "did:plc:crewabc"
pds, cleanup := setupTestPDSWithIndex(t, ownerDID)
defer cleanup()
pds := setupTestPDSWithIndex(t, ownerDID)
ctx := sharedCtx
@@ -608,8 +601,7 @@ func TestGetQuotaForUserWithTier_NoQuotaManager(t *testing.T) {
func TestGetQuotaForUserWithTier_DisabledQuotas(t *testing.T) {
ownerDID := "did:plc:ownerdef"
crewDID := "did:plc:crewdef"
pds, cleanup := setupTestPDSWithIndex(t, ownerDID)
defer cleanup()
pds := setupTestPDSWithIndex(t, ownerDID)
ctx := sharedCtx
@@ -655,8 +647,7 @@ func TestGetQuotaForUserWithTier_DisabledQuotas(t *testing.T) {
func TestGetQuotaForUserWithTier_DeduplicatesBlobs(t *testing.T) {
ownerDID := "did:plc:ownerghi"
crewDID := "did:plc:crewghi"
pds, cleanup := setupTestPDSWithIndex(t, ownerDID)
defer cleanup()
pds := setupTestPDSWithIndex(t, ownerDID)
ctx := sharedCtx
pkg/hold/pds/server.go
+6
View File
@@ -4,6 +4,7 @@ import (
"context"
"database/sql"
"fmt"
"io"
"log/slog"
"os"
"path/filepath"
@@ -388,6 +389,11 @@ func (p *HoldPDS) Close() error {
return fmt.Errorf("failed to close records index: %w", err)
}
}
if closer, ok := p.carstore.(io.Closer); ok {
if err := closer.Close(); err != nil {
return fmt.Errorf("failed to close carstore: %w", err)
}
}
return nil
}
pkg/hold/pds/status_test.go
+1 -1
View File
@@ -288,6 +288,6 @@ func TestMain(m *testing.M) {
// Run tests
code := m.Run()
// Cleanup is automatic with t.TempDir()
sharedPDS.Close()
os.Exit(code)
}