gateway: fix broken coverage build

Signed-off-by: Adam Korczynski <[email protected]>

Author: AdamKorcz

infra/base-images/base-builder/compile_native_go_fuzzer

@@ -22,18 +22,8 @@ function build_native_go_fuzzer() {
 	tags="-tags gofuzz"
 
 	if [[ $SANITIZER == *coverage* ]]; then
-		current_dir=$(pwd)
-		mkdir $OUT/rawfuzzers || true
-		cd $abs_file_dir
-		go test $tags -c -run $fuzzer -o $OUT/$fuzzer -cover
-		cp "${fuzzer_filename}" "${OUT}/rawfuzzers/${fuzzer}"
-
 		fuzzed_repo=$(go list $tags -f {{.Module}} "$path")
-  		abspath_repo=`go list -m $tags -f {{.Dir}} $fuzzed_repo || go list $tags -f {{.Dir}} $fuzzed_repo`
-  		# give equivalence to absolute paths in another file, as go test -cover uses golangish pkg.Dir
-  		echo "s=$fuzzed_repo"="$abspath_repo"= > $OUT/$fuzzer.gocovpath
-
-		cd $current_dir
+		go-118-fuzz-build $tags -o $fuzzer -sanitizer=coverage -coverpkg=$fuzzed_repo/... -func $function $abs_file_dir
 	else
 		go-118-fuzz-build $tags -o $fuzzer.a -func $function $abs_file_dir
 		$CXX $CXXFLAGS $LIB_FUZZING_ENGINE $fuzzer.a -o $OUT/$fuzzer

infra/base-images/base-runner/coverage

@@ -137,30 +137,18 @@ function run_go_fuzz_target {
   export FUZZ_CORPUS_DIR="$CORPUS_DIR/${target}/"
   export FUZZ_PROFILE_NAME="$DUMPS_DIR/$target.perf"
 
-  # setup for native go fuzzers
-  cd $OUT
-  mkdir -p "testdata/fuzz/${target}"
-  cp -r "${FUZZ_CORPUS_DIR}" "testdata/fuzz/"
-
-  # rewrite libFuzzer corpus to Std Go corpus if native fuzzing
-  grep "TestFuzzCorpus" $target > /dev/null 2>&1 && $SYSGOPATH/bin/convertcorpus $target "testdata/fuzz/${target}"
-  cd -
-
   timeout $TIMEOUT $OUT/$target -test.coverprofile $DUMPS_DIR/$target.profdata &> $LOGS_DIR/$target.log
   if (( $? != 0 )); then
     echo "Error occured while running $target:"
     cat $LOGS_DIR/$target.log
   fi
 
-  # cleanup after native go fuzzers
-  rm -r "${OUT}/testdata/fuzz/${target}"
-
-  # The Go 1.18 fuzzers are renamed to "*_fuzz_.go" during "infra/helper.py build_fuzzers".
-  # They are are therefore refered to as "*_fuzz_.go" in the profdata files.
-  # Since the copies named "*_fuzz_.go" do not exist in the file tree during
+  # The Go 1.18 fuzzers are renamed to "*libFuzzer.go" during "infra/helper.py build_fuzzers".
+  # They are are therefore refered to as "*_libFuzzer.go" in the profdata files.
+  # Since the copies named "*_libFuzzer.go" do not exist in the file tree during
   # the coverage build, we change the references in the .profdata files
   # to the original file names.
-  #sed -i "s/_test.go_fuzz_.go/_test.go/g" $DUMPS_DIR/$target.profdata
+  sed -i "s/_libFuzzer.go/_test.go/g" $DUMPS_DIR/$target.profdata
   # translate from golangish paths to current absolute paths
   cat $OUT/$target.gocovpath | while read i; do sed -i $i $DUMPS_DIR/$target.profdata; done
   # cf PATH_EQUIVALENCE_ARGS

projects/gateway/Dockerfile

@@ -25,6 +25,7 @@ RUN wget https://go.dev/dl/go1.24.0.linux-amd64.tar.gz \
     && apt-get update \
     && apt-get install -y btrfs-progs libbtrfs-dev
 
+RUN git clone --depth=1 --branch=november-update https://github.com/AdamKorcz/go-118-fuzz-build
 RUN git clone --depth 1 https://github.com/envoyproxy/gateway.git
 
-COPY build.sh $SRC/
+COPY build.sh $SRC/

projects/gateway/build.sh

@@ -15,4 +15,23 @@
 #
 ################################################################################
 
-$SRC/gateway/test/fuzz/oss_fuzz_build.sh
+cd "$SRC"/go-118-fuzz-build
+go build
+rm "$GOPATH"/bin/go-118-fuzz-build
+mv go-118-fuzz-build "$GOPATH"/bin/
+
+cd "$SRC"/gateway
+
+set -o nounset
+set -o pipefail
+set -o errexit
+set -x
+printf "package envoygateway\nimport _ \"github.com/AdamKorcz/go-118-fuzz-build/testing\"\n" > register.go
+go mod edit -replace github.com/AdamKorcz/go-118-fuzz-build="$SRC"/go-118-fuzz-build
+go mod tidy
+
+# compile native-format fuzzers
+compile_native_go_fuzzer github.com/envoyproxy/gateway/test/fuzz FuzzGatewayAPIToXDS FuzzGatewayAPIToXDS
+
+# add seed corpus
+zip -j "$OUT"/FuzzGatewayAPIToXDS_seed_corpus.zip "$SRC"/gateway/test/fuzz/testdata/FuzzGatewayAPIToXDS/*