Closing iterator for import listing and validate args (treeverse#1398)

itaiad200 · web-flow · commit 3b2739bb28ef · 2021-02-02T19:00:06.000+02:00
diff --git a/catalog/entry_catalog.go b/catalog/entry_catalog.go
@@ -133,10 +133,21 @@ func NewEntryCatalog(cfg *config.Config, db db.Database) (*EntryCatalog, error)
 }
 
 func (e *EntryCatalog) AddCommitToBranchHead(ctx context.Context, repositoryID graveler.RepositoryID, branchID graveler.BranchID, commit graveler.Commit) (graveler.CommitID, error) {
+	if err := Validate([]ValidateArg{
+		{"repositoryID", repositoryID, ValidateRepositoryID},
+		{"branchID", branchID, ValidateBranchID},
+	}); err != nil {
+		return "", err
+	}
 	return e.Store.AddCommitToBranchHead(ctx, repositoryID, branchID, commit)
 }
 
 func (e *EntryCatalog) AddCommit(ctx context.Context, repositoryID graveler.RepositoryID, commit graveler.Commit) (graveler.CommitID, error) {
+	if err := Validate([]ValidateArg{
+		{"repositoryID", repositoryID, ValidateRepositoryID},
+	}); err != nil {
+		return "", err
+	}
 	return e.Store.AddCommit(ctx, repositoryID, commit)
 }
 
diff --git a/graveler/graveler.go b/graveler/graveler.go
@@ -946,7 +946,7 @@ func (g *Graveler) validateCommitParent(ctx context.Context, repositoryID Reposi
 	return parentCommitID, nil
 }
 
-func (g *Graveler) commitExists(ctx context.Context, repositoryID RepositoryID, commitID CommitID) (bool, error) {
+func (g *Graveler) isCommitExist(ctx context.Context, repositoryID RepositoryID, commitID CommitID) (bool, error) {
 	_, err := g.RefManager.GetCommit(ctx, repositoryID, commitID)
 	if err == nil {
 		// commit already exists
@@ -977,7 +977,7 @@ func (g *Graveler) AddCommitToBranchHead(ctx context.Context, repositoryID Repos
 
 		// check if commit already exists.
 		commitID := CommitID(ident.NewHexAddressProvider().ContentAddress(commit))
-		if exists, err := g.commitExists(ctx, repositoryID, commitID); err != nil {
+		if exists, err := g.isCommitExist(ctx, repositoryID, commitID); err != nil {
 			return nil, err
 		} else if exists {
 			return commitID, nil
@@ -1011,7 +1011,7 @@ func (g *Graveler) AddCommit(ctx context.Context, repositoryID RepositoryID, com
 
 	// check if commit already exists.
 	commitID := CommitID(ident.NewHexAddressProvider().ContentAddress(commit))
-	if exists, err := g.commitExists(ctx, repositoryID, commitID); err != nil {
+	if exists, err := g.isCommitExist(ctx, repositoryID, commitID); err != nil {
 		return "", err
 	} else if exists {
 		return commitID, nil
diff --git a/onboard/catalog_actions.go b/onboard/catalog_actions.go
@@ -89,6 +89,7 @@ func (c *CatalogRepoActions) ApplyImport(ctx context.Context, it Iterator, _ boo
 	if err != nil {
 		return nil, fmt.Errorf("listing commit: %w", err)
 	}
+	defer listIt.Close()
 
 	c.createdMetaRangeID, err = c.entryCataloger.WriteMetaRange(ctx, c.repoID, newPrefixMergeIterator(NewValueToEntryIterator(invIt, c.progress), listIt, c.prefixes))
 	if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -133,10 +133,21 @@ func NewEntryCatalog(cfg config.Config, db db.Database) (EntryCatalog, error)`
`133`	`133`	`}`
`134`	`134`
`135`	`135`	`func (e *EntryCatalog) AddCommitToBranchHead(ctx context.Context, repositoryID graveler.RepositoryID, branchID graveler.BranchID, commit graveler.Commit) (graveler.CommitID, error) {`
	`136`	`+ if err := Validate([]ValidateArg{`
	`137`	`+ {"repositoryID", repositoryID, ValidateRepositoryID},`
	`138`	`+ {"branchID", branchID, ValidateBranchID},`
	`139`	`+ }); err != nil {`
	`140`	`+ return "", err`
	`141`	`+ }`
`136`	`142`	`return e.Store.AddCommitToBranchHead(ctx, repositoryID, branchID, commit)`
`137`	`143`	`}`
`138`	`144`
`139`	`145`	`func (e *EntryCatalog) AddCommit(ctx context.Context, repositoryID graveler.RepositoryID, commit graveler.Commit) (graveler.CommitID, error) {`
	`146`	`+ if err := Validate([]ValidateArg{`
	`147`	`+ {"repositoryID", repositoryID, ValidateRepositoryID},`
	`148`	`+ }); err != nil {`
	`149`	`+ return "", err`
	`150`	`+ }`
`140`	`151`	`return e.Store.AddCommit(ctx, repositoryID, commit)`
`141`	`152`	`}`
`142`	`153`
Original file line number	Diff line number	Diff line change
`@@ -89,6 +89,7 @@ func (c *CatalogRepoActions) ApplyImport(ctx context.Context, it Iterator, _ boo`
`89`	`89`	`if err != nil {`
`90`	`90`	`return nil, fmt.Errorf("listing commit: %w", err)`
`91`	`91`	`}`
	`92`	`+ defer listIt.Close()`
`92`	`93`
`93`	`94`	`c.createdMetaRangeID, err = c.entryCataloger.WriteMetaRange(ctx, c.repoID, newPrefixMergeIterator(NewValueToEntryIterator(invIt, c.progress), listIt, c.prefixes))`
`94`	`95`	`if err != nil {`