back round 0 view raw

spindle/xrpc: pass a context down #386

merged

opened by

anirudh.fi 4 months ago targeting master from push-mzsvpkottnnt

Signed-off-by: Anirudh Oppiliappan anirudh@tangled.sh

options

unified split

Changed files

+5 -3

spindle

xrpc

add_secret.go

list_secrets.go

remove_secret.go

+3 -1

spindle/xrpc/add_secret.go

···

       4
       4
        
       	"encoding/json"

     

       5
       5
        
       	"fmt"

     

       6
       6
        
       	"net/http"

     

       7
       7
       +
       	"time"

     

       7
       8
        
       

     

       8
       9
        
       	"github.com/bluesky-social/indigo/api/atproto"

     

       9
       10
        
       	"github.com/bluesky-social/indigo/atproto/syntax"

     
···

       76
       77
        
       		Repo:      secrets.DidSlashRepo(didPath),

     

       77
       78
        
       		Key:       data.Key,

     

       78
       79
        
       		Value:     data.Value,

     

       80
       80
       +
       		CreatedAt: time.Now(),

     

       79
       81
        
       		CreatedBy: actorDid,

     

       80
       82
        
       	}

     

       81
       81
       -
       	err = x.Vault.AddSecret(secret)

     

       83
       83
       +
       	err = x.Vault.AddSecret(r.Context(), secret)

     

       82
       84
        
       	if err != nil {

     

       83
       85
        
       		l.Error("failed to add secret to vault", "did", actorDid.String(), "err", err)

     

       84
       86
        
       		writeError(w, GenericError(err), http.StatusInternalServerError)

+1 -1

spindle/xrpc/list_secrets.go

···

       68
       68
        
       		return

     

       69
       69
        
       	}

     

       70
       70
        
       

     

       71
       71
       -
       	ls, err := x.Vault.GetSecretsLocked(secrets.DidSlashRepo(didPath))

     

       71
       71
       +
       	ls, err := x.Vault.GetSecretsLocked(r.Context(), secrets.DidSlashRepo(didPath))

     

       72
       72
        
       	if err != nil {

     

       73
       73
        
       		l.Error("failed to get secret from vault", "did", actorDid.String(), "err", err)

     

       74
       74
        
       		writeError(w, GenericError(err), http.StatusInternalServerError)

+1 -1

spindle/xrpc/remove_secret.go

···

       71
       71
        
       		Repo: secrets.DidSlashRepo(didPath),

     

       72
       72
        
       		Key:  data.Key,

     

       73
       73
        
       	}

     

       74
       74
       -
       	err = x.Vault.RemoveSecret(secret)

     

       74
       74
       +
       	err = x.Vault.RemoveSecret(r.Context(), secret)

     

       75
       75
        
       	if err != nil {

     

       76
       76
        
       		l.Error("failed to remove secret from vault", "did", actorDid.String(), "err", err)

     

       77
       77
        
       		writeError(w, GenericError(err), http.StatusInternalServerError)