From 9dab6d02348c24eaadd3af1d98654d05f897b852 Mon Sep 17 00:00:00 2001 From: kacey Date: Fri, 29 May 2026 18:21:23 -0700 Subject: [PATCH 1/4] chore: update integration tests to use internal api and cas startup messages --- .../compose/docker-compose-internal-auth_test.go | 16 ++++++++-------- .../compose/docker-compose-legacy-auth_test.go | 16 ++++++++-------- .../integration/helm/helm-internal-auth_test.go | 12 ++++++------ tests/integration/helm/helm-legacy-auth_test.go | 12 ++++++------ .../helm/helm-topology-spread-constraint_test.go | 4 ++-- 5 files changed, 30 insertions(+), 30 deletions(-) diff --git a/tests/integration/compose/docker-compose-internal-auth_test.go b/tests/integration/compose/docker-compose-internal-auth_test.go index 01496634d..71b682ecb 100644 --- a/tests/integration/compose/docker-compose-internal-auth_test.go +++ b/tests/integration/compose/docker-compose-internal-auth_test.go @@ -93,7 +93,7 @@ func (s *commonServicesInternalAuthDockerComposeUpTest) TestDockerComposeUp() { url: "http://127.0.0.1:8000/health", responsePayload: `{"status":{"teams":"available"}}`, httpResponseCode: 200, - log: "motd.py", + log: "FiftyOne Teams API starting up", }, { name: "teams-app", @@ -107,7 +107,7 @@ func (s *commonServicesInternalAuthDockerComposeUpTest) TestDockerComposeUp() { url: "http://127.0.0.1:3030/cas/api", responsePayload: `{"status":"available"}`, httpResponseCode: 200, - log: " ✓ Ready in", + log: "FiftyOne CAS starting up", }, // ordering this last to avoid test flakes where testing for log before the container is running { @@ -130,7 +130,7 @@ func (s *commonServicesInternalAuthDockerComposeUpTest) TestDockerComposeUp() { url: "http://127.0.0.1:8000/health", responsePayload: `{"status":{"teams":"available"}}`, httpResponseCode: 200, - log: "motd.py", + log: "FiftyOne Teams API starting up", }, { name: "teams-app", @@ -144,7 +144,7 @@ func (s *commonServicesInternalAuthDockerComposeUpTest) TestDockerComposeUp() { url: "http://127.0.0.1:3030/cas/api", responsePayload: `{"status":"available"}`, httpResponseCode: 200, - log: " ✓ Ready in", + log: "FiftyOne CAS starting up", }, // ordering this last to avoid test flakes where testing for log before the container is running { @@ -167,7 +167,7 @@ func (s *commonServicesInternalAuthDockerComposeUpTest) TestDockerComposeUp() { url: "http://127.0.0.1:8000/health", responsePayload: `{"status":{"teams":"available"}}`, httpResponseCode: 200, - log: "motd.py", + log: "FiftyOne Teams API starting up", }, { name: "teams-app", @@ -181,7 +181,7 @@ func (s *commonServicesInternalAuthDockerComposeUpTest) TestDockerComposeUp() { url: "http://127.0.0.1:3030/cas/api", responsePayload: `{"status":"available"}`, httpResponseCode: 200, - log: " ✓ Ready in", + log: "FiftyOne CAS starting up", }, // ordering this last to avoid test flakes where testing for log before the container is running { @@ -211,7 +211,7 @@ func (s *commonServicesInternalAuthDockerComposeUpTest) TestDockerComposeUp() { url: "http://127.0.0.1:8000/health", responsePayload: `{"status":{"teams":"available"}}`, httpResponseCode: 200, - log: "motd.py", + log: "FiftyOne Teams API starting up", }, { name: "teams-app", @@ -225,7 +225,7 @@ func (s *commonServicesInternalAuthDockerComposeUpTest) TestDockerComposeUp() { url: "http://127.0.0.1:3030/cas/api", responsePayload: `{"status":"available"}`, httpResponseCode: 200, - log: " ✓ Ready in", + log: "FiftyOne CAS starting up", }, // ordering this last to avoid test flakes where testing for log before the container is running { diff --git a/tests/integration/compose/docker-compose-legacy-auth_test.go b/tests/integration/compose/docker-compose-legacy-auth_test.go index 3314c64e1..03f23a773 100644 --- a/tests/integration/compose/docker-compose-legacy-auth_test.go +++ b/tests/integration/compose/docker-compose-legacy-auth_test.go @@ -93,7 +93,7 @@ func (s *commonServicesLegacyAuthDockerComposeUpTest) TestDockerComposeUp() { url: "http://127.0.0.1:8000/health", responsePayload: `{"status":{"teams":"available"}}`, httpResponseCode: 200, - log: "motd.py", + log: "FiftyOne Teams API starting up", }, { name: "teams-app", @@ -107,7 +107,7 @@ func (s *commonServicesLegacyAuthDockerComposeUpTest) TestDockerComposeUp() { url: "http://127.0.0.1:3030/cas/api", responsePayload: `{"status":"available"}`, httpResponseCode: 200, - log: " ✓ Ready in", + log: "FiftyOne CAS starting up", }, // ordering this last to avoid test flakes where testing for log before the container is running { @@ -130,7 +130,7 @@ func (s *commonServicesLegacyAuthDockerComposeUpTest) TestDockerComposeUp() { url: "http://127.0.0.1:8000/health", responsePayload: `{"status":{"teams":"available"}}`, httpResponseCode: 200, - log: "motd.py", + log: "FiftyOne Teams API starting up", }, { name: "teams-app", @@ -144,7 +144,7 @@ func (s *commonServicesLegacyAuthDockerComposeUpTest) TestDockerComposeUp() { url: "http://127.0.0.1:3030/cas/api", responsePayload: `{"status":"available"}`, httpResponseCode: 200, - log: " ✓ Ready in", + log: "FiftyOne CAS starting up", }, // ordering this last to avoid test flakes where testing for log before the container is running { @@ -167,7 +167,7 @@ func (s *commonServicesLegacyAuthDockerComposeUpTest) TestDockerComposeUp() { url: "http://127.0.0.1:8000/health", responsePayload: `{"status":{"teams":"available"}}`, httpResponseCode: 200, - log: "motd.py", + log: "FiftyOne Teams API starting up", }, { name: "teams-app", @@ -181,7 +181,7 @@ func (s *commonServicesLegacyAuthDockerComposeUpTest) TestDockerComposeUp() { url: "http://127.0.0.1:3030/cas/api", responsePayload: `{"status":"available"}`, httpResponseCode: 200, - log: " ✓ Ready in", + log: "FiftyOne CAS starting up", }, // ordering this last to avoid test flakes where testing for log before the container is running { @@ -211,7 +211,7 @@ func (s *commonServicesLegacyAuthDockerComposeUpTest) TestDockerComposeUp() { url: "http://127.0.0.1:8000/health", responsePayload: `{"status":{"teams":"available"}}`, httpResponseCode: 200, - log: "motd.py", + log: "FiftyOne Teams API starting up", }, { name: "teams-app", @@ -225,7 +225,7 @@ func (s *commonServicesLegacyAuthDockerComposeUpTest) TestDockerComposeUp() { url: "http://127.0.0.1:3030/cas/api", responsePayload: `{"status":"available"}`, httpResponseCode: 200, - log: " ✓ Ready in", + log: "FiftyOne CAS starting up", }, // ordering this last to avoid test flakes where testing for log before the container is running { diff --git a/tests/integration/helm/helm-internal-auth_test.go b/tests/integration/helm/helm-internal-auth_test.go index 36e307a7a..41e9b6859 100644 --- a/tests/integration/helm/helm-internal-auth_test.go +++ b/tests/integration/helm/helm-internal-auth_test.go @@ -79,14 +79,14 @@ func (s *internalAuthHelmTest) TestHelmInstall() { url: ternary(s.context == "minikube", "https://local.fiftyone.ai/cas/api", ""), responsePayload: `{"status":"available"}`, httpResponseCode: 200, - log: " ✓ Ready in", + log: "FiftyOne CAS starting up", }, { name: "teams-api", url: ternary(s.context == "minikube", "https://local.fiftyone.ai/health", ""), responsePayload: `{"status":{"teams":"available"}}`, httpResponseCode: 200, - log: "Starting worker", + log: "FiftyOne Teams API starting up", }, { name: "teams-app", @@ -166,14 +166,14 @@ func (s *internalAuthHelmTest) TestHelmInstall() { url: ternary(s.context == "minikube", "https://local.fiftyone.ai/cas/api", ""), responsePayload: `{"status":"available"}`, httpResponseCode: 200, - log: " ✓ Ready in", + log: "FiftyOne CAS starting up", }, { name: "teams-api", url: ternary(s.context == "minikube", "https://local.fiftyone.ai/health", ""), responsePayload: `{"status":{"teams":"available"}}`, httpResponseCode: 200, - log: "Starting worker", + log: "FiftyOne Teams API starting up", }, { name: "teams-app", @@ -255,14 +255,14 @@ func (s *internalAuthHelmTest) TestHelmInstall() { url: ternary(s.context == "minikube", "https://local.fiftyone.ai/cas/api", ""), responsePayload: `{"status":"available"}`, httpResponseCode: 200, - log: " ✓ Ready in", + log: "FiftyOne CAS starting up", }, { name: "teams-api", url: ternary(s.context == "minikube", "https://local.fiftyone.ai/health", ""), responsePayload: `{"status":{"teams":"available"}}`, httpResponseCode: 200, - log: "Starting worker", + log: "FiftyOne Teams API starting up", }, { name: "teams-app", diff --git a/tests/integration/helm/helm-legacy-auth_test.go b/tests/integration/helm/helm-legacy-auth_test.go index 8c1942657..535f04838 100644 --- a/tests/integration/helm/helm-legacy-auth_test.go +++ b/tests/integration/helm/helm-legacy-auth_test.go @@ -85,14 +85,14 @@ func (s *legacyAuthHelmTest) TestHelmInstall() { url: ternary(s.context == "minikube", "https://local.fiftyone.ai/cas/api", ""), responsePayload: `{"status":"available"}`, httpResponseCode: 200, - log: " ✓ Ready in", + log: "FiftyOne CAS starting up", }, { name: "teams-api", url: ternary(s.context == "minikube", "https://local.fiftyone.ai/health", ""), responsePayload: `{"status":{"teams":"available"}}`, httpResponseCode: 200, - log: "Starting worker", + log: "FiftyOne Teams API starting up", }, { name: "teams-app", @@ -162,14 +162,14 @@ func (s *legacyAuthHelmTest) TestHelmInstall() { url: ternary(s.context == "minikube", "https://local.fiftyone.ai/cas/api", ""), responsePayload: `{"status":"available"}`, httpResponseCode: 200, - log: " ✓ Ready in", + log: "FiftyOne CAS starting up", }, { name: "teams-api", url: ternary(s.context == "minikube", "https://local.fiftyone.ai/health", ""), responsePayload: `{"status":{"teams":"available"}}`, httpResponseCode: 200, - log: "Starting worker", + log: "FiftyOne Teams API starting up", }, { name: "teams-app", @@ -249,14 +249,14 @@ func (s *legacyAuthHelmTest) TestHelmInstall() { url: ternary(s.context == "minikube", "https://local.fiftyone.ai/cas/api", ""), responsePayload: `{"status":"available"}`, httpResponseCode: 200, - log: " ✓ Ready in", + log: "FiftyOne CAS starting up", }, { name: "teams-api", url: ternary(s.context == "minikube", "https://local.fiftyone.ai/health", ""), responsePayload: `{"status":{"teams":"available"}}`, httpResponseCode: 200, - log: "Starting worker", + log: "FiftyOne Teams API starting up", }, { name: "teams-app", diff --git a/tests/integration/helm/helm-topology-spread-constraint_test.go b/tests/integration/helm/helm-topology-spread-constraint_test.go index ed1583418..9bab8a26a 100644 --- a/tests/integration/helm/helm-topology-spread-constraint_test.go +++ b/tests/integration/helm/helm-topology-spread-constraint_test.go @@ -96,7 +96,7 @@ func (s *topologyAuthHelmTest) TestHelmInstall() { url: ternary(s.context == "minikube", "https://local.fiftyone.ai/health", ""), responsePayload: `{"status":{"teams":"available"}}`, httpResponseCode: 200, - log: "Starting worker", + log: "FiftyOne Teams API starting up", }, { name: "teams-app", @@ -110,7 +110,7 @@ func (s *topologyAuthHelmTest) TestHelmInstall() { url: ternary(s.context == "minikube", "https://local.fiftyone.ai/cas/api", ""), responsePayload: `{"status":"available"}`, httpResponseCode: 200, - log: " ✓ Ready in", + log: "FiftyOne CAS starting up", }, // ordering this last to avoid test flakes where testing for log before the container is running { From 382e6f4ff8d7d1ba8556077199a14538d8b1e999 Mon Sep 17 00:00:00 2001 From: kacey Date: Tue, 2 Jun 2026 20:02:56 -0700 Subject: [PATCH 2/4] chore: update teams-app message --- .../compose/docker-compose-internal-auth_test.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/integration/compose/docker-compose-internal-auth_test.go b/tests/integration/compose/docker-compose-internal-auth_test.go index 71b682ecb..e05a30af4 100644 --- a/tests/integration/compose/docker-compose-internal-auth_test.go +++ b/tests/integration/compose/docker-compose-internal-auth_test.go @@ -98,7 +98,7 @@ func (s *commonServicesInternalAuthDockerComposeUpTest) TestDockerComposeUp() { { name: "teams-app", url: "http://127.0.0.1:3000/api/hello", - responsePayload: `{"name":"John Doe"}`, + responsePayload: `{"status":"available"}`, httpResponseCode: 200, log: " ✓ Ready in", }, @@ -135,7 +135,7 @@ func (s *commonServicesInternalAuthDockerComposeUpTest) TestDockerComposeUp() { { name: "teams-app", url: "http://127.0.0.1:3000/api/hello", - responsePayload: `{"name":"John Doe"}`, + responsePayload: `{"status":"available"}`, httpResponseCode: 200, log: " ✓ Ready in", }, @@ -172,7 +172,7 @@ func (s *commonServicesInternalAuthDockerComposeUpTest) TestDockerComposeUp() { { name: "teams-app", url: "http://127.0.0.1:3000/api/hello", - responsePayload: `{"name":"John Doe"}`, + responsePayload: `{"status":"available"}`, httpResponseCode: 200, log: " ✓ Ready in", }, @@ -216,7 +216,7 @@ func (s *commonServicesInternalAuthDockerComposeUpTest) TestDockerComposeUp() { { name: "teams-app", url: "http://127.0.0.1:3000/api/hello", - responsePayload: `{"name":"John Doe"}`, + responsePayload: `{"status":"available"}`, httpResponseCode: 200, log: " ✓ Ready in", }, From 50f295c55d2edad73a8fa910148e3d4b9b8ec56b Mon Sep 17 00:00:00 2001 From: kacey Date: Fri, 26 Jun 2026 17:36:17 -0700 Subject: [PATCH 3/4] chore: trigger tests From 82780106fcb78d54303f3a33be0ce9e0d41b27c0 Mon Sep 17 00:00:00 2001 From: kacey Date: Tue, 30 Jun 2026 16:43:54 -0700 Subject: [PATCH 4/4] fix: update all John Doe responses --- CONTRIBUTING.md | 2 +- .../compose/docker-compose-legacy-auth_test.go | 8 ++++---- tests/integration/helm/helm-internal-auth_test.go | 6 +++--- tests/integration/helm/helm-legacy-auth_test.go | 6 +++--- .../helm/helm-topology-spread-constraint_test.go | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 311aba910..583f5c613 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -560,7 +560,7 @@ Afterwards, access the FiftyOne Enterprise app via ```shell $ curl http://localhost:3000/api/hello - {"name":"John Doe"} + {"status":"available"} ``` #### Port Forward to the `teams-api` Service diff --git a/tests/integration/compose/docker-compose-legacy-auth_test.go b/tests/integration/compose/docker-compose-legacy-auth_test.go index 03f23a773..e36c230a1 100644 --- a/tests/integration/compose/docker-compose-legacy-auth_test.go +++ b/tests/integration/compose/docker-compose-legacy-auth_test.go @@ -98,7 +98,7 @@ func (s *commonServicesLegacyAuthDockerComposeUpTest) TestDockerComposeUp() { { name: "teams-app", url: "http://127.0.0.1:3000/api/hello", - responsePayload: `{"name":"John Doe"}`, + responsePayload: `{"status":"available"}`, httpResponseCode: 200, log: " ✓ Ready in", }, @@ -135,7 +135,7 @@ func (s *commonServicesLegacyAuthDockerComposeUpTest) TestDockerComposeUp() { { name: "teams-app", url: "http://127.0.0.1:3000/api/hello", - responsePayload: `{"name":"John Doe"}`, + responsePayload: `{"status":"available"}`, httpResponseCode: 200, log: " ✓ Ready in", }, @@ -172,7 +172,7 @@ func (s *commonServicesLegacyAuthDockerComposeUpTest) TestDockerComposeUp() { { name: "teams-app", url: "http://127.0.0.1:3000/api/hello", - responsePayload: `{"name":"John Doe"}`, + responsePayload: `{"status":"available"}`, httpResponseCode: 200, log: " ✓ Ready in", }, @@ -216,7 +216,7 @@ func (s *commonServicesLegacyAuthDockerComposeUpTest) TestDockerComposeUp() { { name: "teams-app", url: "http://127.0.0.1:3000/api/hello", - responsePayload: `{"name":"John Doe"}`, + responsePayload: `{"status":"available"}`, httpResponseCode: 200, log: " ✓ Ready in", }, diff --git a/tests/integration/helm/helm-internal-auth_test.go b/tests/integration/helm/helm-internal-auth_test.go index 41e9b6859..6c94e013c 100644 --- a/tests/integration/helm/helm-internal-auth_test.go +++ b/tests/integration/helm/helm-internal-auth_test.go @@ -91,7 +91,7 @@ func (s *internalAuthHelmTest) TestHelmInstall() { { name: "teams-app", url: ternary(s.context == "minikube", "https://local.fiftyone.ai/api/hello", ""), - responsePayload: `{"name":"John Doe"}`, + responsePayload: `{"status":"available"}`, httpResponseCode: 200, log: " ✓ Ready in", }, @@ -178,7 +178,7 @@ func (s *internalAuthHelmTest) TestHelmInstall() { { name: "teams-app", url: ternary(s.context == "minikube", "https://local.fiftyone.ai/api/hello", ""), - responsePayload: `{"name":"John Doe"}`, + responsePayload: `{"status":"available"}`, httpResponseCode: 200, log: " ✓ Ready in", }, @@ -267,7 +267,7 @@ func (s *internalAuthHelmTest) TestHelmInstall() { { name: "teams-app", url: ternary(s.context == "minikube", "https://local.fiftyone.ai/api/hello", ""), - responsePayload: `{"name":"John Doe"}`, + responsePayload: `{"status":"available"}`, httpResponseCode: 200, log: " ✓ Ready in", }, diff --git a/tests/integration/helm/helm-legacy-auth_test.go b/tests/integration/helm/helm-legacy-auth_test.go index 535f04838..19f73fb92 100644 --- a/tests/integration/helm/helm-legacy-auth_test.go +++ b/tests/integration/helm/helm-legacy-auth_test.go @@ -97,7 +97,7 @@ func (s *legacyAuthHelmTest) TestHelmInstall() { { name: "teams-app", url: ternary(s.context == "minikube", "https://local.fiftyone.ai/api/hello", ""), - responsePayload: `{"name":"John Doe"}`, + responsePayload: `{"status":"available"}`, httpResponseCode: 200, log: " ✓ Ready in", }, @@ -174,7 +174,7 @@ func (s *legacyAuthHelmTest) TestHelmInstall() { { name: "teams-app", url: ternary(s.context == "minikube", "https://local.fiftyone.ai/api/hello", ""), - responsePayload: `{"name":"John Doe"}`, + responsePayload: `{"status":"available"}`, httpResponseCode: 200, log: " ✓ Ready in", }, @@ -261,7 +261,7 @@ func (s *legacyAuthHelmTest) TestHelmInstall() { { name: "teams-app", url: ternary(s.context == "minikube", "https://local.fiftyone.ai/api/hello", ""), - responsePayload: `{"name":"John Doe"}`, + responsePayload: `{"status":"available"}`, httpResponseCode: 200, log: " ✓ Ready in", }, diff --git a/tests/integration/helm/helm-topology-spread-constraint_test.go b/tests/integration/helm/helm-topology-spread-constraint_test.go index 9bab8a26a..a81e6671f 100644 --- a/tests/integration/helm/helm-topology-spread-constraint_test.go +++ b/tests/integration/helm/helm-topology-spread-constraint_test.go @@ -101,7 +101,7 @@ func (s *topologyAuthHelmTest) TestHelmInstall() { { name: "teams-app", url: ternary(s.context == "minikube", "https://local.fiftyone.ai/api/hello", ""), - responsePayload: `{"name":"John Doe"}`, + responsePayload: `{"status":"available"}`, httpResponseCode: 200, log: " ✓ Ready in", },