From 3e3a7551e38c3007dbe6d357bde5b5e0bc804480 Mon Sep 17 00:00:00 2001
From: Maru Newby <maru.newby@avalabs.org>
Date: Tue, 27 Aug 2024 20:03:27 -0700
Subject: [PATCH] fixup: Extend module path support to instrumentation

---
 scripts/lib_build_antithesis_images.sh            |  9 +++++++--
 tests/antithesis/Dockerfile.builder-instrumented  | 15 ++++++++++-----
 .../antithesis/Dockerfile.builder-uninstrumented  | 10 ++++------
 3 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/scripts/lib_build_antithesis_images.sh b/scripts/lib_build_antithesis_images.sh
index d006836be67a..f4ee0ba51353 100644
--- a/scripts/lib_build_antithesis_images.sh
+++ b/scripts/lib_build_antithesis_images.sh
@@ -26,8 +26,13 @@ function build_antithesis_builder_image {
     builder_dockerfile="${base_dockerfile}.builder-uninstrumented"
   fi
 
-  docker buildx build --build-arg GO_VERSION="${go_version}" --build-arg=MODULE_PATH="${module_path}" \
-         -t "${image_name}" -f "${builder_dockerfile}" "${target_path}"
+  BUILD_ARGS="--build-arg GO_VERSION=${go_version}"
+  if [[ -n "${module_path}" ]]; then
+    # Only set the module path if it is provided
+    BUILD_ARGS="${BUILD_ARGS} --build-arg MODULE_PATH=${module_path}"
+  fi
+
+  docker buildx build ${BUILD_ARGS} -t "${image_name}" -f "${builder_dockerfile}" "${target_path}"
 }
 
 # Build the antithesis node, workload, and config images.
diff --git a/tests/antithesis/Dockerfile.builder-instrumented b/tests/antithesis/Dockerfile.builder-instrumented
index f9e4b2d054e1..e49db5948219 100644
--- a/tests/antithesis/Dockerfile.builder-instrumented
+++ b/tests/antithesis/Dockerfile.builder-instrumented
@@ -9,14 +9,19 @@ FROM docker.io/antithesishq/go-instrumentor AS instrumentor
 FROM golang:$GO_VERSION-bullseye
 
 WORKDIR /build
-# Copy and download dependencies using go mod
-COPY go.mod .
-COPY go.sum .
-RUN go mod download
 
 # Copy the code into the container
 COPY . .
 
+# Providing a non-empty MODULE_PATH supports the case where the target module is
+# not at the root of the repo but its go.mod references other modules in the repo
+# (including the root).
+ARG MODULE_PATH=.
+
+# Download dependencies for the specified go module if a path was provided,
+# otherwise download dependencies for the current directory.
+RUN cd $MODULE_PATH && go mod download
+
 # Ensure pre-existing builds are not available for inclusion in the final image
 RUN [ -d ./build ] && rm -rf ./build/* || true
 
@@ -38,7 +43,7 @@ RUN cp -r .git /opt/tmp/
 RUN /opt/antithesis/bin/goinstrumentor \
     -stderrthreshold=INFO \
     -antithesis /opt/antithesis/instrumentation \
-    . \
+    $MODULE_PATH \
     /instrumented
 
 WORKDIR /instrumented/customer
diff --git a/tests/antithesis/Dockerfile.builder-uninstrumented b/tests/antithesis/Dockerfile.builder-uninstrumented
index aedbc610f0ba..0bf1321fe54a 100644
--- a/tests/antithesis/Dockerfile.builder-uninstrumented
+++ b/tests/antithesis/Dockerfile.builder-uninstrumented
@@ -9,16 +9,14 @@ WORKDIR /build
 # Copy the code into the container
 COPY . .
 
-# Download dependencies of the main go module
-RUN go mod download
-
 # Providing a non-empty MODULE_PATH supports the case where the target module is
 # not at the root of the repo but its go.mod references other modules in the repo
 # (including the root).
-ARG MODULE_PATH
+ARG MODULE_PATH=.
 
-# Download dependencies for the specified go module if a path was provided
-RUN [ -n $MODULE_PATH ] && (cd $MODULE_PATH && go mod download) || true
+# Download dependencies for the specified go module if a path was provided,
+# otherwise download dependencies for the current directory.
+RUN cd $MODULE_PATH && go mod download
 
 # Ensure pre-existing builds are not available for inclusion in the final image
 RUN [ -d ./build ] && rm -rf ./build/* || true