harry/keystone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ran pint

Browse Source
This commit is contained in:
Harry (hjbdev)
2025-04-07 12:16:11 +01:00
parent ce8b201a1c
commit e15a80163b
62 changed files with 149 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Actions/FirewallRules/InstallFirewallRule.php
View File

@@ -20,6 +20,7 @@ class InstallFirewallRule
$firewallRule->update([
'status' => FirewallRuleStatus::FAILED,
]);
return;
}

1
app/Actions/FirewallRules/UninstallFirewallRule.php
View File

@@ -20,6 +20,7 @@ class UninstallFirewallRule
$firewallRule->update([
'status' => FirewallRuleStatus::FAILED,
]);
return;
}

4
app/Actions/GenerateRandomSlug.php
View File

@@ -12,11 +12,11 @@ class GenerateRandomSlug
$slug = '';
for ($i = 0; $i < $adjectiveCount; $i++) {
$slug .= $adjectives[array_rand($adjectives)] . '-';
$slug .= $adjectives[array_rand($adjectives)].'-';
}
$slug .= $nouns[array_rand($nouns)];
return $slug;
}
}
}

4
app/Actions/GetProviderService.php
View File

@@ -7,10 +7,10 @@ use App\Services\ServerProviders\ServerProviderService;
class GetProviderService
{
public function execute(string $provider): ServerProviderService|null
public function execute(string $provider): ?ServerProviderService
{
return match ($provider) {
'hetzner' => new HetznerService(),
'hetzner' => new HetznerService,
default => null,
};
}

8
app/Console/Commands/CreateServiceCommand.php
View File

@@ -11,6 +11,7 @@ use Illuminate\Console\Command;
class CreateServiceCommand extends Command
{
protected $signature = 'service:create';
protected $description = 'Create a service';
public function handle()
@@ -18,17 +19,18 @@ class CreateServiceCommand extends Command
$serverId = $this->components->ask('Enter the server ID');
$server = Server::find($serverId);
if (!$server) {
if (! $server) {
$this->components->error('Server not found');
return;
}
$serviceType = $this->components->choice('select the service you want to install', [
'postgres-17'
'postgres-17',
]);
$serviceName = $this->components->ask('Enter the service name');
list ($type, $version) = explode('-', $serviceType);
[$type, $version] = explode('-', $serviceType);
$service = app(CreateService::class)->execute(
server: $server,

26
app/Console/Commands/GenerateJSEnums.php
View File

@@ -40,10 +40,10 @@ class GenerateJSEnums extends Command
}
foreach ((new Finder)->in($paths)->files() as $enum) {
$enum = 'App\\' . str_replace(
$enum = 'App\\'.str_replace(
['/', '.php'],
['\\', ''],
Str::after($enum->getRealPath(), realpath(app_path()) . DIRECTORY_SEPARATOR)
Str::after($enum->getRealPath(), realpath(app_path()).DIRECTORY_SEPARATOR)
);
if (! class_exists($enum)) {
@@ -51,36 +51,36 @@ class GenerateJSEnums extends Command
}
$js = "// This is a generated file. \n";
$js .= '// Published at ' . now()->format('Y-m-d H:i:s') . "\n";
$js .= '// Published at '.now()->format('Y-m-d H:i:s')."\n";
$js .= "\n";
$js .= 'export default ';
$js .= json_encode($enum::toArray(), JSON_PRETTY_PRINT) . "\n";
$js .= json_encode($enum::toArray(), JSON_PRETTY_PRINT)."\n";
$js .= "\n";
if (method_exists($enum, 'getLabels')) {
$labels = $enum::getLabels();
$js .= 'export const LabelMap = ';
$js .= json_encode($labels, JSON_PRETTY_PRINT) . "\n";
$js .= json_encode($labels, JSON_PRETTY_PRINT)."\n";
$js .= "\n";
$labelSelect = array_map(fn($key) => ['title' => $labels[$key], 'id' => $key], array_keys($labels));
$labelSelect = array_map(fn ($key) => ['title' => $labels[$key], 'id' => $key], array_keys($labels));
$js .= 'export const LabelSelectMap = ';
$js .= json_encode($labelSelect, JSON_PRETTY_PRINT) . "\n";
$js .= json_encode($labelSelect, JSON_PRETTY_PRINT)."\n";
$js .= "\n";
}
if (method_exists($enum, 'getDescription')) {
$values = $enum::toArray();
$descriptions = array_map(fn($key) => $enum::getDescription($key), $values);
$descriptions = array_map(fn ($key) => $enum::getDescription($key), $values);
$js .= 'export const DescriptionMap = ';
$js .= json_encode($descriptions, JSON_PRETTY_PRINT) . "\n";
$js .= json_encode($descriptions, JSON_PRETTY_PRINT)."\n";
$js .= "\n";
}
if (method_exists($enum, 'colours')) {
$colours = $enum::colours();
$js .= 'export const ColourMap = ';
$js .= json_encode($colours, JSON_PRETTY_PRINT) . "\n";
$js .= json_encode($colours, JSON_PRETTY_PRINT)."\n";
$js .= "\n";
}
@@ -88,10 +88,10 @@ class GenerateJSEnums extends Command
// Skip format, JS date formats are different to PHP ones.
if ($name !== 'Format') {
file_put_contents(base_path('resources/js/Enums/' . $name . '.js'), $js);
$this->info('Stored ' . $enum);
file_put_contents(base_path('resources/js/Enums/'.$name.'.js'), $js);
$this->info('Stored '.$enum);
} else {
$this->info('Skipped ' . $name . 's');
$this->info('Skipped '.$name.'s');
}
}
}

9
app/Console/Commands/Setup/GenerateSshKey.php
View File

@@ -8,27 +8,30 @@ use Illuminate\Support\Facades\Process;
class GenerateSshKey extends Command
{
protected $signature = 'setup:generate-ssh-key';
protected $description = 'Generates an SSH key pair for the application.';
public function handle()
{
if (file_exists(storage_path('app/private/ssh/id_ed25519'))) {
$this->components->info('SSH key pair already exists.');
return;
}
$this->components->info('Generating SSH key pair...');
if (!file_exists(storage_path('app/private/ssh'))) {
if (! file_exists(storage_path('app/private/ssh'))) {
$this->components->info('ssh directory does not exist. Creating it now...');
mkdir(storage_path('app/private/ssh'), 0755, true);
}
$result = Process::run(['ssh-keygen', '-t', 'ed25519', '-f', storage_path('app/private/ssh/id_ed25519'), '-N', '']);
if (!$result->successful()) {
if (! $result->successful()) {
$this->components->error('Failed to generate SSH key pair.');
$this->line($result->output());
$this->line($result->errorOutput());
return;
}

1
app/Console/Commands/Setup/Setup.php
View File

@@ -7,6 +7,7 @@ use Illuminate\Console\Command;
class Setup extends Command
{
protected $signature = 'setup';
protected $description = 'Initialize the application.';
public function handle()

4
app/Data/Deployments/Plan.php
View File

@@ -5,11 +5,11 @@ namespace App\Data\Deployments;
class Plan
{
/**
* @param PlannedStep[] $steps
* @param PlannedStep[] $steps
*/
public function __construct(
public array $steps = [],
) {
//
}
}
}

6
app/Data/Deployments/PlannedStep.php
View File

@@ -18,12 +18,13 @@ class PlannedStep
}
}
public function getSafeScript(): string
public function getSafeScript(): string
{
$script = $this->script;
foreach ($this->secrets as $key => $value) {
$script = str_replace("[!{$key}]", '********', $script);
}
return $script;
}
@@ -33,6 +34,7 @@ class PlannedStep
foreach ($this->secrets as $key => $value) {
$script = str_replace("[!{$key}]", $value, $script);
}
return $script;
}
}
}

2
app/Data/ServerProviders/CreatedServer.php
View File

@@ -12,4 +12,4 @@ class CreatedServer
public string $ipv4,
public string $ipv6,
) {}
}
}

