From 56bdcf1cdc3046a995cce2574467d0acdfb5fc60 Mon Sep 17 00:00:00 2001
From: Sanne Raymaekers <sanne.raymaekers@gmail.com>
Date: Fri, 1 Mar 2024 16:49:49 +0100
Subject: [PATCH] aws.ec2: prep sources before starting build

---
 internal/osbuildexecutor/runner-impl-aws-ec2.go | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/internal/osbuildexecutor/runner-impl-aws-ec2.go b/internal/osbuildexecutor/runner-impl-aws-ec2.go
index 026a64c00..45ebc4264 100644
--- a/internal/osbuildexecutor/runner-impl-aws-ec2.go
+++ b/internal/osbuildexecutor/runner-impl-aws-ec2.go
@@ -18,8 +18,20 @@ type awsEC2Executor struct {
 	cloudWatchGroup string
 }
 
+func prepareSources(manifest []byte, store string, result bool, errorWriter io.Writer) error {
+	hostExecutor := NewHostExecutor()
+	_, err := hostExecutor.RunOSBuild(manifest, store, "", nil, nil, nil, nil, result, errorWriter)
+	return err
+}
+
 func (ec2e *awsEC2Executor) RunOSBuild(manifest []byte, store, outputDirectory string, exports, exportPaths, checkpoints,
 	extraEnv []string, result bool, errorWriter io.Writer) (*osbuild.Result, error) {
+
+	err := prepareSources(manifest, store, result, errorWriter)
+	if err != nil {
+		return nil, err
+	}
+
 	region, err := awscloud.RegionFromInstanceMetadata()
 	if err != nil {
 		return nil, err
@@ -45,6 +57,8 @@ func (ec2e *awsEC2Executor) RunOSBuild(manifest []byte, store, outputDirectory s
 	args := []string{
 		"--builder-host",
 		*si.Instance.PrivateIpAddress,
+		"--store",
+		store,
 	}
 
 	for _, exp := range exports {