make gv helpers less storage-centric

 * Include computing addons in the addons list from gravyvalet.

 * Suport other addon types when fetching wb credentials.

 [ENG-6825]

osf/external/gravy_valet/request_helpers.py

@@ -18,7 +18,7 @@
 ACCOUNT_ENDPOINT = f'{API_BASE}authorized-storage-accounts/{{pk}}'
 ADDONS_ENDPOINT = f'{API_BASE}configured-storage-addons'
 GENERIC_ADDONS_ENDPOINT = f'{API_BASE}{{addon_type}}'
-ADDON_ENDPOINT = f'{ADDONS_ENDPOINT}/{{pk}}'
+ADDON_ENDPOINT = f'{GENERIC_ADDONS_ENDPOINT}/{{pk}}'
 WB_CONFIG_ENDPOINT = f'{ADDON_ENDPOINT}/waterbutler-credentials'
 
 USER_LIST_ENDPOINT = f'{API_BASE}user-references'
@@ -32,6 +32,8 @@
 ADDON_EXTERNAL_SERVICE_PATH = 'base_account.external_storage_service'
 ACCOUNT_EXTERNAL_CITATION_SERVICE_PATH = 'external_citation_service'
 ADDON_EXTERNAL_CITATIONS_SERVICE_PATH = 'base_account.external_citation_service'
+ACCOUNT_EXTERNAL_COMPUTING_SERVICE_PATH = 'external_computing_service'
+ADDON_EXTERNAL_COMPUTING_SERVICE_PATH = 'base_account.external_computing_service'
 
 CITATION_ITEM_TYPE_ALIASES = {
     'COLLECTION': 'folder',
@@ -100,6 +102,11 @@ def iterate_accounts_for_user(requesting_user):  # -> typing.Iterator[JSONAPIRes
         requesting_user=requesting_user,
         params={'include': f'{ACCOUNT_EXTERNAL_CITATION_SERVICE_PATH}'}
     )
+    yield from iterate_gv_results(
+        endpoint_url=user_result.get_related_link('authorized_computing_accounts'),
+        requesting_user=requesting_user,
+        params={'include': f'{ACCOUNT_EXTERNAL_COMPUTING_SERVICE_PATH}'}
+    )
 
 
 def iterate_addons_for_resource(requested_resource, requesting_user):  # -> typing.Iterator[JSONAPIResultEntry]
@@ -124,11 +131,17 @@ def iterate_addons_for_resource(requested_resource, requesting_user):  # -> typi
         requested_resource=requested_resource,
         params={'include': f'{ADDON_EXTERNAL_CITATIONS_SERVICE_PATH},{ACCOUNT_OWNER_PATH}'}
     )
+    yield from iterate_gv_results(
+        endpoint_url=resource_result.get_related_link('configured_computing_addons'),
+        requesting_user=requesting_user,
+        requested_resource=requested_resource,
+        params={'include': f'{ADDON_EXTERNAL_COMPUTING_SERVICE_PATH},{ACCOUNT_OWNER_PATH}'}
+    )
 
 
-def get_waterbutler_config(gv_addon_pk, requested_resource, requesting_user):  # -> JSONAPIResultEntry
+def get_waterbutler_config(gv_addon_pk, requested_resource, requesting_user, addon_type):  # -> JSONAPIResultEntry
     return get_gv_result(
-        endpoint_url=WB_CONFIG_ENDPOINT.format(pk=gv_addon_pk),
+        endpoint_url=WB_CONFIG_ENDPOINT.format(pk=gv_addon_pk, addon_type=addon_type),
         requesting_user=requesting_user,
         requested_resource=requested_resource
     )

osf/external/gravy_valet/translations.py

@@ -227,6 +227,7 @@ def _fetch_wb_config(self):
             gv_addon_pk=self.gv_data.resource_id,
             requested_resource=self.configured_resource,
             requesting_user=self.active_user,
+            addon_type=self.gv_data.resource_type,
         )
         self._credentials = result.get_attribute('credentials')
         self._config = result.get_attribute('config')