2
app/Data/ServerProviders/Image.php
View File

@@ -10,4 +10,4 @@ class Image
public string $osFlavor,
public string $osVersion,
) {}
}
}

2
app/Data/ServerProviders/Location.php
View File

@@ -10,4 +10,4 @@ class Location
public string $country,
public string $city,
) {}
}
}

10
app/Data/ServerProviders/ServerType.php
View File

@@ -5,10 +5,10 @@ namespace App\Data\ServerProviders;
class ServerType
{
/**
* @param string $name The name of the server type
* @param int $cores The number of cores
* @param int $memory The amount of memory in GB
* @param int $disk The amount of disk space in GB
* @param string $name The name of the server type
* @param int $cores The number of cores
* @param int $memory The amount of memory in GB
* @param int $disk The amount of disk space in GB
*/
public function __construct(
public string $id,
@@ -19,4 +19,4 @@ class ServerType
public float $priceMonthly,
public float $priceHourly,
) {}
}
}

6
app/Drivers/DatabaseDriver.php
View File

@@ -5,9 +5,13 @@ namespace App\Drivers;
abstract class DatabaseDriver extends Driver
{
public string $defaultUser = 'keystone';
public string $defaultDb = 'keystone';
public ?string $containerName;
public ?string $containerId;
public ?string $defaultPassword;
abstract public function __construct(
@@ -15,4 +19,4 @@ abstract class DatabaseDriver extends Driver
?string $containerId = null,
?string $defaultPassword = null,
);
}
}

