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-internal-auth_test.go b/tests/integration/compose/docker-compose-internal-auth_test.go index 01496634d..e05a30af4 100644 --- a/tests/integration/compose/docker-compose-internal-auth_test.go +++ b/tests/integration/compose/docker-compose-internal-auth_test.go @@ -93,12 +93,12 @@ 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", url: "http://127.0.0.1:3000/api/hello", - responsePayload: `{"name":"John Doe"}`, + responsePayload: `{"status":"available"}`, httpResponseCode: 200, log: " ✓ Ready in", }, @@ -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,12 +130,12 @@ 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", url: "http://127.0.0.1:3000/api/hello", - responsePayload: `{"name":"John Doe"}`, + responsePayload: `{"status":"available"}`, httpResponseCode: 200, log: " ✓ Ready in", }, @@ -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,12 +167,12 @@ 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", url: "http://127.0.0.1:3000/api/hello", - responsePayload: `{"name":"John Doe"}`, + responsePayload: `{"status":"available"}`, httpResponseCode: 200, log: " ✓ Ready in", }, @@ -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,12 +211,12 @@ 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", url: "http://127.0.0.1:3000/api/hello", - responsePayload: `{"name":"John Doe"}`, + responsePayload: `{"status":"available"}`, httpResponseCode: 200, log: " ✓ Ready in", }, @@ -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..e36c230a1 100644 --- a/tests/integration/compose/docker-compose-legacy-auth_test.go +++ b/tests/integration/compose/docker-compose-legacy-auth_test.go @@ -93,12 +93,12 @@ 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", url: "http://127.0.0.1:3000/api/hello", - responsePayload: `{"name":"John Doe"}`, + responsePayload: `{"status":"available"}`, httpResponseCode: 200, log: " ✓ Ready in", }, @@ -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,12 +130,12 @@ 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", url: "http://127.0.0.1:3000/api/hello", - responsePayload: `{"name":"John Doe"}`, + responsePayload: `{"status":"available"}`, httpResponseCode: 200, log: " ✓ Ready in", }, @@ -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,12 +167,12 @@ 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", url: "http://127.0.0.1:3000/api/hello", - responsePayload: `{"name":"John Doe"}`, + responsePayload: `{"status":"available"}`, httpResponseCode: 200, log: " ✓ Ready in", }, @@ -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,12 +211,12 @@ 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", url: "http://127.0.0.1:3000/api/hello", - responsePayload: `{"name":"John Doe"}`, + responsePayload: `{"status":"available"}`, httpResponseCode: 200, log: " ✓ Ready in", }, @@ -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..6c94e013c 100644 --- a/tests/integration/helm/helm-internal-auth_test.go +++ b/tests/integration/helm/helm-internal-auth_test.go @@ -79,19 +79,19 @@ 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", url: ternary(s.context == "minikube", "https://local.fiftyone.ai/api/hello", ""), - responsePayload: `{"name":"John Doe"}`, + responsePayload: `{"status":"available"}`, httpResponseCode: 200, log: " ✓ Ready in", }, @@ -166,19 +166,19 @@ 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", url: ternary(s.context == "minikube", "https://local.fiftyone.ai/api/hello", ""), - responsePayload: `{"name":"John Doe"}`, + responsePayload: `{"status":"available"}`, httpResponseCode: 200, log: " ✓ Ready in", }, @@ -255,19 +255,19 @@ 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", 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 8c1942657..19f73fb92 100644 --- a/tests/integration/helm/helm-legacy-auth_test.go +++ b/tests/integration/helm/helm-legacy-auth_test.go @@ -85,19 +85,19 @@ 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", url: ternary(s.context == "minikube", "https://local.fiftyone.ai/api/hello", ""), - responsePayload: `{"name":"John Doe"}`, + responsePayload: `{"status":"available"}`, httpResponseCode: 200, log: " ✓ Ready in", }, @@ -162,19 +162,19 @@ 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", url: ternary(s.context == "minikube", "https://local.fiftyone.ai/api/hello", ""), - responsePayload: `{"name":"John Doe"}`, + responsePayload: `{"status":"available"}`, httpResponseCode: 200, log: " ✓ Ready in", }, @@ -249,19 +249,19 @@ 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", 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 ed1583418..a81e6671f 100644 --- a/tests/integration/helm/helm-topology-spread-constraint_test.go +++ b/tests/integration/helm/helm-topology-spread-constraint_test.go @@ -96,12 +96,12 @@ 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", url: ternary(s.context == "minikube", "https://local.fiftyone.ai/api/hello", ""), - responsePayload: `{"name":"John Doe"}`, + responsePayload: `{"status":"available"}`, httpResponseCode: 200, log: " ✓ Ready in", }, @@ -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 {