feat: update to latest gateway

Author: cyclimse

.github/workflows/integration-gateway.yml

@@ -26,20 +26,8 @@ jobs:
 
       - uses: ./.github/actions/setup-poetry
 
-      - name: Create gateway database
-        run: |
-          poetry run scwgw create-db
-          poetry run scwgw await-db
-
-      - name: Create gateway namespace
-        run: |
-          poetry run scwgw create-namespace
-          poetry run scwgw await-namespace
-
-      - name: Create gateway container
-        run: |
-          poetry run scwgw create-containers
-          poetry run scwgw await-containers
+      - name: Deploy Serverless Gateway
+        run: poetry run scwgw deploy
 
   run-tests:
     needs:
@@ -71,8 +59,5 @@ jobs:
 
       - uses: ./.github/actions/setup-poetry
 
-      - name: Delete namespace
-        run: poetry run scwgw delete-namespace
-
-      - name: Delete database
-        run: poetry run scwgw delete-db
+      - name: Delete Serverless Gateway
+        run: poetry run scwgw delete

poetry.lock

@@ -47,7 +47,7 @@ pytest-xdist = "^3.1.0"
 pylint = "^2.15.10"
 pylint-per-file-ignores = "^1.1.0"
 responses = ">=0.22,<0.24"
-scw-gateway = "^0.2.0"
+scw-gateway = "^0.3.0"
 
 [tool.poetry.group.doc]
 optional = true

pyproject.toml

@@ -24,7 +24,12 @@ def __init__(self) -> None:
             raise RuntimeError("scwgw is not installed")
         self.cli = cli
 
-        # TODO?: run check command
+        # Verify that the CLI is installed and working
+        cmd = self._invoke_cli(["check"])
+        for line in cmd.stdout.splitlines():
+            if not line.endswith("ready"):
+                click.secho(f"scwgw is not ready: {line}", fg="red")
+                raise RuntimeError("scwgw is not ready")
 
     def _invoke_cli(self, args: list[str]) -> subprocess.CompletedProcess:
         cmd = subprocess.run(
@@ -33,8 +38,6 @@ def _invoke_cli(self, args: list[str]) -> subprocess.CompletedProcess:
             stdout=subprocess.PIPE,
             universal_newlines=True,
         )
-        for line in cmd.stdout:
-            print(line, end="")
         return cmd
 
     def add_route(self, route: GatewayRoute) -> None:
@@ -43,4 +46,10 @@ def add_route(self, route: GatewayRoute) -> None:
         if not route.target:
             raise RuntimeError(f"route {route.relative_url} is missing upstream target")
 
-        self._invoke_cli(["add-route", route.relative_url, route.target])
+        cli_args = ["add-route", route.relative_url, route.target]
+        for method in route.http_methods or []:
+            cli_args += ["--http-methods", method.value]
+
+        cmd = self._invoke_cli(cli_args)
+        for char in cmd.stdout:
+            print(char, end="")