Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
24 changes: 12 additions & 12 deletions tests/integration/compose/docker-compose-internal-auth_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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",
},
Expand All @@ -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
{
Expand All @@ -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",
},
Expand All @@ -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
{
Expand All @@ -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",
},
Expand All @@ -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
{
Expand Down Expand Up @@ -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",
},
Expand All @@ -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
{
Expand Down
24 changes: 12 additions & 12 deletions tests/integration/compose/docker-compose-legacy-auth_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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",
},
Expand All @@ -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
{
Expand All @@ -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",
},
Expand All @@ -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
{
Expand All @@ -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",
},
Expand All @@ -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
{
Expand Down Expand Up @@ -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",
},
Expand All @@ -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
{
Expand Down
18 changes: 9 additions & 9 deletions tests/integration/helm/helm-internal-auth_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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",
},
Expand Down Expand Up @@ -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",
},
Expand Down Expand Up @@ -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",
},
Expand Down
18 changes: 9 additions & 9 deletions tests/integration/helm/helm-legacy-auth_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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",
},
Expand Down Expand Up @@ -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",
},
Expand Down Expand Up @@ -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",
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",
},
Expand All @@ -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
{
Expand Down
Loading