From 853e5ee81cc9ab89e6285a70c8f2584eadf77ab7 Mon Sep 17 00:00:00 2001
From: Peter Amstutz <peter.amstutz@curii.com>
Date: Tue, 2 Jul 2024 16:50:24 -0400
Subject: [PATCH] 21121: CWL supports username/pw auth

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>
---
 tools/cluster-activity/cluster-activity.cwl | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tools/cluster-activity/cluster-activity.cwl b/tools/cluster-activity/cluster-activity.cwl
index bf20cfb6b6..a636f2059f 100644
--- a/tools/cluster-activity/cluster-activity.cwl
+++ b/tools/cluster-activity/cluster-activity.cwl
@@ -12,7 +12,9 @@ $namespaces:
 inputs:
   reporting_days: int
   prometheus_host: string
-  prometheus_apikey: string
+  prometheus_apikey: string?
+  prometheus_user: string?
+  prometheus_password: string?
 
 requirements:
   DockerRequirement:
@@ -24,12 +26,14 @@ requirements:
         entry: |
           PROMETHEUS_HOST=$(inputs.prometheus_host)
           PROMETHEUS_APIKEY=$(inputs.prometheus_apikey)
+          PROMETHEUS_USER=$(inputs.prometheus_user)
+          PROMETHEUS_PASSWORD=$(inputs.prometheus_password)
 
   arv:APIRequirement: {}
 
 hints:
   cwltool:Secrets:
-    secrets: [prometheus_apikey]
+    secrets: [prometheus_apikey, prometheus_password]
 
 arguments:
   - arv-cluster-activity
-- 
2.30.2