Skip to content

Commit 49c09c5

Browse files
Bump Azure.Deployments.Templates from 1.473.0 to 1.527.0 (#18407)
Updated [Azure.Deployments.Templates](https://msazure.visualstudio.com/One/_git/AzureUX-Deployments) from 1.473.0 to 1.527.0. <details> <summary>Release notes</summary> _Sourced from [Azure.Deployments.Templates's releases](https://msazure.visualstudio.com/One/_git/AzureUX-Deployments/tags)._ No release notes found for this version range. Commits viewable in [compare view](https://msazure.visualstudio.com/One/_git/AzureUX-Deployments/commits). </details> [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=Azure.Deployments.Templates&package-manager=nuget&previous-version=1.473.0&new-version=1.527.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> ###### Microsoft Reviewers: [Open in CodeFlow](https://microsoft.github.io/open-pr/?codeflow=https://github.com/Azure/bicep/pull/18407) --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Anthony Martin <[email protected]>
1 parent 4726ec1 commit 49c09c5

File tree

9 files changed

+20
-66
lines changed

9 files changed

+20
-66
lines changed

src/Bicep.Cli/Helpers/Snapshot/SnapshotHelper.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ public ParametersRewriteVisitor(DeploymentParametersDefinition parameters, Func<
142142
this.tryResolveExternalInput = tryResolveExternalInput;
143143
}
144144

145-
public override ITemplateLanguageExpression MapFunctionExpression(FunctionExpression expression, ISet<ITemplateLanguageExpression>? expressionsToSkip)
145+
protected override ITemplateLanguageExpression RewriteFunction(FunctionExpression expression, Func<ITemplateLanguageExpression, ITemplateLanguageExpression> rewriteChildExpression)
146146
{
147147
if (expression.Name.Equals(LanguageConstants.ExternalInputsArmFunctionName, StringComparison.OrdinalIgnoreCase))
148148
{
@@ -168,7 +168,7 @@ public override ITemplateLanguageExpression MapFunctionExpression(FunctionExpres
168168
};
169169
}
170170

171-
return base.MapFunctionExpression(expression, expressionsToSkip);
171+
return base.RewriteFunction(expression, rewriteChildExpression);
172172
}
173173
}
174174

src/Bicep.Core/Analyzers/Linter/Rules/WhatIfShortCircuitingRule.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -703,7 +703,7 @@ public IEnumerable<string> MapObjectExpression(
703703
return [];
704704
}
705705

706-
return expression.SelectMany(
706+
return expression.Properties.SelectMany(
707707
kvp => kvp.Key.Apply(this, expressionsToSkip).Concat(kvp.Value.Apply(this, expressionsToSkip)));
708708
}
709709

src/Bicep.Core/Intermediate/TemplateLanguageExpressionVisitor.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public virtual void VisitNullExpression(NullExpression expression)
5151

5252
public virtual void VisitObjectExpression(Azure.Deployments.Expression.Intermediate.ObjectExpression expression)
5353
{
54-
foreach (var kvp in expression)
54+
foreach (var kvp in expression.Properties)
5555
{
5656
Visit(kvp.Key);
5757
Visit(kvp.Value);

src/Bicep.Local.Deploy/Engine/IServiceCollectionExtensions.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
using Azure.Deployments.Engine.Dependencies;
1414
using Azure.Deployments.Engine.DeploymentExpander;
1515
using Azure.Deployments.Engine.External;
16+
using Azure.Deployments.Engine.Http;
1617
using Azure.Deployments.Engine.Interfaces;
1718
using Azure.Deployments.Engine.Providers;
1819
using Azure.Deployments.Engine.Storage.Volatile;
@@ -40,7 +41,7 @@ public static IServiceCollection RegisterLocalDeployServices(this IServiceCollec
4041
services.AddSingleton<IDeploymentEventSource>(eventSource);
4142
services.AddSingleton<IDeploymentMetricsReporter, NoOpDeploymentMetricsReporter>();
4243

43-
services.AddSingleton<IHttpContentHandler, LocalHttpContentHandler>();
44+
services.AddSingleton<IHttpResponseReader, DefaultHttpResponseReader>();
4445
services.AddSingleton<IKeyVaultDataProvider, LocalKeyVaultDataProvider>();
4546
services.AddSingleton<IAzureDeploymentSettings, LocalDeploymentSettings>();
4647
services.AddSingleton<IEnablementConfigProvider, LocalEnablementConfigProvider>();

src/Bicep.Local.Deploy/Engine/LocalDeploymentEngine.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ public async Task StartDeployment(string name, string templateString, string par
104104
originalDeploymentName: context.DeploymentName,
105105
isNestedDeployment: false,
106106
validateOnly: false,
107-
request: null,
107+
requestContext: null,
108108
frontdoorEndpointUri: new Uri(requestContext.FrontdoorEndpoint),
109109
cancellationToken: cancellationToken,
110110
oboToken: oboToken,

src/Bicep.Local.Deploy/Engine/LocalDeploymentEngineHost.cs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@
1212
using Azure.Deployments.Core.Exceptions;
1313
using Azure.Deployments.Core.FeatureEnablement;
1414
using Azure.Deployments.Core.Telemetry;
15+
using Azure.Deployments.Engine.DotnetMigration.Abstraction;
1516
using Azure.Deployments.Engine.External;
17+
using Azure.Deployments.Engine.Http;
1618
using Azure.Deployments.Engine.Interfaces;
1719
using Azure.Deployments.Engine.Workers.Metadata;
1820
using Azure.Deployments.ResourceMetadata.Contracts;
@@ -41,9 +43,9 @@ public LocalDeploymentEngineHost(
4143
IDataProviderHolder dataProviderHolder,
4244
ITemplateExceptionHandler exceptionHandler,
4345
IEnablementConfigProvider enablementConfigProvider,
44-
IHttpContentHandler contentHandler,
46+
IHttpResponseReader responseReader,
4547
IDeploymentMetricsReporter metricsReporter)
46-
: base(settings, contentHandler, deploymentEventSource, metricsReporter, keyVaultDataProvider, requestContext, dataProviderHolder, exceptionHandler, enablementConfigProvider)
48+
: base(settings, responseReader, deploymentEventSource, metricsReporter, keyVaultDataProvider, requestContext, dataProviderHolder, exceptionHandler, enablementConfigProvider)
4749
{
4850
this.extensionHostManager = extensionHostManager;
4951
}
@@ -76,7 +78,7 @@ public override Task<HttpResponseMessage> CallFrontdoorService(
7678
string oboToken,
7779
string oboCorrelationId,
7880
string auxToken,
79-
HttpRequestMessage requestMessage = null,
81+
IRequestContext originalRequestContext = null,
8082
HttpContent content = null,
8183
Action<HttpRequestHeaders> addHeadersFunc = null,
8284
Action<IDictionary<string, object>> requestPropertiesEnricher = null,

src/Bicep.Local.Deploy/Engine/LocalDeploymentSettings.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -219,9 +219,9 @@ public class LocalDeploymentSettings : IAzureDeploymentSettings
219219
public IReadOnlyDictionary<string, List<string>> PreviewFeatureTenantDictionary { get; set; } = new Dictionary<string, List<string>>();
220220
public IReadOnlyDictionary<string, List<string>> PreviewFeatureRegionDictionary { get; set; } = new Dictionary<string, List<string>>();
221221
public IReadOnlyDictionary<string, decimal> PreviewFeatureThresholdDictionary { get; set; } = new Dictionary<string, decimal>();
222-
public IReadOnlyDictionary<string, List<string>> DisabledTenantDictionary { get; set; } = new Dictionary<string, List<string>>();
223-
public IReadOnlyDictionary<string, List<string>> DisabledSubscriptionDictionary { get; set; } = new Dictionary<string, List<string>>();
224-
public IReadOnlyDictionary<string, List<string>> DisabledRegionDictionary { get; set; } = new Dictionary<string, List<string>>();
222+
public IReadOnlyDictionary<string, IEnumerable<string>> DisabledTenantDictionary => ImmutableDictionary<string, IEnumerable<string>>.Empty;
223+
public IReadOnlyDictionary<string, IEnumerable<string>> DisabledSubscriptionDictionary => ImmutableDictionary<string, IEnumerable<string>>.Empty;
224+
public IReadOnlyDictionary<string, IEnumerable<string>> DisabledRegionDictionary => ImmutableDictionary<string, IEnumerable<string>>.Empty;
225225
public IEnumerable<string> DisabledThresholdFeatures { get; set; } = [];
226226

227227
public string[] AllowedLocations => ["local", "west us", "east us"];
@@ -286,9 +286,9 @@ public class LocalDeploymentSettings : IAzureDeploymentSettings
286286

287287
public TimeSpan AcquirePolicyTokenMaxRetryDuration => TimeSpan.Zero;
288288

289-
IReadOnlyDictionary<string, IEnumerable<string>> IAzureDeploymentSettings.DisabledTenantDictionary => ImmutableDictionary<string, IEnumerable<string>>.Empty;
289+
public IReadOnlyDictionary<string, IEnumerable<string>> DisabledApplicationDictionary => throw new NotImplementedException();
290290

291-
IReadOnlyDictionary<string, IEnumerable<string>> IAzureDeploymentSettings.DisabledSubscriptionDictionary => ImmutableDictionary<string, IEnumerable<string>>.Empty;
291+
public int ExtendedDeploymentLimit => 2500;
292292

293-
IReadOnlyDictionary<string, IEnumerable<string>> IAzureDeploymentSettings.DisabledRegionDictionary => ImmutableDictionary<string, IEnumerable<string>>.Empty;
293+
public int ExtendedGroomingJobMinimumThreshold => 2000;
294294
}

src/Bicep.Local.Deploy/Engine/LocalHttpContentHandler.cs

Lines changed: 0 additions & 49 deletions
This file was deleted.

src/Directory.Packages.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
<PackageVersion Include="Azure.Bicep.Types.K8s" Version="0.1.644" />
1717
<PackageVersion Include="Azure.Containers.ContainerRegistry" Version="1.1.1" />
1818
<PackageVersion Include="Azure.Deployments.ClientTools" Version="1.527.0" />
19-
<PackageVersion Include="Azure.Deployments.Engine" Version="1.473.0" />
19+
<PackageVersion Include="Azure.Deployments.Engine" Version="1.527.0" />
2020
<PackageVersion Include="Azure.Deployments.Extensibility.Core" Version="0.1.67" />
2121
<PackageVersion Include="Azure.Deployments.Internal.GenerateNotice" Version="0.1.45" />
22-
<PackageVersion Include="Azure.Deployments.Templates" Version="1.473.0" />
22+
<PackageVersion Include="Azure.Deployments.Templates" Version="1.527.0" />
2323
<PackageVersion Include="Azure.Identity" Version="1.17.0" />
2424
<PackageVersion Include="Azure.ResourceManager.ResourceGraph" Version="1.1.0" />
2525
<PackageVersion Include="Azure.ResourceManager.Resources" Version="1.11.1" />

0 commit comments

Comments
 (0)