@devkong/cli-nx 0.0.67-alpha.25 → 0.0.67-alpha.26

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devkong/cli-nx",
-  "version": "0.0.67-alpha.25",
+  "version": "0.0.67-alpha.26",
   "type": "commonjs",
   "main": "./src/index.js",
   "typings": "./src/index.d.ts",

package/src/generators/preset/files/python-with-s3/src/main.py

@@ -1,24 +1,22 @@
 import sys
 from datetime import timedelta
 
-from frontend import frontend
-from input_data import InputData
 from kong.sdk.app import App
-from kong.sdk.app_logger import app_logger
 from kong.sdk.kong_function import KongFunction
 from kong.sdk.kong_function_context import KongFunctionContext
 from kong.sdk.s3 import S3Secret
+
+from frontend import frontend
+from input_data import InputData
 from output_data import OutputData
 from s3 import create_s3_client
 
 
 class Main(KongFunction):
-    __logger = app_logger(__name__)
-
     async def handle(self, data: InputData, context: KongFunctionContext) -> OutputData:
         secret: S3Secret = context.secret.get("s3").data
         client = await context.state.use(
-            key=f"{secret.endpoint}:{secret.port}:{secret.bucket}:{secret.access_key}",
+            key=f"{secret.endpoint}:{secret.port}:{secret.bucket}:{secret.accessKey}",
             create=lambda: create_s3_client(secret),
             unused=(timedelta(minutes=5), lambda c: c.close()),
         )
@@ -29,14 +27,7 @@ class Main(KongFunction):
         )
 
         body = await response["Body"].read()
-        self.__logger.info(
-            "have response from S3",
-            lambda: {
-                "bucket": secret.bucket,
-                "key": data.execute.key,
-                "size": len(body),
-            },
-        )
+        print("body size:", len(body))
 
         return OutputData(
             key=data.execute.key,

package/src/generators/preset/files/python-with-s3/src/main_test.py

@@ -1,23 +1,19 @@
-from datetime import timedelta
-from types import SimpleNamespace
-
 from frontend import frontend
 from input_data import ExecuteData, InputData
 from kong.sdk.conftest import ExtensionFixture, extension_test_context
 from kong.sdk.kong_function_request import KongFunctionRequest
-from kong.sdk.kong_state_context import KongStateContext
 from kong.sdk.s3 import S3Secret
-from main import Main, client_cache_key
+from main import Main
 
 S3_SECRET = S3Secret(
-    access_key="access",
-    secret_key="secret",
+    accessKey="access",
+    secretKey="secret",
     bucket="my-bucket",
     region="us-east-1",
     endpoint=None,
     port=None,
-    use_ssl=True,
-    path_style=False,
+    useSSL=True,
+    pathStyle=False,
 )
 
 

package/src/generators/preset/files/python-with-s3/src/output_data.py

@@ -1,5 +1,3 @@
-from typing import Optional
-
 from pydantic import BaseModel, Field
 
 
@@ -8,14 +6,3 @@ class OutputData(BaseModel):
         examples=["test/example.json"],
         description="Key of the object that was downloaded",
     )
-
-    size: int = Field(
-        examples=[42],
-        description="Size of the downloaded object, in bytes",
-    )
-
-    content: Optional[str] = Field(
-        default=None,
-        examples=['{"hello": "world"}'],
-        description="UTF-8 decoded content of the downloaded object",
-    )

package/src/generators/preset/files/python-with-s3/src/s3.py

@@ -8,7 +8,7 @@ async def create_s3_client(secret: S3Secret):
     # stores (MinIO, Ceph, ...) need an explicit endpoint override.
     endpoint_url = None
     if secret.endpoint and "amazonaws.com" not in secret.endpoint:
-        scheme = "https" if secret.use_ssl else "http"
+        scheme = "https" if secret.useSSL else "http"
         endpoint_url = (
             f"{scheme}://{secret.endpoint}:{secret.port}"
             if secret.port
@@ -19,9 +19,9 @@ async def create_s3_client(secret: S3Secret):
         "s3",
         region_name=secret.region,
         endpoint_url=endpoint_url,
-        use_ssl=secret.use_ssl,
-        aws_access_key_id=secret.access_key,
-        aws_secret_access_key=secret.secret_key,
-        config=(Config(s3={"addressing_style": "path"}) if secret.path_style else None),
+        use_ssl=secret.useSSL,
+        aws_access_key_id=secret.accessKey,
+        aws_secret_access_key=secret.secretKey,
+        config=(Config(s3={"addressing_style": "path"}) if secret.pathStyle else None),
     )
     return await client_context.__aenter__()