P:testswarm: set run token

jquery · Mar 9, 2023 · c089253 · c089253
1 parent 0ea4eeb
commit c089253
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/modules/profile/manifests/testswarm/browserstack.pp b/modules/profile/manifests/testswarm/browserstack.pp
@@ -1,9 +1,9 @@
 # @summary configures the testswarm-browserstack connector
 class profile::testswarm::browserstack (
   Stdlib::Fqdn  $public_host_name  = lookup('profile::testswarm::public_host_name'),
+  String[1]     $run_token         = lookup('profile::testswarm::run_token'),
   String[1]     $browserstack_user = lookup('profile::testswarm::browserstack::browserstack_user'),
   String[1]     $browserstack_key  = lookup('profile::testswarm::browserstack::browserstack_key'),
-  String[1]     $run_token         = lookup('profile::testswarm::browserstack::run_token'),
   Jqlib::Ensure $ensure            = lookup('profile::testswarm::browserstack::ensure'),
 ) {
   ensure_packages(['nodejs', 'npm'])

diff --git a/modules/profile/manifests/testswarm/server.pp b/modules/profile/manifests/testswarm/server.pp
@@ -2,6 +2,7 @@
 class profile::testswarm::server (
   String[1]                       $db_user_password   = lookup('profile::testswarm::db_user_password'),
   Stdlib::Fqdn                    $public_host_name   = lookup('profile::testswarm::public_host_name'),
+  String[1]                       $run_token          = lookup('profile::testswarm::run_token'),
   String[1]                       $tls_key_name       = lookup('profile::testswarm::server::tls_key_name'),
   Stdlib::Fqdn                    $builds_server_name = lookup('profile::testswarm::server::builds_server_name'),
   Jqlib::Ensure                   $cleanup_ensure     = lookup('profile::testswarm::server::cleanup_ensure'),
@@ -58,6 +59,7 @@
       cooldownSleep   => 0,
       nonewrunsSleep  => 10,
       runTimeout      => 600,
+      runTokenHash    => sha1($run_token),
       requireRunToken => true,
       refreshControl  => 4,
     },

diff --git a/test_data/private/hieradata/common.yaml b/test_data/private/hieradata/common.yaml
@@ -6,10 +6,10 @@ profile::puppet::puppetdb::nginx_htpassword_users: []
 profile::puppet::server::tarsnap_account_email: email@example.com
 
 profile::testswarm::db_user_password: 'fakepass'
+profile::testswarm::run_token: 'faketoken'
 profile::testswarm::server::builds_server_name: builds.example.com
 profile::testswarm::browserstack::browserstack_user: 'fakeuser'
 profile::testswarm::browserstack::browserstack_key: 'fakekey'
-profile::testswarm::browserstack::run_token: 'faketoken'
 
 # hacks
 jqlib::secret::use_fake_private: true