Merge pull request #14 from UpstreamDataInc/dev

Remove `revision` refrences from URLs.
UpstreamDataInc · Jul 12, 2024 · 714ad04 · 714ad04
2 parents 6e7c328 + 546002e
commit 714ad04
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 11 deletions.
diff --git a/goosebit/updater/controller/routes.py b/goosebit/updater/controller/routes.py
@@ -1,6 +1,6 @@
 from fastapi import APIRouter
 
-from . import revision
+from . import v1
 
 router = APIRouter(prefix="/controller")
-router.include_router(revision.router)
+router.include_router(v1.router)
diff --git a/...t/updater/controller/revision/__init__.py → goosebit/updater/controller/v1/__init__.py b/...t/updater/controller/revision/__init__.py → goosebit/updater/controller/v1/__init__.py
diff --git a/...bit/updater/controller/revision/routes.py → goosebit/updater/controller/v1/routes.py b/...bit/updater/controller/revision/routes.py → goosebit/updater/controller/v1/routes.py
@@ -6,14 +6,13 @@
 from goosebit.updater.manager import UpdateManager, get_update_manager
 
 # v1 is hardware revision
-router = APIRouter(prefix="/{revision}")
+router = APIRouter(prefix="/v1")
 
 
 @router.get("/{dev_id}")
 async def polling(
     request: Request,
     tenant: str,
-    revision: str,
     dev_id: str,
     updater: UpdateManager = Depends(get_update_manager),
 ):
@@ -27,7 +26,6 @@ async def polling(
                 request.url_for(
                     "config_data",
                     tenant=tenant,
-                    revision=revision,
                     dev_id=dev_id,
                 )
             )
@@ -43,7 +41,6 @@ async def polling(
                     request.url_for(
                         "deployment_base",
                         tenant=tenant,
-                        revision=revision,
                         dev_id=dev_id,
                         action_id=1,
                     )
@@ -60,7 +57,6 @@ async def polling(
 async def config_data(
     request: Request,
     dev_id: str,
-    revision: str,
     tenant: str,
     updater: UpdateManager = Depends(get_update_manager),
 ):
@@ -74,7 +70,6 @@ async def config_data(
 async def deployment_base(
     request: Request,
     tenant: str,
-    revision: str,
     dev_id: str,
     action_id: int,
     updater: UpdateManager = Depends(get_update_manager),
@@ -89,7 +84,7 @@ async def deployment_base(
             "download": update,
             "update": update,
             "chunks": artifact.generate_chunk(
-                request, tenant=tenant, revision=revision, dev_id=dev_id
+                request, tenant=tenant, dev_id=dev_id
             ),
         },
     }
@@ -99,7 +94,6 @@ async def deployment_base(
 async def deployment_feedback(
     request: Request,
     tenant: str,
-    revision: str,
     dev_id: str,
     action_id: int,
     updater: UpdateManager = Depends(get_update_manager),

diff --git a/goosebit/updater/updates.py b/goosebit/updater/updates.py
@@ -60,7 +60,7 @@ def dl_endpoint(self):
         return "download_file"
 
     def generate_chunk(
-        self, request: Request, tenant: str, revision: str, dev_id: str
+        self, request: Request, tenant: str, dev_id: str
     ) -> list:
         if not self.file_exists():
             return []