Add service pack reference to server and send to daemon

Author: DaneEveritt

app/Http/Controllers/Admin/ServersController.php

@@ -168,7 +168,9 @@ public function postNewServer(Request $request)
 
         try {
             $server = new ServerRepository;
-            $response = $server->create($request->all());
+            $response = $server->create($request->except([
+                '_token'
+            ]));
             return redirect()->route('admin.servers.view', [ 'id' => $response ]);
         } catch (DisplayValidationException $ex) {
             return redirect()->route('admin.servers.new')->withErrors(json_decode($ex->getMessage()))->withInput();

app/Repositories/ServerRepository.php

@@ -86,6 +86,7 @@ public function create(array $data)
             'disk' => 'required|numeric|min:0',
             'service' => 'bail|required|numeric|min:1|exists:services,id',
             'option' => 'bail|required|numeric|min:1|exists:service_options,id',
+            'pack' => 'bail|required|numeric|min:0'
             'startup' => 'string',
             'custom_image_name' => 'required_if:use_custom_image,on',
             'auto_deploy' => 'sometimes|boolean'
@@ -161,6 +162,18 @@ public function create(array $data)
             throw new DisplayException('The requested service option does not exist for the specified service.');
         }
 
+        // Validate the Pack
+        if ($data['pack'] === 0) {
+            $data['pack'] = null;
+        }
+
+        if (!is_null($data['pack'])) {
+            $pack = Models\ServicePack::where('id', $data['pack'])->where('option', $data['option'])->first();
+            if (!$pack) {
+                throw new DisplayException('The requested service pack does not seem to exist for this combination.');
+            }
+        }
+
         // Load up the Service Information
         $service = Models\Service::find($option->parent_service);
 
@@ -248,6 +261,7 @@ public function create(array $data)
                 'allocation' => $allocation->id,
                 'service' => $data['service'],
                 'option' => $data['option'],
+                'pack' => $data['pack'],
                 'startup' => $data['startup'],
                 'daemonSecret' => $uuid->generate('servers', 'daemonSecret'),
                 'image' => (isset($data['custom_image_name'])) ? $data['custom_image_name'] : $option->docker_image,
@@ -297,27 +311,28 @@ public function create(array $data)
                     'build' => [
                         'default' => [
                             'ip' => $allocation->ip,
-                            'port' => (int) $allocation->port
+                            'port' => (int) $allocation->port,
                         ],
                         'ports' => [
-                            (string) $allocation->ip => [ (int) $allocation->port ]
+                            (string) $allocation->ip => [ (int) $allocation->port ],
                         ],
                         'env' => $environmentVariables,
                         'memory' => (int) $server->memory,
                         'swap' => (int) $server->swap,
                         'io' => (int) $server->io,
                         'cpu' => (int) $server->cpu,
                         'disk' => (int) $server->disk,
-                        'image' => (isset($data['custom_image_name'])) ? $data['custom_image_name'] : $option->docker_image
+                        'image' => (isset($data['custom_image_name'])) ? $data['custom_image_name'] : $option->docker_image,
                     ],
                     'service' => [
                         'type' => $service->file,
-                        'option' => $option->tag
+                        'option' => $option->tag,
+                        'pack' => (isset($pack)) ? $pack->uuid : null,
                     ],
                     'keys' => [
-                        (string) $server->daemonSecret => $this->daemonPermissions
+                        (string) $server->daemonSecret => $this->daemonPermissions,
                     ],
-                    'rebuild' => false
+                    'rebuild' => false,
                 ]
             ]);
 

database/migrations/2016_11_27_142519_add_pack_column.php

@@ -0,0 +1,36 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddPackColumn extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('servers', function (Blueprint $table) {
+            $table->unsignedInteger('pack')->nullable()->after('option');
+
+            $table->foreign('pack')->references('id')->on('service_packs');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('servers', function (Blueprint $table) {
+            $table->dropForeign('servers_pack_foreign');
+            $table->dropIndex('servers_pack_foreign');
+            $table->dropColumn('pack');
+        });
+    }
+}

resources/views/admin/servers/new.blade.php

@@ -451,7 +451,7 @@
             $.each(data.packs, function (i, item) {
                 $('#getPack').append('<option value="' + item.uuid + '">' + item.name + ' (' + item.version + ')</option>');
             });
-            $('#getPack').append('<option value="none">No Service Pack</option>').parent().parent().removeClass('hidden');
+            $('#getPack').append('<option value="0">No Service Pack</option>').parent().parent().removeClass('hidden');
 
             $.each(data.variables, function (i, item) {
                 var isRequired = (item.required === 1) ? '<span class="label label-primary">Required</span> ' : '';