Feature/plans resources

.github/workflows/run-unit-tests.yml

@@ -83,6 +83,8 @@ jobs:
             echo "DEV_FIRST_NAME=Admin"
             echo "DEV_LAST_NAME=User"
             echo "DEV_PASSWORD=secret-password"
+            echo "DEV_REPOSITORIES="
+            echo "DEV_PACKAGES="
             echo "DEV_SEED_DEVELOPMENT_DATA=true"
           } >> .env
 

composer.json

@@ -41,26 +41,18 @@
         "laravel/horizon": "^5.35",
         "laravel/octane": "^2.12",
         "laravel/sanctum": "^4.0",
-        "livewire/livewire": "^v4.0"
+        "livewire/livewire": "^v4.0",
+        "phpseclib/phpseclib": "^3.0"
     },
     "autoload": {
         "psr-4": {
             "Froxlor\\Auth\\": "packages/auth/src",
             "Froxlor\\Core\\": "packages/core/src",
             "Froxlor\\Core\\Database\\Factories\\": "packages/core/database/factories/",
             "Froxlor\\Core\\Database\\Seeders\\": "packages/core/database/seeders/",
-            "Froxlor\\Database\\": "packages/database/src",
-            "Froxlor\\Developer\\": "packages/developer/src",
-            "Froxlor\\Domain\\": "packages/domain/src",
-            "Froxlor\\Domain\\Database\\Seeders\\": "packages/domain/database/seeders/",
-            "Froxlor\\Ftp\\": "packages/ftp/src",
-            "Froxlor\\Mail\\": "packages/mail/src",
-            "Froxlor\\Mail\\Database\\Seeders\\": "packages/mail/database/seeders/",
             "Froxlor\\Packages\\": "packages/packages/src",
             "Froxlor\\Packages\\Database\\Factories\\": "packages/packages/database/factories/",
             "Froxlor\\Packages\\Database\\Seeders\\": "packages/packages/database/seeders/",
-            "Froxlor\\Web\\": "packages/web/src",
-            "Froxlor\\Web\\Database\\Seeders\\": "packages/web/database/seeders/",
             "Froxlor\\UI\\": "packages/ui/src"
         }
     },
@@ -81,14 +73,8 @@
     "replace": {
         "froxlor/auth": "self.version",
         "froxlor/core": "self.version",
-        "froxlor/database": "self.version",
-        "froxlor/developer": "self.version",
-        "froxlor/domain": "self.version",
-        "froxlor/ftp": "self.version",
-        "froxlor/mail": "self.version",
         "froxlor/package": "self.version",
-        "froxlor/ui": "self.version",
-        "froxlor/web": "self.version"
+        "froxlor/ui": "self.version"
     },
     "extra": {
         "froxlor": {
@@ -100,17 +86,8 @@
                 "Froxlor\\Core\\Providers\\EventServiceProvider",
                 "Froxlor\\Core\\Providers\\FroxlorCoreServiceProvider",
                 "Froxlor\\Core\\Providers\\HorizonServiceProvider",
-                "Froxlor\\Database\\Providers\\FroxlorDatabaseServiceProvider",
-                "Froxlor\\Developer\\Providers\\FroxlorDeveloperServiceProvider",
-                "Froxlor\\Domain\\Providers\\EventServiceProvider",
-                "Froxlor\\Domain\\Providers\\FroxlorDomainServiceProvider",
-                "Froxlor\\Ftp\\Providers\\FroxlorFtpServiceProvider",
-                "Froxlor\\Mail\\Providers\\EventServiceProvider",
-                "Froxlor\\Mail\\Providers\\FroxlorMailServiceProvider",
                 "Froxlor\\Packages\\Providers\\EventServiceProvider",
                 "Froxlor\\Packages\\Providers\\FroxlorPackageServiceProvider",
-                "Froxlor\\Web\\Providers\\EventServiceProvider",
-                "Froxlor\\Web\\Providers\\FroxlorWebServiceProvider",
                 "Froxlor\\UI\\Providers\\FroxlorUIServiceProvider"
             ]
         }

docker-compose.ci.yml

@@ -1,6 +1,7 @@
 services:
   froxlor:
     image: hub.froxlor.io/froxlor/froxlor:latest
+    command: ["php", "artisan", "serve"]
     privileged: true
     pid: "host"
     depends_on:

packages/core/composer.json

@@ -25,7 +25,8 @@
     "require": {
         "php": "^8.5",
         "illuminate/support": "^12.0",
-        "laravel/sanctum": "^4.0"
+        "laravel/sanctum": "^4.0",
+        "phpseclib/phpseclib": "^3.0"
     },
     "autoload": {
         "psr-4": {

packages/core/database/migrations/0001_01_01_000040_create_plans_table.php

@@ -14,13 +14,12 @@ public function up(): void
         Schema::create('plans', function (Blueprint $table) {
             $table->ulid('id')->primary();
             $table->ulid('tenant_id')->nullable()->index();
-            $table->enum('type', ['tenant', 'environment'])->default('environment');
             $table->string('name');
             $table->string('description')->nullable();
             $table->timestamps();
             $table->softDeletes();
 
-            $table->unique(['tenant_id', 'type', 'name']);
+            $table->unique(['tenant_id', 'name']);
         });
 
         Schema::table('environments', function (Blueprint $table) {

packages/core/database/migrations/0001_01_01_000073_create_tenant_resource_reservations_table.php

@@ -0,0 +1,38 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration {
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('tenant_resource_reservations', function (Blueprint $table) {
+            $table->ulid('id')->primary();
+            $table->ulid('tenant_id')->index();
+            $table->ulid('reserved_for_tenant_id')->index();
+            $table->ulid('plan_id')->index();
+            $table->string('resource_key')->index();
+            $table->string('resource_type')->index();
+            $table->bigInteger('limit')->default(0);
+            $table->timestamps();
+
+            $table->unique(['tenant_id', 'reserved_for_tenant_id', 'resource_key', 'resource_type'], 'tenant_resource_reservation_unique');
+
+            $table->foreign('tenant_id')->references('id')->on('tenants')->onDelete('cascade');
+            $table->foreign('reserved_for_tenant_id')->references('id')->on('tenants')->onDelete('cascade');
+            $table->foreign('plan_id')->references('id')->on('plans')->onDelete('cascade');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('tenant_resource_reservations');
+    }
+};

packages/core/database/seeders/DatabaseSeeder.php

@@ -19,12 +19,12 @@ public function run(): void
     {
         // call required package seeders
         $this->call($this->coreSeederClasses());
-        Audit::log('The core seeder classes have been seeded.');
+        Audit::info('The core seeder classes have been seeded.');
 
         // call development/test fixture seeders
         if (SeedProfile::includesDevelopmentData()) {
             $this->call($this->fixtureSeederClasses());
-            Audit::log('The ' . SeedProfile::developmentDataLabel() . ' core seeder classes have been seeded.');
+            Audit::debug('The ' . SeedProfile::developmentDataLabel() . ' core seeder classes have been seeded.');
         }
 
         // notify other seeders