From e82a258c1eedb90cf09f54ef59566c46a964f34d Mon Sep 17 00:00:00 2001 From: Fedor Korotkov Date: Thu, 16 Jul 2026 16:52:40 -0400 Subject: [PATCH] Satisfy platform image lint rules --- internal/imageconstant/imageconstant.go | 13 ++++++++----- .../tests/platformdependent/platformdependent.go | 4 ++-- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/internal/imageconstant/imageconstant.go b/internal/imageconstant/imageconstant.go index 51502a5..9e2a238 100644 --- a/internal/imageconstant/imageconstant.go +++ b/internal/imageconstant/imageconstant.go @@ -1,22 +1,25 @@ package imageconstant import ( + "errors" "fmt" v1 "github.com/cirruslabs/orchard/pkg/resource/v1" ) +var ErrUnsupportedPlatform = errors.New("unsupported platform") + const ( DefaultMacosImage = "ghcr.io/cirruslabs/macos-tahoe-base:latest" DefaultLinuxAMD64Image = "ghcr.io/cirruslabs/ubuntu-amd64:24.04" DefaultLinuxARM64Image = "ghcr.io/cirruslabs/ubuntu:24.04" ) -func DefaultImage(os v1.OS, architecture v1.Architecture) (string, error) { - switch os { +func DefaultImage(operatingSystem v1.OS, architecture v1.Architecture) (string, error) { + switch operatingSystem { case v1.OSDarwin: if architecture != v1.ArchitectureARM64 { - return "", fmt.Errorf("no default image for %s/%s", os, architecture) + return "", fmt.Errorf("%w: %s/%s", ErrUnsupportedPlatform, operatingSystem, architecture) } return DefaultMacosImage, nil @@ -27,9 +30,9 @@ func DefaultImage(os v1.OS, architecture v1.Architecture) (string, error) { case v1.ArchitectureARM64: return DefaultLinuxARM64Image, nil default: - return "", fmt.Errorf("no default image for %s/%s", os, architecture) + return "", fmt.Errorf("%w: %s/%s", ErrUnsupportedPlatform, operatingSystem, architecture) } default: - return "", fmt.Errorf("no default image for %s/%s", os, architecture) + return "", fmt.Errorf("%w: %s/%s", ErrUnsupportedPlatform, operatingSystem, architecture) } } diff --git a/internal/tests/platformdependent/platformdependent.go b/internal/tests/platformdependent/platformdependent.go index 0ea3fcc..d682b8e 100644 --- a/internal/tests/platformdependent/platformdependent.go +++ b/internal/tests/platformdependent/platformdependent.go @@ -60,7 +60,7 @@ func CloneDefaultImage(ctx context.Context, logger *zap.SugaredLogger, destinati case v1.OSDarwin: _, _, err = tart.Tart(ctx, logger, "clone", image, destination) default: - return fmt.Errorf("unsupported host OS: %q", hostOS) + return fmt.Errorf("%w: %q", imageconstant.ErrUnsupportedPlatform, hostOS) } return err @@ -78,7 +78,7 @@ func ListVMs(ctx context.Context, logger *zap.SugaredLogger) ([]vmmanager.VMInfo case v1.OSDarwin: return tart.List(ctx, logger) default: - return nil, fmt.Errorf("unsupported host OS: %q", hostOS) + return nil, fmt.Errorf("%w: %q", imageconstant.ErrUnsupportedPlatform, hostOS) } }