allow for second infra

cli/azd/pkg/azapi/resource_service.go

@@ -2,8 +2,10 @@ package azapi
 
 import (
 	"context"
+	"errors"
 	"fmt"
 
+	"github.com/Azure/azure-sdk-for-go/sdk/azcore"
 	"github.com/Azure/azure-sdk-for-go/sdk/azcore/arm"
 	"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources"
 	"github.com/azure/azure-dev/cli/azd/pkg/account"
@@ -194,6 +196,11 @@ func (rs *ResourceService) DeleteResourceGroup(ctx context.Context, subscription
 	}
 
 	poller, err := client.BeginDelete(ctx, resourceGroupName, nil)
+	var respErr *azcore.ResponseError
+	if errors.As(err, &respErr) && respErr.StatusCode == 404 { // Resource group is already deleted
+		return nil
+	}
+
 	if err != nil {
 		return fmt.Errorf("beginning resource group deletion: %w", err)
 	}

cli/azd/pkg/azapi/standard_deployments.go

@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"log"
 	"net/url"
 
 	"github.com/Azure/azure-sdk-for-go/sdk/azcore"
@@ -55,6 +56,7 @@ func NewStandardDeployments(
 // unix time to the environment name (separated by a hyphen) to provide a unique name for each deployment. If the resulting
 // name is longer than the ARM limit, the longest suffix of the name under the limit is returned.
 func (ds *StandardDeployments) GenerateDeploymentName(baseName string) string {
+	log.Printf("Generating deployment name %s", baseName)
 	name := fmt.Sprintf("%s-%d", baseName, ds.clock.Now().Unix())
 	if len(name) <= cArmDeploymentNameLengthMax {
 		return name

cli/azd/pkg/azure/tags.go

@@ -7,6 +7,11 @@ const (
 	// TagKeyAzdEnvName is the name of the key in the tags map of a resource
 	// used to store the azd environment a resource is associated with.
 	TagKeyAzdEnvName = "azd-env-name"
+
+	// TagKeyAzdModuleName is the name of the key in the tags map of a resource
+	// used to store the Bicep module a resource is associated with.
+	TagKeyAzdModuleName = "azd-module-name"
+
 	/* #nosec G101 - Potential hardcoded credentials - false positive */
 	// TagKeyAzdDeploymentStateParamHashName is the name of the key in the tags map of a deployment
 	// used to store the parameters hash.

cli/azd/pkg/devcenter/provision_provider.go

@@ -475,7 +475,7 @@ func (p *ProvisionProvider) pollForProgress(ctx context.Context, deployment infr
 	}
 
 	// Report incremental progress
-	progressDisplay := p.deploymentManager.ProgressDisplay(deployment)
+	progressDisplay := p.deploymentManager.ProgressDisplay([]infra.Deployment{deployment})
 
 	initialDelay := 3 * time.Second
 	regularDelay := 10 * time.Second

cli/azd/pkg/infra/deployment_manager.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"log"
 	"slices"
 	"strings"
 
@@ -47,7 +48,7 @@ func (dm *DeploymentManager) CalculateTemplateHash(
 	return dm.deploymentService.CalculateTemplateHash(ctx, subscriptionId, template)
 }
 
-func (dm *DeploymentManager) ProgressDisplay(deployment Deployment) *ProvisioningProgressDisplay {
+func (dm *DeploymentManager) ProgressDisplay(deployment []Deployment) *ProvisioningProgressDisplay {
 	return NewProvisioningProgressDisplay(dm.resourceManager, dm.console, deployment)
 }
 
@@ -77,6 +78,7 @@ func (dm *DeploymentManager) CompletedDeployments(
 	ctx context.Context,
 	scope Scope,
 	envName string,
+	moduleName string,
 	hint string,
 ) ([]*azapi.ResourceDeployment, error) {
 	deployments, err := scope.ListDeployments(ctx)
@@ -106,8 +108,22 @@ func (dm *DeploymentManager) CompletedDeployments(
 			continue
 		}
 
-		// Match on current azd strategy (tags) or old azd strategy (deployment name)
-		if v, has := deployment.Tags[azure.TagKeyAzdEnvName]; has && *v == envName || deployment.Name == envName {
+		// Match on current azd strategy (tags)
+		if v, has := deployment.Tags[azure.TagKeyAzdEnvName]; has && *v == envName {
+			moduleVal, hasModuleTag := deployment.Tags[azure.TagKeyAzdModuleName]
+			if moduleName != "" && hasModuleTag && *moduleVal == moduleName {
+				log.Printf(
+					"completedDeployments: matched deployment '%s' using moduleName: %s", deployment.Name, moduleName)
+				return []*azapi.ResourceDeployment{deployment}, nil
+			}
+
+			if moduleName == "" && (!hasModuleTag || moduleVal == nil || *moduleVal == "") {
+				return []*azapi.ResourceDeployment{deployment}, nil
+			}
+		}
+
+		// LEGACY: match on deployment name
+		if deployment.Name == envName {
 			return []*azapi.ResourceDeployment{deployment}, nil
 		}