4
app/Drivers/Driver.php
View File

@@ -7,11 +7,13 @@ use App\Data\Deployments\Plan;
abstract class Driver
{
public Plan $deploymentPlan;
public ?string $containerName;
public ?string $containerId;
abstract public function __construct(
?string $containerName = null,
?string $containerId = null,
);
}
}

21
app/Drivers/Postgres/Postgres17Driver.php
View File

@@ -9,15 +9,16 @@ use App\Drivers\DatabaseDriver;
class Postgres17Driver extends DatabaseDriver
{
public Plan $deploymentPlan;
public string $defaultUser = 'keystone';
public string $defaultDb = 'keystone';
public function __construct(
public ?string $containerName = null,
public ?string $containerId = null,
public ?string $defaultPassword = null,
)
{
) {
$this->deploymentPlan = new Plan(steps: [
new Step(
name: 'Run the docker image',
@@ -27,17 +28,17 @@ class Postgres17Driver extends DatabaseDriver
script: function () {
$script = collect();
if ($this->containerName) {
$script->push('docker stop ' . $this->containerName . ' || true');
} else if ($this->containerId) {
$script->push('docker stop ' . $this->containerId . ' || true');
$script->push('docker stop '.$this->containerName.' || true');
} elseif ($this->containerId) {
$script->push('docker stop '.$this->containerId.' || true');
}
$runCommand = "docker run -d";
$runCommand = 'docker run -d';
if ($this->containerName) {
$runCommand .= " --name {$this->containerName}";
}
if ($this->defaultPassword) {
$runCommand .= " -e POSTGRES_PASSWORD=[!defaultPassword!]";
$runCommand .= ' -e POSTGRES_PASSWORD=[!defaultPassword!]';
}
if ($this->defaultUser) {
$runCommand .= " -e POSTGRES_USER={$this->defaultUser}";
@@ -46,7 +47,7 @@ class Postgres17Driver extends DatabaseDriver
$runCommand .= " -e POSTGRES_DB={$this->defaultDb}";
}
$runCommand .= " -p 5432:5432 postgres:17";
$runCommand .= ' -p 5432:5432 postgres:17';
return $runCommand;
}
@@ -54,7 +55,7 @@ class Postgres17Driver extends DatabaseDriver
new Step(
name: 'Configure firewall',
script: 'ufw allow 5432/tcp || true',
)
),
]);
}
}
}

2
app/Enums/Concerns/Arrayable.php
View File

@@ -11,4 +11,4 @@ trait Arrayable
return array_combine($names, $values);
}
}
}

4
app/Enums/DeploymentStatus.php
View File

