From c8f4359ee2364277affad2ae36552ddc979c30f9 Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Thu, 29 Jun 2023 22:19:35 +0200 Subject: [PATCH] Allow github token to be retrieved from a deferred function This allows you to ``` class{'github_actions_runner': personal_access_token => Deferred('secret::get',['poc']), } ``` for the existing case where a string is used the module will operate in the same way. --- manifests/instance.pp | 2 +- metadata.json | 2 +- templates/configure_install_runner.sh.epp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/manifests/instance.pp b/manifests/instance.pp index 90c8dde..3d688fa 100644 --- a/manifests/instance.pp +++ b/manifests/instance.pp @@ -131,7 +131,7 @@ mode => '0755', owner => $user, group => $group, - content => epp('github_actions_runner/configure_install_runner.sh.epp', { + content => stdlib::deferrable_epp('github_actions_runner/configure_install_runner.sh.epp', { personal_access_token => $personal_access_token, token_url => $token_url, instance_name => $instance_name, diff --git a/metadata.json b/metadata.json index 2916211..0848c1b 100644 --- a/metadata.json +++ b/metadata.json @@ -10,7 +10,7 @@ "dependencies": [ { "name": "puppetlabs-stdlib", - "version_requirement": ">= 1.0.0 < 7.0.0" + "version_requirement": ">= 8.4.0 < 10.0.0" }, { "name": "camptocamp/systemd", diff --git a/templates/configure_install_runner.sh.epp b/templates/configure_install_runner.sh.epp index bc5abe2..31c14f1 100644 --- a/templates/configure_install_runner.sh.epp +++ b/templates/configure_install_runner.sh.epp @@ -1,7 +1,7 @@ <%- | String $personal_access_token, String $token_url, String $instance_name, - Stdlib::Absolutepath $root_dir, + String $root_dir, String $url, String $hostname, String $assured_labels,