Skip to content

Commit 7949f94

Browse files
committed
Revert AF-related changes
1 parent ec868c3 commit 7949f94

File tree

2 files changed

+2
-17
lines changed

2 files changed

+2
-17
lines changed

src/Aspire.Hosting.Azure.Storage/AzureBlobStorageContainerResource.cs

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@ namespace Aspire.Hosting;
1717
/// <param name="parent">The <see cref="AzureBlobStorageResource"/> that the resource is stored in.</param>
1818
public class AzureBlobStorageContainerResource(string name, string blobContainerName, AzureBlobStorageResource parent) : Resource(name),
1919
IResourceWithConnectionString,
20-
IResourceWithParent<AzureBlobStorageResource>,
21-
IResourceWithAzureFunctionsConfig
20+
IResourceWithParent<AzureBlobStorageResource>
2221
{
2322

2423
/// <summary>
@@ -36,9 +35,6 @@ public class AzureBlobStorageContainerResource(string name, string blobContainer
3635
/// </summary>
3736
public AzureBlobStorageResource Parent => parent ?? throw new ArgumentNullException(nameof(parent));
3837

39-
internal void ApplyAzureFunctionsConfiguration(IDictionary<string, object> target, string connectionName)
40-
=> Parent.ApplyAzureFunctionsConfiguration(target, connectionName, Name);
41-
4238
/// <summary>
4339
/// Converts the current instance to a provisioning entity.
4440
/// </summary>
@@ -58,7 +54,4 @@ private static string ThrowIfNullOrEmpty([NotNull] string? argument, [CallerArgu
5854
ArgumentException.ThrowIfNullOrEmpty(argument, paramName);
5955
return argument;
6056
}
61-
62-
void IResourceWithAzureFunctionsConfig.ApplyAzureFunctionsConfiguration(IDictionary<string, object> target, string connectionName)
63-
=> ApplyAzureFunctionsConfiguration(target, connectionName);
6457
}

src/Aspire.Hosting.Azure.Storage/AzureBlobStorageResource.cs

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ internal ReferenceExpression GetConnectionString(string? blobContainerName)
4747
return builder.Build();
4848
}
4949

50-
internal void ApplyAzureFunctionsConfiguration(IDictionary<string, object> target, string connectionName, string? blobContainerName = null)
50+
void IResourceWithAzureFunctionsConfig.ApplyAzureFunctionsConfiguration(IDictionary<string, object> target, string connectionName)
5151
{
5252
if (Parent.IsEmulator)
5353
{
@@ -68,11 +68,6 @@ internal void ApplyAzureFunctionsConfiguration(IDictionary<string, object> targe
6868
// We don't inject the queue resource here since we on;y want it to
6969
// be accessible by the Functions host.
7070
target[$"{AzureStorageResource.BlobsConnectionKeyPrefix}__{connectionName}__ServiceUri"] = Parent.BlobEndpoint;
71-
72-
if (blobContainerName is not null)
73-
{
74-
target[$"{AzureStorageResource.BlobsConnectionKeyPrefix}__{connectionName}__BlobContainerName"] = blobContainerName;
75-
}
7671
}
7772
}
7873

@@ -85,7 +80,4 @@ internal void ApplyAzureFunctionsConfiguration(IDictionary<string, object> targe
8580
global::Azure.Provisioning.Storage.BlobService service = new(Infrastructure.NormalizeBicepIdentifier(Name));
8681
return service;
8782
}
88-
89-
void IResourceWithAzureFunctionsConfig.ApplyAzureFunctionsConfiguration(IDictionary<string, object> target, string connectionName)
90-
=> ApplyAzureFunctionsConfiguration(target, connectionName);
9183
}

0 commit comments

Comments
 (0)