Skip to content
Merged
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
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@ public static IResourceBuilder<AzureCosmosDBResource> WithAccessKeyAuthenticatio
ArgumentNullException.ThrowIfNull(builder);

var azureResource = builder.Resource;
azureResource.ConnectionStringSecretOutput = keyVaultBuilder.Resource.GetSecretReference(
azureResource.ConnectionStringSecretOutput = keyVaultBuilder.Resource.GetSecret(
$"connectionstrings--{azureResource.Name}");

builder.WithParameter(AzureBicepResource.KnownParameters.KeyVaultName, keyVaultBuilder.Resource.NameOutputReference);
Expand Down
2 changes: 1 addition & 1 deletion src/Aspire.Hosting.Azure.CosmosDB/AzureCosmosDBResource.cs
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ internal ReferenceExpression GetChildConnectionString(string childResourceName,

if (UseAccessKeyAuthentication && !IsEmulator)
{
builder.AppendFormatted(ConnectionStringSecretOutput.Resource.GetSecretReference(GetKeyValueSecretName(childResourceName)));
builder.AppendFormatted(ConnectionStringSecretOutput.Resource.GetSecret(GetKeyValueSecretName(childResourceName)));
}
else
{
Expand Down
2 changes: 1 addition & 1 deletion src/Aspire.Hosting.Azure.KeyVault/AzureKeyVaultResource.cs
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public class AzureKeyVaultResource(string name, Action<AzureResourceInfrastructu
/// <param name="secretName"></param>
/// <returns></returns>
/// <exception cref="ArgumentException"></exception>
public IAzureKeyVaultSecretReference GetSecretReference(string secretName)
public IAzureKeyVaultSecretReference GetSecret(string secretName)
{
ArgumentException.ThrowIfNullOrEmpty(secretName, nameof(secretName));

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@ public static IResourceBuilder<AzurePostgresFlexibleServerResource> WithPassword
ParameterResourceBuilderExtensions.CreateDefaultPasswordParameter(builder.ApplicationBuilder, $"{builder.Resource.Name}-password");
builder.WithParameter("administratorLoginPassword", azureResource.PasswordParameter);

azureResource.ConnectionStringSecretOutput = keyVaultBuilder.Resource.GetSecretReference($"connectionstrings--{builder.Resource.Name}");
azureResource.ConnectionStringSecretOutput = keyVaultBuilder.Resource.GetSecret($"connectionstrings--{builder.Resource.Name}");

builder.WithParameter(AzureBicepResource.KnownParameters.KeyVaultName, keyVaultBuilder.Resource.NameOutputReference);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ internal ReferenceExpression GetDatabaseConnectionString(string databaseResource
// Note that the bicep template puts each database's connection string in a KeyVault secret.
if (InnerResource is null && ConnectionStringSecretOutput is not null)
{
return ReferenceExpression.Create($"{ConnectionStringSecretOutput.Resource.GetSecretReference(GetDatabaseKeyVaultSecretName(databaseResourceName))}");
return ReferenceExpression.Create($"{ConnectionStringSecretOutput.Resource.GetSecret(GetDatabaseKeyVaultSecretName(databaseResourceName))}");
}

return ReferenceExpression.Create($"{this};Database={databaseName}");
Expand Down
2 changes: 1 addition & 1 deletion src/Aspire.Hosting.Azure.Redis/AzureRedisExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ public static IResourceBuilder<AzureRedisCacheResource> WithAccessKeyAuthenticat
ArgumentNullException.ThrowIfNull(keyVaultBuilder);

var azureResource = builder.Resource;
azureResource.ConnectionStringSecretOutput = keyVaultBuilder.Resource.GetSecretReference($"connectionstrings--{azureResource.Name}");
azureResource.ConnectionStringSecretOutput = keyVaultBuilder.Resource.GetSecret($"connectionstrings--{azureResource.Name}");
builder.WithParameter(AzureBicepResource.KnownParameters.KeyVaultName, keyVaultBuilder.Resource.NameOutputReference);

// remove role assignment annotations when using access key authentication so an empty roles bicep module isn't generated
Expand Down
2 changes: 1 addition & 1 deletion src/Aspire.Hosting.Azure/IAzureKeyVaultResource.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,5 @@ public interface IAzureKeyVaultResource : IResource, IAzureResource
/// </summary>
/// <param name="secretName">The name of the secret.</param>
/// <returns>A reference to the secret.</returns>
IAzureKeyVaultSecretReference GetSecretReference(string secretName);
IAzureKeyVaultSecretReference GetSecret(string secretName);
}
Loading