From 3323b154c5990a73d01eddf4341ed1d87c2a66d8 Mon Sep 17 00:00:00 2001
From: Matt Hammerly <matt.hammerly@sentry.io>
Date: Fri, 4 Apr 2025 13:14:05 -0700
Subject: [PATCH] allow Makefile vars including REQUIREMENTS_TAG to be
 overridden

---
 Makefile | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index c0431a143f..d9748d3dfb 100644
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,14 @@
-sha := $(shell git rev-parse --short=7 HEAD)
-long_sha := $(shell git rev-parse HEAD)
-merge_sha := $(shell git merge-base HEAD^ origin/main)
+sha ?= $(shell git rev-parse --short=7 HEAD)
+long_sha ?= $(shell git rev-parse HEAD)
+merge_sha ?= $(shell git merge-base HEAD^ origin/main)
 release_version := `cat VERSION`
 build_date ?= $(shell git show -s --date=iso8601-strict --pretty=format:%cd $$sha)
-branch = $(shell git branch | grep \* | cut -f2 -d' ')
-epoch := $(shell date +"%s")
+branch ?= $(shell git branch | grep \* | cut -f2 -d' ')
+epoch ?= $(shell date +"%s")
 AR_REPO ?= codecov/api
 DOCKERHUB_REPO ?= codecov/self-hosted-api
-REQUIREMENTS_TAG := requirements-v1-$(shell sha1sum uv.lock | cut -d ' ' -f 1)-$(shell sha1sum docker/Dockerfile.requirements | cut -d ' ' -f 1)
-VERSION := release-${sha}
+REQUIREMENTS_TAG ?= requirements-v1-$(shell sha1sum uv.lock | cut -d ' ' -f 1)-$(shell sha1sum docker/Dockerfile.requirements | cut -d ' ' -f 1)
+VERSION ?= release-${sha}
 CODECOV_UPLOAD_TOKEN ?= "notset"
 CODECOV_STATIC_TOKEN ?= "notset"
 CODECOV_URL ?= "https://api.codecov.io"
@@ -19,6 +19,9 @@ export CODECOV_TOKEN=${CODECOV_UPLOAD_TOKEN}
 API_DOMAIN ?= api
 PROXY_NETWORK ?= api_default
 
+DEFAULT_REQS_TAG := requirements-v1-$(shell sha1sum uv.lock | cut -d ' ' -f 1)-$(shell sha1sum docker/Dockerfile.requirements | cut -d ' ' -f 1)
+REQUIREMENTS_TAG ?= ${DEFAULT_REQS_TAG}
+
 # We allow this to be overridden so that we can run `pytest` from this directory
 # but have the junit file use paths relative to a parent directory. This will
 # help us move to a monorepo.
@@ -70,6 +73,12 @@ lint.check:
 	ruff format --check
 
 build.requirements:
+	# If make was given a different requirements tag, we assume a suitable image
+	# was already built (e.g. by umbrella) and don't want to build this one.
+	ifneq (${REQUIREMENTS_TAG},${DEFAULT_REQS_TAG})
+	echo "Error: building api reqs image despite another being provided"
+	exit 1
+	endif
 	# if docker pull succeeds, we have already build this version of
 	# requirements.txt.  Otherwise, build and push a version tagged
 	# with the hash of this requirements.txt