fix fill_garbage, tidy a bit

aaxelb · aaxelb · commit 0da80f0ee49a · 2024-04-10T16:47:57.000-04:00
diff --git a/addon_service/external_storage_service/models.py b/addon_service/external_storage_service/models.py
@@ -24,14 +24,16 @@ class ExternalStorageService(AddonsServiceBaseModel):
     )
     max_concurrent_downloads = models.IntegerField(null=False)
     max_upload_mb = models.IntegerField(null=False)
-    auth_callback_url = models.URLField(null=False, default="")
+    auth_callback_url = models.URLField(null=False, blank=True, default="")
     supported_scopes = ArrayField(models.CharField(), null=True, blank=True)
     api_base_url = models.URLField(null=False)
 
     oauth2_client_config = models.ForeignKey(
         "addon_service.OAuth2ClientConfig",
         on_delete=models.CASCADE,
         related_name="external_storage_services",
+        null=True,
+        blank=True,
     )
 
     class Meta:
diff --git a/addon_service/management/commands/fill_garbage.py b/addon_service/management/commands/fill_garbage.py
@@ -3,7 +3,7 @@
 
 from addon_service import models as db
 from addon_service.addon_imp.known import get_imp_by_name
-from addon_service.common.invocation import InvocationStatus
+from addon_service.credentials.enums import CredentialsFormats
 from addon_toolkit import AddonCapabilities
 
 
@@ -16,46 +16,38 @@ class Command(LabelCommand):
     def handle_label(self, label, **options):
         if not settings.DEBUG:
             raise Exception("must have DEBUG set to eat garbage")
-        _ci = db.CredentialsIssuer.objects.create(name=f"entity-{label}")
+        _blarg_imp = get_imp_by_name("BLARG")
         _ess = db.ExternalStorageService.objects.create(
-            int_addon_imp=get_imp_by_name("BLARG").imp_number,
+            service_name=label,
+            int_addon_imp=_blarg_imp.imp_number,
+            int_credentials_format=CredentialsFormats.PERSONAL_ACCESS_TOKEN.value,
             max_concurrent_downloads=2,
             max_upload_mb=2,
-            auth_uri=f"http://foo.example/{label}",
-            credentials_issuer=_ci,
+            api_base_url=f"http://foo.example/{label}/",
         )
-        for _i in range(3):
-            _iu, _ = db.UserReference.objects.get_or_create(
-                user_uri=f"http://osf.example/u{label}{_i}",
-            )
-            _ec = db.ExternalCredentials.objects.create()
-            _ea = db.ExternalAccount.objects.create(
-                credentials_issuer=_ci,
-                owner=_iu,
-                credentials=_ec,
-            )
-            _asa = db.AuthorizedStorageAccount.objects.create(
-                external_storage_service=_ess,
-                external_account=_ea,
-                authorized_capabilities=[
-                    AddonCapabilities.ACCESS,
-                    AddonCapabilities.UPDATE,
-                ],
-            )
-            for _op in _asa.authorized_operations:
-                _ir, _ = db.ResourceReference.objects.get_or_create(
-                    resource_uri=f"http://osf.example/r{label}{_op.name}",
-                )
-                _csa = db.ConfiguredStorageAddon.objects.create(
-                    base_account=_asa,
-                    authorized_resource=_ir,
-                    connected_capabilities=[AddonCapabilities.ACCESS],
-                )
-                _soi = db.AddonOperationInvocation.objects.create(
-                    invocation_status=InvocationStatus.STARTING,
-                    operation_identifier=_op.natural_key_str,
-                    operation_kwargs={"item": {"item_id": "foo"}, "page": {}},
-                    thru_addon=_csa,
-                    by_user=_iu,
-                )
-        return str(_soi)
+        _userref, _ = db.UserReference.objects.get_or_create(
+            user_uri=f"http://osf.example/u{label}",
+        )
+        _asa = db.AuthorizedStorageAccount.objects.create(
+            external_storage_service=_ess,
+            account_owner=_userref,
+            authorized_capabilities=[
+                AddonCapabilities.ACCESS,
+                AddonCapabilities.UPDATE,
+            ],
+        )
+        _resourceref, _ = db.ResourceReference.objects.get_or_create(
+            resource_uri=f"http://osf.example/r{label}",
+        )
+        _addon = db.ConfiguredStorageAddon.objects.create(
+            base_account=_asa,
+            authorized_resource=_resourceref,
+            connected_capabilities=[AddonCapabilities.ACCESS],
+        )
+        _invocation = db.AddonOperationInvocation.objects.create(
+            operation_identifier="BLARG:get_root_items",
+            operation_kwargs={"item": {"item_id": "foo"}, "page": {}},
+            thru_addon=_addon,
+            by_user=_userref,
+        )
+        return str(_invocation)
diff --git a/addon_service/migrations/0001_initial.py b/addon_service/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 4.2.7 on 2024-04-09 18:13
+# Generated by Django 4.2.7 on 2024-04-10 20:47
 
 import django.contrib.postgres.fields
 import django.db.models.deletion
@@ -170,7 +170,7 @@ class Migration(migrations.Migration):
                 ),
                 ("max_concurrent_downloads", models.IntegerField()),
                 ("max_upload_mb", models.IntegerField()),
