diff --git a/src/Aspire.Hosting.Azure/AzureBicepResourceScope.cs b/src/Aspire.Hosting.Azure/AzureBicepResourceScope.cs
index 83e576cde5c..7c70437009d 100644
--- a/src/Aspire.Hosting.Azure/AzureBicepResourceScope.cs
+++ b/src/Aspire.Hosting.Azure/AzureBicepResourceScope.cs
@@ -43,7 +43,7 @@ private AzureBicepResourceScope(object? resourceGroup, object? subscription, boo
///
/// The subscription identifier for subscription-level resources.
/// A new scoped to the subscription.
- public static AzureBicepResourceScope ForSubscription(object subscription)
+ public static AzureBicepResourceScope CreateForSubscription(object subscription)
{
ArgumentNullException.ThrowIfNull(subscription);
@@ -54,7 +54,7 @@ public static AzureBicepResourceScope ForSubscription(object subscription)
/// Creates a scope for tenant-level resources in the current tenant.
///
/// A new scoped to the current tenant.
- public static AzureBicepResourceScope ForTenant()
+ public static AzureBicepResourceScope CreateForTenant()
{
return new AzureBicepResourceScope(resourceGroup: null, subscription: null, isTenantScope: true);
}
@@ -80,14 +80,14 @@ public static AzureBicepResourceScope ForTenant()
if (annotation.IsTenantScope)
{
- return ForTenant();
+ return CreateForTenant();
}
return (annotation.ResourceGroup, annotation.Subscription) switch
{
({ } resourceGroup, { } subscription) => new AzureBicepResourceScope(resourceGroup, subscription),
({ } resourceGroup, null) => new AzureBicepResourceScope(resourceGroup),
- (null, { } subscription) => ForSubscription(subscription),
+ (null, { } subscription) => CreateForSubscription(subscription),
_ => null
};
}
diff --git a/tests/Aspire.Hosting.Azure.Tests/AzureBicepProvisionerTests.cs b/tests/Aspire.Hosting.Azure.Tests/AzureBicepProvisionerTests.cs
index 59cd34ba241..77dda982c1a 100644
--- a/tests/Aspire.Hosting.Azure.Tests/AzureBicepProvisionerTests.cs
+++ b/tests/Aspire.Hosting.Azure.Tests/AzureBicepProvisionerTests.cs
@@ -160,7 +160,7 @@ public async Task GetOrCreateResourceAsync_WithSubscriptionScope_UsesSubscriptio
targetScope = 'subscription'
output result string = 'ok'
""");
- resource.Scope = AzureBicepResourceScope.ForSubscription(subscription.Id.Name);
+ resource.Scope = AzureBicepResourceScope.CreateForSubscription(subscription.Id.Name);
var provisioner = CreateProvisioner(services);
var context = ProvisioningTestHelpers.CreateTestProvisioningContext(
@@ -195,7 +195,7 @@ public async Task GetOrCreateResourceAsync_WithTenantScope_UsesTenantDeploymentC
targetScope = 'tenant'
output result string = 'ok'
""");
- resource.Scope = AzureBicepResourceScope.ForTenant();
+ resource.Scope = AzureBicepResourceScope.CreateForTenant();
var provisioner = CreateProvisioner(services);
var context = ProvisioningTestHelpers.CreateTestProvisioningContext(
@@ -293,7 +293,7 @@ public async Task GetOrCreateResourceAsync_WithSubscriptionScopeInRunMode_UsesSu
targetScope = 'subscription'
output result string = 'ok'
""");
- resource.Scope = AzureBicepResourceScope.ForSubscription(subscription.Id.Name);
+ resource.Scope = AzureBicepResourceScope.CreateForSubscription(subscription.Id.Name);
var provisioner = CreateProvisioner(services, DistributedApplicationOperation.Run);
var context = ProvisioningTestHelpers.CreateTestProvisioningContext(
@@ -671,7 +671,7 @@ public async Task GetOrCreateResourceAsync_PublishesSubscriptionScopedPredictedD
var tenant = new TestTenantResource();
var resource = new AzureBicepResource("subscriptionDeployment", templateString: "output name string = 'subscriptionDeployment'")
{
- Scope = AzureBicepResourceScope.ForSubscription(subscription.Id.Name)
+ Scope = AzureBicepResourceScope.CreateForSubscription(subscription.Id.Name)
};
var provisioner = new BicepProvisioner(
diff --git a/tests/Aspire.Hosting.Azure.Tests/AzureEnvironmentResourceTests.cs b/tests/Aspire.Hosting.Azure.Tests/AzureEnvironmentResourceTests.cs
index 542418887af..b228541d065 100644
--- a/tests/Aspire.Hosting.Azure.Tests/AzureEnvironmentResourceTests.cs
+++ b/tests/Aspire.Hosting.Azure.Tests/AzureEnvironmentResourceTests.cs
@@ -200,7 +200,7 @@ param location string
output value string = 'subscription'
""");
- subscriptionScoped.Resource.Scope = AzureBicepResourceScope.ForSubscription(subscription.Resource);
+ subscriptionScoped.Resource.Scope = AzureBicepResourceScope.CreateForSubscription(subscription.Resource);
var tenantScoped = builder.AddBicepTemplateString("tenantScoped",
"""
@@ -210,7 +210,7 @@ param location string
output value string = 'tenant'
""");
- tenantScoped.Resource.Scope = AzureBicepResourceScope.ForTenant();
+ tenantScoped.Resource.Scope = AzureBicepResourceScope.CreateForTenant();
var app = builder.Build();
app.Run();
diff --git a/tests/Aspire.Hosting.Azure.Tests/BicepUtilitiesTests.cs b/tests/Aspire.Hosting.Azure.Tests/BicepUtilitiesTests.cs
index 9727c1f60e8..47543a70520 100644
--- a/tests/Aspire.Hosting.Azure.Tests/BicepUtilitiesTests.cs
+++ b/tests/Aspire.Hosting.Azure.Tests/BicepUtilitiesTests.cs
@@ -364,7 +364,7 @@ public async Task SetScopeAsync_SetsSubscriptionFromScope()
{
using var builder = TestDistributedApplicationBuilder.Create();
var bicep = builder.AddBicepTemplateString("test", "param name string").Resource;
- bicep.Scope = AzureBicepResourceScope.ForSubscription("12345678-1234-1234-1234-123456789012");
+ bicep.Scope = AzureBicepResourceScope.CreateForSubscription("12345678-1234-1234-1234-123456789012");
var scope = new JsonObject();
@@ -379,7 +379,7 @@ public async Task SetScopeAsync_RemovesStaleScopeValues()
{
using var builder = TestDistributedApplicationBuilder.Create();
var bicep = builder.AddBicepTemplateString("test", "param name string").Resource;
- bicep.Scope = AzureBicepResourceScope.ForSubscription("12345678-1234-1234-1234-123456789012");
+ bicep.Scope = AzureBicepResourceScope.CreateForSubscription("12345678-1234-1234-1234-123456789012");
var scope = new JsonObject
{
@@ -398,7 +398,7 @@ public async Task SetScopeAsync_SetsTenantFromScope()
{
using var builder = TestDistributedApplicationBuilder.Create();
var bicep = builder.AddBicepTemplateString("test", "param name string").Resource;
- bicep.Scope = AzureBicepResourceScope.ForTenant();
+ bicep.Scope = AzureBicepResourceScope.CreateForTenant();
var scope = new JsonObject();
@@ -489,7 +489,7 @@ public async Task GetCurrentChecksumAsync_UsesCurrentScopeWhenSavedScopeIsMissin
await BicepUtilities.SetParametersAsync(legacyParameters, bicep);
var legacyChecksum = BicepUtilities.GetChecksum(bicep, legacyParameters, scope: null);
- bicep.Scope = AzureBicepResourceScope.ForSubscription("12345678-1234-1234-1234-123456789012");
+ bicep.Scope = AzureBicepResourceScope.CreateForSubscription("12345678-1234-1234-1234-123456789012");
var configurationBuilder = new ConfigurationBuilder();
configurationBuilder.AddInMemoryCollection(new Dictionary
diff --git a/tests/Aspire.Hosting.Azure.Tests/ExistingAzureResourceTests.cs b/tests/Aspire.Hosting.Azure.Tests/ExistingAzureResourceTests.cs
index cfe0519ddbc..3a1b8a6c46c 100644
--- a/tests/Aspire.Hosting.Azure.Tests/ExistingAzureResourceTests.cs
+++ b/tests/Aspire.Hosting.Azure.Tests/ExistingAzureResourceTests.cs
@@ -585,7 +585,7 @@ param value string
output id string = 'subscription'
""")
.WithParameter("value", "unused");
- resource.Resource.Scope = AzureBicepResourceScope.ForSubscription(existingSubscriptionId.Resource);
+ resource.Resource.Scope = AzureBicepResourceScope.CreateForSubscription(existingSubscriptionId.Resource);
var (manifest, bicep) = await AzureManifestUtils.GetManifestWithBicep(resource.Resource, skipPreparer: true);
@@ -604,7 +604,7 @@ public async Task SupportsBicepTemplateWithTenantScopeInPublishMode()
output id string = 'tenant'
""");
- resource.Resource.Scope = AzureBicepResourceScope.ForTenant();
+ resource.Resource.Scope = AzureBicepResourceScope.CreateForTenant();
var (manifest, bicep) = await AzureManifestUtils.GetManifestWithBicep(resource.Resource, skipPreparer: true);