From a394178b2f37b24997f20a8b84660058a0dc63de Mon Sep 17 00:00:00 2001 From: Angela Yu Date: Wed, 30 Sep 2026 10:55:01 -0400 Subject: [PATCH] TAN-998: added correct verison to /api --- .github/scripts/build-image/index.ts | 1 + src/main/resources/application.yml | 2 +- .../api/ApiControllerVersionTest.java | 30 +++++++++++++++++++ 3 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 src/test/java/org/patinanetwork/codebloom/api/ApiControllerVersionTest.java diff --git a/.github/scripts/build-image/index.ts b/.github/scripts/build-image/index.ts index a7a8fc039..f856a25b3 100644 --- a/.github/scripts/build-image/index.ts +++ b/.github/scripts/build-image/index.ts @@ -113,6 +113,7 @@ async function main() { tags.forEach((tag) => console.log(tag)); const buildArgs = { + ...(type === "web" ? { COMMIT_SHA: gitSha } : {}), ...(environment === "staging" ? { VITE_STAGING: true, diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index f88f634a1..e79b0dd22 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -114,7 +114,7 @@ server: app: commit: - sha: "@commit.sha@" + sha: "${VERSION:@commit.sha@}" jedis: url: ${REDIS_URL} diff --git a/src/test/java/org/patinanetwork/codebloom/api/ApiControllerVersionTest.java b/src/test/java/org/patinanetwork/codebloom/api/ApiControllerVersionTest.java new file mode 100644 index 000000000..6fe5a565b --- /dev/null +++ b/src/test/java/org/patinanetwork/codebloom/api/ApiControllerVersionTest.java @@ -0,0 +1,30 @@ +package org.patinanetwork.codebloom.api; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + +import org.junit.jupiter.api.Test; +import org.patinanetwork.codebloom.common.dto.ApiResponder; +import org.patinanetwork.codebloom.utilities.ServerMetadataObject; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; +import org.springframework.mock.web.MockHttpServletRequest; + +@SpringBootTest(classes = ApiController.class, webEnvironment = WebEnvironment.NONE, properties = "VERSION=abc1234") +public class ApiControllerVersionTest { + + @Autowired + private ApiController apiController; + + @Test + void testApiVersionUsesRuntimeVersion() { + ApiResponder apiResponder = + apiController.apiIndex(new MockHttpServletRequest()).getBody(); + + assertNotNull(apiResponder, "Expected an API response"); + assertNotNull(apiResponder.getPayload(), "Expected server metadata"); + assertEquals( + "abc1234", apiResponder.getPayload().getVersion(), "Expected the runtime VERSION in server metadata"); + } +}