Merge pull request #19797 from nwnt/nwnt/consolidate-mod-files

Consolidate to tests's go.mod

Author: serathius

.github/workflows/antithesis-test.yml

@@ -75,8 +75,8 @@ jobs:
       - name: Build and push client image
         uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4 # v6.15.0
         with:
-          context: ./tests/antithesis/test-template
-          file: ./tests/antithesis/test-template/Dockerfile.client
+          context: .
+          file: ./tests/antithesis/test-template/Dockerfile
           push: true
           tags: |
             ${{ env.REGISTRY }}/${{ env.REPOSITORY }}/etcd-client:latest,

bill-of-materials.json

@@ -17,6 +17,15 @@
 			}
 		]
 	},
+	{
+		"project": "github.com/antithesishq/antithesis-sdk-go",
+		"licenses": [
+			{
+				"type": "MIT License",
+				"confidence": 1
+			}
+		]
+	},
 	{
 		"project": "github.com/beorn7/perks/quantile",
 		"licenses": [

tests/antithesis/Makefile

@@ -0,0 +1,5 @@
+REPOSITORY_ROOT := $(shell git rev-parse --show-toplevel)
+
+.PHONY: antithesis-build-client-docker-image
+antithesis-build-client-docker-image:
+	docker build --build-arg GO_VERSION=$(shell cat $(REPOSITORY_ROOT)/.go-version) -f $(REPOSITORY_ROOT)/tests/antithesis/test-template/Dockerfile $(REPOSITORY_ROOT)

tests/antithesis/test-template/Dockerfile

@@ -1,35 +1,14 @@
-FROM ubuntu:latest
+ARG GO_VERSION=1.24.2
+ARG ARCH=amd64
 
-# Install dependencies
-RUN apt-get update -y && apt-get install -y pip wget
+FROM golang:$GO_VERSION AS builder
+WORKDIR /build
+COPY . .
 
-# GO:
+WORKDIR /build/tests
+RUN go build -o /opt/entrypoint -race ./antithesis/test-template/entrypoint/entrypoint.go
+RUN go build -o /opt/serial_driver_delete_keys -race ./antithesis/test-template/go-delete-keys/serial_driver_delete_keys.go
 
-# Install go
-RUN wget https://golang.org/dl/go1.22.5.linux-amd64.tar.gz
-RUN tar -C /usr/local -xzf go1.22.5.linux-amd64.tar.gz
-ENV PATH=$PATH:/usr/local/go/bin 
-
-# Set working directory
-WORKDIR /opt/antithesis/entrypoint
-
-# Copy your entrypoint script
-COPY ./entrypoint/go.mod ./go.mod
-COPY ./entrypoint/go.sum ./go.sum
-COPY ./entrypoint/entrypoint.go ./entrypoint.go
-
-# Run go mod tidy to ensure the dependencies are correct
-RUN go mod tidy
-
-# Building go executable and putting it in Test Composer directory
-RUN go build -o ./entrypoint -race
-
-# Copying go script and building an executable into Test Composer directory
-WORKDIR /opt/antithesis/go-delete-keys
-
-COPY ./go-delete-keys/go.mod ./go.mod
-COPY ./go-delete-keys/go.sum ./go.sum
-COPY ./go-delete-keys/serial_driver_delete_keys.go ./serial_driver_delete_keys.go
-
-# Building go executable and putting it in Test Composer directory
-RUN go build -o /opt/antithesis/test/v1/main/serial_driver_delete_keys -race
+FROM --platform=linux/${ARCH} gcr.io/distroless/static-debian12@sha256:3d0f463de06b7ddff27684ec3bfd0b54a425149d0f8685308b1fdf297b0265e9
+COPY --from=builder /opt/entrypoint /opt/antithesis/entrypoint/entrypoint
+COPY --from=builder /opt/serial_driver_delete_keys /opt/antithesis/test/v1/main/serial_driver_delete_keys

tests/antithesis/test-template/entrypoint/entrypoint.go

@@ -46,8 +46,9 @@ func CheckHealth() bool {
 		}
 
 		defer func() {
-			if err := cli.Close(); err != nil {
-				fmt.Printf("Client [entrypoint]: error closing connection: %v\n", err)
+			cErr := cli.Close()
+			if cErr != nil {
+				fmt.Printf("Client [entrypoint]: error closing connection: %v\n", cErr)
 			}
 		}()