WIP: almost got webapps working

architect-team · Dec 11, 2023 · 22ab03f · 22ab03f
1 parent 6ec894e
commit 22ab03f
Show file tree

Hide file tree

Showing 14 changed files with 229 additions and 99 deletions.
diff --git a/deno.lock b/deno.lock
diff --git a/examples/datacenters/local/datacenter.arc b/examples/datacenters/local/datacenter.arc
@@ -190,6 +190,11 @@ environment {
         mount_path = "/var/run/docker.sock"
       }
 
+      volume {
+        host_path = node.inputs.dockerfile
+        mount_path = node.inputs.dockerfile
+      }
+
       inputs = {
         image = "${node.component}-${node.name}"
         context = node.inputs.context
@@ -241,7 +246,7 @@ environment {
       }
 
       inputs = merge(node.inputs, {
-        service_name = "${replace(node.component + "-" + node.name, "/", "-")}"
+        service_name = replace(node.component + "-" + node.name, "/", "-")
         hostname = "${node.inputs.subdomain}.127.0.0.1.nip.io"
       })
     }

diff --git a/import_map.json b/import_map.json
@@ -27,7 +27,8 @@
     "unique-names-generator": "https://esm.sh/v124/[email protected]",
     "uuid": "https://esm.sh/v124/[email protected]",
     "which": "https://esm.sh/v124/[email protected]",
-    "winston": "https://esm.sh/v124/[email protected]"
+    "winston": "https://esm.sh/v124/[email protected]",
+    "p-limit": "https://esm.sh/v124/[email protected]"
   },
   "scopes": {
     "https://esm.sh/v124/": {

diff --git a/src/@resources/webapp/inputs.schema.json b/src/@resources/webapp/inputs.schema.json
@@ -13,6 +13,13 @@
                 "registry.architect.io/architect/webapp:latest"
               ],
               "type": "string"
+            },
+            "subdomain": {
+              "description": "Subdomain the webapp will be served from",
+              "examples": [
+                "www"
+              ],
+              "type": "string"
             }
           },
           "required": [
@@ -89,6 +96,13 @@
                 "type": "string"
               },
               "type": "array"
+            },
+            "subdomain": {
+              "description": "Subdomain the webapp will be served from",
+              "examples": [
+                "www"
+              ],
+              "type": "string"
             }
           },
           "required": [

diff --git a/src/@resources/webapp/outputs.schema.json b/src/@resources/webapp/outputs.schema.json
@@ -17,7 +17,10 @@
           "examples": [
             443
           ],
-          "type": "number"
+          "type": [
+            "string",
+            "number"
+          ]
         },
         "protocol": {
           "description": "Protocol to access the webapp",

diff --git a/src/@resources/webapp/outputs.ts b/src/@resources/webapp/outputs.ts
@@ -25,7 +25,7 @@ export type WebappOutputs = {
    *
    * @example 443
    */
-  port: number;
+  port: string | number;
 };
 
 export default WebappOutputs;
diff --git a/src/commands/common/datacenter.ts b/src/commands/common/datacenter.ts
@@ -193,6 +193,6 @@ export class DatacenterUtils {
       });
 
       return promises[module_path];
-    });
+    }, { concurrency: 3 });
   }
 }
diff --git a/src/components/v2/index.ts b/src/components/v2/index.ts
@@ -714,8 +714,11 @@ export default class ComponentV2 extends Component {
             component_source: context.component.source,
             context: webapp_config.context,
             dockerfile: dockerfile,
+            args: {},
+            target: '',
           },
         });
+        graph.insertNodes(build_node);
       }
 
       let webapp_node: AppGraphNode<'webapp'>;
@@ -744,11 +747,21 @@ export default class ComponentV2 extends Component {
         });
       }
 
+      webapp_node.inputs = parseExpressionRefs(
+        graph,
+        this.normalizedDependencies,
+        context,
+        webapp_node.getId(),
+        webapp_node.inputs,
+      );
+
+      graph.insertNodes(webapp_node);
+
       if (build_node) {
         graph.insertEdges(
           new GraphEdge({
-            from: build_node.getId(),
-            to: webapp_node.getId(),
+            from: webapp_node.getId(),
+            to: build_node.getId(),
           }),
         );
       }

diff --git a/src/datacenters/datacenter-schema.ts b/src/datacenters/datacenter-schema.ts
@@ -1902,7 +1902,10 @@ export default {
                           "examples": [
                             443
                           ],
-                          "type": "number"
+                          "type": [
+                            "string",
+                            "number"
+                          ]
                         },
                         "protocol": {
                           "description": "Protocol to access the webapp",

diff --git a/src/datacenters/datacenter.schema.json b/src/datacenters/datacenter.schema.json
@@ -1902,7 +1902,10 @@
                           "examples": [
                             443
                           ],
-                          "type": "number"
+                          "type": [
+                            "string",
+                            "number"
+                          ]
                         },
                         "protocol": {
                           "description": "Protocol to access the webapp",

diff --git a/src/datacenters/datacenter.ts b/src/datacenters/datacenter.ts
@@ -7,6 +7,11 @@ export type DockerBuildFn = (options: {
   context: string;
   plugin: Plugin;
 }) => Promise<string>;
+
+export type DatacenterBuildOptions = {
+  concurrency?: number;
+};
+
 export type DockerTagFn = (
   sourceRef: string,
   targetName: string,
@@ -34,7 +39,7 @@ export abstract class Datacenter {
   public abstract getGraph(appGraph: AppGraph, options: GetGraphOptions): InfraGraph;
   public abstract getVariablesSchema(): DatacenterVariablesSchema;
 
-  public abstract build(buildFn: DockerBuildFn): Promise<Datacenter>;
+  public abstract build(buildFn: DockerBuildFn, options?: DatacenterBuildOptions): Promise<Datacenter>;
   public abstract tag(tagFn: DockerTagFn): Promise<Datacenter>;
   public abstract push(pushFn: DockerPushFn): Promise<Datacenter>;
 }