From 1f52150ff199460a20679ce2d3a289afad5d68b4 Mon Sep 17 00:00:00 2001 From: Sanne Raymaekers Date: Thu, 6 Jun 2024 16:48:23 +0200 Subject: [PATCH] internal/osbulid-executor/aws-ec2: return more verbose errors In RunOsbuild return more verbose errors where the error doesn't originate from one of the local helper functions. --- internal/osbuildexecutor/runner-impl-aws-ec2.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/internal/osbuildexecutor/runner-impl-aws-ec2.go b/internal/osbuildexecutor/runner-impl-aws-ec2.go index 74a34f336..a09e476c9 100644 --- a/internal/osbuildexecutor/runner-impl-aws-ec2.go +++ b/internal/osbuildexecutor/runner-impl-aws-ec2.go @@ -120,7 +120,7 @@ func handleBuild(inputArchive, host string) (*osbuild.Result, error) { } inputFile, err := os.Open(inputArchive) if err != nil { - return nil, err + return nil, fmt.Errorf("Unable to open inputArchive (%s): %w", inputArchive, err) } defer inputFile.Close() @@ -196,22 +196,22 @@ func (ec2e *awsEC2Executor) RunOSBuild(manifest []byte, store, outputDirectory s err := prepareSources(manifest, store, extraEnv, result, errorWriter) if err != nil { - return nil, err + return nil, fmt.Errorf("Failed to prepare sources: %w", err) } region, err := awscloud.RegionFromInstanceMetadata() if err != nil { - return nil, err + return nil, fmt.Errorf("Failed to get region from instance metadata: %w", err) } aws, err := awscloud.NewDefault(region) if err != nil { - return nil, err + return nil, fmt.Errorf("Failed to get default aws client in %s region: %w", region, err) } si, err := aws.RunSecureInstance(ec2e.iamProfile, ec2e.keyName, ec2e.cloudWatchGroup) if err != nil { - return nil, err + return nil, fmt.Errorf("Unable to start secure instance: %w", err) } defer func() { err := aws.TerminateSecureInstance(si)