feat(cli): prepare undeploy

Author: michael-0acf4

libs/common/src/node.rs

@@ -4,14 +4,15 @@
 use anyhow::{Context, Result};
 use indoc::indoc;
 use reqwest::{Client, IntoUrl, RequestBuilder, Url};
+use serde::Serialize;
 use std::{collections::HashMap, time::Duration};
 
 use crate::{
     graphql::{self, Query},
     typegraph::Typegraph,
 };
 
-#[derive(Debug, Clone)]
+#[derive(Debug, Serialize, Clone)]
 pub struct BasicAuth {
     pub username: String,
     pub password: String,
@@ -21,7 +22,7 @@ pub struct BasicAuth {
 pub struct Node {
     pub base_url: Url,
     pub prefix: Option<String>,
-    auth: Option<BasicAuth>,
+    pub auth: Option<BasicAuth>,
     pub env: HashMap<String, String>,
 }
 

meta-cli/src/cli/undeploy.rs

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: MPL-2.0
 
 use crate::{
-    com::store::{Command, ServerStore},
+    com::store::{Command, Endpoint, ServerStore},
     config::Config,
 };
 use anyhow::Result;
@@ -36,6 +36,11 @@ impl Action for Undeploy {
         // Hint the server what state we are globally in
         ServerStore::with(Some(Command::Undeploy), Some(config.clone()));
 
+        ServerStore::set_endpoint(Endpoint {
+            typegate: node.base_url.clone().into(),
+            auth: node.auth.clone(),
+        });
+
         node.try_undeploy(&self.typegraphs).await?;
         Ok(())
     }

meta-cli/src/com/server.rs

@@ -4,10 +4,10 @@
 use std::net::{Ipv4Addr, SocketAddrV4, TcpListener};
 
 use crate::com::store::ServerStore;
-use actix_web::{get, post, App, HttpResponse, HttpServer, Responder};
+use actix_web::{get, post, web::Query, App, HttpRequest, HttpResponse, HttpServer, Responder};
 use lazy_static::lazy_static;
 use reqwest::StatusCode;
-use serde::Serialize;
+use serde::{Deserialize, Serialize};
 use serde_json::{json, Value};
 
 pub fn random_free_port() -> u16 {
@@ -34,18 +34,31 @@ struct CLIResponseError {
     error: String,
 }
 
+#[derive(Debug, Deserialize)]
+struct QueryConfigParams {
+    typegraph: String,
+}
+
 #[get("/config")]
-async fn config() -> impl Responder {
+async fn config(req: HttpRequest) -> impl Responder {
+    let parsed = Query::<QueryConfigParams>::from_query(req.query_string());
+    let folder = match parsed {
+        Ok(p) => p.typegraph.to_owned(),
+        Err(_) => "".to_string(),
+    };
+    let endpoint = ServerStore::get_endpoint();
     match ServerStore::get_config() {
         Some(config) => {
             let data = json!({
-                "typegates": config.typegates,
+                "typegate": {
+                    "endpoint": endpoint.typegate,
+                    "auth": endpoint.auth
+                },
                 "secrets": ServerStore::get_secrets(),
                 "artifactsConfig": json!({
                     "dir": config.base_dir.display().to_string(),
                     "prismaMigration": {
-                        // TODO:
-                        "migrationDir": ".",
+                        "migrationDir": config.prisma_migrations_dir(&folder),
                         "action": {
                             // TODO:
                             "create": true,

meta-cli/src/com/store.rs

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: MPL-2.0
 
 use crate::config::Config;
+use common::node::BasicAuth;
 use lazy_static::lazy_static;
 use serde::Serialize;
 use std::{
@@ -34,11 +35,18 @@ pub enum Command {
     Serialize,
 }
 
+#[derive(Default, Clone, Debug)]
+pub struct Endpoint {
+    pub typegate: String,
+    pub auth: Option<BasicAuth>,
+}
+
 #[derive(Default, Clone, Debug)]
 pub struct ServerStore {
     config: Option<Config>,
     command: Option<Command>,
     secrets: HashMap<String, String>,
+    endpoint: Endpoint,
 }
 
 #[allow(dead_code)]
@@ -69,4 +77,12 @@ impl ServerStore {
     pub fn get_secrets() -> HashMap<String, String> {
         with_store(|s| s.secrets.clone())
     }
+
+    pub fn set_endpoint(endpoint: Endpoint) {
+        with_store_mut(|s| s.endpoint = endpoint)
+    }
+
+    pub fn get_endpoint() -> Endpoint {
+        with_store(|s| s.endpoint.clone())
+    }
 }

meta-cli/src/config.rs

@@ -100,6 +100,10 @@ impl NodeConfig {
             self.env.clone(),
         )
     }
+
+    pub fn get_auth_pair(&self) -> (Option<String>, Option<String>) {
+        (self.username.to_owned(), self.password.to_owned())
+    }
 }
 
 #[derive(Deserialize, Debug, Default, Clone)]
@@ -239,6 +243,19 @@ impl Config {
             .get(&module_type)
             .unwrap_or(&DEFAULT_LOADER_CONFIG)
     }
+
+    pub fn prisma_migrations_dir(&self, typegraph: &str) -> PathBuf {
+        let mut path = self.base_dir.join(
+            self.typegraphs
+                .materializers
+                .prisma
+                .migrations_path
+                .as_deref()
+                .unwrap_or_else(|| Path::new("prisma/migrations")),
+        );
+        path.push(typegraph);
+        path
+    }
 }
 
 #[cfg(test)]

typegraph/node/sdk/src/tg_manage.ts

@@ -20,7 +20,7 @@ type CLIServerResponse = {
 type CLIConfigRequest = {
   typegate: {
     endpoint: string;
-    auth: {
+    auth?: {
       username: string;
       password: string;
     };
@@ -33,14 +33,11 @@ type CLISuccess<T> = {
   data: T;
 };
 
-// Types for SDK => CLi
+// Types for SDK => CLi (typically forwarding the response from typegate)
 type SDKResponse<T> = {
   command: Command;
-  data: T;
-} | {
-  command: Command;
-  error: T;
-};
+  typegraphName: string;
+} & ({ error: T } | { data: T });
 
 export class Manager {
   #port: number;
@@ -89,6 +86,7 @@ export class Manager {
 
   async #requestCommands(): Promise<CLIServerResponse> {
     const { data: config } = await this.#requestConfig();
+    console.error("CONFIG", config);
     const { data: command } =
       await (await fetch(new URL("command", this.#endpoint)))
         .json() as CLISuccess<Command>;
@@ -99,7 +97,10 @@ export class Manager {
   }
 
   async #requestConfig(): Promise<CLISuccess<CLIConfigRequest>> {
-    const response = await fetch(new URL("config", this.#endpoint));
+    const params = new URLSearchParams({
+      typegraph: this.#typegraph.name,
+    });
+    const response = await fetch(new URL("config?" + params, this.#endpoint));
     return (await response.json()) as CLISuccess<CLIConfigRequest>;
   }
 
@@ -113,13 +114,18 @@ export class Manager {
   }
 
   async #undeploy({ typegate }: CLIConfigRequest): Promise<void> {
-    const { endpoint, auth: { username, password } } = typegate;
+    const { endpoint, auth } = typegate;
+    if (!auth) {
+      throw new Error(
+        `"${this.#typegraph.name}" received null or undefined "auth" field on the configuration`,
+      );
+    }
     await this.#relayResultToCLI(
       "undeploy",
       async () =>
         await tgRemove(this.#typegraph, {
           baseUrl: endpoint,
-          auth: new BasicAuth(username, password),
+          auth: new BasicAuth(auth.username, auth.password),
         }),
     );
   }
@@ -129,13 +135,14 @@ export class Manager {
   }
 
   async #relayResultToCLI<T>(initiator: Command, fn: () => Promise<T>) {
+    const typegraphName = this.#typegraph.name;
     let response: SDKResponse<any>;
     try {
       const data = await fn();
-      response = { command: initiator, data };
+      response = { command: initiator, typegraphName, data };
     } catch (err) {
       const msg = err instanceof Error ? err.message : err;
-      response = { command: initiator, error: msg };
+      response = { command: initiator, typegraphName, error: msg };
     }
 
     await fetch(new URL("response", this.#endpoint), {

website/static/specs/0.0.3.json

@@ -1241,6 +1241,24 @@
               "$ref": "#/definitions/InjectionData_for_String"
             }
           }
+        },
+        {
+          "type": "object",
+          "required": [
+            "data",
+            "source"
+          ],
+          "properties": {
+            "source": {
+              "type": "string",
+              "enum": [
+                "random"
+              ]
+            },
+            "data": {
+              "$ref": "#/definitions/InjectionData_for_String"
+            }
+          }
         }
       ]
     },
@@ -2363,6 +2381,14 @@
         },
         "version": {
           "type": "string"
+        },
+        "random_seed": {
+          "type": [
+            "integer",
+            "null"
+          ],
+          "format": "uint32",
+          "minimum": 0.0
         }
       }
     },