Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
21 changes: 20 additions & 1 deletion src/Analyzer.Core/TemplateAnalyzer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,9 @@ private IEnumerable<IEvaluation> AnalyzeAllIncludedTemplates(string populatedTem
templatejObject = armTemplateProcessor.ProcessTemplate(parameters);
}
catch (Exception e)
{
{
// log populated template
this.logger?.LogDebug($"Populated template: {populatedTemplate}");
throw new TemplateAnalyzerException("Error while processing template.", e);
}

Expand Down Expand Up @@ -169,6 +171,23 @@ private IEnumerable<IEvaluation> AnalyzeAllIncludedTemplates(string populatedTem

if (currentProcessedResource.InsensitiveToken("type")?.ToString().Equals("Microsoft.Resources/deployments", StringComparison.OrdinalIgnoreCase) ?? false)
{
var resourceCondition = currentProcessedResource.InsensitiveToken("condition");

if (resourceCondition != null)
{
bool skip = false;
// Condition is simply false.
if (resourceCondition.ToString().Equals("false", StringComparison.OrdinalIgnoreCase))
skip = true;

// TODO: evaluate expressions, e.g. {[not(empty(parameters('dashboardName')))]}
if (skip)
{
this.logger?.LogInformation($"Conditions for template not met, skipping.");
continue;
}
}

var nestedTemplate = currentProcessedResource.InsensitiveToken("properties.template");
if (nestedTemplate == null)
{
Expand Down
11 changes: 10 additions & 1 deletion src/Analyzer.TemplateProcessor/ArmTemplateProcessor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
using Azure.Deployments.Core.Definitions.Schema;
using Azure.Deployments.Core.Resources;
using Azure.Deployments.Expression.Engines;
using Azure.Deployments.Expression.Extensions;
using Azure.Deployments.Templates.Engines;
using Azure.Deployments.Templates.Expressions;
using Azure.Deployments.Templates.Extensions;
Expand Down Expand Up @@ -546,7 +547,15 @@ internal InsensitiveDictionary<JToken> PopulateParameters(string parameters)

foreach (var parameter in parametersObject.InsensitiveToken("parameters").Value<JObject>()?.Properties() ?? Enumerable.Empty<JProperty>())
{
JToken parameterValueAsJToken = parameter.Value.ToObject<JObject>().Property("value")?.Value;
JToken parameterValueAsJToken;
if (parameter.Value.IsTextBasedJTokenType())
{
parameterValueAsJToken = parameter.Value;
}
else
{
parameterValueAsJToken = parameter.Value.ToObject<JObject>().Property("value")?.Value;
}

// See if "reference" was specified instead of "value"
bool isReference = false;
Expand Down