@@ -7,10 +7,10 @@ use App\Enums\Concerns\Arrayable;
enum DeploymentStatus: string
{
use Arrayable;
case PENDING = 'pending';
case IN_PROGRESS = 'in-progress';
case COMPLETED = 'completed';
case CANCELLED = 'canceled';
case FAILED = 'failed';
}
}

2
app/Enums/FirewallRuleStatus.php
View File

@@ -12,4 +12,4 @@ enum FirewallRuleStatus: string
case INSTALLED = 'installed';
case FAILED = 'failed';
case REMOVED = 'removed';
}
}

2
app/Enums/FirewallRuleType.php
View File

@@ -6,4 +6,4 @@ enum FirewallRuleType: string
{
case ALLOW = 'allow';
case DENY = 'deny';
}
}

4
app/Enums/NetworkType.php
View File

@@ -7,7 +7,7 @@ use App\Enums\Concerns\Arrayable;
enum NetworkType: string
{
use Arrayable;
case EXTERNAL = 'external'; // managed by provider
case INTERNAL = 'internal'; // managed by keystone
}
}

2
app/Enums/RepositoryType.php
View File

@@ -9,4 +9,4 @@ enum RepositoryType: string
use Arrayable;
case GIT = 'git';
}
}

2
app/Enums/ServerStatus.php
View File

@@ -7,7 +7,7 @@ use App\Enums\Concerns\Arrayable;
enum ServerStatus: string
{
use Arrayable;
case WAITING_FOR_PROVIDER = 'waiting-for-provider';
case PROVIDER_TIMEOUT = 'provider-timeout';
case UNPROVISIONED = 'unprovisioned';

8
app/Enums/ServiceCategory.php
View File

@@ -7,20 +7,22 @@ use App\Enums\Concerns\Arrayable;
enum ServiceCategory: string
{
use Arrayable;
case DATABASE = 'database';
case APPLICATION = 'application';
case GATEWAY = 'gateway';
case STORAGE = 'storage';
case CACHE = 'cache';
public static function getDescription(ServiceCategory|string $category) {
public static function getDescription(ServiceCategory|string $category)
{
if (is_string($category)) {
$category = ServiceCategory::from($category);
}
if (! $category instanceof ServiceCategory) {
throw new \InvalidArgumentException('Invalid category provided');
}
return match ($category) {
self::APPLICATION => 'The base container image for your application',
self::DATABASE => 'Postgres or MySQL',
@@ -29,4 +31,4 @@ enum ServiceCategory: string
self::CACHE => 'Redis, Memcached or similar',
};
}
}
}

4
app/Enums/ServiceStatus.php
View File

@@ -7,11 +7,11 @@ use App\Enums\Concerns\Arrayable;
enum ServiceStatus: string
{
use Arrayable;
case NOT_INSTALLED = 'not-installed';
case INSTALLING = 'installing';
case RUNNING = 'running';
case STOPPED = 'stopped';
case ERROR = 'error';
case UNKNOWN = 'unknown';
}
}

3
app/Enums/ServiceType.php
View File

