chore: code-refactoring by ShashwatDadhich · Pull Request #85 · devtron-labs/git-sensor

ShashwatDadhich · 2024-02-01T07:27:33Z

Refactoring done to make structs and interfaces extended

subhashish-devtron · 2024-02-01T08:18:24Z

pkg/git/RepositoryManager.go

+func (impl *RepositoryManagerImpl) OpenNewRepo(gitCtx GitContext, location string, url string) (*GitRepository, error) {
+
+	r, err := impl.gitManager.OpenRepoPlain(location)
+	if err != nil {
+		err = os.RemoveAll(location)
+		if err != nil {
+			impl.logger.Errorw("error in cleaning checkout path: %s", err)
+			return r, err
+		}
+		err = impl.gitManager.Init(gitCtx, location, url, true)
+		if err != nil {
+			impl.logger.Errorw("err in git init: %s", err)
+			return r, err
+		}
+		r, err = impl.gitManager.OpenRepoPlain(location)
+		if err != nil {
+			impl.logger.Errorw("err in git init: %s", err)
+			return r, err
+		}


subhashish-devtron · 2024-02-01T08:19:42Z

pkg/git/GoGitSDKManager.go

+
+func (impl *GoGitSDKManagerImpl) OpenNewRepo(gitCtx GitContext, location string, url string) (*GitRepository, error) {
+
+	r, err := impl.OpenRepoPlain(location)
+	if err != nil {
+		err = os.RemoveAll(location)
+		if err != nil {
+			return r, fmt.Errorf("error in cleaning checkout path: %s", err)
+		}
+		err = impl.Init(gitCtx, location, url, true)
+		if err != nil {
+			return r, fmt.Errorf("err in git init: %s", err)
+		}
+		r, err = impl.OpenRepoPlain(location)
+		if err != nil {
+			return r, fmt.Errorf("err in git init: %s", err)
+		}
+	}
+	return r, nil
+}


why is this here?

subhashish-devtron · 2024-02-01T08:20:38Z

pkg/git/GitCliManager.go

+func (impl *GitCliManagerImpl) OpenNewRepo(gitCtx GitContext, location string, url string) (*GitRepository, error) {
+
+	r, err := impl.OpenRepoPlain(location)
+	if err != nil {
+		err = os.RemoveAll(location)
+		if err != nil {
+			return r, fmt.Errorf("error in cleaning checkout path: %s", err)
+		}
+		err = impl.Init(gitCtx, location, url, true)
+		if err != nil {
+			return r, fmt.Errorf("err in git init: %s", err)
+		}
+		r, err = impl.OpenRepoPlain(location)
+		if err != nil {
+			return r, fmt.Errorf("err in git init: %s", err)
+		}
+	}
+	return r, nil
+}


is this needed?

subhashish-devtron · 2024-02-01T08:21:45Z

pkg/git/GitBaseManager.go

-func NewGitManagerImpl(configuration *internal.Configuration,
+func NewGitManagerImpl(configuration *internals.Configuration,
 	cliGitManager GitCliManager,
-	goGitManager GoGitSDKManager) GitManagerImpl {
+	goGitManager GoGitSDKManager) *GitManagerImpl {

 	if configuration.UseGitCli {
-		return GitManagerImpl{cliGitManager}
-	}
-	return GitManagerImpl{goGitManager}
-}
-
-func (impl *GitManagerImpl) OpenNewRepo(gitCtx GitContext, location string, url string) (*GitRepository, error) {
-
-	r, err := impl.OpenRepoPlain(location)
-	if err != nil {
-		err = os.RemoveAll(location)
-		if err != nil {
-			return r, fmt.Errorf("error in cleaning checkout path: %s", err)
-		}
-		err = impl.Init(gitCtx, location, url, true)
-		if err != nil {
-			return r, fmt.Errorf("err in git init: %s", err)
-		}
-		r, err = impl.OpenRepoPlain(location)
-		if err != nil {
-			return r, fmt.Errorf("err in git init: %s", err)
+		return &GitManagerImpl{
+			cliGitManager,


need to have a look

subhashish-devtron · 2024-02-02T09:10:50Z

pkg/git/GitBaseManager.go

 }

-func (impl *GitManagerBaseImpl) runCommandWithCred(cmd *exec.Cmd, userName, password string) (response, errMsg string, err error) {
+func (impl *GitManagerBaseImpl) RunCommandWithCred(cmd *exec.Cmd, userName, password string) (response, errMsg string, err error) {


subhashish-devtron · 2024-02-02T09:10:56Z

pkg/git/GitBaseManager.go

 }

-func (impl *GitManagerBaseImpl) runCommand(cmd *exec.Cmd) (response, errMsg string, err error) {
+func (impl *GitManagerBaseImpl) RunCommand(cmd *exec.Cmd) (response, errMsg string, err error) {


subhashish-devtron · 2024-02-02T09:11:13Z

pkg/git/GitCliManager.go

+//type GitCliManager interface {
+//	//GitManager
+//}



subhashish-devtron · 2024-02-02T09:14:56Z

pkg/git/GoGitSDKManager.go

+//	type GoGitSDKManager interface {
+//		GitManager
+//	}


subhashish-devtron · 2024-02-02T09:16:27Z

pkg/git/GoGitSDKManager.go

+//	}
 type GoGitSDKManagerImpl struct {
-	*GitManagerBaseImpl
+	GitManagerBase


interface here but impl in cliManager. why?

can we make interfaces in both places?

Yes sure....Used interface in cliManager as well

subhashish-devtron · 2024-02-02T09:21:25Z

pkg/git/Watcher.go

 	if err != nil {
 		impl.logger.Errorw("error in fetching material details ", "repo", material.Url, "err", err)
-		// there might be the case if ssh private key gets flush from disk, so creating and single retrying in this case
+		// there might be the case if ssh priclvate key gets flush from disk, so creating and single retrying in this case


correct pls

kazhuravlev · 2024-07-10T06:58:18Z

api/GrpcHandler.go

 import (
 	"context"
-	"github.com/devtron-labs/git-sensor/internal/sql"
+	"github.com/devtron-labs/git-sensor/internals/sql"


internal directory - is a special name that do not allow others to import any package under this directory. So after renaming it to internals - anyone can import this packages. I am almost sure that this is not a main goal of this PR.

ShashwatDadhich added 9 commits January 31, 2024 11:21

code refactoring

a927028

internal name changed to internals

870512a

code made common

afea9c7

code refactoring in GitBaseManager.go

12688e0

code refactoring in GitBaseManager.go

ab32ad7

code refactoring in GitBaseManager.go

36e964e

code refactoring

135bca7

code refactoring

22a0c6a

code refactoring

6959802

ShashwatDadhich changed the title ~~Git sensor sync~~ chore: code-refactoring Feb 1, 2024

subhashish-devtron reviewed Feb 1, 2024

View reviewed changes

code refactoring

4590a56

subhashish-devtron reviewed Feb 1, 2024

View reviewed changes

ShashwatDadhich added 9 commits February 1, 2024 13:52

code refactoring

87c7fd6

code refactoring as suggested in code review

1e4829a

commented code removed

2bbe296

commented code retrieved

a02805a

GitManagerImpl retrieved

e9b3856

GitManagerImpl - wire file corrected

2a6a05a

code review comments incorporated

b23e4f3

code review comments incorporated

32b9bd3

app directory created

9543583

subhashish-devtron reviewed Feb 2, 2024

View reviewed changes

ShashwatDadhich added 5 commits February 2, 2024 16:08

code review comments incorporated

49f1498

code review comments incorporated

8d9f6d5

code review comments incorporated

8028b7e

wireSet generated

bccadd8

wireSet and test file changed

7e70ef9

kazhuravlev reviewed Jul 10, 2024

View reviewed changes

Conversation

ShashwatDadhich commented Feb 1, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ShashwatDadhich Feb 2, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

ShashwatDadhich commented Feb 1, 2024 •

edited

Loading

ShashwatDadhich Feb 2, 2024 •

edited

Loading