File re-created in postUpgradeTasks is detected as deleted

[dominikholler]

How are you running Renovate?

Self-hosted Renovate

If you're self-hosting Renovate, tell us which platform (GitHub, GitLab, etc) and which version of Renovate.

GitHub

Please tell us more about your question or problem

1. Renovates main action, e.g. go mod vendor, might delete files. These files are detected as deleted as expected.
2. A postUpgradeTask might recreate an updated version of this file. This file is are detected as modifed as expected.
3. A postUpgradeTask might recreate the original version of this file. This file is are detected as deleted, but expected to deteced to be added to the git commit.

Example scenario in https://github.com/dominikholler/renovatemissingfile

Initial state:

• vendor/golang.org/x/net/modifiedfile contains a
• vendor/golang.org/x/net/unmodifiedfile contains a

Renovate go update:

• go mod vendor removes both files as expected

       "updatedArtifacts": [
         "go.sum",
         "vendor/modules.txt",
         "vendor/golang.org/x/net/modifiedfile (delete)",
         "vendor/golang.org/x/net/unmodifiedfile (delete)"
       ]

postUpgradeTasks:

• cp b.txt vendor/golang.org/x/net/modifiedfile
• cp a.txt vendor/golang.org/x/net/unmodifiedfile

DEBUG: Post-upgrade file saved (repository=dominikholler/renovatemissingfile, branch=renovate/golang.org-x-net-0.x)
       "dep": "golang.org/x/net",
       "file": "vendor/golang.org/x/net/modifiedfile",
       "pattern": "**/*"

...
       "deletedFiles": ["vendor/golang.org/x/net/unmodifiedfile"],
       "ignoredFiles": [],

Logs (if relevant)

Full log in https://gist.github.com/dominikholler/cd57ff8b3ad3e18e67b1537568854be4

Logs

DEBUG: Post-upgrade file saved (repository=dominikholler/renovatemissingfile, branch=renovate/golang.org-x-net-0.x)
       "dep": "golang.org/x/net",
       "file": "vendor/golang.org/x/net/modifiedfile",
       "pattern": "**/*"

...
       "deletedFiles": ["vendor/golang.org/x/net/unmodifiedfile"],
       "ignoredFiles": [],

[astellingwerf]

You need to git add the files you're changing in post-upgrade tasks to ensure they get picked up as part of the update.

git add vendor/golang.org/x/net/modifiedfile vendor/golang.org/x/net/unmodifiedfile

[dominikholler]

Thanks for the idea, but unfortunately git add seems not to change the scenario: https://gist.github.com/dominikholler/59fc66f971244e689f72b787c1c17941

I have my doubts if I can understand the relevant source code, but

      const addedOrModifiedFiles = [
        ...coerceArray(status.not_added),
        ...coerceArray(status.modified),
      ];

...

      for (const relativePath of addedOrModifiedFiles) {

in

renovate/lib/workers/repository/update/branch/execute-post-upgrade-commands.ts

Line 125 in 9e51d42

for (const relativePath of addedOrModifiedFiles) {

makes me think that renovate tracks only files added or modified files in the postUpgradeCommandsExecutor , but does not cover the restored to unmodified ones.

[rarkins]

This gives the impression that it's probably a "simple" fix in terms of lines of code. The challenge is working out which lines.

@dominikholler can you simplify your reproduction again if the git add didn't work?

[dominikholler]

Thanks @rarkins for having a look! Please let me know if I can help by providing any additional input.

can you simplify your reproduction again if the git add didn't work?

The manual git add did not work, I reverted the main branch of the reproduction repo.
Please find in https://gist.github.com/dominikholler/25847df05cb2dbe76308e1c92c4b5d4a a fresh renovate debug output, and in dominikholler/renovatemissingfile#9 the PR created in this run.