Fix building Leeway with Leeway

.devcontainer/devcontainer.json

@@ -1,13 +1,17 @@
 {
 	"name": "leeway",
-	"build": {
-		"context": "..",
-		"dockerfile": "../.gitpod.Dockerfile"
+	"image": "mcr.microsoft.com/devcontainers/base:ubuntu",
+	"features": {
+		"ghcr.io/devcontainers/features/node:1": {
+			"version": "lts"
+		},
+		"ghcr.io/devcontainers/features/go:1": {
+			"version": "1.24.0"
+		},
+		"ghcr.io/devcontainers/features/common-utils:2": {},
+		"ghcr.io/devcontainers-contrib/features/shfmt:1": {
+			"version": "3.10.0"
+		}
 	},
-	"runArgs": [
-		"--privileged",
-		"--security-opt=seccomp=unconfined",
-		"--network=host"
-	],
-	"containerUser": "root"
-}
+	"postStartCommand": "./.devcontainer/install-leeway.sh"
+}

.devcontainer/install-leeway.sh

@@ -0,0 +1,27 @@
+#!/bin/bash
+# This script downloads and installs the latest version of leeway
+
+set -euo pipefail
+
+# Get the latest leeway version from GitHub API
+LATEST_LEEWAY_VERSION=$(curl -s https://api.github.com/repos/gitpod-io/leeway/releases/latest | jq -r '.tag_name' | sed 's/^v//')
+
+# Ensure we got a valid version
+if [ -z "$LATEST_LEEWAY_VERSION" ]; then
+    echo "Error: Could not determine latest leeway version" >&2
+    exit 1
+fi
+
+echo "Installing leeway version: $LATEST_LEEWAY_VERSION"
+
+# Download the latest leeway release
+curl -L -o /tmp/leeway.tar.gz "https://github.com/gitpod-io/leeway/releases/download/v${LATEST_LEEWAY_VERSION}/leeway_Linux_x86_64.tar.gz"
+
+# Extract the tarball
+tar -xzf /tmp/leeway.tar.gz -C /tmp
+
+# Install leeway to /usr/local/bin
+sudo install -m 755 /tmp/leeway /usr/local/bin/
+
+# Clean up temporary files
+rm /tmp/leeway.tar.gz /tmp/leeway

cmd/build.go

@@ -136,13 +136,19 @@ func saveBuildResult(ctx context.Context, loc string, localCache cache.LocalCach
 	}
 	fin, err := os.OpenFile(br, os.O_RDONLY, 0644)
 	if err != nil {
-		fout.Close()
+		if closeErr := fout.Close(); closeErr != nil {
+			log.WithError(closeErr).Warn("failed to close output file")
+		}
 		log.WithError(err).Fatal("cannot copy build result")
 	}
 
 	_, err = io.Copy(fout, fin)
-	fout.Close()
-	fin.Close()
+	if err := fout.Close(); err != nil {
+		log.WithError(err).Warn("failed to close output file")
+	}
+	if err := fin.Close(); err != nil {
+		log.WithError(err).Warn("failed to close input file")
+	}
 	if err != nil {
 		log.WithError(err).Fatal("cannot copy build result")
 	}
@@ -246,7 +252,11 @@ func getBuildOpts(cmd *cobra.Command) ([]leeway.BuildOption, cache.LocalCache) {
 			if err != nil {
 				log.Fatal(err)
 			}
-			defer f.Close()
+			defer func() {
+				if err := f.Close(); err != nil {
+					log.WithError(err).Warn("failed to close plan file")
+				}
+			}()
 
 			planOutlet = f
 		}

cmd/exec.go

@@ -273,7 +273,11 @@ func executeCommandInLocations(rawExecCmd []string, locs []commandExecLocation,
 			return fmt.Errorf("execution failed in %s (%s): %w", loc.Name, loc.Dir, err)
 		}
 		_ = pty.InheritSize(ptmx, os.Stdin)
-		defer ptmx.Close()
+		defer func() {
+			if err := ptmx.Close(); err != nil {
+				log.WithError(err).Warn("failed to close pty")
+			}
+		}()
 
 		//nolint:errcheck
 		go io.Copy(textio.NewPrefixWriter(os.Stdout, prefix), ptmx)
@@ -358,7 +362,9 @@ func (c filesystemExecCache) MarkExecuted(ctx context.Context, loc commandExecLo
 	if err != nil {
 		return err
 	}
-	f.Close()
+	if err := f.Close(); err != nil {
+		log.WithError(err).Warn("failed to close file")
+	}
 	log.WithField("name", fn).Debug("marked executed")
 	return nil
 }

cmd/experiemental-unmount.go

@@ -80,13 +80,21 @@ var unmountCmd = &cobra.Command{
 			if err != nil {
 				return err
 			}
-			defer src.Close()
+			defer func() {
+				if err := src.Close(); err != nil {
+					logrus.WithError(err).Warn("failed to close source file")
+				}
+			}()
 
 			f, err := os.OpenFile(dst, os.O_CREATE|os.O_TRUNC|os.O_WRONLY, info.Mode())
 			if err != nil {
 				return err
 			}
-			defer f.Close()
+			defer func() {
+				if err := f.Close(); err != nil {
+					logrus.WithError(err).Warn("failed to close destination file")
+				}
+			}()
 
 			logrus.WithField("dest", dst).Debug("applying change: copying content")
 			_, err = io.Copy(f, src)

cmd/fmt.go

@@ -48,7 +48,11 @@ func formatBuildYaml(fn string, inPlace, fix bool) error {
 	if err != nil {
 		return err
 	}
-	defer f.Close()
+	defer func() {
+		if err := f.Close(); err != nil {
+			fmt.Fprintf(os.Stderr, "warning: failed to close file: %v\n", err)
+		}
+	}()
 
 	var out io.Writer = os.Stdout
 	if inPlace {

cmd/init.go

@@ -55,14 +55,18 @@ var initCmd = &cobra.Command{
 		err = yaml.Unmarshal(tpl, &pkg)
 		if err != nil {
 			log.WithField("template", string(tpl)).Warn("broken package template")
-			return fmt.Errorf("This is a leeway bug. Cannot parse package template: %w", err)
+			return fmt.Errorf("this is a leeway bug, cannot parse package template: %w", err)
 		}
 
 		f, err := os.OpenFile("BUILD.yaml", os.O_CREATE|os.O_RDWR, 0644)
 		if err != nil {
 			return err
 		}
-		defer f.Close()
+		defer func() {
+			if err := f.Close(); err != nil {
+				fmt.Fprintf(os.Stderr, "warning: failed to close BUILD.yaml file: %v\n", err)
+			}
+		}()
 
 		var cmp yaml.Node
 		err = yaml.NewDecoder(f).Decode(&cmp)
@@ -75,7 +79,7 @@ var initCmd = &cobra.Command{
 
 		cmps := cmp.Content[0].Content
 		for i, nde := range cmps {
-			if !(nde.Value == "packages" && i < len(cmps)-1 && cmps[i+1].Kind == yaml.SequenceNode) {
+			if nde.Value != "packages" || i >= len(cmps)-1 || cmps[i+1].Kind != yaml.SequenceNode {
 				continue
 			}
 

cmd/provenance-assert.go

@@ -95,7 +95,11 @@ var provenanceAssertCmd = &cobra.Command{
 			if err != nil {
 				log.WithError(err).Fatalf("cannot open attestation bundle %s", bundleFN)
 			}
-			defer f.Close()
+			defer func() {
+				if err := f.Close(); err != nil {
+					log.WithError(err).Warn("failed to close attestation bundle file")
+				}
+			}()
 
 			err = provutil.DecodeBundle(f, assert)
 		} else {

cmd/provenance-export.go

@@ -58,7 +58,11 @@ var provenanceExportCmd = &cobra.Command{
 			if err != nil {
 				log.WithError(err).Fatal("cannot open attestation bundle")
 			}
-			defer f.Close()
+			defer func() {
+				if err := f.Close(); err != nil {
+					log.WithError(err).Warn("failed to close attestation bundle file")
+				}
+			}()
 			err = provutil.DecodeBundle(f, export)
 			if err != nil {
 				log.WithError(err).Fatal("cannot extract attestation bundle")

cmd/root.go

@@ -111,7 +111,11 @@ func Execute() {
 			log.WithError(err).Fatal("cannot start trace but LEEWAY_TRACE is set")
 			return
 		}
-		defer f.Close()
+		defer func() {
+			if err := f.Close(); err != nil {
+				log.WithError(err).Warn("failed to close trace file")
+			}
+		}()
 		err = trace.Start(f)
 		if err != nil {
 			log.WithError(err).Fatal("cannot start trace but LEEWAY_TRACE is set")