Refactor Git operations and introduce go-git support for Azure DevOps and AWS CodeCommit
#944
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -20,6 +20,7 @@ import ( | |
| "context" | ||
| "errors" | ||
| "fmt" | ||
| "net/url" | ||
| "os" | ||
| "path/filepath" | ||
| "strings" | ||
|
|
@@ -41,6 +42,9 @@ import ( | |
| "sigs.k8s.io/controller-runtime/pkg/ratelimiter" | ||
|
|
||
| "github.com/fluxcd/pkg/apis/meta" | ||
| "github.com/fluxcd/pkg/git" | ||
| "github.com/fluxcd/pkg/git/gogit" | ||
| "github.com/fluxcd/pkg/git/libgit2" | ||
| "github.com/fluxcd/pkg/runtime/conditions" | ||
| helper "github.com/fluxcd/pkg/runtime/controller" | ||
| "github.com/fluxcd/pkg/runtime/events" | ||
|
|
@@ -54,8 +58,6 @@ import ( | |
| sreconcile "github.com/fluxcd/source-controller/internal/reconcile" | ||
| "github.com/fluxcd/source-controller/internal/reconcile/summarize" | ||
| "github.com/fluxcd/source-controller/internal/util" | ||
| ) | ||
|
|
||
| // gitRepositoryReadyCondition contains the information required to summarize a | ||
|
|
@@ -440,9 +442,7 @@ func (r *GitRepositoryReconciler) reconcileSource(ctx context.Context, | |
| conditions.Delete(obj, sourcev1.SourceVerifiedCondition) | ||
| } | ||
|
|
||
| var authData map[string][]byte | ||
| if obj.Spec.SecretRef != nil { | ||
| // Attempt to retrieve secret | ||
| name := types.NamespacedName{ | ||
|
|
@@ -459,20 +459,27 @@ func (r *GitRepositoryReconciler) reconcileSource(ctx context.Context, | |
| // Return error as the world as observed may change | ||
| return sreconcile.ResultEmpty, e | ||
| } | ||
| authData = secret.Data | ||
| } | ||
|
|
||
| u, err := url.Parse(obj.Spec.URL) | ||
| if err != nil { | ||
| e := serror.NewStalling( | ||
| fmt.Errorf("failed to parse url '%s': %w", obj.Spec.URL, err), | ||
| sourcev1.URLInvalidReason, | ||
| ) | ||
| conditions.MarkTrue(obj, sourcev1.FetchFailedCondition, e.Reason, e.Err.Error()) | ||
| return sreconcile.ResultEmpty, e | ||
| } | ||
|
|
||
| // Configure authentication strategy to access the source | ||
| authOpts, err := git.NewAuthOptions(*u, authData) | ||
| if err != nil { | ||
| e := serror.NewGeneric( | ||
| fmt.Errorf("failed to configure authentication options: %w", err), | ||
| sourcev1.AuthenticationFailedReason, | ||
| ) | ||
| conditions.MarkTrue(obj, sourcev1.FetchFailedCondition, e.Reason, e.Err.Error()) | ||
| return sreconcile.ResultEmpty, e | ||
darkowlzz marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
|
|
||
|
|
@@ -725,59 +732,52 @@ func (r *GitRepositoryReconciler) reconcileInclude(ctx context.Context, | |
| func (r *GitRepositoryReconciler) gitCheckout(ctx context.Context, | ||
| obj *sourcev1.GitRepository, authOpts *git.AuthOptions, dir string, optimized bool) (*git.Commit, error) { | ||
| // Configure checkout strategy. | ||
| cloneOpts := git.CloneOptions{ | ||
| RecurseSubmodules: obj.Spec.RecurseSubmodules, | ||
| ShallowClone: true, | ||
| } | ||
| if ref := obj.Spec.Reference; ref != nil { | ||
| cloneOpts.Branch = ref.Branch | ||
| cloneOpts.Commit = ref.Commit | ||
| cloneOpts.Tag = ref.Tag | ||
| cloneOpts.SemVer = ref.SemVer | ||
| } | ||
|
|
||
| // Only if the object has an existing artifact in storage, attempt to | ||
| // short-circuit clone operation. reconcileStorage has already verified | ||
| // that the artifact exists. | ||
| if optimized && conditions.IsTrue(obj, sourcev1.ArtifactInStorageCondition) { | ||
| if artifact := obj.GetArtifact(); artifact != nil { | ||
| cloneOpts.LastObservedCommit = artifact.Revision | ||
| } | ||
| } | ||
|
|
||
| gitCtx, cancel := context.WithTimeout(ctx, obj.Spec.Timeout.Duration) | ||
| defer cancel() | ||
|
|
||
| var gitReader git.RepositoryReader | ||
| var err error | ||
|
|
||
| switch obj.Spec.GitImplementation { | ||
| case sourcev1.LibGit2Implementation: | ||
| gitReader, err = libgit2.NewClient(dir, authOpts) | ||
| case sourcev1.GoGitImplementation: | ||
| gitReader, err = gogit.NewClient(dir, authOpts) | ||
| default: | ||
| err = fmt.Errorf("invalid Git implementation: %s", obj.Spec.GitImplementation) | ||
| } | ||
| if err != nil { | ||
| // Do not return err as recovery without changes is impossible. | ||
| e := serror.NewStalling( | ||
|
There was a problem hiding this comment. While reviewing #945, I noticed that this stalling error may not be appropriate for the above operation. The old code had stalling error because |
||
| fmt.Errorf("failed to create Git client for implementation '%s': %w", obj.Spec.GitImplementation, err), | ||
| sourcev1.GitOperationFailedReason, | ||
| ) | ||
| conditions.MarkTrue(obj, sourcev1.FetchFailedCondition, e.Reason, e.Err.Error()) | ||
| return nil, e | ||
| } | ||
| defer gitReader.Close() | ||
|
|
||
| commit, err := gitReader.Clone(gitCtx, obj.Spec.URL, cloneOpts) | ||
| if err != nil { | ||
| e := serror.NewGeneric( | ||
| fmt.Errorf("failed to checkout and determine revision: %w", err), | ||
|
|
@@ -786,6 +786,7 @@ func (r *GitRepositoryReconciler) gitCheckout(ctx context.Context, | |
| conditions.MarkTrue(obj, sourcev1.FetchFailedCondition, e.Reason, e.Err.Error()) | ||
| return nil, e | ||
| } | ||
|
|
||
| return commit, nil | ||
| } | ||
|
|
||
|
|
||
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.