From c5f3e0489ba2dc5e84312f9e2db7c025e28ef004 Mon Sep 17 00:00:00 2001
From: Hugo Haakseth <hugo.haakseth@spk.no>
Date: Sun, 5 May 2024 01:54:36 +0200
Subject: [PATCH] Cleanup workflow templates; require 'with' key in module's
 .sync.yml

---
 config_defaults.yml                          |  2 --
 moduleroot/.github/workflows/ci.yml.erb      | 32 +++-----------------
 moduleroot/.github/workflows/release.yml.erb |  4 ++-
 3 files changed, 7 insertions(+), 31 deletions(-)

diff --git a/config_defaults.yml b/config_defaults.yml
index adea84c5..5d396f06 100644
--- a/config_defaults.yml
+++ b/config_defaults.yml
@@ -2,8 +2,6 @@
 # yamllint disable rule:line-length
 .github/workflows/ci.yml:
   excludes: []
-  pidfile_workaround: false
-  additional_packages: ''
   acceptance_tests: true
   main_branches: ['main', 'master']
 # PDK creates this
diff --git a/moduleroot/.github/workflows/ci.yml.erb b/moduleroot/.github/workflows/ci.yml.erb
index 801c2e1e..91084300 100644
--- a/moduleroot/.github/workflows/ci.yml.erb
+++ b/moduleroot/.github/workflows/ci.yml.erb
@@ -21,42 +21,18 @@ jobs:
     name: Puppet
 <%- if @configs['acceptance_tests'] && Dir[File.join(@metadata[:workdir], 'spec', 'acceptance', '**', '*_spec.rb')].any? -%>
     uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v2
-    with:
-      pidfile_workaround: '<%= @configs['pidfile_workaround'] %>'
 <%- if @configs['with'] -%>
+    with:
 <%- @configs['with'].each do |k,v| -%>
-      <%= k %>: <%=  v %>
-<%- end -%>
-<%- end -%>
-<%- if @configs['unit_runs_on'] -%>
-      unit_runs_on: '<%= @configs['unit_runs_on'] %>'
-<%- end -%>
-<%- if @configs['beaker_facter'] -%>
-      beaker_facter: '<%= @configs['beaker_facter'] %>'
-<%- end -%>
-<%- if @configs['beaker_hypervisor'] -%>
-      beaker_hypervisor: '<%= @configs['beaker_hypervisor'] %>'
+      <%= k %>: '<%= v %>'
 <%- end -%>
-<%- if @configs['acceptance_runs_on'] -%>
-      acceptance_runs_on: '<%= @configs['acceptance_runs_on'] %>'
 <%- end -%>
 <%- else -%>
     uses: voxpupuli/gha-puppet/.github/workflows/basic.yml@v2
-<%- if @configs.key?('rubocop') || !@configs['additional_packages'].empty? || @configs.key?('unit_runs_on') || @configs.key?('with') -%>
-    with:
-<%- end -%>
 <%- if @configs['with'] -%>
+    with:
 <%- @configs['with'].each do |k,v| -%>
-      <%= k %>: <%=  v %>
-<%- end -%>
-<%- end -%>
-<%- end -%>
-<%- unless @configs['additional_packages'].empty? -%>
-      additional_packages: '<%= @configs['additional_packages'] %>'
+      <%= k %>: '<%= v %>'
 <%- end -%>
-<%- if @configs.key?('rubocop') -%>
-      rubocop: <%= @configs['rubocop'] %>
 <%- end -%>
-<%- if Dir[File.join(@metadata[:workdir], 'spec', 'acceptance', '**', '*_spec.rb')].none? && @configs['unit_runs_on'] -%>
-      unit_runs_on: '<%= @configs['unit_runs_on'] %>'
 <%- end -%>
diff --git a/moduleroot/.github/workflows/release.yml.erb b/moduleroot/.github/workflows/release.yml.erb
index c4d598b8..f48ae376 100644
--- a/moduleroot/.github/workflows/release.yml.erb
+++ b/moduleroot/.github/workflows/release.yml.erb
@@ -16,10 +16,12 @@ jobs:
     with:
 <%- if @configs['with'] -%>
 <%- @configs['with'].each do |k,v| -%>
-      <%= k %>: <%=  v %>
+      <%= k %>: '<%= v %>'
 <%- end -%>
 <%- end -%>
+<%- if @configs['with'].nil? || !@configs['with'].has_key?('allowed_owner') -%>
       allowed_owner: '<%= @configs[:namespace] %>'
+<%- end -%>
     secrets:
       # Configure secrets here:
       #  https://docs.github.com/en/actions/security-guides/encrypted-secrets