Skip to content

feat(service-client): remove decommissioned SANDBOXES_API and WAII services #491

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
odinuv wants to merge 3 commits into
base: main
Choose a base branch
from
Open

feat(service-client): remove decommissioned SANDBOXES_API and WAII services #491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
891411a
feat(service-client): remove decommissioned SANDBOXES_API service
odinuv Apr 29, 2026
d7205f6
feat(service-client): remove decommissioned WAII service
odinuv May 1, 2026
7576e7d
fix(service-client): fix closing brace placement in ServiceClient
odinuv May 1, 2026
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
6 changes: 0 additions & 6 deletions libs/service-client/src/Service.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,11 @@ enum Service
case QUERY;
case QUEUE;
case QUEUE_INTERNAL_API;
case SANDBOXES_API;
case SANDBOXES_SERVICE;
case SCHEDULER;
case SYNC_ACTIONS;
case TEMPLATES;
case VAULT;
case WAII;

public function getPublicSubdomain(): string
{
Expand All @@ -43,13 +41,11 @@ public function getPublicSubdomain(): string
self::QUERY => 'query',
self::QUEUE => 'queue',
self::QUEUE_INTERNAL_API => throw new RuntimeException('Job queue internal API does not have public DNS'),
self::SANDBOXES_API => 'sandboxes',
self::SANDBOXES_SERVICE => 'data-science',
self::SCHEDULER => 'scheduler',
self::SYNC_ACTIONS => 'sync-actions',
self::TEMPLATES => 'templates',
self::VAULT => 'vault',
self::WAII => 'waii',
};
}

Expand All @@ -68,13 +64,11 @@ public function getInternalServiceName(): string
self::QUERY => 'query-service-api.query-service',
self::QUEUE => 'job-queue-api.default',
self::QUEUE_INTERNAL_API => 'job-queue-internal-api.default',
self::SANDBOXES_API => 'sandboxes-api.sandboxes',
self::SANDBOXES_SERVICE => 'sandboxes-service-api.default',
self::SCHEDULER => 'scheduler-api.default',
self::SYNC_ACTIONS => 'runner-sync-api.default',
self::TEMPLATES => 'templates-api.templates-api',
self::VAULT => 'vault-api.default',
self::WAII => 'waii-svc.waii',
};
}
}
16 changes: 0 additions & 16 deletions libs/service-client/src/ServiceClient.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,14 +116,6 @@ public function getNotificationServiceUrl(?ServiceDnsType $dnsType = null): stri
return $this->getServiceUrl(Service::NOTIFICATION, $dnsType);
}

/**
* @return non-empty-string
*/
public function getSandboxesApiUrl(?ServiceDnsType $dnsType = null): string
{
return $this->getServiceUrl(Service::SANDBOXES_API, $dnsType);
}

/**
* @return non-empty-string
*/
Expand Down Expand Up @@ -179,12 +171,4 @@ public function getVaultUrl(?ServiceDnsType $dnsType = null): string
{
return $this->getServiceUrl(Service::VAULT, $dnsType);
}

/**
* @return non-empty-string
*/
public function getWaiiServiceUrl(?ServiceDnsType $dnsType = null): string
{
return $this->getServiceUrl(Service::WAII, $dnsType);
}
}
12 changes: 0 additions & 12 deletions libs/service-client/tests/ServiceClientTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,10 @@ class ServiceClientTest extends TestCase
private const PUBLIC_NOTIFICATION_SERVICE = 'https://notification.north-europe.azure.keboola.com';
private const PUBLIC_OAUTH = 'https://oauth.north-europe.azure.keboola.com';
private const PUBLIC_QUEUE = 'https://queue.north-europe.azure.keboola.com';
private const PUBLIC_SANDBOXES_SERVICE = 'https://sandboxes.north-europe.azure.keboola.com';
private const PUBLIC_SCHEDULER_SERVICE = 'https://scheduler.north-europe.azure.keboola.com';
private const PUBLIC_SYNC_ACTIONS_SERVICE = 'https://sync-actions.north-europe.azure.keboola.com';
private const PUBLIC_TEMPLATES = 'https://templates.north-europe.azure.keboola.com';
private const PUBLIC_VAULT = 'https://vault.north-europe.azure.keboola.com';
private const PUBLIC_WAII_SERVICE = 'https://waii.north-europe.azure.keboola.com';
private const PUBLIC_QUERY_SERVICE = 'https://query.north-europe.azure.keboola.com';