-                ("auth_callback_url", models.URLField(default="")),
+                ("auth_callback_url", models.URLField(blank=True, default="")),
                 (
                     "supported_scopes",
                     django.contrib.postgres.fields.ArrayField(
@@ -295,6 +295,8 @@ class Migration(migrations.Migration):
             model_name="externalstorageservice",
             name="oauth2_client_config",
             field=models.ForeignKey(
+                blank=True,
+                null=True,
                 on_delete=django.db.models.deletion.CASCADE,
                 related_name="external_storage_services",
                 to="addon_service.oauth2clientconfig",
diff --git a/addon_toolkit/constrained_aiohttp.py b/addon_toolkit/constrained_aiohttp.py
@@ -9,7 +9,7 @@
     urlsplit,
 )
 
-import aiohttp  # type: ignore[import-not-found]
+import aiohttp
 
 from addon_toolkit.constrained_http import (
     HttpRequestInfo,
diff --git a/addon_toolkit/tests/test_addon_protocol.py b/addon_toolkit/tests/test_addon_protocol.py
@@ -1,11 +1,11 @@
 import dataclasses
-import enum
 import typing
 import unittest
 from http import HTTPMethod
 from unittest.mock import Mock
 
 from addon_toolkit import (
+    AddonCapabilities,
     AddonImp,
     AddonOperationDeclaration,
     AddonOperationImp,
@@ -19,10 +19,6 @@
 
 class TestAddonProtocol(unittest.TestCase):
     # the basics of an addon protocol
-    class _MyCapability(enum.Enum):
-        GET_IT = "get-it"
-        PUT_IT = "put-it"
-        UNUSED = "unused"  # for testing when a capability has no operations
 
     ###
     # shared test env (on `self`)
@@ -49,12 +45,12 @@ class _MyCustomOperationResult:
         class _MyProtocol(typing.Protocol):
             """this _MyProtocol docstring should find its way to browsable docs somewhere"""
 
-            @redirect_operation(capability=cls._MyCapability.GET_IT)
+            @redirect_operation(capability=AddonCapabilities.ACCESS)
             def url_for_get(self, checksum_iri: str) -> RedirectResult:
                 """this url_for_get docstring should find its way to docs"""
                 ...
 
-            @immediate_operation(capability=cls._MyCapability.GET_IT)
+            @immediate_operation(capability=AddonCapabilities.ACCESS)
             async def query_relations(
                 self,
                 checksum_iri: str,
@@ -63,7 +59,7 @@ async def query_relations(
                 """this query_relations docstring should find its way to docs"""
                 ...
 
-            @redirect_operation(capability=cls._MyCapability.PUT_IT)
+            @redirect_operation(capability=AddonCapabilities.UPDATE)
             def url_for_put(self, checksum_iri: str) -> RedirectResult:
                 """this url_for_put docstring should find its way to docs"""
                 ...
@@ -93,17 +89,17 @@ def url_for_put(self, checksum_iri: str) -> RedirectResult:
         # shared operations
         cls._expected_get_op = AddonOperationDeclaration(
             operation_type=AddonOperationType.REDIRECT,
-            capability=cls._MyCapability.GET_IT,
+            capability=AddonCapabilities.ACCESS,
             operation_fn=_MyProtocol.url_for_get,
         )
         cls._expected_put_op = AddonOperationDeclaration(
             operation_type=AddonOperationType.REDIRECT,
-            capability=cls._MyCapability.PUT_IT,
+            capability=AddonCapabilities.UPDATE,
             operation_fn=_MyProtocol.url_for_put,
         )
         cls._expected_query_op = AddonOperationDeclaration(
             operation_type=AddonOperationType.IMMEDIATE,
-            capability=cls._MyCapability.GET_IT,
+            capability=AddonCapabilities.ACCESS,
             operation_fn=_MyProtocol.query_relations,
         )
         cls._my_imp = AddonImp(
@@ -131,27 +127,19 @@ def test_get_operations(self) -> None:
         self.assertEqual(
             set(
                 _protocol_dec.get_operation_declarations(
-                    capabilities=[self._MyCapability.GET_IT]
+                    capabilities=[AddonCapabilities.ACCESS]
                 )
             ),
             {self._expected_get_op, self._expected_query_op},
         )
         self.assertEqual(
             set(
                 _protocol_dec.get_operation_declarations(
-                    capabilities=[self._MyCapability.PUT_IT]
+                    capabilities=[AddonCapabilities.UPDATE]
                 )
             ),
             {self._expected_put_op},
         )
-        self.assertEqual(
-            set(
-                _protocol_dec.get_operation_declarations(
-                    capabilities=[self._MyCapability.UNUSED]
-                )
-            ),
-            set(),
-        )
 
     def test_get_operation_imps(self) -> None:
         self.assertEqual(
@@ -160,28 +148,16 @@ def test_get_operation_imps(self) -> None:
         )
         self.assertEqual(
             set(
-                self._my_imp.get_operation_imps(
-                    capabilities=[self._MyCapability.GET_IT]
-                )
+                self._my_imp.get_operation_imps(capabilities=[AddonCapabilities.ACCESS])
             ),
             {self._expected_get_imp},
         )
         self.assertEqual(
             set(
-                self._my_imp.get_operation_imps(
-                    capabilities=[self._MyCapability.PUT_IT]
-                )
+                self._my_imp.get_operation_imps(capabilities=[AddonCapabilities.UPDATE])
             ),
             {self._expected_put_imp},
         )
-        self.assertEqual(
-            set(
-                self._my_imp.get_operation_imps(
-                    capabilities=[self._MyCapability.UNUSED]
-                )
-            ),
-            set(),
-        )
 
     def test_operation_imp_by_name(self) -> None:
         self.assertEqual(

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`urlsplit,`
`10`	`10`	`)`
`11`	`11`
`12`		`-import aiohttp # type: ignore[import-not-found]`
	`12`	`+import aiohttp`
`13`	`13`
`14`	`14`	`from addon_toolkit.constrained_http import (`
`15`	`15`	`HttpRequestInfo,`