Skip to content

Merge change allowing parameters files to be handled properly. #1764

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.

Sign up for GitHub

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

Merged
Jtango18 merged 1 commit into from
Feb 9, 2026
Merged

Merge change allowing parameters files to be handled properly. #1764

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions source/Calamari.AzureResourceGroup/DeployBicepTemplateBehaviour.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public async Task Execute(RunningDeployment context)
var subscriptionId = context.Variables.GetRequiredVariable(AzureAccountVariables.SubscriptionId);
var deploymentModeVariable = context.Variables.GetRequiredVariable(SpecialVariables.Action.Azure.ResourceGroupDeploymentMode);
var deploymentMode = (ArmDeploymentMode)Enum.Parse(typeof(ArmDeploymentMode), deploymentModeVariable);

var resourceGroup = await GetOrCreateResourceGroup(armClient, subscriptionId, resourceGroupName, resourceGroupLocation);

var (template, parameters) = GetArmTemplateAndParameters(context);
Expand All @@ -56,7 +56,11 @@ public async Task Execute(RunningDeployment context)
log.Verbose($"Deployment Name: {armDeploymentName}, set to variable \"AzureRmOutputs[DeploymentName]\"");
log.SetOutputVariable("AzureRmOutputs[DeploymentName]", armDeploymentName, context.Variables);

var deploymentOperation = await resourceGroupOperator.CreateDeployment(resourceGroup, armDeploymentName, deploymentMode, template, parameters);
var deploymentOperation = await resourceGroupOperator.CreateDeployment(resourceGroup,
armDeploymentName,
deploymentMode,
template,
parameters);
await resourceGroupOperator.PollForCompletion(deploymentOperation, context.Variables);
await resourceGroupOperator.FinalizeDeployment(deploymentOperation, context.Variables);
}
Expand Down Expand Up @@ -84,10 +88,9 @@ async Task<ResourceGroupResource> GetOrCreateResourceGroup(ArmClient armClient,
var bicepCli = new BicepCli(log, commandLineRunner, context.CurrentDirectory);

var bicepTemplateFile = context.Variables.Get(SpecialVariables.Action.Azure.BicepTemplateFile, "template.bicep");
var templateParametersFile = context.Variables.Get(SpecialVariables.Action.Azure.TemplateParameters, "parameters.json");
var templateSource = context.Variables.Get(SpecialVariables.Action.Azure.TemplateSource, string.Empty);

var filesInPackageOrRepository = templateSource == "Package" || templateSource == "GitRepository";
var filesInPackageOrRepository = templateSource is "Package" or "GitRepository";
if (filesInPackageOrRepository)
{
bicepTemplateFile = context.Variables.Get(SpecialVariables.Action.Azure.BicepTemplate);
Expand All @@ -98,9 +101,8 @@ async Task<ResourceGroupResource> GetOrCreateResourceGroup(ArmClient armClient,
log.Info("Bicep file processed");

var template = templateService.GetSubstitutedTemplateContent(armTemplateFile, filesInPackageOrRepository, context.Variables);
var parameters = !string.IsNullOrWhiteSpace(templateParametersFile)
? templateService.GetSubstitutedTemplateContent(templateParametersFile, filesInPackageOrRepository, context.Variables)
: null;

var parameters = templateService.GetSubstitutedTemplateContent("parameters.json", inPackage: false, context.Variables);
Copy link

@denys-octopus denys-octopus Feb 9, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the key change: Bicep template step doesn't support parameters sourced from package or Git repository.


return (template, parameters);
}
Expand Down