chore: code-refactoring #85
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
pkg/git/RepositoryManager.go
Outdated
Comment on lines
379
to
397
| 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 | ||
| } |
pkg/git/GoGitSDKManager.go
Outdated
Comment on lines
137
to
156
|
|
||
| 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 | ||
| } |
There was a problem hiding this comment.
why is this here?
pkg/git/GitCliManager.go
Outdated
Comment on lines
195
to
213
| 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 | ||
| } |
pkg/git/GitBaseManager.go
Outdated
Comment on lines
78
to
87
| 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, |
There was a problem hiding this comment.
need to have a look
pkg/git/GitBaseManager.go
Outdated
| @@ -148,16 +133,16 @@ func (impl *GitManagerBaseImpl) LogMergeBase(gitCtx GitContext, rootDir, from st | |||
| return commits, nil | |||
| } | |||
|
|
|||
| 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) { | |||
pkg/git/GitBaseManager.go
Outdated
| } | ||
|
|
||
| func (impl *GitManagerBaseImpl) runCommand(cmd *exec.Cmd) (response, errMsg string, err error) { | ||
| func (impl *GitManagerBaseImpl) RunCommand(cmd *exec.Cmd) (response, errMsg string, err error) { |
pkg/git/GitCliManager.go
Outdated
Comment on lines
11
to
14
| //type GitCliManager interface { | ||
| // //GitManager | ||
| //} | ||
|
|
pkg/git/GoGitSDKManager.go
Outdated
Comment on lines
12
to
14
| // type GoGitSDKManager interface { | ||
| // GitManager | ||
| // } |
| type GoGitSDKManagerImpl struct { | ||
| *GitManagerBaseImpl | ||
| GitManagerBase |
There was a problem hiding this comment.
interface here but impl in cliManager. why?
There was a problem hiding this comment.
can we make interfaces in both places?
There was a problem hiding this comment.
Yes sure....Used interface in cliManager as well
pkg/git/Watcher.go
Outdated
|
|
||
| updated, repo, err := impl.FetchAndUpdateMaterial(gitCtx, material, location) | ||
| 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 |
kazhuravlev
reviewed
Jul 10, 2024
| @@ -2,7 +2,7 @@ package api | |||
|
|
|||
| import ( | |||
| "context" | |||
| "github.com/devtron-labs/git-sensor/internal/sql" | |||
| "github.com/devtron-labs/git-sensor/internals/sql" | |||
There was a problem hiding this comment.
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.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Refactoring done to make structs and interfaces extended