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 Duplicate conflicting deployments with DeployAllMultipleTemplateParameterFiles #887

Merged
merged 3 commits into from
Jun 25, 2024

Conversation

Jefajers
Copy link
Member

Overview/Summary

This PR changes two key pieces to fix #886 and avoid incorrect recursive parameter discovery.

  1. Adjusts how the $deploymentName is derived at run-time. Ensuring that if the deployment job que contains overlapping deployments, we only process it once when they have matching deployment name and files.
    1. Addressing Duplicate conflicting deployments performed when enabling DeployAllMultipleTemplateParameterFiles and ParallelDeployMultipleTemplateParameterFiles #886
  2. During recursive parameter discovery there was a possibility that a un-related file pair would have been discovered and queued for processing. This is not the intent so a step in the recursive process has been added to regex match the base name of any discovered files prior to any further processing.

This PR fixes/adds/changes/removes

  1. Changes Invoke-AzOpsPush.ps1
  2. Changes Repository.Tests.ps1
  3. Adds decoy.westeurope.bicep
  4. Adds decoy.westeurope.x123.parameters.json
  5. Adds deployallrt.westeurope.bicep
  6. Adds deployallrt.westeurope.x123.parameters.json
  7. Adds deployallrt.westeurope.xabc.bicepparam
  8. Adds deployallrt2.westeurope.bicep

Breaking Changes

  1. N/A

Testing Evidence

The logic has been tested according to the issue and an automated test has been added.

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 merged commit ff3d3dd into Azure:main Jun 25, 2024
4 checks passed
@Jefajers Jefajers deleted the duplicateConflict branch June 25, 2024 16:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/powershell bug Something isn't working
Projects
Status: Done
2 participants