private const INTERNAL_AI_SERVICE = 'http://ai-service-api.default.svc.cluster.local';
Expand All @@ -43,12 +41,10 @@ class ServiceClientTest extends TestCase
private const INTERNAL_QUERY_SERVICE = 'http://query-service-api.query-service.svc.cluster.local';
private const INTERNAL_QUEUE = 'http://job-queue-api.default.svc.cluster.local';
private const INTERNAL_QUEUE_INTERNAL_API = 'http://job-queue-internal-api.default.svc.cluster.local';
private const INTERNAL_SANDBOXES_SERVICE = 'http://sandboxes-api.sandboxes.svc.cluster.local';
private const INTERNAL_SCHEDULER_SERVICE = 'http://scheduler-api.default.svc.cluster.local';
private const INTERNAL_SYNC_ACTIONS_SERVICE = 'http://runner-sync-api.default.svc.cluster.local';
private const INTERNAL_TEMPLATES = 'http://templates-api.templates-api.svc.cluster.local';
private const INTERNAL_VAULT = 'http://vault-api.default.svc.cluster.local';
private const INTERNAL_WAII_SERVICE = 'http://waii-svc.waii.svc.cluster.local';

public function testGetExplicitPublicUrlMethods(): void
{
Expand All @@ -67,12 +63,10 @@ public function testGetExplicitPublicUrlMethods(): void
self::assertSame(self::PUBLIC_OAUTH, $client->getOauthUrl(ServiceDnsType::PUBLIC));
self::assertSame(self::PUBLIC_QUERY_SERVICE, $client->getQueryServiceUrl(ServiceDnsType::PUBLIC));
self::assertSame(self::PUBLIC_QUEUE, $client->getQueueUrl(ServiceDnsType::PUBLIC));
self::assertSame(self::PUBLIC_SANDBOXES_SERVICE, $client->getSandboxesApiUrl(ServiceDnsType::PUBLIC));
self::assertSame(self::PUBLIC_SCHEDULER_SERVICE, $client->getSchedulerServiceUrl(ServiceDnsType::PUBLIC));
self::assertSame(self::PUBLIC_SYNC_ACTIONS_SERVICE, $client->getSyncActionsServiceUrl(ServiceDnsType::PUBLIC));
self::assertSame(self::PUBLIC_TEMPLATES, $client->getTemplatesUrl(ServiceDnsType::PUBLIC));
self::assertSame(self::PUBLIC_VAULT, $client->getVaultUrl(ServiceDnsType::PUBLIC));
self::assertSame(self::PUBLIC_WAII_SERVICE, $client->getWaiiServiceUrl(ServiceDnsType::PUBLIC));
}

public function testGetDefaultPublicUrlMethods(): void
Expand All @@ -91,12 +85,10 @@ public function testGetDefaultPublicUrlMethods(): void
self::assertSame(self::PUBLIC_OAUTH, $client->getOauthUrl());
self::assertSame(self::PUBLIC_QUERY_SERVICE, $client->getQueryServiceUrl());
self::assertSame(self::PUBLIC_QUEUE, $client->getQueueUrl());
self::assertSame(self::PUBLIC_SANDBOXES_SERVICE, $client->getSandboxesApiUrl());
self::assertSame(self::PUBLIC_SCHEDULER_SERVICE, $client->getSchedulerServiceUrl());
self::assertSame(self::PUBLIC_SYNC_ACTIONS_SERVICE, $client->getSyncActionsServiceUrl());
self::assertSame(self::PUBLIC_TEMPLATES, $client->getTemplatesUrl());
self::assertSame(self::PUBLIC_VAULT, $client->getVaultUrl());
self::assertSame(self::PUBLIC_WAII_SERVICE, $client->getWaiiServiceUrl());
}

