Skip to content

armgit / cua

Public Imported from GitHub
0

Scale computer-use 2.0 with open-source drivers, cross-OS sandboxes, and benchmarks for training, evaluation, and data generation.

fix(ci): repair baseline formatting and error preservation gates (#7768)

r33drichardsdfc19e57fb3e
diff --git a/libs/fleet/backend/handlers/image_uploads.go b/libs/fleet/backend/handlers/image_uploads.go
index 454789ca44..bf654b910a 100644
--- a/libs/fleet/backend/handlers/image_uploads.go
+++ b/libs/fleet/backend/handlers/image_uploads.go
@@ -181,7 +181,10 @@ func imageObjectNames(namespace, digest string) (key, reference string) {
func imageDigestChecksum(digest string) (string, error) {
raw, err := hex.DecodeString(strings.TrimPrefix(digest, "sha256:"))
- if err != nil || len(raw) != sha256.Size {
+ if err != nil {
+ return "", fmt.Errorf("invalid sha256 digest: %w", err)
+ }
+ if len(raw) != sha256.Size {
return "", fmt.Errorf("invalid sha256 digest")
}
return base64.StdEncoding.EncodeToString(raw), nil
diff --git a/libs/fleet/backend/handlers/image_uploads_test.go b/libs/fleet/backend/handlers/image_uploads_test.go
index ed9a5119e5..ec81902d07 100644
--- a/libs/fleet/backend/handlers/image_uploads_test.go
+++ b/libs/fleet/backend/handlers/image_uploads_test.go
@@ -24,6 +24,22 @@ import (
const imageUploadDigest = "sha256:0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"
+func TestImageDigestChecksumPreservesDecodeError(t *testing.T) {
+ _, err := imageDigestChecksum("sha256:z0")
+ var invalidByte hex.InvalidByteError
+ if !errors.As(err, &invalidByte) {
+ t.Fatalf("expected hex decode error, got %v", err)
+ }
+ _, err = imageDigestChecksum("sha256:0")
+ if !errors.Is(err, hex.ErrLength) {
+ t.Fatalf("expected hex length error, got %v", err)
+ }
+ _, err = imageDigestChecksum("sha256:00")
+ if err == nil || err.Error() != "invalid sha256 digest" {
+ t.Fatalf("expected digest size rejection, got %v", err)
+ }
+}
+
type fakeImageObjectStore struct {
exists bool
existsErr error
diff --git a/libs/fleet/backend/main.go b/libs/fleet/backend/main.go
index 25ba791785..3b06657599 100644
--- a/libs/fleet/backend/main.go
+++ b/libs/fleet/backend/main.go
@@ -498,7 +498,7 @@ func run() error {
}
h.ImageObjects, err = newImageObjectStore(ctx, cfg.ImageUploads)
if err != nil {
- return err
+ return errors.Join(err, startupErrors, telemetryErr, lookupErr)
}
if h.ImageObjects != nil {
slog.Info("image uploads: presigning enabled", "region", cfg.ImageUploads.Region)
diff --git a/libs/fleet/dev/scripts/doctor.py b/libs/fleet/dev/scripts/doctor.py
index 51b8078726..1876ad6d29 100644
--- a/libs/fleet/dev/scripts/doctor.py
+++ b/libs/fleet/dev/scripts/doctor.py
@@ -8,6 +8,7 @@ import os
from pathlib import Path
import shutil
import subprocess
+import sys
NETWORKS = ("10.210.0.0/24", "10.211.0.0/16", "10.212.0.0/16")
REQUIRED_COVERAGE = ("node_pod_cidrs", "service_cidrs", "outer_routes", "vpn_routes")
@@ -51,6 +52,7 @@ def kvm_probe():
fds.append(vcpu)
return {"api_version": version, "vm_created": True, "vcpu_created": True}
except OSError as exc:
+ print("KVM probe failed (errno):", exc.errno, file=sys.stderr)
return {"error": str(exc)}
finally:
for fd in reversed(fds):
diff --git a/libs/fleet/sdk/src/transport.rs b/libs/fleet/sdk/src/transport.rs
index 225e0b7b88..c7d52287b5 100644
--- a/libs/fleet/sdk/src/transport.rs
+++ b/libs/fleet/sdk/src/transport.rs
@@ -483,13 +483,13 @@ impl Transport {
}
pub(crate) async fn execute_upload(&self, request: HttpRequest) -> Result<(), SdkError> {
- let response = self
- .http_client
- .execute(request)
- .await
- .map_err(|_| SdkError::Transport {
- reason: "image upload request failed".into(),
- })?;
+ let response =
+ self.http_client
+ .execute(request)
+ .await
+ .map_err(|_| SdkError::Transport {
+ reason: "image upload request failed".into(),
+ })?;
if !matches!(response.status, 200 | 201 | 204) {
return Err(SdkError::Status {
operation: "upload image file".into(),