@@ -4,7 +4,8 @@ namespace App\Enums;
use App\Enums\Concerns\Arrayable;
enum ServiceType: string {
enum ServiceType: string
{
use Arrayable;
case FRANKENPHP = 'frankenphp';

1
app/Http/Controllers/ApplicationController.php
View File

@@ -9,6 +9,7 @@ class ApplicationController extends Controller
public function show(Request $request)
{
$id = $request->route('application');
return inertia('applications/Show');
}
}

1
app/Http/Controllers/EnvironmentController.php
View File

@@ -10,6 +10,7 @@ class EnvironmentController extends Controller
public function show(Request $request)
{
$id = $request->route('environment');
return inertia('environments/Show', [
'environment' => Environment::findOrFail($id),
]);

2
app/Http/Controllers/OrganisationController.php
View File

@@ -2,8 +2,6 @@
namespace App\Http\Controllers;
use Illuminate\Http\Request;
class OrganisationController extends Controller
{
public function show()

10
app/Http/Controllers/ServerController.php
View File

@@ -8,11 +8,9 @@ use App\Enums\ServerProvider;
use App\Enums\ServerStatus;
use App\Jobs\Servers\WaitForServerToConnect;
use App\Models\Organisation;
use App\Services\ServerProviders\HetznerService;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Cache;
use Illuminate\Support\Str;
use NunoMaduro\Collision\Provider;
class ServerController extends Controller
{
@@ -35,13 +33,13 @@ class ServerController extends Controller
$providerService = app(GetProviderService::class)->execute($request->provider);
if ($providerService) {
$locations = Cache::remember($request->provider . '.locations', now()->addHour(), function () use ($providerService) {
$locations = Cache::remember($request->provider.'.locations', now()->addHour(), function () use ($providerService) {
return $providerService->getLocations();
});
$serverTypes = Cache::remember($request->provider . '.serverTypes', now()->addHour(), function () use ($providerService) {
$serverTypes = Cache::remember($request->provider.'.serverTypes', now()->addHour(), function () use ($providerService) {
return $providerService->getServerTypes();
});
$images = Cache::remember($request->provider . '.images', now()->addHour(), function () use ($providerService) {
$images = Cache::remember($request->provider.'.images', now()->addHour(), function () use ($providerService) {
return $providerService->getImages();
});
}
@@ -59,7 +57,7 @@ class ServerController extends Controller
$sudoPassword = Str::random(32);
$providerService = app(GetProviderService::class)->execute($request->provider);
if (!$providerService) {
if (! $providerService) {
return back()->with('error', 'Invalid provider');
}

1
app/Http/Controllers/ServiceController.php
View File

@@ -9,6 +9,7 @@ class ServiceController extends Controller
public function create(Request $request)
{
$server = $request->route('server');
return inertia('services/Create', [
'server' => $server,
]);

4
app/Http/Integrations/Connectors/HetznerConnector.php
View File

@@ -8,7 +8,7 @@ class HetznerConnector extends Connector
{
public function resolveBaseUrl(): string
{
return "https://api.hetzner.cloud/v1";
return 'https://api.hetzner.cloud/v1';
}
protected function defaultHeaders(): array
@@ -16,7 +16,7 @@ class HetznerConnector extends Connector
return [
'Content-Type' => 'application/json',
'Accept' => 'application/json',
'Authorization' => 'Bearer ' . config('services.hetzner.key'),
'Authorization' => 'Bearer '.config('services.hetzner.key'),
];
}
}

1
app/Http/Integrations/Requests/Hetzner/Images/GetImagesRequest.php
View File

@@ -4,7 +4,6 @@ namespace App\Http\Integrations\Requests\Hetzner\Images;
use Saloon\Enums\Method;
use Saloon\Http\Request;
use Saloon\Traits\Body\HasJsonBody;
class GetImagesRequest extends Request
{

2
app/Http/Integrations/Requests/Hetzner/ServerTypes/GetServerTypesRequest.php
View File

@@ -13,4 +13,4 @@ class GetServerTypesRequest extends Request
{
return '/server_types';
}
}
}

2
app/Http/Middleware/HandleAppearance.php
View File

@@ -20,4 +20,4 @@ class HandleAppearance
return $next($request);
}
}
}

5
app/Jobs/Servers/ProvisionServer.php
View File

@@ -9,7 +9,7 @@ use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Foundation\Queue\Queueable;
use Spatie\Ssh\Ssh;
class ProvisionServer implements ShouldQueue, ShouldBeEncrypted
class ProvisionServer implements ShouldBeEncrypted, ShouldQueue
{
use Queueable;
@@ -37,7 +37,7 @@ class ProvisionServer implements ShouldQueue, ShouldBeEncrypted
// Download the provision script and execute it
// The script will run in the background
$result = $ssh->execute([
'wget --quiet --output-document=provision.sh "' . $provisionScriptUrl . '"',
'wget --quiet --output-document=provision.sh "'.$provisionScriptUrl.'"',
'chmod +x provision.sh',
'nohup ./provision.sh > /dev/null 2>&1 &',
]);
@@ -46,6 +46,7 @@ class ProvisionServer implements ShouldQueue, ShouldBeEncrypted
$this->server->update([
'status' => ServerStatus::PROVISIONING_FAILED,
]);
return;
}

5
app/Jobs/Servers/WaitForServerToConnect.php
View File

@@ -7,14 +7,14 @@ use App\Models\Server;
use Illuminate\Contracts\Queue\ShouldBeEncrypted;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Foundation\Queue\Queueable;
use Illuminate\Support\Str;
use Spatie\Ssh\Ssh;
class WaitForServerToConnect implements ShouldQueue, ShouldBeEncrypted
class WaitForServerToConnect implements ShouldBeEncrypted, ShouldQueue
{
use Queueable;
public int $retryAfter = 15;
public int $tries = 40;
public function __construct(
@@ -35,6 +35,7 @@ class WaitForServerToConnect implements ShouldQueue, ShouldBeEncrypted
if (! $process->isSuccessful()) {
$this->release(15);
return;
}

5
app/Jobs/Services/DeployService.php
View File

@@ -18,8 +18,7 @@ class DeployService implements ShouldQueue
public function __construct(
public Service $service,
public ?string $defaultPassword = null,
)
{
) {
//
}
@@ -27,7 +26,7 @@ class DeployService implements ShouldQueue
{
$driver = $this->service->driver($this->defaultPassword);
$this->service->update([
'status' => ServiceStatus::INSTALLING
'status' => ServiceStatus::INSTALLING,
]);
$this->deployment = $this->service->deployments()->create([
'status' => DeploymentStatus::PENDING,

10
app/Jobs/Services/RunStep.php
View File

@@ -7,7 +7,6 @@ use App\Enums\ServiceStatus;
use App\Models\Step;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Foundation\Queue\Queueable;
use Spatie\Ssh\Ssh;
class RunStep implements ShouldQueue
{
@@ -15,8 +14,7 @@ class RunStep implements ShouldQueue
public function __construct(
protected Step $step,
)
{
) {
//
}
@@ -33,7 +31,7 @@ class RunStep implements ShouldQueue
$ssh = $server->sshClient()
->onOutput(function ($output) {
$this->step->update([
'logs' => $this->step->logs . "\n" . trim($output),
'logs' => $this->step->logs."\n".trim($output),
]);
});
@@ -43,7 +41,7 @@ class RunStep implements ShouldQueue
$this->step->update([
'status' => DeploymentStatus::FAILED,
'finished_at' => now(),
'logs' => $this->step->logs . "\n" . trim($result->getErrorOutput()),
'logs' => $this->step->logs."\n".trim($result->getErrorOutput()),
]);
return;
@@ -74,7 +72,7 @@ class RunStep implements ShouldQueue
$this->step->update([
'status' => DeploymentStatus::FAILED,
'finished_at' => now(),
'logs' => $this->step->logs . "\n" . trim($exception->getMessage()),
'logs' => $this->step->logs."\n".trim($exception->getMessage()),
]);
$this->step->deployment->steps()->where('order', '>', $this->step->order)->update([

10
app/Models/FirewallRule.php
View File

@@ -36,21 +36,21 @@ class FirewallRule extends Model
public function command(bool $delete = false): string
{
$command = "ufw";
$command = 'ufw';
if ($delete) {
$command .= " delete";
$command .= ' delete';
}
if ($this->type === 'allow') {
$command .= " allow";
$command .= ' allow';
} elseif ($this->type === 'deny') {
$command .= " deny";
$command .= ' deny';
}
if ($this->from) {
$command .= " from {$this->from}";
$command .= " to any port";
$command .= ' to any port';
}
$command .= " {$this->ports}";

2
app/Models/Network.php
View File

@@ -29,7 +29,7 @@ class Network extends Model
{
return $this->hasMany(Server::class, 'external_network_id');
}
public function organisation(): BelongsTo
{
return $this->belongsTo(Organisation::class);

3
app/Models/Organisation.php
View File

@@ -45,8 +45,9 @@ class Organisation extends Model
$slug = Str::slug($name);
$count = 2;
while (Organisation::where('slug', $slug)->exists()) {
$slug = Str::slug($name) . '-' . $count++;
$slug = Str::slug($name).'-'.$count++;
}
return $slug;
}
}

6
app/Models/Server.php
View File

@@ -33,11 +33,11 @@ class Server extends Model
$existingServer = Server::whereOrganisationId($server->organisation_id)
->orderByDesc('internal_ip_ending')
->first();
$server->internal_ip_ending = $existingServer
? $existingServer->internal_ip_ending + 1
: 2;
$server->internal_ip = config('keystone.internal_ip_base') . $server->internal_ip_ending;
$server->internal_ip = config('keystone.internal_ip_base').$server->internal_ip_ending;
});
}
@@ -45,7 +45,7 @@ class Server extends Model
{
return $this->belongsTo(Network::class, 'external_network_id');
}
public function internalNetwork(): BelongsTo
{
return $this->belongsTo(Network::class, 'internal_network_id');

6
app/Models/Service.php
View File

@@ -41,12 +41,12 @@ class Service extends Model
public function driver(
?string $defaultPassword = null,
): Driver
{
): Driver {
$class = config("keystone.drivers.{$this->driver_name}");
if (!class_exists($class)) {
if (! class_exists($class)) {
throw new \Exception("Driver class {$class} not found");
}
return new $class($this->container_name, $this->container_id, defaultPassword: $defaultPassword);
}
}

2
app/Services/ServerProviders/ServerProviderService.php
View File

@@ -22,4 +22,4 @@ abstract class ServerProviderService
abstract public function getLocations(): Collection;
abstract public function getImages(): Collection;
}
}

4
config/keystone.php
View File

@@ -6,7 +6,7 @@ return [
'drivers' => [
'postgres' => [
'17' => Postgres17Driver::class,
]
],
],
'internal_ip_base' => env('INTERNAL_IP_BASE', '192.168.2.'),
];
];

2
config/services.php
View File

@@ -37,6 +37,6 @@ return [
'hetzner' => [
'key' => env('HETZNER_KEY'),
]
],
];

1
database/factories/OrganisationFactory.php
View File

@@ -20,6 +20,7 @@ class OrganisationFactory extends Factory
{
$name = $this->faker->company();
$owner = User::inRandomOrder()->first() ?: User::factory()->create();
return [
'name' => $this->faker->company(),
'slug' => Organisation::createUniqueSlug($name),

4
database/seeders/DatabaseSeeder.php
View File

@@ -36,7 +36,7 @@ class DatabaseSeeder extends Seeder
$organisation->servers()->saveMany($servers);
$organisation->members()->attach($user, ['role' => OrganisationRole::ADMIN]);
$organisation->members()->attach($user, ['role' => OrganisationRole::ADMIN]);
$application = $organisation->applications()->create([
'name' => 'ClipBin',
@@ -48,7 +48,7 @@ class DatabaseSeeder extends Seeder
'name' => 'Dev',
'branch' => 'main',
'url' => 'https://dev.clipbin.hjb.dev',
'status' => 'active'
'status' => 'active',
]);
}
}

15
routes/web.php
View File

@@ -35,7 +35,7 @@ Route::middleware(['auth', 'verified'])->group(function () {
->name('create', 'services.create')
->name('store', 'services.store');
});
Route::resource('applications', ApplicationController::class)
->only('show')
->name('show', 'applications.show');
@@ -87,10 +87,11 @@ Route::post('/provision-callback', function (Request $request) {
if (! $isValidIp) {
logger('someone tried to callback from an invalid IP');
logger(' server ip: ' . $server->ipv4);
logger(' server ipv6: ' . $server->ipv6);
logger(' callback ip: ' . $request->ip());
logger(' server id: ' . $server->id);
logger(' server ip: '.$server->ipv4);
logger(' server ipv6: '.$server->ipv6);
logger(' callback ip: '.$request->ip());
logger(' server id: '.$server->id);
return response('Unauthorized', 401);
}
@@ -101,5 +102,5 @@ Route::post('/provision-callback', function (Request $request) {
return response('OK', 200);
})->name('provision.callback');
require __DIR__ . '/settings.php';
require __DIR__ . '/auth.php';
require __DIR__.'/settings.php';
require __DIR__.'/auth.php';

2
tests/Feature/Auth/AuthenticationTest.php
View File

@@ -38,4 +38,4 @@ test('users can logout', function () {
$this->assertGuest();
$response->assertRedirect('/');
});
});

2
tests/Feature/Auth/EmailVerificationTest.php
View File

@@ -43,4 +43,4 @@ test('email is not verified with invalid hash', function () {
$this->actingAs($user)->get($verificationUrl);
expect($user->fresh()->hasVerifiedEmail())->toBeFalse();
});
});

2
tests/Feature/Auth/PasswordConfirmationTest.php
View File

@@ -29,4 +29,4 @@ test('password is not confirmed with invalid password', function () {
]);
$response->assertSessionHasErrors();
});
});

2
tests/Feature/Auth/PasswordResetTest.php
View File

@@ -57,4 +57,4 @@ test('password can be reset with valid token', function () {
return true;
});
});
});

