feat(cache): add close function (fanal#104)

knqyf263 · web-flow · commit 83ff3fda257b · 2020-05-05T10:45:51.000+03:00
* feat(cache): add close function

* test(mock): update mock

* test(analyzer): fix tests according to updated mock
diff --git a/analyzer/analyzer_test.go b/analyzer/analyzer_test.go
@@ -286,7 +286,7 @@ func TestApplier_ApplyLayers(t *testing.T) {
 			getLayerExpectations: []cache.LocalImageCacheGetLayerExpectation{
 				{
 					Args: cache.LocalImageCacheGetLayerArgs{
-						LayerID: "sha256:932da51564135c98a49a34a193d6cd363d8fa4184d957fde16c9d8527b3f3b02",
+						DiffID: "sha256:932da51564135c98a49a34a193d6cd363d8fa4184d957fde16c9d8527b3f3b02",
 					},
 					Returns: cache.LocalImageCacheGetLayerReturns{
 						LayerInfo: types.LayerInfo{
@@ -315,7 +315,7 @@ func TestApplier_ApplyLayers(t *testing.T) {
 				},
 				{
 					Args: cache.LocalImageCacheGetLayerArgs{
-						LayerID: "sha256:dffd9992ca398466a663c87c92cfea2a2db0ae0cf33fcb99da60eec52addbfc5",
+						DiffID: "sha256:dffd9992ca398466a663c87c92cfea2a2db0ae0cf33fcb99da60eec52addbfc5",
 					},
 					Returns: cache.LocalImageCacheGetLayerReturns{
 						LayerInfo: types.LayerInfo{
@@ -343,7 +343,7 @@ func TestApplier_ApplyLayers(t *testing.T) {
 				},
 				{
 					Args: cache.LocalImageCacheGetLayerArgs{
-						LayerID: "sha256:24df0d4e20c0f42d3703bf1f1db2bdd77346c7956f74f423603d651e8e5ae8a7",
+						DiffID: "sha256:24df0d4e20c0f42d3703bf1f1db2bdd77346c7956f74f423603d651e8e5ae8a7",
 					},
 					Returns: cache.LocalImageCacheGetLayerReturns{
 						LayerInfo: types.LayerInfo{
@@ -447,7 +447,7 @@ func TestApplier_ApplyLayers(t *testing.T) {
 			getLayerExpectations: []cache.LocalImageCacheGetLayerExpectation{
 				{
 					Args: cache.LocalImageCacheGetLayerArgs{
-						LayerID: "sha256:531743b7098cb2aaf615641007a129173f63ed86ca32fe7b5a246a1c47286028",
+						DiffID: "sha256:531743b7098cb2aaf615641007a129173f63ed86ca32fe7b5a246a1c47286028",
 					},
 					Returns: cache.LocalImageCacheGetLayerReturns{
 						LayerInfo: types.LayerInfo{
@@ -565,7 +565,7 @@ func TestApplier_ApplyLayers(t *testing.T) {
 			getLayerExpectations: []cache.LocalImageCacheGetLayerExpectation{
 				{
 					Args: cache.LocalImageCacheGetLayerArgs{
-						LayerID: "sha256:932da51564135c98a49a34a193d6cd363d8fa4184d957fde16c9d8527b3f3b02",
+						DiffID: "sha256:932da51564135c98a49a34a193d6cd363d8fa4184d957fde16c9d8527b3f3b02",
 					},
 					Returns: cache.LocalImageCacheGetLayerReturns{LayerInfo: types.LayerInfo{}},
 				},
@@ -582,7 +582,7 @@ func TestApplier_ApplyLayers(t *testing.T) {
 			getLayerExpectations: []cache.LocalImageCacheGetLayerExpectation{
 				{
 					Args: cache.LocalImageCacheGetLayerArgs{
-						LayerID: "sha256:932da51564135c98a49a34a193d6cd363d8fa4184d957fde16c9d8527b3f3b02",
+						DiffID: "sha256:932da51564135c98a49a34a193d6cd363d8fa4184d957fde16c9d8527b3f3b02",
 					},
 					Returns: cache.LocalImageCacheGetLayerReturns{LayerInfo: types.LayerInfo{}},
 				},
@@ -602,7 +602,7 @@ func TestApplier_ApplyLayers(t *testing.T) {
 			getLayerExpectations: []cache.LocalImageCacheGetLayerExpectation{
 				{
 					Args: cache.LocalImageCacheGetLayerArgs{
-						LayerID: "sha256:932da51564135c98a49a34a193d6cd363d8fa4184d957fde16c9d8527b3f3b02",
+						DiffID: "sha256:932da51564135c98a49a34a193d6cd363d8fa4184d957fde16c9d8527b3f3b02",
 					},
 					Returns: cache.LocalImageCacheGetLayerReturns{
 						LayerInfo: types.LayerInfo{
@@ -627,7 +627,7 @@ func TestApplier_ApplyLayers(t *testing.T) {
 				},
 				{
 					Args: cache.LocalImageCacheGetLayerArgs{
-						LayerID: "sha256:dffd9992ca398466a663c87c92cfea2a2db0ae0cf33fcb99da60eec52addbfc5",
+						DiffID: "sha256:dffd9992ca398466a663c87c92cfea2a2db0ae0cf33fcb99da60eec52addbfc5",
 					},
 					Returns: cache.LocalImageCacheGetLayerReturns{
 						LayerInfo: types.LayerInfo{
@@ -655,7 +655,7 @@ func TestApplier_ApplyLayers(t *testing.T) {
 				},
 				{
 					Args: cache.LocalImageCacheGetLayerArgs{
-						LayerID: "sha256:24df0d4e20c0f42d3703bf1f1db2bdd77346c7956f74f423603d651e8e5ae8a7",
+						DiffID: "sha256:24df0d4e20c0f42d3703bf1f1db2bdd77346c7956f74f423603d651e8e5ae8a7",
 					},
 					Returns: cache.LocalImageCacheGetLayerReturns{
 						LayerInfo: types.LayerInfo{
@@ -743,7 +743,7 @@ func TestApplier_ApplyLayers(t *testing.T) {
 			getLayerExpectations: []cache.LocalImageCacheGetLayerExpectation{
 				{
 					Args: cache.LocalImageCacheGetLayerArgs{
-						LayerID: "sha256:932da51564135c98a49a34a193d6cd363d8fa4184d957fde16c9d8527b3f3b02",
+						DiffID: "sha256:932da51564135c98a49a34a193d6cd363d8fa4184d957fde16c9d8527b3f3b02",
 					},
 					Returns: cache.LocalImageCacheGetLayerReturns{
 						LayerInfo: types.LayerInfo{
diff --git a/cache/cache.go b/cache/cache.go
@@ -37,6 +37,7 @@ type ImageCache interface {
 type LocalImageCache interface {
 	GetImage(imageID string) (imageInfo types.ImageInfo, err error)
 	GetLayer(diffID string) (layerInfo types.LayerInfo, err error)
+	Close() (err error)
 	Clear() (err error)
 }
 
@@ -196,10 +197,17 @@ func (fs FSCache) MissingLayers(imageID string, layerIDs []string) (bool, []stri
 	return missingImage, missingLayerIDs, nil
 }
 
-func (fs FSCache) Clear() error {
+func (fs FSCache) Close() error {
 	if err := fs.db.Close(); err != nil {
 		return xerrors.Errorf("unable to close DB: %w", err)
 	}
+	return nil
+}
+
+func (fs FSCache) Clear() error {
+	if err := fs.Close(); err != nil {
+		return err
+	}
 	if err := os.RemoveAll(fs.directory); err != nil {
 		return xerrors.Errorf("failed to remove cache: %w", err)
 	}
diff --git a/cache/mock_local_image_cache.go b/cache/mock_local_image_cache.go

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,7 @@ type ImageCache interface {`
`37`	`37`	`type LocalImageCache interface {`
`38`	`38`	`GetImage(imageID string) (imageInfo types.ImageInfo, err error)`
`39`	`39`	`GetLayer(diffID string) (layerInfo types.LayerInfo, err error)`
	`40`	`+ Close() (err error)`
`40`	`41`	`Clear() (err error)`
`41`	`42`	`}`
`42`	`43`
`@@ -196,10 +197,17 @@ func (fs FSCache) MissingLayers(imageID string, layerIDs []string) (bool, []stri`
`196`	`197`	`return missingImage, missingLayerIDs, nil`
`197`	`198`	`}`
`198`	`199`
`199`		`-func (fs FSCache) Clear() error {`
	`200`	`+func (fs FSCache) Close() error {`
`200`	`201`	`if err := fs.db.Close(); err != nil {`
`201`	`202`	`return xerrors.Errorf("unable to close DB: %w", err)`
`202`	`203`	`}`
	`204`	`+ return nil`
	`205`	`+}`
	`206`	`+`
	`207`	`+func (fs FSCache) Clear() error {`
	`208`	`+ if err := fs.Close(); err != nil {`
	`209`	`+ return err`
	`210`	`+ }`
`203`	`211`	`if err := os.RemoveAll(fs.directory); err != nil {`
`204`	`212`	`return xerrors.Errorf("failed to remove cache: %w", err)`
`205`	`213`	`}`