Skip to content

fix sfcompute v2 termination not found handling #138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
jarrad wants to merge 2 commits into
base: main
Choose a base branch
from
+45 −1
Draft

fix sfcompute v2 termination not found handling #138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a9fbdc7
fix sfcompute v2 termination not found handling
jarrad Jul 30, 2026
57172f8
Merge remote-tracking branch 'origin/main' into agent/sfcompute-v2-no…
jarrad Jul 31, 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
13 changes: 12 additions & 1 deletion v1/providers/sfcomputev2/instance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
"github.com/alecthomas/units"
"github.com/brevdev/cloud/internal/errors"
v1 "github.com/brevdev/cloud/v1"
"github.com/sfcompute/sfc-go/models/apierrors"
"github.com/sfcompute/sfc-go/models/components"
"github.com/sfcompute/sfc-go/models/operations"
"github.com/sfcompute/sfc-go/optionalnullable"
Expand Down Expand Up @@ -183,7 +184,7 @@ func (c *SFCClientV2) TerminateInstance(ctx context.Context, id v1.CloudProvider

_, err := c.client.Instances.TerminateInstance(ctx, string(id))
if err != nil {
return errors.WrapAndTrace(err)
return normalizeTerminateInstanceError(err)
}

c.logger.Debug(ctx, "sfcv2: TerminateInstance end",
Expand All @@ -193,6 +194,16 @@ func (c *SFCClientV2) TerminateInstance(ctx context.Context, id v1.CloudProvider
return nil
}

func normalizeTerminateInstanceError(err error) error {
var notFoundErr *apierrors.NotFoundError
if errors.As(err, &notFoundErr) {
// Termination is idempotent: a missing instance is already in the
// requested terminal state. Do not retain the provider response body.
return errors.WrapAndTrace(v1.ErrInstanceNotFound)
}
return errors.WrapAndTrace(err)
}

func (c *SFCClientV2) getSSHInfo(ctx context.Context, id string, status components.InstanceStatus) (*components.InstanceSSHInfo, error) {
if status != components.InstanceStatusRunning {
return nil, nil
Expand Down
33 changes: 33 additions & 0 deletions v1/providers/sfcomputev2/instance_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
package v2

import (
"errors"
"fmt"
"testing"

v1 "github.com/brevdev/cloud/v1"
"github.com/sfcompute/sfc-go/models/apierrors"
"github.com/stretchr/testify/require"
)

func TestNormalizeTerminateInstanceErrorTreatsNotFoundAsAlreadyGone(t *testing.T) {
t.Parallel()

providerErr := fmt.Errorf("release instance: %w", &apierrors.NotFoundError{})

err := normalizeTerminateInstanceError(providerErr)

require.ErrorIs(t, err, v1.ErrInstanceNotFound)
var notFoundErr *apierrors.NotFoundError
require.False(t, errors.As(err, &notFoundErr))
}

func TestNormalizeTerminateInstanceErrorPreservesRetryableFailure(t *testing.T) {
t.Parallel()

providerErr := errors.New("provider rate limited")

err := normalizeTerminateInstanceError(providerErr)

require.ErrorIs(t, err, providerErr)
}
Loading