Remove private bindings when compile script finishes

NordSecurity · Dec 6, 2024 · e2b5328 · e2b5328
1 parent 4b094ef
commit e2b5328
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/ci/add_private_bindings.sh b/ci/add_private_bindings.sh
@@ -4,11 +4,4 @@ bindings_name=$1
 bindings_path=$2
 
 go mod edit -require="$bindings_name"@v0.0.0
-go mod edit -replace="$bindings_name"="$bindings_path"
-
-function revert_private_bindings {
-    go mod edit -droprequire="$bindings_name"
-    go mod edit -dropreplace="$bindings_name"
-}
-
-trap revert_private_bindings EXIT
+go mod edit -replace="$bindings_name"="$bindings_path"
diff --git a/ci/compile.sh b/ci/compile.sh
@@ -62,6 +62,7 @@ tags="${FEATURES:-"telio drop"}"
 source "${WORKDIR}"/ci/set_bindings_version.sh libtelio
 source "${WORKDIR}"/ci/set_bindings_version.sh libdrop
 
+private_bindings_rollback=""
 if [[ $tags == *"moose"* ]]; then
 	# Set correct events domain in case compiling with moose
 	if [[ "${ENVIRONMENT}" == "prod" ]]; then
@@ -74,11 +75,15 @@ if [[ $tags == *"moose"* ]]; then
 		-X 'main.EventsDomain=${events_domain:-""}' \
 		-X 'main.EventsSubdomain=${EVENTS_SUBDOMAIN:-""}'"
 
+	private_bindings_rollback="${WORKDIR}/ci/remove_private_bindings.sh moose/events; ${WORKDIR}/ci/remove_private_bindings.sh moose/worker;"
+	trap "$private_bindings_rollback" EXIT
 	source "${WORKDIR}"/ci/add_private_bindings.sh moose/events ./third-party/moose-events/moosenordvpnappgo/v14
 	source "${WORKDIR}"/ci/add_private_bindings.sh moose/worker ./third-party/moose-worker/mooseworkergo/v14
 fi
 
 if [[ $tags == *"quench"* ]]; then
+	private_bindings_rollback="${private_bindings_rollback} ${WORKDIR}/ci/remove_private_bindings.sh quench"
+	trap "$private_bindings_rollback" EXIT
 	source "${WORKDIR}"/ci/add_private_bindings.sh quench ./third-party/libquench-go
 fi
 

diff --git a/ci/remove_private_bindings.sh b/ci/remove_private_bindings.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+bindings_name=$1
+
+go mod edit -droprequire="$bindings_name"
+go mod edit -dropreplace="$bindings_name"
diff --git a/ci/test.sh b/ci/test.sh
@@ -18,6 +18,7 @@ tags="internal"
 # everything
 if [ "${1:-""}" = "full" ]; then
 	# Apply moose patch in case compiling with moose
+	trap "${WORKDIR}/ci/remove_private_bindings.sh moose/events; ${WORKDIR}/ci/remove_private_bindings.sh moose/worker;" EXIT
 	source "${WORKDIR}"/ci/add_private_bindings.sh moose/events ./third-party/moose-events/moosenordvpnappgo/v14
 	source "${WORKDIR}"/ci/add_private_bindings.sh moose/worker ./third-party/moose-worker/mooseworkergo/v14