.gitlab-ci.yml - fixed test:debian

.PKGBUILD/PKGBUILD

@@ -37,7 +37,6 @@ package() {
     sed -i "s/join(dirname(__file__), 'cert\//join('\/var\/lib\/$pkgname', 'cert\//g" "$srcdir/$pkgname/app/main.py"
     install -Dm755 "$srcdir/$pkgname/app/main.py" "$pkgdir/opt/$pkgname/main.py"
     install -Dm755 "$srcdir/$pkgname/app/orm.py" "$pkgdir/opt/$pkgname/orm.py"
-    install -Dm755 "$srcdir/$pkgname/app/util.py" "$pkgdir/opt/$pkgname/util.py"
     install -Dm644 "$srcdir/$pkgname.default" "$pkgdir/etc/default/$pkgname"
     install -Dm644 "$srcdir/$pkgname.service" "$pkgdir/usr/lib/systemd/system/$pkgname.service"
 }

.gitlab-ci.yml

@@ -94,10 +94,6 @@ test:
 
 .test:linux:
   stage: test
-  rules:
-    - changes:
-        - .DEBIAN/**/*
-        - app/**/*
   needs:
     - job: build:apt
       artifacts: true

CODEOWNERS

@@ -1,2 +0,0 @@
-* @oscar.krause
-.PKGBUILD/ @samicrusader

README.md

@@ -25,22 +25,14 @@ Status endpoint, used for *healthcheck*. Shows also current version and commit h
 
 OpenAPI specifications rendered from `GET /openapi.json`.
 
-### `GET /-/origins?leases=false`
+### `GET /-/origins`
 
 List registered origins.
 
-| Query Parameter | Default | Usage                                |
+### `GET /-/leases`
-|-----------------|---------|--------------------------------------|
-| `leases`        | `false` | Include referenced leases per origin |
-
-### `GET /-/leases?origin=false`
 
 List current leases.
 
-| Query Parameter | Default | Usage                               |
-|-----------------|---------|-------------------------------------|
-| `origin`        | `false` | Include referenced origin per lease |
-
 ### `GET /client-token`
 
 Generate client token, (see [installation](#installation)).
@@ -227,8 +219,6 @@ Start with `systemctl start fastapi-dls.service` and enable autostart with `syst
 
 ## ArchLinux (using `pacman`)
 
-**Shout out to `samicrusader` who created build file for ArchLinux!**
-
 Packages are available here:
 
 - [GitLab-Registry](https://git.collinwebdesigns.de/oscar.krause/fastapi-dls/-/packages)

app/main.py

@@ -77,28 +77,17 @@ async def status(request: Request):
 
 
 @app.get('/-/origins')
-async def _origins(request: Request, leases: bool = False):
+async def _origins(request: Request):
     session = sessionmaker(bind=db)()
-    response = []
+    response = list(map(lambda x: jsonable_encoder(x), session.query(Origin).all()))
-    for origin in session.query(Origin).all():
-        x = origin.serialize()
-        if leases:
-            x['leases'] = list(map(lambda _: _.serialize(), Lease.find_by_origin_ref(db, origin.origin_ref)))
-        response.append(x)
     session.close()
     return JSONResponse(response)
 
 
 @app.get('/-/leases')
-async def _leases(request: Request, origin: bool = False):
+async def _leases(request: Request):
     session = sessionmaker(bind=db)()
-    response = []
+    response = list(map(lambda x: jsonable_encoder(x), session.query(Lease).all()))
-    for lease in session.query(Lease).all():
-        x = lease.serialize()
-        if origin:
-            # assume that each lease has a valid origin record
-            x['origin'] = session.query(Origin).filter(Origin.origin_ref == lease.origin_ref).first().serialize()
-        response.append(x)
     session.close()
     return JSONResponse(response)
 
@@ -117,7 +106,7 @@ async def client_token():
         "nbf": timegm(cur_time.timetuple()),
         "exp": timegm(exp_time.timetuple()),
         "update_mode": "ABSOLUTE",
-        "scope_ref_list": [str(uuid4())],  # this is our LEASE_REF
+        "scope_ref_list": [str(uuid4())],
         "fulfillment_class_ref_list": [],
         "service_instance_configuration": {
             "nls_service_instance_ref": INSTANCE_REF,

app/orm.py

@@ -21,15 +21,6 @@ class Origin(Base):
     def __repr__(self):
         return f'Origin(origin_ref={self.origin_ref}, hostname={self.hostname})'
 
-    def serialize(self) -> dict:
-        return {
-            'origin_ref': self.origin_ref,
-            'hostname': self.hostname,
-            'guest_driver_version': self.guest_driver_version,
-            'os_platform': self.os_platform,
-            'os_version': self.os_version,
-        }
-
     @staticmethod
     def create_statement(engine: Engine):
         from sqlalchemy.schema import CreateTable
@@ -68,15 +59,6 @@ class Lease(Base):
     def __repr__(self):
         return f'Lease(origin_ref={self.origin_ref}, lease_ref={self.lease_ref}, expires={self.lease_expires})'
 
-    def serialize(self) -> dict:
-        return {
-            'lease_ref': self.lease_ref,
-            'origin_ref': self.origin_ref,
-            'lease_created': self.lease_created.isoformat(),
-            'lease_expires': self.lease_expires.isoformat(),
-            'lease_updated': self.lease_updated.isoformat(),
-        }
-
     @staticmethod
     def create_statement(engine: Engine):
         from sqlalchemy.schema import CreateTable