fix(repo-server): completely clean up Git working directory (#3683) #13001

yann-soubeyrand · 2023-03-24T16:42:38Z

In some cases, for example when a Git submodule wasn’t present anymore in a Git revision, the repo-server didn’t completely clean up its Git working directory.

Fixes #3683

Note on DCO:

If the DCO action in the integration test fails, one or more of your commits are not signed off. Please click on the Details link next to the DCO action for instructions on how to resolve this.

Checklist:

Please see Contribution FAQs if you have questions about your pull-request.

codecov · 2023-03-24T18:33:14Z

Codecov Report

Patch coverage: 37.50% and project coverage change: -0.01 ⚠️

Comparison is base (0a8a71e) 49.17% compared to head (aaba605) 49.17%.

Additional details and impacted files

@@            Coverage Diff             @@
##           master   #13001      +/-   ##
==========================================
- Coverage   49.17%   49.17%   -0.01%     
==========================================
  Files         248      248              
  Lines       42872    42872              
==========================================
- Hits        21084    21081       -3     
- Misses      19687    19689       +2     
- Partials     2101     2102       +1

Impacted Files	Coverage Δ
util/git/client.go	`50.00% <37.50%> (ø)`

... and 1 file with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

blakepettersson · 2023-03-30T18:16:59Z

Looks good! Would it be possible to add an E2E test that exercises that this works as intended?

yann-soubeyrand · 2023-04-07T12:47:45Z

Hello @blakepettersson, it’s done 😉

Adding this test showed me that my PR wasn’t correct, as git checkout --recurse-submodule failed due to a missing submodule commit. So I introduced a new parameter to the Fetch() function to use git fetch --recurse-submodule when submodules are enabled, which made me modify a lot of code (essentially tests though). But I finally realized that adding a double f argument to the git clean command should be sufficient and I removed the --recurse-submodule argument of the git checkout command.

util/git/client.go

blakepettersson

This LGTM at least, good stuff! Will need to add a few more eyes on this though.

ishitasequeira

The PR looks good!!

…nt with runCmd() one Signed-off-by: Yann Soubeyrand <yann.soubeyrand@camptocamp.com>

In some cases, for example when a Git submodule wasn’t present anymore in a Git revision, the repo-server didn’t completely clean up its Git working directory. Fixes argoproj#3683 Signed-off-by: Yann Soubeyrand <yann.soubeyrand@camptocamp.com>

crenshaw-dev

lgtm, thanks @yann-soubeyrand!

chris-ng-scmp · 2023-06-28T09:02:01Z

Seems the fix has not released in version 2.5 / 2.6 / 2.7 yet
Currently, my ArgoCD v2.4 can't go for any upgrade due to migrating CMP from configmap to sidecar with the bug.

Keen to see if we can have this fix release for v2.5 as part of the upgrade path from v2.4

yann-soubeyrand · 2023-06-28T09:19:04Z

I don’t know if I can run these commands, but just trying 😉

/cherry-pick release-2.7

chris-ng-scmp · 2023-07-06T08:21:37Z

I don’t know if I can run these commands, but just trying 😉

/cherry-pick release-2.7

Seems not working... haha

Just checked the new release for both 2.7 / 2.6 / 2.5, not including these changes as well

yann-soubeyrand · 2023-07-06T09:14:43Z

Hi @crenshaw-dev, I can’t issue cherry-pick commands myself, could you do it please? Or tell me if I should open cherry-pick PRs instead.

ldacey · 2023-07-29T04:37:43Z

I believe this is the fix required to get Gitlab to sync properly. Any idea if it will be in 2.8? I just updated to 2.7.9 a bit ago and my Gitlab app has an error

blakepettersson · 2023-07-29T11:01:26Z

It should be @ldacey, try out the latest 2.8-rc and see if that helps.

…#3683) (argoproj#13001) * refactor(util/git/client): make runCredentialedCmd() signature coherent with runCmd() one Signed-off-by: Yann Soubeyrand <yann.soubeyrand@camptocamp.com> * fix(repo-server): completely clean up Git working directory In some cases, for example when a Git submodule wasn’t present anymore in a Git revision, the repo-server didn’t completely clean up its Git working directory. Fixes argoproj#3683 Signed-off-by: Yann Soubeyrand <yann.soubeyrand@camptocamp.com> --------- Signed-off-by: Yann Soubeyrand <yann.soubeyrand@camptocamp.com>

yann-soubeyrand force-pushed the fix-3683 branch from e61335e to 9c8e218 Compare March 24, 2023 16:43

yann-soubeyrand force-pushed the fix-3683 branch 6 times, most recently from 1f6d7b6 to 7b5b290 Compare April 7, 2023 11:45

blakepettersson reviewed Apr 7, 2023

View reviewed changes

util/git/client.go Show resolved Hide resolved

blakepettersson added the ready-for-review label Apr 7, 2023

yann-soubeyrand force-pushed the fix-3683 branch from 7b5b290 to 07dd9b1 Compare April 7, 2023 14:46

blakepettersson approved these changes Apr 7, 2023

View reviewed changes

blakepettersson requested review from crenshaw-dev and jannfis April 7, 2023 14:51

ishitasequeira approved these changes Apr 22, 2023

View reviewed changes

yann-soubeyrand force-pushed the fix-3683 branch from 07dd9b1 to d6fee8a Compare May 10, 2023 13:00

yann-soubeyrand added 2 commits May 24, 2023 16:14

refactor(util/git/client): make runCredentialedCmd() signature cohere…

adc09a8

…nt with runCmd() one Signed-off-by: Yann Soubeyrand <yann.soubeyrand@camptocamp.com>

yann-soubeyrand force-pushed the fix-3683 branch from d6fee8a to aaba605 Compare May 24, 2023 14:15

crenshaw-dev approved these changes May 27, 2023

View reviewed changes

crenshaw-dev merged commit 41e91d5 into argoproj:master May 27, 2023
24 checks passed

yann-soubeyrand deleted the fix-3683 branch May 29, 2023 09:39

MJDSys mentioned this pull request May 30, 2023

Unable to use latest GitLab Helm chart with Kustomize and Argocd #13395

Closed

3 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix(repo-server): completely clean up Git working directory (#3683) #13001

fix(repo-server): completely clean up Git working directory (#3683) #13001

yann-soubeyrand commented Mar 24, 2023 •

edited

codecov bot commented Mar 24, 2023 •

edited

blakepettersson commented Mar 30, 2023

yann-soubeyrand commented Apr 7, 2023 •

edited

blakepettersson left a comment

ishitasequeira left a comment

crenshaw-dev left a comment

chris-ng-scmp commented Jun 28, 2023 •

edited

yann-soubeyrand commented Jun 28, 2023

chris-ng-scmp commented Jul 6, 2023

yann-soubeyrand commented Jul 6, 2023

ldacey commented Jul 29, 2023

blakepettersson commented Jul 29, 2023

fix(repo-server): completely clean up Git working directory (#3683) #13001

fix(repo-server): completely clean up Git working directory (#3683) #13001

Conversation

yann-soubeyrand commented Mar 24, 2023 • edited

codecov bot commented Mar 24, 2023 • edited

Codecov Report

blakepettersson commented Mar 30, 2023

yann-soubeyrand commented Apr 7, 2023 • edited

blakepettersson left a comment

Choose a reason for hiding this comment

ishitasequeira left a comment

Choose a reason for hiding this comment

crenshaw-dev left a comment

Choose a reason for hiding this comment

chris-ng-scmp commented Jun 28, 2023 • edited

yann-soubeyrand commented Jun 28, 2023

chris-ng-scmp commented Jul 6, 2023

yann-soubeyrand commented Jul 6, 2023

ldacey commented Jul 29, 2023

blakepettersson commented Jul 29, 2023

yann-soubeyrand commented Mar 24, 2023 •

edited

codecov bot commented Mar 24, 2023 •

edited

yann-soubeyrand commented Apr 7, 2023 •

edited

chris-ng-scmp commented Jun 28, 2023 •

edited