Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
refactor: update errors to use errors.AsType
Kyle Mendell4d24767f30da
diff --git a/backend/internal/models/errors.go b/backend/internal/models/errors.goindex 5e2ebf0e1..75a2d0f84 100644--- a/backend/internal/models/errors.go+++ b/backend/internal/models/errors.go@@ -127,24 +127,19 @@ func (e *ValidationError) Error() string {}func ToAPIError(err error) *APIError {- var apiErr *APIError- if errors.As(err, &apiErr) {+ if apiErr, ok := errors.AsType[*APIError](err); ok {return apiErr}- var notFoundErr *NotFoundError- if errors.As(err, ¬FoundErr) {+ if notFoundErr, ok := errors.AsType[*NotFoundError](err); ok {return NewNotFoundError(notFoundErr.Message)}- var conflictErr *ConflictError- if errors.As(err, &conflictErr) {+ if conflictErr, ok := errors.AsType[*ConflictError](err); ok {return NewConflictError(conflictErr.Message)}- var validationErr *ValidationError- if errors.As(err, &validationErr) {+ if validationErr, ok := errors.AsType[*ValidationError](err); ok {return NewValidationError(validationErr.Message, map[string]string{"field": validationErr.Field})}- var dockerAPIErr *DockerAPIError- if errors.As(err, &dockerAPIErr) {+ if dockerAPIErr, ok := errors.AsType[*DockerAPIError](err); ok {return NewAPIErrorWithDetails(dockerAPIErr.Message, APIErrorCodeDockerAPIError, dockerAPIErr.HTTPStatus(), dockerAPIErr.Details)}return NewInternalServerError(err.Error())diff --git a/backend/internal/services/swarm_service.go b/backend/internal/services/swarm_service.goindex b4b51dbb1..df6fd69ab 100644--- a/backend/internal/services/swarm_service.go+++ b/backend/internal/services/swarm_service.go@@ -2091,8 +2091,7 @@ func (s *SwarmService) deleteStackSourceInternal(ctx context.Context, environmenenvironmentDir := filepath.Dir(stackSourceDir)if environmentDir != rootDir {if err := os.Remove(environmentDir); err != nil && !errors.Is(err, os.ErrNotExist) {- var errno syscall.Errno- if errors.As(err, &errno) && (errno == syscall.ENOTEMPTY || errno == syscall.EACCES) {+ if errno, ok := errors.AsType[syscall.Errno](err); ok && (errno == syscall.ENOTEMPTY || errno == syscall.EACCES) {slog.DebugContext(ctx, "swarm stack source environment directory cleanup skipped", "dir", environmentDir, "error", err)return nil}diff --git a/backend/internal/services/version_service.go b/backend/internal/services/version_service.goindex 185844967..a7035a8b9 100644--- a/backend/internal/services/version_service.go+++ b/backend/internal/services/version_service.go@@ -87,8 +87,7 @@ func (s *VersionService) GetLatestVersion(ctx context.Context) (string, error) {return payload.TagName, nil})- var staleErr *cache.ErrStale- if errors.As(err, &staleErr) {+ if staleErr, ok := errors.AsType[*cache.ErrStale](err); ok {slog.Warn("Failed to fetch latest version, returning stale cache", "error", staleErr.Err)return version, nil}@@ -160,8 +159,7 @@ func (s *VersionService) GetVersionInformation(ctx context.Context, currentVersilatest, err := s.GetLatestVersion(ctx)if err != nil {- var staleErr *cache.ErrStale- if errors.As(err, &staleErr) {+ if staleErr, ok := errors.AsType[*cache.ErrStale](err); ok {slog.Warn("Failed to refresh latest version; using stale cache", "error", staleErr.Err)} else {return check, errdiff --git a/backend/pkg/gitutil/git.go b/backend/pkg/gitutil/git.goindex 379db4bbc..d68ba4404 100644--- a/backend/pkg/gitutil/git.go+++ b/backend/pkg/gitutil/git.go@@ -145,8 +145,7 @@ func (c *Client) createAcceptNewHostKeyCallback() (gossh.HostKeyCallback, error)return nil // Host key matches}// Check if it's a "key mismatch" error vs "unknown host"- var keyErr *knownhosts.KeyError- if errors.As(err, &keyErr) && len(keyErr.Want) > 0 {+ if keyErr, ok := errors.AsType[*knownhosts.KeyError](err); ok && len(keyErr.Want) > 0 {// Host is known but key doesn't match - this is a security concernreturn fmt.Errorf("host key mismatch for %s (possible MITM attack): %w", hostname, err)}diff --git a/cli/internal/client/client.go b/cli/internal/client/client.goindex 83e459b99..b7547d352 100644--- a/cli/internal/client/client.go+++ b/cli/internal/client/client.go@@ -399,8 +399,7 @@ func (c *Client) shouldRetry(method string, status int, err error) bool {return false}- var netErr net.Error- if errors.As(err, &netErr) {+ if netErr, ok := errors.AsType[net.Error](err); ok {return netErr.Timeout()}return true