refactor(storage): refactoring storage by laurentiuNiculae · Pull Request #1459 · project-zot/zot

laurentiuNiculae · 2023-05-18T12:24:08Z

What type of PR is this?

Which issue does this PR fix:
#Closes

What does this PR do / Why do we need it:

If an issue # is not available please add repro steps and logs showing the issue:

Testing done on this change:

Automation added to e2e:

Will this break upgrades or downgrades?

Does this PR introduce any user-facing change?:

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

 	var err error
 	if _, err = os.ReadDir(localRepoPath); os.IsNotExist(err) {
-		if err = os.MkdirAll(localRepoPath, local.DefaultDirPerms); err != nil {
+		if err = os.MkdirAll(localRepoPath, storageConstants.DefaultDirPerms); err != nil {



 	cachedRepoPath := path.Join(localCachePath, repo)
-	if err = os.MkdirAll(cachedRepoPath, local.DefaultDirPerms); err != nil {
+	if err = os.MkdirAll(cachedRepoPath, storageConstants.DefaultDirPerms); err != nil {


+) types.ImageStore {
 	if _, err := os.Stat(rootDir); os.IsNotExist(err) {
-		if err := os.MkdirAll(rootDir, DefaultDirPerms); err != nil {
+		if err := os.MkdirAll(rootDir, storageConstants.DefaultDirPerms); err != nil {


 	blobUploadPath := is.BlobUploadPath(repo, uid)

-	file, err := os.OpenFile(blobUploadPath, os.O_WRONLY|os.O_TRUNC|os.O_CREATE, DefaultFilePerms)
+	file, err := os.OpenFile(blobUploadPath, os.O_WRONLY|os.O_TRUNC|os.O_CREATE, storageConstants.DefaultFilePerms)


 	}

-	file, err := os.OpenFile(blobUploadPath, os.O_WRONLY|os.O_CREATE, DefaultFilePerms)
+	file, err := os.OpenFile(blobUploadPath, os.O_WRONLY|os.O_CREATE, storageConstants.DefaultFilePerms)


 	}

-	file, err := os.OpenFile(blobUploadPath, os.O_WRONLY|os.O_CREATE, DefaultFilePerms)
+	file, err := os.OpenFile(blobUploadPath, os.O_WRONLY|os.O_CREATE, storageConstants.DefaultFilePerms)


 func (is *ImageStoreLocal) writeFile(filename string, data []byte) error {
 	if !is.commit {
-		return os.WriteFile(filename, data, DefaultFilePerms)
+		return os.WriteFile(filename, data, storageConstants.DefaultFilePerms)


 	}

-	fhandle, err := os.OpenFile(filename, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, DefaultFilePerms)
+	fhandle, err := os.OpenFile(filename, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, storageConstants.DefaultFilePerms)


-
 func ensureDir(dir string, log zerolog.Logger) error {
-	if err := os.MkdirAll(dir, DefaultDirPerms); err != nil {
+	if err := os.MkdirAll(dir, storageConstants.DefaultDirPerms); err != nil {


codecov · 2023-05-18T15:06:35Z

Codecov Report

Merging #1459 (edcfa2a) into main (9acd19f) will increase coverage by 0.01%.
The diff coverage is 91.90%.

@@            Coverage Diff             @@
##             main    #1459      +/-   ##
==========================================
+ Coverage   90.97%   90.98%   +0.01%     
==========================================
  Files         103      104       +1     
  Lines       22635    22639       +4     
==========================================
+ Hits        20592    20599       +7     
+ Misses       1522     1520       -2     
+ Partials      521      520       -1

Impacted Files	Coverage Δ
pkg/extensions/extension_scrub.go	`100.00% <ø> (ø)`
pkg/extensions/lint/lint-disabled.go	`100.00% <ø> (ø)`
pkg/extensions/lint/lint.go	`87.50% <ø> (ø)`
pkg/extensions/sync/signatures.go	`86.86% <ø> (ø)`
pkg/meta/repodb/storage_parsing.go	`100.00% <ø> (ø)`
pkg/test/inject/dev.go	`92.30% <ø> (ø)`
pkg/test/inject/prod.go	`71.42% <ø> (ø)`
pkg/test/common.go	`84.69% <50.00%> (ø)`
pkg/storage/storage.go	`89.93% <89.93%> (ø)`
pkg/storage/local/local.go	`81.96% <97.95%> (-0.02%)`	⬇️
... and 13 more

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

andaaron · 2023-05-24T13:11:37Z

Besides my 2 remaining comments, the code looks good.

andaaron

LGTM

rchincha · 2023-05-25T20:18:05Z

@@ -51,8 +51,9 @@ import (
 	"zotregistry.io/zot/pkg/log"
 	"zotregistry.io/zot/pkg/meta/repodb/repodbfactory"


we still use "factory"? why?

Refactoring pkg/meta is out of scope of this PR.

Laurentiu has a draft at: #1476

Signed-off-by: Laurentiu Niculae <niculae.laurentiu1@gmail.com>

rchincha

lgtm

github-advanced-security AI found potential problems May 18, 2023

View reviewed changes

laurentiuNiculae force-pushed the refactor-storage branch 3 times, most recently from c8cc3f8 to b9ec429 Compare May 18, 2023 14:06

laurentiuNiculae force-pushed the refactor-storage branch 4 times, most recently from 442b5e5 to 1d25fb1 Compare May 19, 2023 10:41

laurentiuNiculae marked this pull request as ready for review May 19, 2023 11:41

laurentiuNiculae requested review from Andreea-Lupu, andaaron, eusebiu-constantin-petu-dbk, rchincha and shimish2 as code owners May 19, 2023 11:41

andaaron reviewed May 19, 2023

View reviewed changes

laurentiuNiculae force-pushed the refactor-storage branch 5 times, most recently from 22c0705 to 99006bb Compare May 23, 2023 16:04

andaaron reviewed May 24, 2023

View reviewed changes

Comment thread pkg/storage/storage.go

andaaron assigned laurentiuNiculae May 24, 2023

andaaron mentioned this pull request May 24, 2023

refactor(storage): move storage init from controller to storagefactory #1345

Closed

laurentiuNiculae force-pushed the refactor-storage branch 5 times, most recently from ee9f59d to 7758a60 Compare May 25, 2023 12:41

andaaron previously approved these changes May 25, 2023

View reviewed changes

eusebiu-constantin-petu-dbk approved these changes May 25, 2023

View reviewed changes

eusebiu-constantin-petu-dbk previously approved these changes May 25, 2023

View reviewed changes

rchincha reviewed May 25, 2023

View reviewed changes

laurentiuNiculae force-pushed the refactor-storage branch from 7758a60 to 6423a59 Compare May 26, 2023 08:35

refactor(storage): refactoring storage

edcfa2a

Signed-off-by: Laurentiu Niculae <niculae.laurentiu1@gmail.com>

laurentiuNiculae dismissed stale reviews from eusebiu-constantin-petu-dbk and andaaron via edcfa2a May 26, 2023 08:39

laurentiuNiculae force-pushed the refactor-storage branch from 6423a59 to edcfa2a Compare May 26, 2023 08:39

andaaron approved these changes May 26, 2023

View reviewed changes

rchincha approved these changes May 26, 2023

View reviewed changes

rchincha merged commit a3f355c into project-zot:main May 26, 2023

		@@ -51,8 +51,9 @@ import (
		"zotregistry.io/zot/pkg/log"
		"zotregistry.io/zot/pkg/meta/repodb/repodbfactory"

Uh oh!

Conversation

laurentiuNiculae commented May 18, 2023

Uh oh!

Check failure

Check failure

Check failure

Check failure

Check failure

Check failure

Check failure

Check failure

Check failure

codecov Bot commented May 18, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

andaaron commented May 24, 2023

Uh oh!

andaaron left a comment

Choose a reason for hiding this comment

Uh oh!

rchincha May 25, 2023

Choose a reason for hiding this comment

Uh oh!

andaaron May 25, 2023

Choose a reason for hiding this comment

Uh oh!

andaaron May 26, 2023

Choose a reason for hiding this comment

Uh oh!

rchincha left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

codecov Bot commented May 18, 2023 •

edited

Loading