From fecbb85c3e034c06d9e8736cf0d761c1d80085ad Mon Sep 17 00:00:00 2001
From: abram axel booth <boothaa@gmail.com>
Date: Mon, 1 Jul 2024 10:06:04 -0400
Subject: [PATCH] support auth.settings.service from osf

---
 waterbutler/core/utils.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/waterbutler/core/utils.py b/waterbutler/core/utils.py
index 9aaf74aa6..862e537b8 100644
--- a/waterbutler/core/utils.py
+++ b/waterbutler/core/utils.py
@@ -37,7 +37,9 @@ def make_provider(name: str, auth: dict, credentials: dict, settings: dict, **kw
     try:
         manager = driver.DriverManager(
             namespace='waterbutler.providers',
-            name=name,
+            # with gravyvalet active, "name" is opaque id for a specific addon
+            # instance and osf puts the provider name in settings['service']
+            name=settings.pop('service', name),
             invoke_on_load=True,
             invoke_args=(auth, credentials, settings),
             invoke_kwds=kwargs,