public function testGetExplicitPublicUrlOfServiceWithoutPublicDns(): void
Expand Down Expand Up @@ -139,12 +131,10 @@ public function testGetExplicitInternalUrlMethods(): void
self::assertSame(self::INTERNAL_QUERY_SERVICE, $client->getQueryServiceUrl(ServiceDnsType::INTERNAL));
self::assertSame(self::INTERNAL_QUEUE, $client->getQueueUrl(ServiceDnsType::INTERNAL));
self::assertSame(self::INTERNAL_QUEUE_INTERNAL_API, $client->getQueueInternalApiUrl(ServiceDnsType::INTERNAL));
self::assertSame(self::INTERNAL_SANDBOXES_SERVICE, $client->getSandboxesApiUrl(ServiceDnsType::INTERNAL));
self::assertSame(self::INTERNAL_SCHEDULER_SERVICE, $client->getSchedulerServiceUrl(ServiceDnsType::INTERNAL));
self::assertSame(self::INTERNAL_SYNC_ACTIONS_SERVICE, $client->getSyncActionsServiceUrl(ServiceDnsType::INTERNAL));
self::assertSame(self::INTERNAL_TEMPLATES, $client->getTemplatesUrl(ServiceDnsType::INTERNAL));
self::assertSame(self::INTERNAL_VAULT, $client->getVaultUrl(ServiceDnsType::INTERNAL));
self::assertSame(self::INTERNAL_WAII_SERVICE, $client->getWaiiServiceUrl(ServiceDnsType::INTERNAL));
// phpcs:enable Generic.Files.LineLength
}

Expand All @@ -165,11 +155,9 @@ public function testGetDefaultInternalUrlMethods(): void
self::assertSame(self::INTERNAL_QUERY_SERVICE, $client->getQueryServiceUrl());
self::assertSame(self::INTERNAL_QUEUE, $client->getQueueUrl());
self::assertSame(self::INTERNAL_QUEUE_INTERNAL_API, $client->getQueueInternalApiUrl());
self::assertSame(self::INTERNAL_SANDBOXES_SERVICE, $client->getSandboxesApiUrl());
self::assertSame(self::INTERNAL_SCHEDULER_SERVICE, $client->getSchedulerServiceUrl());
self::assertSame(self::INTERNAL_SYNC_ACTIONS_SERVICE, $client->getSyncActionsServiceUrl());
self::assertSame(self::INTERNAL_TEMPLATES, $client->getTemplatesUrl());
self::assertSame(self::INTERNAL_VAULT, $client->getVaultUrl());
self::assertSame(self::INTERNAL_WAII_SERVICE, $client->getWaiiServiceUrl());
}
}
4 changes: 0 additions & 4 deletions libs/service-client/tests/ServiceTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,8 @@ public static function providePublicSubdomains(): iterable
yield 'notification' => [Service::NOTIFICATION, 'notification'];
yield 'oauth' => [Service::OAUTH, 'oauth'];
yield 'queue' => [Service::QUEUE, 'queue'];
yield 'sandboxes' => [Service::SANDBOXES_API, 'sandboxes'];
yield 'scheduler' => [Service::SCHEDULER, 'scheduler'];
yield 'sync-actions' => [Service::SYNC_ACTIONS, 'sync-actions'];
yield 'waii' => [Service::WAII, 'waii'];
}

#[DataProvider('providePublicSubdomains')]
Expand Down Expand Up @@ -66,10 +64,8 @@ public static function provideInternalServiceNames(): iterable
yield 'oauth' => [Service::OAUTH, 'oauth-api.default'];
yield 'queue' => [Service::QUEUE, 'job-queue-api.default'];
yield 'queue internal api' => [Service::QUEUE_INTERNAL_API, 'job-queue-internal-api.default'];
yield 'sandboxes' => [Service::SANDBOXES_API, 'sandboxes-api.sandboxes']; // <-- custom namespace
yield 'scheduler' => [Service::SCHEDULER, 'scheduler-api.default'];
yield 'sync-actions' => [Service::SYNC_ACTIONS, 'runner-sync-api.default'];
yield 'waii' => [Service::WAII, 'waii-svc.waii'];
}

#[DataProvider('provideInternalServiceNames')]
Expand Down