Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
41b60d5
Detect active deployments before provisioning (#7248)
spboyer Mar 23, 2026
0a466de
Retrigger CI
spboyer Mar 23, 2026
2e8c4d7
Address review: fix range, scope-agnostic wording, extract filter hel…
spboyer Mar 23, 2026
82d4a35
Restore range-over-int (Go 1.26, enforced by go fix)
spboyer Mar 23, 2026
c233cef
Retrigger CI (ADO pool flake)
spboyer Mar 23, 2026
9ad06e0
Retrigger CI
spboyer Mar 23, 2026
8118c17
Retrigger CI
spboyer Mar 24, 2026
04dfd68
Fix: remove ListActiveDeployments from Scope interface
spboyer Mar 24, 2026
d5a72e8
Remove orphaned ListActiveDeployments from mockedScope
spboyer Mar 24, 2026
85d5080
Fix: use scopeForTemplate instead of deployment for active check
spboyer Mar 24, 2026
eab4e32
Fix review: handle ErrDeploymentsNotFound in poll loop
spboyer Mar 26, 2026
6364000
Address review feedback: spinner status, error handling, scope-agnost…
spboyer Mar 30, 2026
6289d69
Fix timer leak and racy mock in active deployment check
spboyer Mar 31, 2026
6a79186
Re-trigger CI (flaky Test_DeploymentStacks/Test_StorageBlobClient fai…
spboyer Mar 31, 2026
d7bd93f
Scope active deployment check to current deployment name
spboyer Apr 1, 2026
244e9e7
Re-trigger CI (flaky Test_DeploymentStacks/Test_StorageBlobClient)
spboyer Apr 1, 2026
3bf8d2e
Re-trigger CI (Test_DeploymentStacks/Test_StorageBlobClient unrelated…
spboyer Apr 1, 2026
c31d3dc
Re-trigger CI
spboyer Apr 2, 2026
b7043b3
Make active deployment check best-effort to avoid blocking recorded t…
spboyer Apr 2, 2026
ade82fe
Remove dead ListActiveDeployments code, add name-filter test
spboyer Apr 3, 2026
4511c47
Re-trigger CI (Linux-only infra failure, no test name in annotation)
spboyer Apr 3, 2026
00d85f9
Re-trigger CI (ADO Linux infra failure)
spboyer Apr 3, 2026
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
49 changes: 49 additions & 0 deletions cli/azd/pkg/azapi/deployment_state_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

package azapi

import (
"testing"

"github.com/stretchr/testify/require"
)

func TestIsActiveDeploymentState(t *testing.T) {
active := []DeploymentProvisioningState{
DeploymentProvisioningStateAccepted,
DeploymentProvisioningStateCanceling,
DeploymentProvisioningStateCreating,
DeploymentProvisioningStateDeleting,
DeploymentProvisioningStateDeletingResources,
DeploymentProvisioningStateDeploying,
DeploymentProvisioningStateRunning,
DeploymentProvisioningStateUpdating,
DeploymentProvisioningStateUpdatingDenyAssignments,
DeploymentProvisioningStateValidating,
DeploymentProvisioningStateWaiting,
}

for _, state := range active {
t.Run(string(state), func(t *testing.T) {
require.True(t, IsActiveDeploymentState(state),
"expected %s to be active", state)
})
}

inactive := []DeploymentProvisioningState{
DeploymentProvisioningStateSucceeded,
DeploymentProvisioningStateFailed,
DeploymentProvisioningStateCanceled,
DeploymentProvisioningStateDeleted,
DeploymentProvisioningStateNotSpecified,
DeploymentProvisioningStateReady,
}

for _, state := range inactive {
t.Run(string(state), func(t *testing.T) {
require.False(t, IsActiveDeploymentState(state),
"expected %s to be inactive", state)
})
}
}
22 changes: 22 additions & 0 deletions cli/azd/pkg/azapi/deployments.go
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,28 @@ const (
DeploymentProvisioningStateUpdating DeploymentProvisioningState = "Updating"
)

// IsActiveDeploymentState reports whether the given provisioning state
// indicates a deployment that is still in progress, including transitional
// states like canceling or deleting that can still block new deployments.
func IsActiveDeploymentState(state DeploymentProvisioningState) bool {
switch state {
case DeploymentProvisioningStateAccepted,
DeploymentProvisioningStateCanceling,
DeploymentProvisioningStateCreating,
DeploymentProvisioningStateDeleting,
DeploymentProvisioningStateDeletingResources,
DeploymentProvisioningStateDeploying,
DeploymentProvisioningStateRunning,
DeploymentProvisioningStateUpdating,
DeploymentProvisioningStateUpdatingDenyAssignments,
DeploymentProvisioningStateValidating,
DeploymentProvisioningStateWaiting:
return true
default:
return false
}
}

type DeploymentService interface {
GenerateDeploymentName(baseName string) string
CalculateTemplateHash(
Expand Down
229 changes: 229 additions & 0 deletions cli/azd/pkg/infra/provisioning/bicep/active_deployment_check_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,229 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

package bicep

import (
"context"
"fmt"
"sync/atomic"
"testing"
"time"

"github.com/azure/azure-dev/cli/azd/pkg/azapi"
"github.com/azure/azure-dev/cli/azd/pkg/infra"
"github.com/azure/azure-dev/cli/azd/test/mocks/mockinput"
"github.com/stretchr/testify/require"
)

// activeDeploymentScope is a test helper that implements infra.Scope and lets
// the caller control what ListDeployments returns on each call.
type activeDeploymentScope struct {
// calls tracks how many times ListDeployments has been invoked.
calls atomic.Int32
// activePerCall maps a 0-based call index to the list of deployments
// returned for that call. If the index is missing, nil is returned.
activePerCall map[int][]*azapi.ResourceDeployment
// errOnCall, if non-nil, maps a call index to an error to return.
errOnCall map[int]error
}

func (s *activeDeploymentScope) SubscriptionId() string { return "test-sub" }

func (s *activeDeploymentScope) Deployment(_ string) infra.Deployment { return nil }

func (s *activeDeploymentScope) ListDeployments(
_ context.Context,
) ([]*azapi.ResourceDeployment, error) {
idx := int(s.calls.Add(1)) - 1
if s.errOnCall != nil {
if e, ok := s.errOnCall[idx]; ok {
return nil, e
}
}
if s.activePerCall != nil {
return s.activePerCall[idx], nil
}
return nil, nil
}

// newTestProvider returns a BicepProvider with fast poll settings for tests.
func newTestProvider() *BicepProvider {
return &BicepProvider{
console: mockinput.NewMockConsole(),
activeDeployPollInterval: 10 * time.Millisecond,
activeDeployTimeout: 2 * time.Second,
}
}

func TestWaitForActiveDeployments_NoActive(t *testing.T) {
scope := &activeDeploymentScope{}
p := newTestProvider()

err := p.waitForActiveDeployments(t.Context(), scope, "test-deploy")
require.NoError(t, err)
require.Equal(t, int32(1), scope.calls.Load(),
"should call ListDeployments once")
}

func TestWaitForActiveDeployments_InitialListError_NotFound(t *testing.T) {
scope := &activeDeploymentScope{
errOnCall: map[int]error{
0: fmt.Errorf("listing: %w", infra.ErrDeploymentsNotFound),
},
}
p := newTestProvider()

// ErrDeploymentsNotFound (resource group doesn't exist yet) is safe to ignore.
err := p.waitForActiveDeployments(t.Context(), scope, "test-deploy")
require.NoError(t, err)
}

func TestWaitForActiveDeployments_InitialListError_Other(t *testing.T) {
scope := &activeDeploymentScope{
errOnCall: map[int]error{
0: fmt.Errorf("auth failure: access denied"),
},
}
p := newTestProvider()

// Non-NotFound errors are logged and skipped — the check is best-effort.
err := p.waitForActiveDeployments(t.Context(), scope, "test-deploy")
require.NoError(t, err)
}

func TestWaitForActiveDeployments_ActiveThenClear(t *testing.T) {
running := []*azapi.ResourceDeployment{
{
Name: "deploy-1",
ProvisioningState: azapi.DeploymentProvisioningStateRunning,
},
}
scope := &activeDeploymentScope{
activePerCall: map[int][]*azapi.ResourceDeployment{
0: running, // first call: active
// second call (index 1): missing key → returns nil (no active)
},
}
p := newTestProvider()

err := p.waitForActiveDeployments(t.Context(), scope, "deploy-1")
require.NoError(t, err)
require.Equal(t, int32(2), scope.calls.Load(),
"should poll once, then see clear")
}

func TestWaitForActiveDeployments_CancelledContext(t *testing.T) {
ctx, cancel := context.WithCancel(t.Context())

running := []*azapi.ResourceDeployment{
{
Name: "deploy-forever",
ProvisioningState: azapi.DeploymentProvisioningStateRunning,
},
}
scope := &activeDeploymentScope{
// Always return active deployments.
// Seed multiple indices so a tick before ctx.Done doesn't hit a missing key.
activePerCall: map[int][]*azapi.ResourceDeployment{
0: running,
1: running,
2: running,
3: running,
4: running,
},
}
p := newTestProvider()

// Cancel immediately so the wait loop exits on the first select.
cancel()

err := p.waitForActiveDeployments(ctx, scope, "deploy-forever")
require.ErrorIs(t, err, context.Canceled)
}

func TestWaitForActiveDeployments_PollError(t *testing.T) {
running := []*azapi.ResourceDeployment{
{
Name: "deploy-1",
ProvisioningState: azapi.DeploymentProvisioningStateRunning,
},
}
scope := &activeDeploymentScope{
activePerCall: map[int][]*azapi.ResourceDeployment{
0: running,
},
errOnCall: map[int]error{
1: fmt.Errorf("transient ARM failure"),
},
}
p := newTestProvider()

err := p.waitForActiveDeployments(t.Context(), scope, "deploy-1")
// Transient poll errors are logged and treated as cleared.
require.NoError(t, err)
}

func TestWaitForActiveDeployments_PollNotFound(t *testing.T) {
// If the resource group is deleted externally while polling,
// ListDeployments returns ErrDeploymentsNotFound. The wait should
// treat this as "no active deployments" and return nil.
running := []*azapi.ResourceDeployment{
{
Name: "deploy-1",
ProvisioningState: azapi.DeploymentProvisioningStateRunning,
},
}
scope := &activeDeploymentScope{
activePerCall: map[int][]*azapi.ResourceDeployment{
0: running,
},
errOnCall: map[int]error{
1: infra.ErrDeploymentsNotFound,
},
}
p := newTestProvider()

err := p.waitForActiveDeployments(t.Context(), scope, "deploy-1")
require.NoError(t, err)
}

func TestWaitForActiveDeployments_Timeout(t *testing.T) {
running := []*azapi.ResourceDeployment{
{
Name: "stuck-deploy",
ProvisioningState: azapi.DeploymentProvisioningStateRunning,
},
}
// Return active on every call.
perCall := make(map[int][]*azapi.ResourceDeployment)
for i := range 200 {
perCall[i] = running
}

scope := &activeDeploymentScope{activePerCall: perCall}
p := &BicepProvider{
console: mockinput.NewMockConsole(),
activeDeployPollInterval: 5 * time.Millisecond,
activeDeployTimeout: 50 * time.Millisecond,
}

err := p.waitForActiveDeployments(t.Context(), scope, "stuck-deploy")
require.Error(t, err)
require.Contains(t, err.Error(), "timed out")
require.Contains(t, err.Error(), "stuck-deploy")
}

func TestWaitForActiveDeployments_DifferentNameNotBlocked(t *testing.T) {
running := []*azapi.ResourceDeployment{{
Name: "other-deploy",
ProvisioningState: azapi.DeploymentProvisioningStateRunning,
}}
scope := &activeDeploymentScope{
activePerCall: map[int][]*azapi.ResourceDeployment{0: running},
}
p := newTestProvider()
err := p.waitForActiveDeployments(t.Context(), scope, "my-deploy")
require.NoError(t, err)
require.Equal(t, int32(1), scope.calls.Load())
}
Loading
Loading