From ce950908b6aa548354889f936bb3426ff506cb8e Mon Sep 17 00:00:00 2001
From: Ditmar Visser <s1175179@student.windesheim.nl>
Date: Thu, 5 Jun 2025 09:34:27 +0000
Subject: [PATCH] refactor: skylab user ssh pub key as var

---
 .gitea/workflows/opdracht-3.yaml |  1 +
 opdracht-3/main.tf               | 12 ++----------
 opdracht-3/variables.tf          |  4 ++++
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/.gitea/workflows/opdracht-3.yaml b/.gitea/workflows/opdracht-3.yaml
index 7db683b..4e13043 100644
--- a/.gitea/workflows/opdracht-3.yaml
+++ b/.gitea/workflows/opdracht-3.yaml
@@ -22,6 +22,7 @@ jobs:
       TF_VAR_esxi_hostname: ${{ secrets.ESXI_HOSTNAME }}
       TF_VAR_esxi_username: ${{ secrets.ESXI_USERNAME }}
       TF_VAR_esxi_password: ${{ secrets.ESXI_PASSWORD }}
+      TF_VAR_skylab_ssh_public_key: ${{ secrets.SKYLAB_SSH_PUBLIC_KEY }}
 
     steps:
       - name: Checkout code
diff --git a/opdracht-3/main.tf b/opdracht-3/main.tf
index b1dc62a..b2d33ff 100644
--- a/opdracht-3/main.tf
+++ b/opdracht-3/main.tf
@@ -1,18 +1,10 @@
 # ESXi
 
-variable "skylab_ssh_public_key_path" {
-  default = "/home/student/.ssh/skylab.pub"
-}
-
-data "local_file" "ssh_key" {
-  filename = var.skylab_ssh_public_key_path
-}
-
 # Render userdata template with skylab SSH key
 data "template_file" "esxi_userdata" {
   template = file("${path.module}/userdata.tftpl")
   vars = {
-    skylab-ssh-key = trimspace(data.local_file.ssh_key.content)
+    skylab-ssh-key = trimspace(var.skylab_ssh_public_key)
   }
 }
 
@@ -50,7 +42,7 @@ locals {
   inventory = templatefile("${path.module}/ansible-inventory.tmpl", {
     name             = esxi_guest.les-5-opdracht-3.guest_name
     ip               = esxi_guest.les-5-opdracht-3.ip_address
-    private_key_file = var.skylab_ssh_public_key_path
+    private_key_file = var.skylab_ssh_public_key
   })
 }
 
diff --git a/opdracht-3/variables.tf b/opdracht-3/variables.tf
index 6b0fbce..4e618c8 100644
--- a/opdracht-3/variables.tf
+++ b/opdracht-3/variables.tf
@@ -25,3 +25,7 @@ variable "prefix" {
   description = "The Prefix used for all resources"
   default     = "week-5-opdracht-3"
 }
+
+variable "skylab_ssh_public_key" {
+  description = "Public key of the Skylab user"
+}