feat: add git timeout #14914

hasanwhitesource · 2022-04-03T10:45:27Z

Changes

Added a 10 seconds timeout for git tasks based on https://github.com/steveukx/git-js/blob/main/docs/PLUGIN-TIMEOUT.md

Context

Closes #13957

Documentation (please check one with an [x])

I have updated the documentation, or
No documentation update is required

How I've tested my work (please tick one)

I have verified these changes via:

Code inspection only, or
Newly added/modified unit tests, or
No unit tests but ran on a real repository, or
Both unit tests + ran on a real repository

lib/util/git/config.ts

hasanwhitesource · 2022-04-05T09:29:45Z

@viceice if this is good so far I will go on to setting this config value to the places where simple-git is being used

lib/config/options/index.ts

hasanwhitesource · 2022-04-07T11:17:21Z

@viceice @rarkins Do we want to leave this pull request just for the addition of the feature and create a different pr/issue to make use of this feature in the relevant code sections?( e.g util\git\index.ts , manager\git-submodules\extract.ts , datasource\git-refs\base.ts ,... )

viceice

see comments

…ce/renovate into 13957-git-timeout

rarkins

If there are other files which should also use this value, it's ideal if we include them in this PR. If not then let's document which are unsupported and have an issue for each

lib/config/validation.ts

lib/config/options/index.ts

lib/config/validation.ts

lib/util/git/config.spec.ts

lib/util/git/config.ts

…3957-git-timeout

lib/config/options/index.ts

lib/config/validation.ts

lib/util/git/config.spec.ts

hasanwhitesource · 2022-04-14T11:08:15Z

@viceice wdyt of the changes ?

viceice

some small test fixes required 😉

lib/config/options/index.ts

lib/util/git/config.spec.ts

…3957-git-timeout

docs/usage/self-hosted-configuration.md

Co-authored-by: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com>

docs/usage/self-hosted-configuration.md

renovate-release · 2022-04-17T17:28:16Z

🎉 This PR is included in version 32.26.0 🎉

The release is available on:

GitHub release
32.26.0

Your semantic-release bot 📦🚀

astellingwerf · 2022-04-19T09:50:18Z

docs/usage/self-hosted-configuration.md

+
+To handle the case where the underlying Git processes appear to hang, configure the timeout with the number of milliseconds to wait after last received content on either `stdOut` or `stdErr` streams before sending a `SIGINT` kill message.
+
+The value must be between `2000` and `6000` (milliseconds) inclusive.


The default value is outside these values. How does that work?

Its a typo in the text it should be 60000

This reverts commit 9270eba.

Added timeout option

d1293bf

viceice reviewed Apr 3, 2022

View reviewed changes

lib/util/git/config.ts Outdated Show resolved Hide resolved

Added timeout to global config

fe19d59

hasanwhitesource marked this pull request as ready for review April 5, 2022 09:36

hasanwhitesource requested a review from viceice April 5, 2022 09:55

moved gitTimeout description to self-hosed-config

718ae55

hasanwhitesource marked this pull request as draft April 6, 2022 12:24

hasanwhitesource and others added 2 commits April 6, 2022 16:41

Added gitTimeout in global.ts

113c461

Merge branch 'main' into 13957-git-timeout

d42d126

hasanwhitesource requested a review from rarkins April 6, 2022 13:57

hasanwhitesource marked this pull request as ready for review April 6, 2022 13:58

rarkins reviewed Apr 6, 2022

View reviewed changes

lib/config/options/index.ts Outdated Show resolved Hide resolved

rarkins marked this pull request as draft April 7, 2022 08:34

viceice reviewed Apr 8, 2022

View reviewed changes

hasanwhitesource added 3 commits April 8, 2022 15:18

Changed to numeric value with test

6c6c9f0

Merge branch '13957-git-timeout' of https://github.com/hasanwhitesour…

2c37c2d

…ce/renovate into 13957-git-timeout

Make seperte object for timeout

e4d3a6e

rarkins requested changes Apr 9, 2022

View reviewed changes

lib/config/validation.ts Outdated Show resolved Hide resolved

hasanwhitesource added 5 commits April 10, 2022 12:39

test and set max value to a minute

d2c9976

For null check

3f5f6b4

revert

d0c0fae

default for null check

725d055

Added timeout for simple git uses

74309ce

hasanwhitesource marked this pull request as ready for review April 10, 2022 12:26

hasanwhitesource requested a review from JamieMagee as a code owner April 10, 2022 12:26

hasanwhitesource requested review from rarkins and viceice April 10, 2022 12:26

viceice requested changes Apr 11, 2022

View reviewed changes

lib/config/options/index.ts Show resolved Hide resolved

