From 9106c964dc8b64be4db31a0336bc5587983edaef Mon Sep 17 00:00:00 2001
From: lmcnatt <85642387+lucymcnatt@users.noreply.github.com>
Date: Tue, 11 Feb 2025 18:00:41 -0500
Subject: [PATCH] adding application default to google auths for batch + papi

---
 .../cacheBetweenWfNoCost.test                 |  1 +
 .../recursive_imports_cost.test               |  1 +
 src/ci/resources/build_application.inc.conf   | 24 ++++---------------
 .../gcp_batch_application.inc.conf.ctmpl      |  4 ++++
 .../resources/papi_application.inc.conf.ctmpl |  4 ++++
 5 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/centaur/src/main/resources/standardTestCases/cacheBetweenWfNoCost.test b/centaur/src/main/resources/standardTestCases/cacheBetweenWfNoCost.test
index 4567ba23100..8844a24d2a4 100644
--- a/centaur/src/main/resources/standardTestCases/cacheBetweenWfNoCost.test
+++ b/centaur/src/main/resources/standardTestCases/cacheBetweenWfNoCost.test
@@ -1,5 +1,6 @@
 name: cacheBetweenWFNoCost
 testFormat: runtwiceexpectingcallcachingnocost
+backends: [Papi, GCPBATCH]
 
 files {
   workflow: cacheBetweenWF/cacheBetweenWFNoCost.wdl
diff --git a/centaur/src/main/resources/standardTestCases/recursive_imports_cost.test b/centaur/src/main/resources/standardTestCases/recursive_imports_cost.test
index b1e5803c3ab..506c602ea79 100644
--- a/centaur/src/main/resources/standardTestCases/recursive_imports_cost.test
+++ b/centaur/src/main/resources/standardTestCases/recursive_imports_cost.test
@@ -1,5 +1,6 @@
 name: recursive_imports_cost
 testFormat: workflowsuccessandverifycost
+backends: [Papi, GCPBATCH]
 
 files {
   workflow: recursive_imports/recursive_imports.wdl
diff --git a/src/ci/resources/build_application.inc.conf b/src/ci/resources/build_application.inc.conf
index 3a2cd0c2678..260e0463a14 100644
--- a/src/ci/resources/build_application.inc.conf
+++ b/src/ci/resources/build_application.inc.conf
@@ -52,25 +52,11 @@ system {
 }
 
 # See documentation for these values in cromwell.examples.conf
-services {
-    MetadataService {
-        class = "cromwell.services.metadata.impl.MetadataServiceActor"
-        config {
-            metadata-write-statistics {
-              enabled = true
-              cache-size = 20000
-              metadata-row-alert-interval = 5000
-              sub-workflow-bundling = true
-            }
-        }
-    }
-   GcpCostCatalogService {
-      class = "cromwell.services.cost.GcpCostCatalogService"
-          config {
-            enabled = true
-            catalogExpirySeconds = 86400
-          }
-      }
+services.MetadataService.config.metadata-write-statistics {
+  enabled = true
+  cache-size = 20000
+  metadata-row-alert-interval = 5000 # Quite low... but we don't expect much metadata from test workflows, right?
+  sub-workflow-bundling = true
 }
 
 # Make the shutdown timeout conspicuously long, so that if it hangs, it is an obvious problem in CI.
diff --git a/src/ci/resources/gcp_batch_application.inc.conf.ctmpl b/src/ci/resources/gcp_batch_application.inc.conf.ctmpl
index dbf5dc3b6ce..b36d4b39333 100644
--- a/src/ci/resources/gcp_batch_application.inc.conf.ctmpl
+++ b/src/ci/resources/gcp_batch_application.inc.conf.ctmpl
@@ -44,6 +44,10 @@ google {
       name = "user_service_account"
       scheme = "user_service_account"
     }
+    {
+       name = "application-default"
+        scheme = "application_default"
+    }
   ]
 }
 
diff --git a/src/ci/resources/papi_application.inc.conf.ctmpl b/src/ci/resources/papi_application.inc.conf.ctmpl
index cd3504fa169..71b5694884d 100644
--- a/src/ci/resources/papi_application.inc.conf.ctmpl
+++ b/src/ci/resources/papi_application.inc.conf.ctmpl
@@ -44,6 +44,10 @@ google {
       name = "user_service_account"
       scheme = "user_service_account"
     }
+    {
+       name = "application-default"
+        scheme = "application_default"
+    }
   ]
 }