6

elastic · Jun 24, 2023 · 435cac3 · 435cac3
1 parent d410d39
commit 435cac3
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 5 deletions.
diff --git a/dev-tools/mage/dockerbuilder.go b/dev-tools/mage/dockerbuilder.go
@@ -255,5 +255,9 @@ func (b *dockerBuilder) dockerSave(tag string) error {
 		}
 		return err
 	}
-	return fmt.Errorf("failed to create .sha512 file"+": %w", CreateSHA512File(outputFile))
+
+	if err = CreateSHA512File(outputFile); err != nil {
+		return fmt.Errorf("failed to create .sha512 file"+": %w", err)
+	}
+	return nil
 }
diff --git a/dev-tools/mage/pkgtypes.go b/dev-tools/mage/pkgtypes.go
@@ -578,7 +578,10 @@ func PackageZip(spec PackageSpec) error {
 		return nil
 	}
 
-	return fmt.Errorf("failed to create .sha512 file"+": %w", CreateSHA512File(spec.OutputFile))
+	if err := CreateSHA512File(spec.OutputFile); err != nil {
+		return fmt.Errorf("failed to create .sha512 file"+": %w", err)
+	}
+	return nil
 }
 
 // PackageTarGz packages a gzipped tar file.
@@ -678,7 +681,11 @@ func PackageTarGz(spec PackageSpec) error {
 		return nil
 	}
 
-	return fmt.Errorf("failed to create .sha512 file"+": %w", CreateSHA512File(spec.OutputFile))
+	if err := CreateSHA512File(spec.OutputFile); err != nil {
+		return fmt.Errorf("failed to create .sha512 file"+": %w", err)
+	}
+
+	return nil
 }
 
 func replaceFileArch(filename string, pkgFile PackageFile, arch string) (string, PackageFile) {
@@ -789,7 +796,10 @@ func runFPM(spec PackageSpec, packageType PackageType) error {
 		return fmt.Errorf("failed while running FPM in docker"+": %w", err)
 	}
 
-	return fmt.Errorf("failed to create .sha512 file"+": %w", CreateSHA512File(spec.OutputFile))
+	if err = CreateSHA512File(spec.OutputFile); err != nil {
+		return fmt.Errorf("failed to create .sha512 file"+": %w", err)
+	}
+	return nil
 }
 
 func addUidGidEnvArgs(args []string) ([]string, error) {

diff --git a/x-pack/dockerlogbeat/magefile.go b/x-pack/dockerlogbeat/magefile.go
@@ -341,7 +341,11 @@ func Export() error {
 		if err != nil {
 			return fmt.Errorf("error creating release tarball"+": %w", err)
 		}
-		return fmt.Errorf("failed to create .sha512 file"+": %w", devtools.CreateSHA512File(outpath))
+
+		if err = devtools.CreateSHA512File(outpath); err != nil {
+			return fmt.Errorf("failed to create .sha512 file"+": %w", err)
+		}
+		return nil
 	}
 
 	return nil