Skip to content
Open
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
4 changes: 2 additions & 2 deletions app/Console/Commands/PolydockCloneStoreAppCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public function handle()
// Ask user which store to clone into
$targetStoreId = array_search($this->choice(
'Select target store to clone into:',
array_values($storeChoices),
$storeChoices,
null,
null,
false
Expand Down Expand Up @@ -111,4 +111,4 @@ public function handle()

return 0;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ public function infolist(Infolist $infolist): Infolist
->label('Requested')
->dateTime(),
]),

]),

Section::make('App Details')
Expand All @@ -65,8 +64,8 @@ public function infolist(Infolist $infolist): Infolist
->label('App'),
TextEntry::make('appInstance.name')
->label('Instance')
->url(fn ($record)
=> route('filament.admin.resources.polydock-app-instances.view',
->url(fn ($record)
=> route('filament.admin.resources.polydock-app-instances.view',
['record' => $record->appInstance])),
]),
]),
Expand All @@ -76,7 +75,7 @@ public function infolist(Infolist $infolist): Infolist
return self::getRenderedSafeRequestDataForRecord($record);
})
->collapsible(),

Section::make('Result Data')
->schema(function ($record) {
return self::getRenderedSafeResultDataForRecord($record);
Expand Down Expand Up @@ -121,8 +120,8 @@ public static function getRenderedSafeDataForRecord(UserRemoteRegistration $reco
$renderedItem->state([$value]);
}

$renderedArray[] = $renderedItem;
$renderedArray[] = $renderedItem;
}
return $renderedArray;
}
}
}
4 changes: 2 additions & 2 deletions app/Jobs/EnsureUnallocatedAppInstancesJob.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public function handle(): void
foreach ($apps as $app) {
$needed = $app->target_unallocated_app_instances - $app->unallocated_instances_count;
$neededTotal += $needed;

Log::info('Creating unallocated instances', [
'app_id' => $app->id,
'app_name' => $app->name,
Expand Down Expand Up @@ -72,4 +72,4 @@ public function handle(): void
'needed_total' => $neededTotal
]);
}
}
}
4 changes: 2 additions & 2 deletions config/horizon.php
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@
'polydock-app-instance-processing-create',
'polydock-app-instance-processing-deploy',
'polydock-app-instance-processing-remove',
'polydock-app-instance-processing-health',
'polydock-app-instance-processing-health',
'polydock-app-instance-processing-upgrade',
'polydock-app-instance-processing-claim',
'polydock-app-instance-processing-progress-to-next-stage'
Expand Down Expand Up @@ -224,7 +224,7 @@
'polydock-app-instance-processing-create',
'polydock-app-instance-processing-deploy',
'polydock-app-instance-processing-remove',
'polydock-app-instance-processing-health',
'polydock-app-instance-processing-health',
'polydock-app-instance-processing-upgrade',
'polydock-app-instance-processing-claim',
'polydock-app-instance-processing-progress-to-next-stage'
Expand Down
6 changes: 3 additions & 3 deletions config/polydock.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
'ssh_user' => env('FTLAGOON_SSH_USER','lagoon'),
'ssh_server' => env('FTLAGOON_SSH_SERVER','ssh.lagoon.amazeeio.cloud'),
'ssh_port' => env('FTLAGOON_SSH_PORT','32222'),
'endpoint' => env('FTLAGOON_ENDPOINT','https://api.lagoon.amazeeio.cloud/graphql'),
'endpoint' => env('FTLAGOON_ENDPOINT','https://api.lagoon.amazeeio.cloud/graphql'),
],
"PolydockServiceProviderAmazeeAiBackend" => [
'class' => App\PolydockServiceProviders\PolydockServiceProviderAmazeeAiBackend::class,
Expand All @@ -19,9 +19,9 @@
'token_file' => env('AMAZEE_AI_BACKEND_TOKEN_FILE', storage_path('amazee-ai-backend/token')),
]
];

$filterServiceProviders = explode(",", env('POLYDOCK_DISABLED_SERVICE_PROVIDERS', ''));

foreach ($filterServiceProviders as $filterServiceProvider) {
$filterServiceProvider = trim($filterServiceProvider);
if(!empty($filterServiceProvider) && isset($serviceProviderSingletons[$filterServiceProvider])) {
Expand Down
4 changes: 2 additions & 2 deletions routes/web.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
if ($appInstance->app_one_time_login_url && !$appInstance->oneTimeLoginUrlHasExpired()) {
return redirect()->away($appInstance->app_one_time_login_url, 302);
}

if ($appInstance->app_url) {
return redirect()->away($appInstance->app_url, 302);
}

abort(404, 'No URL available for this app instance');
})->name('app-instances.show');