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 composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"require": {
"php": "^8.3",
"symfony/console": "^7.4",
"keboola/sandboxes-service-api-client": "^1.8.0",
"keboola/sandboxes-service-api-client": "^2.1.1",
"keboola/service-client": "^1.0",
"keboola/storage-api-client": "^18.5.0",
"keboola/kbc-manage-api-php-client": "^7",
Expand Down
68 changes: 61 additions & 7 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
use Keboola\JobQueueClient\Client as JobQueueClient;
use Keboola\JobQueueClient\JobData;
use Keboola\ManageApi\Client;
use Keboola\SandboxesServiceApiClient\ApiClientConfiguration;
use Keboola\SandboxesServiceApiClient\Apps\AppsApiClient;
use Keboola\ServiceClient\ServiceClient;
use Keboola\StorageApi\BranchAwareClient;
Expand Down Expand Up @@ -194,11 +193,11 @@ protected function execute(InputInterface $input, OutputInterface $output): int
// Handle Python/R sandboxes via sandbox-service.
// Configs are bound to creatorToken.id, not userId: a user who leaves and rejoins gets a new token,
// so their old sandbox configs are reaped here even if the user is back — intentional, matches original behavior.
$appsClient = new AppsApiClient(new ApiClientConfiguration(
$appsClient = new AppsApiClient(
baseUrl: $serviceClient->getSandboxesServiceUrl(),
storageToken: $storageToken['token'],
userAgent: 'Keboola CLI Utils',
));
);

$storageComponents = new Components($storageClient);
$sandboxConfigMap = [];
Expand Down
5 changes: 2 additions & 3 deletions src/Keboola/Console/Command/DeleteOwnerlessWorkspaces.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

use Keboola\JobQueueClient\Client as JobQueueClient;
use Keboola\JobQueueClient\JobData;
use Keboola\SandboxesServiceApiClient\ApiClientConfiguration;
use Keboola\SandboxesServiceApiClient\Apps\AppsApiClient;
use Keboola\ServiceClient\ServiceClient;
use Keboola\StorageApi\BranchAwareClient;
Expand Down Expand Up @@ -140,11 +139,11 @@ protected function execute(InputInterface $input, OutputInterface $output): int
// Handle Python/R sandboxes via sandbox-service.
// Configs are bound to creatorToken.id, not userId: a user who leaves and rejoins gets a new token,
// so their old sandbox configs are reaped here even if the user is back — intentional, matches original behavior.
$appsClient = new AppsApiClient(new ApiClientConfiguration(
$appsClient = new AppsApiClient(
baseUrl: $serviceClient->getSandboxesServiceUrl(),
storageToken: $token,
userAgent: 'Keboola CLI Utils',
));
);

$storageComponents = new Components($storageClient);
$sandboxConfigMap = [];
Expand Down