lib/config/validation.ts Outdated Show resolved Hide resolved

lib/util/git/config.spec.ts Outdated Show resolved Hide resolved

lib/util/git/config.ts Outdated Show resolved Hide resolved

hasanwhitesource added 2 commits April 13, 2022 15:38

Merge branch 'main' of https://github.com/renovatebot/renovate into 1…

8d4bf80

…3957-git-timeout

lint fix

3d4d138

hasanwhitesource requested a review from viceice April 13, 2022 13:09

hasanwhitesource marked this pull request as ready for review April 13, 2022 13:09

viceice reviewed Apr 13, 2022

View reviewed changes

lib/config/options/index.ts Show resolved Hide resolved

lib/config/validation.ts Outdated Show resolved Hide resolved

lib/util/git/config.spec.ts Outdated Show resolved Hide resolved

lib/util/git/config.spec.ts Outdated Show resolved Hide resolved

added test and refactored

8b10979

hasanwhitesource requested a review from viceice April 14, 2022 06:46

viceice reviewed Apr 14, 2022

View reviewed changes

viceice requested a review from HonkingGoose April 14, 2022 12:36

hasanwhitesource added 2 commits April 14, 2022 15:39

Merge branch 'main' of https://github.com/renovatebot/renovate into 1…

d2e0695

…3957-git-timeout

refactored tests

95e4d26

HonkingGoose reviewed Apr 14, 2022

View reviewed changes

docs/usage/self-hosted-configuration.md Outdated Show resolved Hide resolved

HonkingGoose reviewed Apr 14, 2022

View reviewed changes

docs/usage/self-hosted-configuration.md Show resolved Hide resolved

Update docs/usage/self-hosted-configuration.md

fa66dc0

Co-authored-by: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com>

rarkins requested changes Apr 14, 2022

View reviewed changes

docs/usage/self-hosted-configuration.md Show resolved Hide resolved

hasanwhitesource and others added 2 commits April 17, 2022 10:20

More info in docs

6cc245a

Update docs/usage/self-hosted-configuration.md

0c1c1d2

rarkins requested changes Apr 17, 2022

View reviewed changes

docs/usage/self-hosted-configuration.md Outdated Show resolved Hide resolved

rarkins added 2 commits April 17, 2022 16:44

Update docs/usage/self-hosted-configuration.md

84d13d7

Merge branch 'main' into 13957-git-timeout

6a012c5

rarkins approved these changes Apr 17, 2022

View reviewed changes

viceice approved these changes Apr 17, 2022

View reviewed changes

rarkins enabled auto-merge (squash) April 17, 2022 17:11

rarkins merged commit 9270eba into renovatebot:main Apr 17, 2022

astellingwerf reviewed Apr 19, 2022

View reviewed changes

hasanwhitesource mentioned this pull request Apr 19, 2022

fix(docs/usage): fix number typo for gitTimeout #15171

Merged

6 tasks

rarkins added a commit that referenced this pull request Apr 20, 2022

Revert "feat: add git timeout (#14914)"

1c039ab

This reverts commit 9270eba.

github-actions bot locked as resolved and limited conversation to collaborators May 20, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: add git timeout #14914

feat: add git timeout #14914

hasanwhitesource commented Apr 3, 2022

hasanwhitesource commented Apr 5, 2022

hasanwhitesource commented Apr 7, 2022

viceice left a comment

rarkins left a comment

hasanwhitesource commented Apr 14, 2022

viceice left a comment

renovate-release commented Apr 17, 2022

astellingwerf Apr 19, 2022

hasanwhitesource Apr 19, 2022 •

edited


		To handle the case where the underlying Git processes appear to hang, configure the timeout with the number of milliseconds to wait after last received content on either `stdOut` or `stdErr` streams before sending a `SIGINT` kill message.

		The value must be between `2000` and `6000` (milliseconds) inclusive.

feat: add git timeout #14914

feat: add git timeout #14914

Conversation

hasanwhitesource commented Apr 3, 2022

Changes

Context

Documentation (please check one with an [x])

How I've tested my work (please tick one)

hasanwhitesource commented Apr 5, 2022

hasanwhitesource commented Apr 7, 2022

viceice left a comment

Choose a reason for hiding this comment

rarkins left a comment

Choose a reason for hiding this comment

hasanwhitesource commented Apr 14, 2022

viceice left a comment

Choose a reason for hiding this comment

renovate-release commented Apr 17, 2022

astellingwerf Apr 19, 2022

Choose a reason for hiding this comment

hasanwhitesource Apr 19, 2022 • edited

Choose a reason for hiding this comment

hasanwhitesource Apr 19, 2022 •

edited