Apply linter autofixes: internal/vaultik (refs #61)

internal/vaultik/blobcache.go

@@ -53,6 +53,7 @@ func newBlobDiskCache(maxBytes int64) (*blobDiskCache, error) {
 	if err != nil {
 		return nil, fmt.Errorf("creating blob cache dir: %w", err)
 	}
+
 	return &blobDiskCache{
 		dir:      dir,
 		maxBytes: maxBytes,
@@ -70,21 +71,25 @@ func (c *blobDiskCache) unlink(e *blobDiskCacheEntry) {
 	} else {
 		c.head = e.next
 	}
+
 	if e.next != nil {
 		e.next.prev = e.prev
 	} else {
 		c.tail = e.prev
 	}
+
 	e.prev = nil
 	e.next = nil
 }
 
 func (c *blobDiskCache) pushFront(e *blobDiskCacheEntry) {
 	e.prev = nil
+
 	e.next = c.head
 	if c.head != nil {
 		c.head.prev = e
 	}
+
 	c.head = e
 	if c.tail == nil {
 		c.tail = e
@@ -95,6 +100,7 @@ func (c *blobDiskCache) evictLRU() {
 	if c.tail == nil {
 		return
 	}
+
 	victim := c.tail
 	c.unlink(victim)
 	delete(c.items, victim.key)
@@ -121,7 +127,8 @@ func (c *blobDiskCache) Put(key string, data []byte) error {
 		delete(c.items, key)
 	}
 
-	if err := os.WriteFile(c.path(key), data, 0600); err != nil {
+	err := os.WriteFile(c.path(key), data, 0600)
+	if err != nil {
 		return fmt.Errorf("writing blob to cache: %w", err)
 	}
 
@@ -163,14 +170,19 @@ func (c *blobDiskCache) PutFromReader(key string, r io.Reader) (int64, error) {
 	if err != nil {
 		return 0, fmt.Errorf("creating cache file: %w", err)
 	}
+
 	written, copyErr := io.Copy(f, r)
 	closeErr := f.Close()
+
 	if copyErr != nil {
 		_ = os.Remove(c.path(key))
+
 		return written, fmt.Errorf("streaming to cache file: %w", copyErr)
 	}
+
 	if closeErr != nil {
 		_ = os.Remove(c.path(key))
+
 		return written, fmt.Errorf("closing cache file: %w", closeErr)
 	}
 
@@ -182,6 +194,7 @@ func (c *blobDiskCache) PutFromReader(key string, r io.Reader) (int64, error) {
 	// so this branch is effectively unreachable there.
 	if written > c.maxBytes {
 		_ = os.Remove(c.path(key))
+
 		return written, nil
 	}
 
@@ -205,11 +218,14 @@ func (c *blobDiskCache) PutFromReader(key string, r io.Reader) (int64, error) {
 func (c *blobDiskCache) Get(key string) ([]byte, bool) {
 	c.mu.Lock()
 	c.getCalls++
+
 	e, ok := c.items[key]
 	if !ok {
 		c.mu.Unlock()
+
 		return nil, false
 	}
+
 	c.unlink(e)
 	c.pushFront(e)
 	c.mu.Unlock()
@@ -223,8 +239,10 @@ func (c *blobDiskCache) Get(key string) ([]byte, bool) {
 			c.curBytes -= e.size
 		}
 		c.mu.Unlock()
+
 		return nil, false
 	}
+
 	return data, true
 }
 
@@ -232,15 +250,20 @@ func (c *blobDiskCache) Get(key string) ([]byte, bool) {
 func (c *blobDiskCache) ReadAt(key string, offset, length int64) ([]byte, error) {
 	c.mu.Lock()
 	c.readAtCalls++
+
 	e, ok := c.items[key]
 	if !ok {
 		c.mu.Unlock()
+
 		return nil, fmt.Errorf("key %q not in cache", key)
 	}
+
 	if offset+length > e.size {
 		c.mu.Unlock()
+
 		return nil, fmt.Errorf("read beyond blob size: offset=%d length=%d size=%d", offset, length, e.size)
 	}
+
 	c.unlink(e)
 	c.pushFront(e)
 	c.mu.Unlock()
@@ -255,6 +278,7 @@ func (c *blobDiskCache) ReadAt(key string, offset, length int64) ([]byte, error)
 	if _, err := f.ReadAt(buf, offset); err != nil {
 		return nil, err
 	}
+
 	return buf, nil
 }
 
@@ -262,7 +286,9 @@ func (c *blobDiskCache) ReadAt(key string, offset, length int64) ([]byte, error)
 func (c *blobDiskCache) Has(key string) bool {
 	c.mu.Lock()
 	defer c.mu.Unlock()
+
 	_, ok := c.items[key]
+
 	return ok
 }
 
@@ -272,10 +298,12 @@ func (c *blobDiskCache) Has(key string) bool {
 func (c *blobDiskCache) Delete(key string) {
 	c.mu.Lock()
 	defer c.mu.Unlock()
+
 	e, ok := c.items[key]
 	if !ok {
 		return
 	}
+
 	c.unlink(e)
 	delete(c.items, key)
 	c.curBytes -= e.size
@@ -287,10 +315,12 @@ func (c *blobDiskCache) Delete(key string) {
 func (c *blobDiskCache) Keys() []string {
 	c.mu.Lock()
 	defer c.mu.Unlock()
+
 	keys := make([]string, 0, len(c.items))
 	for k := range c.items {
 		keys = append(keys, k)
 	}
+
 	return keys
 }
 
@@ -298,6 +328,7 @@ func (c *blobDiskCache) Keys() []string {
 func (c *blobDiskCache) Size() int64 {
 	c.mu.Lock()
 	defer c.mu.Unlock()
+
 	return c.curBytes
 }
 
@@ -305,6 +336,7 @@ func (c *blobDiskCache) Size() int64 {
 func (c *blobDiskCache) Len() int {
 	c.mu.Lock()
 	defer c.mu.Unlock()
+
 	return len(c.items)
 }
 
@@ -312,6 +344,7 @@ func (c *blobDiskCache) Len() int {
 func (c *blobDiskCache) GetCalls() int {
 	c.mu.Lock()
 	defer c.mu.Unlock()
+
 	return c.getCalls
 }
 
@@ -319,6 +352,7 @@ func (c *blobDiskCache) GetCalls() int {
 func (c *blobDiskCache) ReadAtCalls() int {
 	c.mu.Lock()
 	defer c.mu.Unlock()
+
 	return c.readAtCalls
 }
 
@@ -327,6 +361,7 @@ func (c *blobDiskCache) ReadAtCalls() int {
 func (c *blobDiskCache) PeakLen() int {
 	c.mu.Lock()
 	defer c.mu.Unlock()
+
 	return c.peakLen
 }
 
@@ -334,9 +369,11 @@ func (c *blobDiskCache) PeakLen() int {
 func (c *blobDiskCache) Close() error {
 	c.mu.Lock()
 	defer c.mu.Unlock()
+
 	c.items = nil
 	c.head = nil
 	c.tail = nil
 	c.curBytes = 0
+
 	return os.RemoveAll(c.dir)
 }