Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix File Pair Processing of Modify and Deletion Overlap #881

Merged
merged 2 commits into from
May 2, 2024

Conversation

Jefajers
Copy link
Member

Overview/Summary

This PR fixes #879 and similar patterns.

With this changed logic the module will check that whenever deployment jobs are constructed example: baseTemplate + parameterTemplate it will check that neither file is being deleted in the same push to the module. If there in an overlap the file targeted for deletion will be skipped when constructing deployment jobs.

Without this logic the module based on its current order of processing would unintentionally first re-process (deploy) the deleted file before proceeding with deletion.

This PR fixes/adds/changes/removes

  1. Changes Invoke-AzOpsPush.ps1
  2. Changes ConvertFrom-AzOpsBicepTemplate.ps1
  3. Changes Strings.psd1

Breaking Changes

N/A

Testing Evidence

Tests have been performed with the following combinations using both .json, parameters.json, bicep, bicepparams:

  • Changes to baseTemplate and removal of parameterTemplate
  • Changes to parameterTemplate and removal of baseTemplate

As part of this Pull Request I have

  • Checked for duplicate Pull Requests
  • Associated it with relevant issues, for tracking and closure.
  • Ensured my code/branch is up-to-date with the latest changes in the main branch
  • Performed testing and provided evidence.
  • Updated relevant and associated documentation.

@Jefajers Jefajers added the bug Something isn't working label Apr 29, 2024
@Jefajers Jefajers added this to the v2.6.3 milestone Apr 29, 2024
@Jefajers Jefajers marked this pull request as ready for review April 30, 2024 08:41
@Jefajers Jefajers requested review from a team as code owners April 30, 2024 08:41
@Jefajers Jefajers added this to Needs review in AzOps Apr 30, 2024
@Jefajers Jefajers merged commit 0fb8d3b into Azure:main May 2, 2024
4 checks passed
@Jefajers Jefajers deleted the trial branch May 2, 2024 07:06
@Jefajers Jefajers moved this from Needs review to Pending release in AzOps May 2, 2024
@Jefajers Jefajers moved this from Pending release to Done in AzOps May 3, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
AzOps
Done
2 participants