scottk/vault
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/vault.git synced 2025-11-02 19:47:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

pass context to postgres queries (#15866)

Browse Source 
* pass context to postgres queries

* add changelog

* Update changelog/15866.txt

Co-authored-by: Alexander Scheel <alexander.m.scheel@gmail.com>

Co-authored-by: Alexander Scheel <alexander.m.scheel@gmail.com>
This commit is contained in:
bhowe34
2022-06-08 16:54:19 -05:00
committed by GitHub
parent 3ab00523a9
commit df279b9b84
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
changelog/15866.txt Normal file
View File

@@ -0,0 +1,3 @@
```release-note:improvement
physical/postgresql: pass context to queries to propagate timeouts and cancellations on requests.
```

8
physical/postgresql/postgresql.go
View File

@@ -244,7 +244,7 @@ func (m *PostgreSQLBackend) Put(ctx context.Context, entry *physical.Entry) erro
parentPath, path, key := m.splitKey(entry.Key) parentPath, path, key := m.splitKey(entry.Key)
_, err := m.client.Exec(m.put_query, parentPath, path, key, entry.Value) _, err := m.client.ExecContext(ctx, m.put_query, parentPath, path, key, entry.Value)
if err != nil { if err != nil {
return err return err
} }
@@ -261,7 +261,7 @@ func (m *PostgreSQLBackend) Get(ctx context.Context, fullPath string) (*physical
_, path, key := m.splitKey(fullPath) _, path, key := m.splitKey(fullPath)
var result []byte var result []byte
err := m.client.QueryRow(m.get_query, path, key).Scan(&result) err := m.client.QueryRowContext(ctx, m.get_query, path, key).Scan(&result)
if err == sql.ErrNoRows { if err == sql.ErrNoRows {
return nil, nil return nil, nil
} }
@@ -285,7 +285,7 @@ func (m *PostgreSQLBackend) Delete(ctx context.Context, fullPath string) error {
_, path, key := m.splitKey(fullPath) _, path, key := m.splitKey(fullPath)
_, err := m.client.Exec(m.delete_query, path, key) _, err := m.client.ExecContext(ctx, m.delete_query, path, key)
if err != nil { if err != nil {
return err return err
} }
@@ -300,7 +300,7 @@ func (m *PostgreSQLBackend) List(ctx context.Context, prefix string) ([]string,
m.permitPool.Acquire() m.permitPool.Acquire()
defer m.permitPool.Release() defer m.permitPool.Release()
rows, err := m.client.Query(m.list_query, "/"+prefix) rows, err := m.client.QueryContext(ctx, m.list_query, "/"+prefix)
if err != nil { if err != nil {
return nil, err return nil, err
} }