fix: broken deno runtime secret injection (#946)

- Bumps to 0.5.0-rc.9 - Fixes bug with deno secret injection #### Migration notes --- - [x] The change comes with new or modified tests - [ ] Hard-to-understand functions have explanatory comments - [ ] End-user documentation is updated to reflect the change
metatypedev · Dec 25, 2024 · 6b68642 · 6b68642
1 parent 37f51aa
commit 6b68642
Show file tree

Hide file tree

Showing 29 changed files with 130 additions and 59 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -24,7 +24,7 @@ exclude = [
 ]
 
 [workspace.package]
-version = "0.5.0-rc.8"
+version = "0.5.0-rc.9"
 edition = "2021"
 
 [workspace.dependencies]

diff --git a/examples/templates/deno/api/example.ts b/examples/templates/deno/api/example.ts
@@ -1,6 +1,6 @@
 import { Policy, t, typegraph } from "jsr:@typegraph/sdk@0.5.0-rc.7";
-import { PythonRuntime } from "jsr:@typegraph/sdk@0.5.0-rc.8/runtimes/python";
-import { DenoRuntime } from "jsr:@typegraph/sdk@0.5.0-rc.8/runtimes/deno";
+import { PythonRuntime } from "jsr:@typegraph/sdk@0.5.0-rc.9/runtimes/python";
+import { DenoRuntime } from "jsr:@typegraph/sdk@0.5.0-rc.9/runtimes/deno";
 
 await typegraph("example", (g) => {
   const pub = Policy.public();

diff --git a/examples/templates/deno/compose.yml b/examples/templates/deno/compose.yml
@@ -1,6 +1,6 @@
 services:
   typegate:
-    image: ghcr.io/metatypedev/typegate:v0.5.0-rc.8
+    image: ghcr.io/metatypedev/typegate:v0.5.0-rc.9
     restart: always
     ports:
       - "7890:7890"

diff --git a/examples/templates/node/compose.yml b/examples/templates/node/compose.yml
@@ -1,6 +1,6 @@
 services:
   typegate:
-    image: ghcr.io/metatypedev/typegate:v0.5.0-rc.8
+    image: ghcr.io/metatypedev/typegate:v0.5.0-rc.9
     restart: always
     ports:
       - "7890:7890"

diff --git a/examples/templates/node/package.json b/examples/templates/node/package.json
@@ -6,7 +6,7 @@
     "dev": "MCLI_LOADER_CMD='npm x tsx' meta dev"
   },
   "dependencies": {
-    "@typegraph/sdk": "^0.5.0-rc.8"
+    "@typegraph/sdk": "^0.5.0-rc.9"
   },
   "devDependencies": {
     "tsx": "^3.13.0",

diff --git a/examples/templates/python/compose.yml b/examples/templates/python/compose.yml
@@ -1,6 +1,6 @@
 services:
   typegate:
-    image: ghcr.io/metatypedev/typegate:v0.5.0-rc.8
+    image: ghcr.io/metatypedev/typegate:v0.5.0-rc.9
     restart: always
     ports:
       - "7890:7890"

diff --git a/examples/templates/python/pyproject.toml b/examples/templates/python/pyproject.toml
@@ -1,12 +1,12 @@
 [tool.poetry]
 name = "example"
-version = "0.5.0-rc.8"
+version = "0.5.0-rc.9"
 description = ""
 authors = []
 
 [tool.poetry.dependencies]
 python = ">=3.8,<4.0"
-typegraph = "0.5.0-rc.8"
+typegraph = "0.5.0-rc.9"
 
 [build-system]
 requires = ["poetry-core"]

diff --git a/pyproject.toml b/pyproject.toml
@@ -6,7 +6,7 @@
 
 [tool.poetry]
 name = "metatype"
-version = "0.5.0-rc.8"
+version = "0.5.0-rc.9"
 description = ""
 authors = []
 

diff --git a/src/pyrt_wit_wire/pyproject.toml b/src/pyrt_wit_wire/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pyrt_wit_wire"
-version = "0.5.0-rc.8"
+version = "0.5.0-rc.9"
 description = "Wasm component implementing the PythonRuntime host using wit_wire protocol."
 license = "MPL-2.0"
 readme = "README.md"

diff --git a/src/typegate/src/runtimes/deno/deno.ts b/src/typegate/src/runtimes/deno/deno.ts
@@ -37,7 +37,7 @@ const predefinedFuncs: Record<string, Resolver<Record<string, unknown>>> = {
   allow: () => "ALLOW" as PolicyResolverOutput,
   deny: () => "DENY" as PolicyResolverOutput,
   pass: () => "PASS" as PolicyResolverOutput,
-  internal_policy: ({ _: { context } }) => context.provider === "internal" ? "ALLOW" : "DENY" as PolicyResolverOutput,
+  internal_policy: ({ _: { context } }) => context.provider === "internal" ? "ALLOW" : "PASS" as PolicyResolverOutput,
 };
 
 export class DenoRuntime extends Runtime {
@@ -73,9 +73,9 @@ export class DenoRuntime extends Runtime {
 
     const secrets: Record<string, string> = {};
     for (const m of materializers) {
-      let secrets = (m.data.secrets as string[]) ?? [];
+      let matSecrets = (m.data.secrets as string[]) ?? [];
       if (m.name === "outjection") {
-        secrets = m.data.source === "secret"
+        matSecrets = m.data.source === "secret"
           ? [...getInjectionValues(m.data)]
           : [];
       }

diff --git a/src/typegate/src/runtimes/wit_wire/mod.ts b/src/typegate/src/runtimes/wit_wire/mod.ts
@@ -9,7 +9,7 @@ import { getLogger } from "../../log.ts";
 
 const logger = getLogger(import.meta);
 
-const METATYPE_VERSION = "0.5.0-rc.8";
+const METATYPE_VERSION = "0.5.0-rc.9";
 
 export class WitWireMessenger {
   static async init(

diff --git a/src/typegraph/core/Cargo.toml b/src/typegraph/core/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "typegraph_core"
-version = "0.5.0-rc.8"
+version = "0.5.0-rc.9"
 edition = "2021"
 
 [lib]

diff --git a/src/typegraph/core/src/global_store.rs b/src/typegraph/core/src/global_store.rs
@@ -108,7 +108,7 @@ const PREDEFINED_DENO_FUNCTIONS: &[&str] = &["identity", "true"];
 
 thread_local! {
     pub static STORE: RefCell<Store> = RefCell::new(Store::new());
-    pub static SDK_VERSION: String = "0.5.0-rc.8".to_owned();
+    pub static SDK_VERSION: String = "0.5.0-rc.9".to_owned();
 }
 
 fn with_store<T, F: FnOnce(&Store) -> T>(f: F) -> T {

diff --git a/src/typegraph/deno/deno.json b/src/typegraph/deno/deno.json
@@ -1,6 +1,6 @@
 {
   "name": "@typegraph/sdk",
-  "version": "0.5.0-rc.8",
+  "version": "0.5.0-rc.9",
   "publish": {
     "exclude": [
       "!src/gen",

diff --git a/src/typegraph/python/pyproject.toml b/src/typegraph/python/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "typegraph"
-version = "0.5.0-rc.8"
+version = "0.5.0-rc.9"
 description = "Declarative API development platform. Build backend components with WASM, Typescript and Python, no matter where and how your (legacy) systems are."
 authors = ["Metatype Contributors <support@metatype.dev>"]
 license = "MPL-2.0"

diff --git a/src/typegraph/python/typegraph/__init__.py b/src/typegraph/python/typegraph/__init__.py
@@ -5,4 +5,4 @@
 from typegraph.policy import Policy  # noqa
 from typegraph import effects as fx  # noqa
 
-version = "0.5.0-rc.8"
+version = "0.5.0-rc.9"
diff --git a/src/xtask/Cargo.toml b/src/xtask/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "xtask"
-version = "0.5.0-rc.8"
+version = "0.5.0-rc.9"
 edition = "2021"
 
 # this allows us to exclude the rust files

diff --git a/tests/artifacts/artifacts_test.ts b/tests/artifacts/artifacts_test.ts
@@ -81,7 +81,11 @@ for (const { mode, ...options } of variants) {
       ...options,
     },
     async (t) => {
-      const e = await t.engine("runtimes/deno/deno.py");
+      const e = await t.engine("runtimes/deno/deno.py", {
+        secrets: {
+          DENO_SECRET: "deno_secret",
+        },
+      });
       const artifacts = e.tg.tg.meta.artifacts;
 
       await t.should("have uploaded artifacts on deploy", async () => {
@@ -120,7 +124,11 @@ for (const { mode, ...options } of variants) {
       ...options,
     },
     async (t) => {
-      const e = await t.engine("runtimes/deno/deno.py");
+      const e = await t.engine("runtimes/deno/deno.py", {
+        secrets: {
+          DENO_SECRET: "deno_secret",
+        },
+      });
       const artifacts = e.tg.tg.meta.artifacts;
 
       await t.should("have uploaded artifacts on deploy", async () => {
@@ -149,7 +157,11 @@ for (const { mode, ...options } of variants) {
       ...options,
     },
     async (t) => {
-      const engine = await t.engine("runtimes/deno/deno.py");
+      const engine = await t.engine("runtimes/deno/deno.py", {
+        secrets: {
+          DENO_SECRET: "deno_secret",
+        },
+      });
       const artifacts = engine.tg.tg.meta.artifacts;
 
       const enginePartial = await t.engine("runtimes/deno/deno_partial.py");

diff --git a/tests/metagen/__snapshots__/metagen_test.ts.snap b/tests/metagen/__snapshots__/metagen_test.ts.snap
@@ -454,7 +454,7 @@ impl Router {
     }
 
     pub fn init(&self, args: InitArgs) -> Result<InitResponse, InitError> {
-        static MT_VERSION: &str = "0.5.0-rc.8";
+        static MT_VERSION: &str = "0.5.0-rc.9";
         if args.metatype_version != MT_VERSION {
             return Err(InitError::VersionMismatch(MT_VERSION.into()));
         }
@@ -1255,7 +1255,7 @@ impl Router {
     }
 
     pub fn init(&self, args: InitArgs) -> Result<InitResponse, InitError> {
-        static MT_VERSION: &str = "0.5.0-rc.8";
+        static MT_VERSION: &str = "0.5.0-rc.9";
         if args.metatype_version != MT_VERSION {
             return Err(InitError::VersionMismatch(MT_VERSION.into()));
         }

diff --git a/tests/metagen/typegraphs/sample/rs/Cargo.toml b/tests/metagen/typegraphs/sample/rs/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "sample_client"
 edition = "2021"
-version = "0.5.0-rc.8"
+version = "0.5.0-rc.9"
 
 [dependencies]
 metagen-client.workspace = true

diff --git a/tests/metagen/typegraphs/sample/rs_upload/Cargo.toml b/tests/metagen/typegraphs/sample/rs_upload/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "sample_client_upload"
 edition = "2021"
-version = "0.5.0-rc.8"
+version = "0.5.0-rc.9"
 
 [dependencies]
 metagen-client.workspace = true

diff --git a/tests/runtimes/deno/deno.py b/tests/runtimes/deno/deno.py
@@ -36,6 +36,13 @@ def deno(g: Graph):
             name="counter",
             effect=effects.update(),
         ),
+        secrets=deno.import_(
+            t.struct(),
+            t.struct({"ok": t.boolean()}),
+            module="ts/deno.ts",
+            name="secrets",
+            secrets=["DENO_SECRET"],
+        ),
         min=deno.import_(number_input, t.float(), module="ts/math.ts", name="min"),
         max=deno.import_(number_input, t.float(), module="ts/math.ts", name="maxAsync"),
         log=deno.import_(

diff --git a/tests/runtimes/deno/deno_sync_test.ts b/tests/runtimes/deno/deno_sync_test.ts
@@ -37,7 +37,11 @@ Meta.test(
     },
   },
   async (t) => {
-    const e = await t.engine("runtimes/deno/deno.py");
+    const e = await t.engine("runtimes/deno/deno.py", {
+      secrets: {
+        DENO_SECRET: "deno_secret",
+      },
+    });
 
     await t.should("work on the default worker", async () => {
       await gql`
@@ -128,7 +132,11 @@ Meta.test(
     },
   },
   async (t) => {
-    const e = await t.engine("runtimes/deno/deno.py");
+    const e = await t.engine("runtimes/deno/deno.py", {
+      secrets: {
+        DENO_SECRET: "deno_secret",
+      },
+    });
 
     await t.should("success for allowed network access", async () => {
       await gql`
@@ -368,7 +376,11 @@ Meta.test(
     },
   },
   async (t) => {
-    const e = await t.engine("runtimes/deno/deno.py");
+    const e = await t.engine("runtimes/deno/deno.py", {
+      secrets: {
+        DENO_SECRET: "deno_secret",
+      },
+    });
 
     await t.should("safely fail upon stack overflow", async () => {
       await gql`