Update Azure.Provisioning to latest #6390
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,7 +2,6 @@ | |
| // The .NET Foundation licenses this file to you under the MIT license. | ||
|
|
||
| using System.Globalization; | ||
| using System.Text.RegularExpressions; | ||
| using Aspire.Hosting.ApplicationModel; | ||
| using Aspire.Hosting.Lifecycle; | ||
|
|
@@ -143,7 +142,7 @@ public void BuildContainerApp(AzureResourceInfrastructure c) | |
| containerImageParam = AllocateContainerImageParameter(); | ||
| } | ||
|
|
||
| var containerAppResource = new ContainerApp(Infrastructure.NormalizeBicepIdentifier(resource.Name)) | ||
| { | ||
| Name = resource.Name.ToLowerInvariant() | ||
| }; | ||
|
|
@@ -180,7 +179,7 @@ public void BuildContainerApp(AzureResourceInfrastructure c) | |
| var containerAppContainer = new ContainerAppContainer(); | ||
| template.Containers = [containerAppContainer]; | ||
|
|
||
| containerAppContainer.Image = containerImageParam is null ? containerImageName! : containerImageParam; | ||
| containerAppContainer.Name = resource.Name; | ||
|
|
||
| AddEnvironmentVariablesAndCommandLineArgs(containerAppContainer); | ||
|
|
@@ -484,7 +483,8 @@ private async Task ProcessEnvironmentAsync(DistributedApplicationExecutionContex | |
| { | ||
| var managedIdentityParameter = AllocateManagedIdentityIdParameter(); | ||
| secret.Identity = managedIdentityParameter; | ||
| // TODO: this should be able to use ToUri(), but it hit an issue | ||
| secret.KeyVaultUri = new BicepValue<Uri>(((BicepExpression?)argValue)!); | ||
| } | ||
| else | ||
| { | ||
|
|
@@ -518,7 +518,6 @@ private static BicepValue<string> ResolveValue(object val) | |
| { | ||
| BicepValue<string> s => s, | ||
| string s => s, | ||
| ProvisioningParameter p => p, | ||
| _ => throw new NotSupportedException("Unsupported value type " + val.GetType()) | ||
| }; | ||
|
|
@@ -685,7 +684,7 @@ BicepValue<string> GetHostValue(string? prefix = null, string? suffix = null) | |
| args[index++] = val; | ||
| } | ||
|
|
||
| return (Interpolate(expr.Format, args), finalSecretType); | ||
|
|
||
| } | ||
|
|
||
|
|
@@ -701,7 +700,7 @@ private BicepValue<string> AllocateKeyVaultSecretUriReference(BicepSecretOutputR | |
| { | ||
| // We resolve the keyvault that represents the storage for secret outputs | ||
| var parameter = AllocateParameter(SecretOutputExpression.GetSecretOutputKeyVault(secretOutputReference.Resource)); | ||
| kv = KeyVaultService.FromExisting($"{parameter.BicepIdentifier}_kv"); | ||
| kv.Name = parameter; | ||
|
|
||
| KeyVaultRefs[secretOutputReference.Resource.Name] = kv; | ||
|
|
@@ -710,19 +709,15 @@ private BicepValue<string> AllocateKeyVaultSecretUriReference(BicepSecretOutputR | |
| if (!KeyVaultSecretRefs.TryGetValue(secretOutputReference.ValueExpression, out var secret)) | ||
| { | ||
| // Now we resolve the secret | ||
| var secretBicepIdentifier = Infrastructure.NormalizeBicepIdentifier($"{kv.BicepIdentifier}_{secretOutputReference.Name}"); | ||
| secret = KeyVaultSecret.FromExisting(secretBicepIdentifier); | ||
| secret.Name = secretOutputReference.Name; | ||
| secret.Parent = kv; | ||
|
|
||
| KeyVaultSecretRefs[secretOutputReference.ValueExpression] = secret; | ||
| } | ||
|
|
||
| return secret.Properties.SecretUri; | ||
| } | ||
|
|
||
| private ProvisioningParameter AllocateContainerImageParameter() | ||
|
|
@@ -882,81 +877,45 @@ private void AddContainerRegistryParameters(ContainerAppConfiguration app) | |
| } | ||
| } | ||
|
|
||
| private static BicepValue<string> Interpolate(string format, object[] args) | ||
| { | ||
| var bicepStringBuilder = new BicepStringBuilder(); | ||
|
There was a problem hiding this comment. FYI - @davidfowl. We aren't able to get rid of our There was a problem hiding this comment. I was able to simplify the BicepValueFormattableString class. No need for it to inherit from FormattableString. There was a problem hiding this comment. We should be able to if you move this logic into the caller right? There was a problem hiding this comment. I can build up the BicepStringBuilder earlier and not have the BicepValueFormattableString at all. But we will still need to parse the |
||
|
|
||
| var span = format.AsSpan(); | ||
| var skip = 0; | ||
| var argumentIndex = 0; | ||
|
|
||
| foreach (var match in Regex.EnumerateMatches(span, @"{\d+}")) | ||
| { | ||
| bicepStringBuilder.Append(span[..(match.Index - skip)].ToString()); | ||
|
|
||
| var argument = args[argumentIndex]; | ||
|
|
||
| if (argument is BicepValue<string> bicepValue) | ||
| { | ||
| bicepStringBuilder.Append($"{bicepValue}"); | ||
| } | ||
| else if (argument is string s) | ||
| { | ||
| bicepStringBuilder.Append(s); | ||
| } | ||
| else if (argument is ProvisioningParameter provisioningParameter) | ||
| { | ||
| bicepStringBuilder.Append($"{provisioningParameter}"); | ||
| } | ||
| else | ||
| { | ||
| throw new NotSupportedException($"{argument} is not supported"); | ||
| } | ||
|
|
||
| argumentIndex++; | ||
| span = span[(match.Index + match.Length - skip)..]; | ||
| skip = match.Index + match.Length; | ||
| } | ||
|
|
||
| bicepStringBuilder.Append(span.ToString()); | ||
|
|
||
| return bicepStringBuilder.Build(); | ||
| } | ||
|
|
||
| /// <summary> | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These NuGet.config changes won't be merged. We won't merge this PR until the
1.0.0versions are on nuget.org.