From d259970ce607ad97eac360756ef9f59184511842 Mon Sep 17 00:00:00 2001
From: Lauri Leitma <lauri.leitma@clarifiedsecurity.com>
Date: Thu, 5 Sep 2024 10:33:45 +0300
Subject: [PATCH] Defaulting to powershell on windows gitlab-runner

---
 .../gitlab_runner/templates/powershell/Register-Runner.ps1      | 2 +-
 .../templates/powershell/gitlab-runner-config.template.toml.j2  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nova/core/roles/gitlab_runner/templates/powershell/Register-Runner.ps1 b/nova/core/roles/gitlab_runner/templates/powershell/Register-Runner.ps1
index b331c309..f0d93051 100644
--- a/nova/core/roles/gitlab_runner/templates/powershell/Register-Runner.ps1
+++ b/nova/core/roles/gitlab_runner/templates/powershell/Register-Runner.ps1
@@ -1,7 +1,7 @@
 $ErrorActionPreference = "Stop"
 
 $RunnerName = "{{ runner.name }}"
-$GitLabURI = "{{gitlab_runner_gitlab_url }}"
+$GitLabURI = "{{ gitlab_runner_gitlab_url }}"
 $RunnerPath = "{{ gitlab_runner_windows_config_folder }}"
 $RunnerToken = "{{ runner.auth_token }}"
 $Template = "{{ gitlab_runner_windows_config_folder }}\{{ runner.name }}\gitlab-runner-config.template.toml"
diff --git a/nova/core/roles/gitlab_runner/templates/powershell/gitlab-runner-config.template.toml.j2 b/nova/core/roles/gitlab_runner/templates/powershell/gitlab-runner-config.template.toml.j2
index 187ccb1b..8ed730c9 100644
--- a/nova/core/roles/gitlab_runner/templates/powershell/gitlab-runner-config.template.toml.j2
+++ b/nova/core/roles/gitlab_runner/templates/powershell/gitlab-runner-config.template.toml.j2
@@ -1,4 +1,4 @@
 [[runners]]
     url = "{{ runner.gitlab_url | default(gitlab_runner_gitlab_url) }}"
     executor = "shell"
-    shell = "pwsh"
+    shell = "{{ runner.shell }} | default('powershell') }}"