From 0bfdc1c5314b2fd672fa1fd2664707b5bdd80385 Mon Sep 17 00:00:00 2001 From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com> Date: Mon, 16 Sep 2024 18:45:08 +0200 Subject: [PATCH] Feat: Store all keys on disk by default --- ...709_add_ssh_sftp_fields_to_private_keys_table.php | 6 ++---- database/seeders/PrivateKeySeeder.php | 12 +++--------- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/database/migrations/2024_09_16_160709_add_ssh_sftp_fields_to_private_keys_table.php b/database/migrations/2024_09_16_160709_add_ssh_sftp_fields_to_private_keys_table.php index a12cd04e9..8297ec75f 100644 --- a/database/migrations/2024_09_16_160709_add_ssh_sftp_fields_to_private_keys_table.php +++ b/database/migrations/2024_09_16_160709_add_ssh_sftp_fields_to_private_keys_table.php @@ -10,7 +10,6 @@ return new class extends Migration { public function up() { - // Empty the SSH keys folder Storage::disk('ssh-keys')->deleteDirectory(''); Storage::disk('ssh-keys')->makeDirectory(''); @@ -19,7 +18,6 @@ return new class extends Migration $table->boolean('is_sftp_key')->default(false); }); - // Re-save SSH keys on server only for records with is_server_ssh_key = true PrivateKey::where('is_server_ssh_key', true)->chunk(100, function ($keys) { foreach ($keys as $key) { $key->storeInFileSystem(); @@ -30,8 +28,8 @@ return new class extends Migration public function down() { Schema::table('private_keys', function (Blueprint $table) { - $table->dropColumn('is_sftp_storage_key'); $table->dropColumn('is_server_ssh_key'); + $table->dropColumn('is_sftp_key'); }); } -}; \ No newline at end of file +}; diff --git a/database/seeders/PrivateKeySeeder.php b/database/seeders/PrivateKeySeeder.php index 8a70cf56d..315c988a5 100644 --- a/database/seeders/PrivateKeySeeder.php +++ b/database/seeders/PrivateKeySeeder.php @@ -15,7 +15,7 @@ class PrivateKeySeeder extends Seeder PrivateKey::create([ 'id' => 0, 'team_id' => 0, - 'name' => 'Testing-host', + 'name' => 'Testing Host Key', 'description' => 'This is a test docker container', 'private_key' => '-----BEGIN OPENSSH PRIVATE KEY----- b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW @@ -25,8 +25,9 @@ AAAECBQw4jg1WRT2IGHMncCiZhURCts2s24HoDS0thHnnRKVuGmoeGq/pojrsyP1pszcNV uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA== -----END OPENSSH PRIVATE KEY----- ', - + 'is_server_ssh_key' => true, ]); + PrivateKey::create([ 'id' => 1, 'team_id' => 0, @@ -61,12 +62,5 @@ a1C8EDKapCw5hAhizEFOUQKOygL8Ipn+tmEUkORYdZ8Q8cWFCv9nIw== -----END RSA PRIVATE KEY-----', 'is_git_related' => true, ]); - PrivateKey::create([ - 'id' => 2, - 'team_id' => 0, - 'name' => 'development-gitlab-app', - 'description' => 'This is the key for using the development Gitlab app', - 'private_key' => 'asdf', - ]); } }