From 784a1a6987df8489c8ee24381e222e768c756cd7 Mon Sep 17 00:00:00 2001
From: Yee Hing Tong <wild-endeavor@users.noreply.github.com>
Date: Mon, 10 Jul 2023 16:48:51 -0700
Subject: [PATCH] lint and nits
Signed-off-by: Yee Hing Tong <wild-endeavor@users.noreply.github.com>
---
cli/pflags/api/namedtype_enumer.go | 1 -
storage/cached_rawstore_test.go | 4 ++--
storage/config.go | 1 +
storage/mem_store.go | 4 ++--
storage/mem_store_test.go | 12 ++++++------
storage/utils.go | 3 ++-
6 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/cli/pflags/api/namedtype_enumer.go b/cli/pflags/api/namedtype_enumer.go
index 4ea1621a..ffceef62 100644
--- a/cli/pflags/api/namedtype_enumer.go
+++ b/cli/pflags/api/namedtype_enumer.go
@@ -1,6 +1,5 @@
// Code generated by "enumer --type=NamedType --trimprefix=NamedType -json"; DO NOT EDIT.
-//
package api
import (
diff --git a/storage/cached_rawstore_test.go b/storage/cached_rawstore_test.go
index 85fa0be1..153aa0eb 100644
--- a/storage/cached_rawstore_test.go
+++ b/storage/cached_rawstore_test.go
@@ -19,7 +19,7 @@ func TestNewCachedStore(t *testing.T) {
t.Run("CachingDisabled", func(t *testing.T) {
cfg := &Config{}
assert.Nil(t, newCachedRawStore(cfg, nil, metrics.cacheMetrics))
- store, err := NewInMemoryRawStore(cfg, metrics)
+ store, err := NewInMemoryRawStore(context.TODO(), cfg, metrics)
assert.NoError(t, err)
assert.Equal(t, store, newCachedRawStore(cfg, store, metrics.cacheMetrics))
})
@@ -31,7 +31,7 @@ func TestNewCachedStore(t *testing.T) {
TargetGCPercent: 20,
},
}
- store, err := NewInMemoryRawStore(cfg, metrics)
+ store, err := NewInMemoryRawStore(context.TODO(), cfg, metrics)
assert.NoError(t, err)
cStore := newCachedRawStore(cfg, store, metrics.cacheMetrics)
assert.Equal(t, 20, debug.SetGCPercent(100))
diff --git a/storage/config.go b/storage/config.go
index caa0cfcf..39082057 100644
--- a/storage/config.go
+++ b/storage/config.go
@@ -2,6 +2,7 @@ package storage
import (
"context"
+
"github.com/flyteorg/flytestdlib/config"
"github.com/flyteorg/flytestdlib/logger"
)
diff --git a/storage/mem_store.go b/storage/mem_store.go
index 976e4aa1..abe4de12 100644
--- a/storage/mem_store.go
+++ b/storage/mem_store.go
@@ -3,7 +3,7 @@ package storage
import (
"bytes"
"context"
- "crypto/md5"
+ "crypto/md5" // #nosec
"encoding/hex"
"fmt"
"io"
@@ -40,7 +40,7 @@ func (s *InMemoryStore) Head(ctx context.Context, reference DataReference) (Meta
data, found := s.cache[reference]
var hash [md5.Size]byte
if found {
- hash = md5.Sum(data)
+ hash = md5.Sum(data) // #nosec
}
return MemoryMetadata{
diff --git a/storage/mem_store_test.go b/storage/mem_store_test.go
index 829b086a..fc58ed11 100644
--- a/storage/mem_store_test.go
+++ b/storage/mem_store_test.go
@@ -10,7 +10,7 @@ import (
func TestInMemoryStore_Head(t *testing.T) {
t.Run("Empty store", func(t *testing.T) {
- s, err := NewInMemoryRawStore(&Config{}, metrics)
+ s, err := NewInMemoryRawStore(context.TODO(), &Config{}, metrics)
assert.NoError(t, err)
metadata, err := s.Head(context.TODO(), DataReference("hello"))
assert.NoError(t, err)
@@ -18,7 +18,7 @@ func TestInMemoryStore_Head(t *testing.T) {
})
t.Run("Existing Item", func(t *testing.T) {
- s, err := NewInMemoryRawStore(&Config{}, metrics)
+ s, err := NewInMemoryRawStore(context.TODO(), &Config{}, metrics)
assert.NoError(t, err)
err = s.WriteRaw(context.TODO(), DataReference("hello"), 0, Options{}, bytes.NewReader([]byte{}))
assert.NoError(t, err)
@@ -31,7 +31,7 @@ func TestInMemoryStore_Head(t *testing.T) {
func TestInMemoryStore_ReadRaw(t *testing.T) {
t.Run("Empty store", func(t *testing.T) {
- s, err := NewInMemoryRawStore(&Config{}, metrics)
+ s, err := NewInMemoryRawStore(context.TODO(), &Config{}, metrics)
assert.NoError(t, err)
raw, err := s.ReadRaw(context.TODO(), DataReference("hello"))
@@ -40,7 +40,7 @@ func TestInMemoryStore_ReadRaw(t *testing.T) {
})
t.Run("Existing Item", func(t *testing.T) {
- s, err := NewInMemoryRawStore(&Config{}, metrics)
+ s, err := NewInMemoryRawStore(context.TODO(), &Config{}, metrics)
assert.NoError(t, err)
err = s.WriteRaw(context.TODO(), DataReference("hello"), 0, Options{}, bytes.NewReader([]byte{}))
@@ -52,7 +52,7 @@ func TestInMemoryStore_ReadRaw(t *testing.T) {
}
func TestInMemoryStore_Clear(t *testing.T) {
- m, err := NewInMemoryRawStore(&Config{}, metrics)
+ m, err := NewInMemoryRawStore(context.TODO(), &Config{}, metrics)
assert.NoError(t, err)
mStore := m.(*InMemoryStore)
@@ -71,7 +71,7 @@ func TestInMemoryStore_Clear(t *testing.T) {
}
func TestInMemoryStore_Delete(t *testing.T) {
- m, err := NewInMemoryRawStore(&Config{}, metrics)
+ m, err := NewInMemoryRawStore(context.TODO(), &Config{}, metrics)
assert.NoError(t, err)
mStore := m.(*InMemoryStore)
diff --git a/storage/utils.go b/storage/utils.go
index 29d88548..0c3f7d77 100644
--- a/storage/utils.go
+++ b/storage/utils.go
@@ -2,9 +2,10 @@ package storage
import (
"context"
+ "os"
+
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
- "os"
stdErrs "github.com/flyteorg/flytestdlib/errors"
"github.com/flyteorg/flytestdlib/promutils/labeled"