version 0.0.12

Author: mbakalarski

function/__version__.py

@@ -16,4 +16,4 @@
 """The version of the function."""
 
 # This is set at build time, using "hatch version"
-__version__ = "0.0.11"
+__version__ = "0.0.12"

function/fn.py

@@ -45,7 +45,7 @@ async def RunFunction(
 
         composite = req.observed.composite.resource
         name_prefix = composite["metadata"]["name"]
-        endpoint = composite["spec"]["endpoint"]
+        fqdn = composite["spec"]["endpoint"]
         cmds = composite["spec"]["cmds"]
 
         environment = resource.struct_to_dict(
@@ -57,11 +57,12 @@ async def RunFunction(
         basic_auth = secret.get("data", {}).get("basicAuth", "") if secret else ""
 
         jsonrpc_cfg = {
-            "endpoint": endpoint,
+            "fqdn": fqdn,
             "port": port,
             "scheme": scheme,
             "basicAuth": basic_auth,
             "insecureSkipTLSVerify": insecure_skip_tls_verify,
+            "basePath": "/command-api",
         }
 
         jsonrpc_observe_params = {
@@ -183,7 +184,7 @@ def construct_resource_request(ops: dict, config: dict) -> dict:
                     "Authorization": [f"Basic {config['basicAuth']}"],
                 },
                 "payload": {
-                    "baseUrl": f"{config['scheme']}://{config['endpoint']}:{config['port']}",
+                    "baseUrl": f"{config['scheme']}://{config['fqdn']}:{config['port']}{config['basePath']}",
                     "body": ops["create"],
                 },
                 "mappings": [

tests/test_fn.py

@@ -143,7 +143,7 @@ async def test_run_function_generates_request(self) -> None:
         payload = spec["payload"]
         self.assertEqual(
             payload["baseUrl"],
-            "http://ceos01.default.svc.cluster.local:6021",
+            "http://ceos01.default.svc.cluster.local:6021/command-api",
         )
 
         # JSON-RPC payload