Ensure idempotency for AddAsExistingResource across all Azure resource implementations (#10562)

* Initial plan

* Implement idempotency for 4 Azure resource AddAsExistingResource methods

Co-authored-by: davidfowl <[email protected]>

* Complete idempotency fixes for 14 Azure resource AddAsExistingResource methods

Co-authored-by: davidfowl <[email protected]>

* Complete idempotency fixes for all remaining Azure resource AddAsExistingResource methods

Co-authored-by: davidfowl <[email protected]>

* Split idempotency tests into individual Azure resource test classes

Co-authored-by: davidfowl <[email protected]>

* Add missing test files and idempotency tests for all Azure resources

Co-authored-by: davidfowl <[email protected]>

---------

Co-authored-by: copilot-swe-agent[bot] <[email protected]>
Co-authored-by: davidfowl <[email protected]>

Author: Copilot

src/Aspire.Hosting.Azure.AIFoundry/AzureAIFoundryResource.cs

@@ -61,7 +61,19 @@ public class AzureAIFoundryResource(string name, Action<AzureResourceInfrastruct
     /// <inheritdoc/>
     public override ProvisionableResource AddAsExistingResource(AzureResourceInfrastructure infra)
     {
-        var csa = CognitiveServicesAccount.FromExisting(this.GetBicepIdentifier());
+        var bicepIdentifier = this.GetBicepIdentifier();
+        var resources = infra.GetProvisionableResources();
+        
+        // Check if a CognitiveServicesAccount with the same identifier already exists
+        var existingCsa = resources.OfType<CognitiveServicesAccount>().SingleOrDefault(csa => csa.BicepIdentifier == bicepIdentifier);
+        
+        if (existingCsa is not null)
+        {
+            return existingCsa;
+        }
+        
+        // Create and add new resource if it doesn't exist
+        var csa = CognitiveServicesAccount.FromExisting(bicepIdentifier);
         csa.Name = NameOutputReference.AsProvisioningParameter(infra);
         infra.Add(csa);
         return csa;

src/Aspire.Hosting.Azure.AppConfiguration/AzureAppConfigurationResource.cs

@@ -35,7 +35,19 @@ public class AzureAppConfigurationResource(string name, Action<AzureResourceInfr
     /// <inheritdoc/>
     public override ProvisionableResource AddAsExistingResource(AzureResourceInfrastructure infra)
     {
-        var store = AppConfigurationStore.FromExisting(this.GetBicepIdentifier());
+        var bicepIdentifier = this.GetBicepIdentifier();
+        var resources = infra.GetProvisionableResources();
+        
+        // Check if an AppConfigurationStore with the same identifier already exists
+        var existingStore = resources.OfType<AppConfigurationStore>().SingleOrDefault(store => store.BicepIdentifier == bicepIdentifier);
+        
+        if (existingStore is not null)
+        {
+            return existingStore;
+        }
+        
+        // Create and add new resource if it doesn't exist
+        var store = AppConfigurationStore.FromExisting(bicepIdentifier);
         store.Name = NameOutputReference.AsProvisioningParameter(infra);
         infra.Add(store);
         return store;

src/Aspire.Hosting.Azure.AppContainers/AzureContainerAppEnvironmentResource.cs

@@ -89,8 +89,20 @@ internal BicepOutputReference GetVolumeStorage(IResource resource, ContainerMoun
     /// <inheritdoc/>
     public override ProvisionableResource AddAsExistingResource(AzureResourceInfrastructure infra)
     {
+        var bicepIdentifier = this.GetBicepIdentifier();
+        var resources = infra.GetProvisionableResources();
+        
+        // Check if a ContainerAppManagedEnvironment with the same identifier already exists
+        var existingCae = resources.OfType<ContainerAppManagedEnvironment>().SingleOrDefault(cae => cae.BicepIdentifier == bicepIdentifier);
+        
+        if (existingCae is not null)
+        {
+            return existingCae;
+        }
+        
+        // Create and add new resource if it doesn't exist
         // Even though it's a compound resource, we'll only expose the managed environment
-        var cae = ContainerAppManagedEnvironment.FromExisting(this.GetBicepIdentifier());
+        var cae = ContainerAppManagedEnvironment.FromExisting(bicepIdentifier);
         cae.Name = NameOutputReference.AsProvisioningParameter(infra);
         infra.Add(cae);
         return cae;

src/Aspire.Hosting.Azure.AppService/AzureAppServiceEnvironmentResource.cs

@@ -44,7 +44,19 @@ public class AzureAppServiceEnvironmentResource(string name, Action<AzureResourc
     /// <inheritdoc/>
     public override ProvisionableResource AddAsExistingResource(AzureResourceInfrastructure infra)
     {
-        var plan = AppServicePlan.FromExisting(this.GetBicepIdentifier());
+        var bicepIdentifier = this.GetBicepIdentifier();
+        var resources = infra.GetProvisionableResources();
+        
+        // Check if an AppServicePlan with the same identifier already exists
+        var existingPlan = resources.OfType<AppServicePlan>().SingleOrDefault(plan => plan.BicepIdentifier == bicepIdentifier);
+        
+        if (existingPlan is not null)
+        {
+            return existingPlan;
+        }
+        
+        // Create and add new resource if it doesn't exist
+        var plan = AppServicePlan.FromExisting(bicepIdentifier);
         plan.Name = NameOutputReference.AsProvisioningParameter(infra);
         infra.Add(plan);
         return plan;

src/Aspire.Hosting.Azure.CognitiveServices/AzureOpenAIResource.cs

@@ -62,7 +62,19 @@ internal void AddDeployment(AzureOpenAIDeploymentResource deployment)
     /// <inheritdoc/>
     public override ProvisionableResource AddAsExistingResource(AzureResourceInfrastructure infra)
     {
-        var account = CognitiveServicesAccount.FromExisting(this.GetBicepIdentifier());
+        var bicepIdentifier = this.GetBicepIdentifier();
+        var resources = infra.GetProvisionableResources();
+        
+        // Check if a CognitiveServicesAccount with the same identifier already exists
+        var existingAccount = resources.OfType<CognitiveServicesAccount>().SingleOrDefault(account => account.BicepIdentifier == bicepIdentifier);
+        
+        if (existingAccount is not null)
+        {
+            return existingAccount;
+        }
+        
+        // Create and add new resource if it doesn't exist
+        var account = CognitiveServicesAccount.FromExisting(bicepIdentifier);
         account.Name = NameOutputReference.AsProvisioningParameter(infra);
         infra.Add(account);
         return account;

src/Aspire.Hosting.Azure.ContainerRegistry/AzureContainerRegistryResource.cs

@@ -34,7 +34,19 @@ public class AzureContainerRegistryResource(string name, Action<AzureResourceInf
     /// <inheritdoc/>
     public override ProvisionableResource AddAsExistingResource(AzureResourceInfrastructure infra)
     {
-        var store = ContainerRegistryService.FromExisting(this.GetBicepIdentifier());
+        var bicepIdentifier = this.GetBicepIdentifier();
+        var resources = infra.GetProvisionableResources();
+        
+        // Check if a ContainerRegistryService with the same identifier already exists
+        var existingStore = resources.OfType<ContainerRegistryService>().SingleOrDefault(store => store.BicepIdentifier == bicepIdentifier);
+        
+        if (existingStore is not null)
+        {
+            return existingStore;
+        }
+        
+        // Create and add new resource if it doesn't exist
+        var store = ContainerRegistryService.FromExisting(bicepIdentifier);
         store.Name = NameOutputReference.AsProvisioningParameter(infra);
         infra.Add(store);
         return store;

src/Aspire.Hosting.Azure.CosmosDB/AzureCosmosDBResource.cs

@@ -117,7 +117,19 @@ internal void SetAccountEndpoint(IDictionary<string, object> target, string conn
     /// <inheritdoc/>
     public override ProvisionableResource AddAsExistingResource(AzureResourceInfrastructure infra)
     {
-        var store = CosmosDBAccount.FromExisting(this.GetBicepIdentifier());
+        var bicepIdentifier = this.GetBicepIdentifier();
+        var resources = infra.GetProvisionableResources();
+        
+        // Check if a CosmosDBAccount with the same identifier already exists
+        var existingStore = resources.OfType<CosmosDBAccount>().SingleOrDefault(store => store.BicepIdentifier == bicepIdentifier);
+        
+        if (existingStore is not null)
+        {
+            return existingStore;
+        }
+        
+        // Create and add new resource if it doesn't exist
+        var store = CosmosDBAccount.FromExisting(bicepIdentifier);
         store.Name = NameOutputReference.AsProvisioningParameter(infra);
         infra.Add(store);
         return store;

src/Aspire.Hosting.Azure.EventHubs/AzureEventHubsResource.cs

@@ -127,7 +127,19 @@ internal void ApplyAzureFunctionsConfiguration(IDictionary<string, object> targe
     /// <inheritdoc/>
     public override ProvisionableResource AddAsExistingResource(AzureResourceInfrastructure infra)
     {
-        var hubs = EventHubsNamespace.FromExisting(this.GetBicepIdentifier());
+        var bicepIdentifier = this.GetBicepIdentifier();
+        var resources = infra.GetProvisionableResources();
+        
+        // Check if an EventHubsNamespace with the same identifier already exists
+        var existingHubs = resources.OfType<EventHubsNamespace>().SingleOrDefault(hubs => hubs.BicepIdentifier == bicepIdentifier);
+        
+        if (existingHubs is not null)
+        {
+            return existingHubs;
+        }
+        
+        // Create and add new resource if it doesn't exist
+        var hubs = EventHubsNamespace.FromExisting(bicepIdentifier);
         hubs.Name = NameOutputReference.AsProvisioningParameter(infra);
         infra.Add(hubs);
         return hubs;

src/Aspire.Hosting.Azure.KeyVault/AzureKeyVaultResource.cs

@@ -62,7 +62,19 @@ public IAzureKeyVaultSecretReference GetSecret(string secretName)
     /// <inheritdoc/>
     public override ProvisionableResource AddAsExistingResource(AzureResourceInfrastructure infra)
     {
-        var store = KeyVaultService.FromExisting(this.GetBicepIdentifier());
+        var bicepIdentifier = this.GetBicepIdentifier();
+        var resources = infra.GetProvisionableResources();
+        
+        // Check if a KeyVaultService with the same identifier already exists
+        var existingStore = resources.OfType<KeyVaultService>().SingleOrDefault(store => store.BicepIdentifier == bicepIdentifier);
+        
+        if (existingStore is not null)
+        {
+            return existingStore;
+        }
+        
+        // Create and add new resource if it doesn't exist
+        var store = KeyVaultService.FromExisting(bicepIdentifier);
         store.Name = NameOutputReference.AsProvisioningParameter(infra);
         infra.Add(store);
         return store;

src/Aspire.Hosting.Azure.OperationalInsights/AzureLogAnalyticsWorkspaceResource.cs

@@ -27,7 +27,19 @@ public class AzureLogAnalyticsWorkspaceResource(string name, Action<AzureResourc
     /// <inheritdoc/>
     public override ProvisionableResource AddAsExistingResource(AzureResourceInfrastructure infra)
     {
-        var store = OperationalInsightsWorkspace.FromExisting(this.GetBicepIdentifier());
+        var bicepIdentifier = this.GetBicepIdentifier();
+        var resources = infra.GetProvisionableResources();
+        
+        // Check if an OperationalInsightsWorkspace with the same identifier already exists
+        var existingStore = resources.OfType<OperationalInsightsWorkspace>().SingleOrDefault(store => store.BicepIdentifier == bicepIdentifier);
+        
+        if (existingStore is not null)
+        {
+            return existingStore;
+        }
+        
+        // Create and add new resource if it doesn't exist
+        var store = OperationalInsightsWorkspace.FromExisting(bicepIdentifier);
         store.Name = NameOutputReference.AsProvisioningParameter(infra);
         infra.Add(store);
         return store;