From cf31abd6cdd5ad90d25fb0b76ab72a3ee7836e84 Mon Sep 17 00:00:00 2001
From: Sanskar Jaiswal <sanskar.jaiswal@weave.works>
Date: Mon, 9 May 2022 22:43:13 +0530
Subject: [PATCH] change fuzz build tag to fluxfuzz

Signed-off-by: Sanskar Jaiswal <sanskar.jaiswal@weave.works>
---
 tests/fuzz/age_fuzzer.go         | 4 ++--
 tests/fuzz/controllers_fuzzer.go | 4 ++--
 tests/fuzz/oss_fuzz_build.sh     | 8 +++++---
 tests/fuzz/pgp_fuzzer.go         | 4 ++--
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/tests/fuzz/age_fuzzer.go b/tests/fuzz/age_fuzzer.go
index 2cca1a35c..5c8476294 100644
--- a/tests/fuzz/age_fuzzer.go
+++ b/tests/fuzz/age_fuzzer.go
@@ -1,5 +1,5 @@
-//go:build gofuzz
-// +build gofuzz
+//go:build fluxfuzz
+// +build fluxfuzz
 
 /*
 Copyright 2022 The Flux authors
diff --git a/tests/fuzz/controllers_fuzzer.go b/tests/fuzz/controllers_fuzzer.go
index b62b8d1be..923eabc6e 100644
--- a/tests/fuzz/controllers_fuzzer.go
+++ b/tests/fuzz/controllers_fuzzer.go
@@ -1,5 +1,5 @@
-//go:build gofuzz
-// +build gofuzz
+//go:build fluxfuzz
+// +build fluxfuzz
 
 /*
 Copyright 2021 The Flux authors
diff --git a/tests/fuzz/oss_fuzz_build.sh b/tests/fuzz/oss_fuzz_build.sh
index 9c909e0cb..df0a8a00f 100755
--- a/tests/fuzz/oss_fuzz_build.sh
+++ b/tests/fuzz/oss_fuzz_build.sh
@@ -40,8 +40,10 @@ pushd "${PROJECT_PATH}"
 
 go get -d github.com/AdaLogics/go-fuzz-headers
 
-compile_go_fuzzer "${PROJECT_PATH}/internal/sops/age/" FuzzAge fuzz_age
-compile_go_fuzzer "${PROJECT_PATH}/internal/sops/pgp/" FuzzPgp fuzz_pgp
+# TODO: The tag `fluxfuzz` is temporary. It should be removed from here and replaced everywhere
+# else by `gofuzz` when this issue is resolved: https://github.com/aws/aws-sdk-go-v2/issues/1693
+compile_go_fuzzer "${PROJECT_PATH}/internal/sops/age/" FuzzAge fuzz_age fluxfuzz
+compile_go_fuzzer "${PROJECT_PATH}/internal/sops/pgp/" FuzzPgp fuzz_pgp fluxfuzz
 
 popd
 
@@ -64,6 +66,6 @@ echo "replace github.com/fluxcd/kustomize-controller => ../../" >> go.mod
 
 go mod download
 
-compile_go_fuzzer "${PROJECT_PATH}/tests/fuzz/" FuzzControllers fuzz_controllers
+compile_go_fuzzer "${PROJECT_PATH}/tests/fuzz/" FuzzControllers fuzz_controllers fluxfuzz
 
 popd
diff --git a/tests/fuzz/pgp_fuzzer.go b/tests/fuzz/pgp_fuzzer.go
index 504b2d75f..ad32afcca 100644
--- a/tests/fuzz/pgp_fuzzer.go
+++ b/tests/fuzz/pgp_fuzzer.go
@@ -1,5 +1,5 @@
-//go:build gofuzz
-// +build gofuzz
+//go:build fluxfuzz
+// +build fluxfuzz
 
 /*
 Copyright 2022 The Flux authors