2
tests/Feature/Auth/RegistrationTest.php
View File

@@ -22,4 +22,4 @@ test('new users can register', function () {
assertTrue(auth()->user()->ownedOrganisations()->count() === 1);
$response->assertRedirect(route('dashboard', absolute: false));
});
});

2
tests/Feature/DashboardTest.php
View File

@@ -13,4 +13,4 @@ test('authenticated users can visit the dashboard', function () {
$response = $this->get('/dashboard');
$response->assertStatus(200);
});
});

2
tests/Feature/ExampleTest.php
View File

@@ -4,4 +4,4 @@ test('returns a successful response', function () {
$response = $this->get('/');
$response->assertStatus(200);
});
});

12
tests/Feature/ServerControllerTest.php
View File

@@ -5,8 +5,6 @@ use App\Data\ServerProviders\CreatedServer;
use App\Models\Organisation;
use App\Models\Server;
use App\Models\User;
use Illuminate\Support\Facades\Cache;
use Illuminate\Support\Facades\Session;
use Illuminate\Support\Str;
use Inertia\Testing\AssertableInertia;
@@ -27,7 +25,7 @@ test('index route displays servers for an organisation', function () {
$response = $this->get(route('servers.index', ['organisation' => $organisation->id]));
$response->assertStatus(200);
$response->assertInertia(fn(AssertableInertia $page) => $page
$response->assertInertia(fn (AssertableInertia $page) => $page
->component('servers/Index'));
});
@@ -35,7 +33,7 @@ test('create route returns inertia view', function () {
$organisation = Organisation::factory()->create();
$response = $this->get(route('servers.create', ['organisation' => $organisation->id]));
$response->assertStatus(200);
$response->assertInertia(fn(AssertableInertia $page) => $page
$response->assertInertia(fn (AssertableInertia $page) => $page
->component('servers/Create'));
});
@@ -67,7 +65,7 @@ test('store route creates a server with valid data', function () {
ipv6: '::1',
status: 'running',
rootPassword: Str::random(16),
)
)
);
$mock->shouldReceive('execute')->andReturn($providerMock);
@@ -95,10 +93,10 @@ test('show route displays a single server', function () {
$response = $this->get(route('servers.show', [
'organisation' => $organisation->id,
'server' => $server->id
'server' => $server->id,
]));
$response->assertStatus(200);
$response->assertInertia(fn(AssertableInertia $page) => $page
$response->assertInertia(fn (AssertableInertia $page) => $page
->component('servers/Show'));
});

2
tests/Feature/Settings/PasswordUpdateTest.php
View File

@@ -37,4 +37,4 @@ test('correct password must be provided to update password', function () {
$response
->assertSessionHasErrors('current_password')
->assertRedirect('/settings/password');
});
});

2
tests/Feature/Settings/ProfileUpdateTest.php
View File

@@ -100,4 +100,4 @@ test('correct password must be provided to delete account', function () {
->assertRedirect('/settings/profile');
expect($user->fresh())->not->toBeNull();
});
});

2
tests/Unit/ExampleTest.php
View File

@@ -2,4 +2,4 @@
test('that true is true', function () {
expect(true)->toBeTrue();
});
});