conlink 2.0.0 → 2.0.2

package/Dockerfile

@@ -28,7 +28,8 @@ RUN apt-get -y install libpcap-dev tcpdump iproute2 iputils-ping curl \
                        openvswitch-switch openvswitch-testcontroller
 
 COPY --from=build /app/ /app/
-ADD link-add.sh link-del.sh schema.yaml /app/
+ADD link-add.sh link-del.sh /app/
+ADD schema.yaml /app/build/
 
 ENV PATH /app:$PATH
 WORKDIR /app

package/README.md

@@ -258,8 +258,7 @@ container (`node1`) and switch (`s1`) that is connected to the router
 defined in the first compose file.
 
 ```
-echo "COMPOSE_FILE=examples/test4-multiple/base-compose.yaml:examples/test4-multiple/node1-compose.yaml" > .env
-docker-compose up --build --force-recreate
+MODES_DIR=./examples/test4-multiple/modes ./mdc node1 up --build --force-recreate
 ```
 
 Ping the router host from `node`:
@@ -273,8 +272,7 @@ two node2 replicas and a switch (`s2`) that is connected to the
 router.
 
 ```
-echo "COMPOSE_FILE=examples/test4-multiple/base-compose.yaml:examples/test4-multiple/node1-compose.yaml:examples/test4-multiple/nodes2-compose.yaml" > .env
-docker-compose up --build --force-recreate
+MODES_DIR=./examples/test4-multiple/modes ./mdc node1,nodes2 up --build --force-recreate
 ```
 
 From both `node2` replicas, ping `node1` across the switches and `r0` router:
@@ -289,8 +287,7 @@ conlink using an addition network file `web-network.yaml`. The network
 file starts up a simple web server on the router.
 
 ```
-echo "COMPOSE_FILE=examples/test4-multiple/base-compose.yaml:examples/test4-multiple/node1-compose.yaml:examples/test4-multiple/nodes2-compose.yaml:examples/test4-multiple/all-compose.yaml" > .env
-docker-compose up --build --force-recreate
+MODES_DIR=./examples/test4-multiple/modes ./mdc node1,nodes2,web up --build --force-recreate
 ```
 
 From the second `node2`, perform a download from the web server running on the
@@ -300,6 +297,14 @@ router host:
 docker-compose exec --index 2 node2 wget -O- 10.0.0.100
 ```
 
+We can simplify the above launch by using the `all` mode, which contains
+depends on `node1`, `nodes2`, and `web`.  Each of those modes depends on
+`base`, so there's no need to specify that again (transitive deps).
+
+```
+MODES_DIR=./examples/test4-multiple/modes ./mdc all up --build --force-recreate
+```
+
 Remove the `.env` file as a final cleanup step:
 
 ```
@@ -453,16 +458,15 @@ python3 -m http.server 8080
 ```
 
 Use the `net2dot` script to transform a network
-configuration into a GraphViz data file (dot language). The `net2dot`
-script supports `--compose-file` and `--network-file` command line
-options. To render the network configuration for example test1, run
-the following in another window:
+configuration into a GraphViz data file (dot language). To render the
+network configuration for example test1, run the following in another
+window:
 
 ```
-./net2dot --compose-file examples/test1-compose.yaml > examples/data.dot
+./conlink --show-config --compose-file examples/test1-compose.yaml | ./net2dot > examples/test1.dot
 ```
 
-Then load `http://localhost:8080` in your browser to see the rendered
+Then load `http://localhost:8080?data=test1.dot` in your browser to see the rendered
 image.
 
 The file `examples/net2dot.yaml` contains a configuration that
@@ -470,10 +474,10 @@ combines many different configuration elements (veth links, dummy
 interfaces, vlan type links, tunnels, etc).
 
 ```
-./net2dot --network-file examples/net2dot.yaml > examples/data.dot
+./conlink --network-file examples/net2dot.yaml --show-config | ./net2dot > examples/net2dot.dot
 ```
 
-Then load `http://localhost:8080` in your browser.
+Then load `http://localhost:8080?data=net2dot.dot` in your browser.
 
 
 ## Copyright & License

package/examples/net2dot.yaml

@@ -15,7 +15,7 @@ links:
   - {type: macvlan, service: nodeH, dev: mv0, outer-dev: eni1, mode: bridge}
 
 tunnels:
-  - {type: geneve, bridge: s1, vni: 1001, remote: "${REMOTE1}"}
-  - {type: geneve, bridge: s3, vni: 1002, remote: "${REMOTE2}"}
+  - {type: geneve, bridge: s1, vni: 1001, remote: "10.0.0.1"}
+  - {type: geneve, bridge: s3, vni: 1002, remote: "10.0.0.2"}
 
 

package/examples/test4-multiple/modes/all/deps

@@ -0,0 +1 @@
+node1 nodes2 web

package/examples/test4-multiple/{base-compose.yaml → modes/base/compose.yaml}

@@ -10,7 +10,7 @@ services:
         - {bridge: s0, dev: e0, ip: "10.0.0.100/24"}
 
   network:
-    build: {context: ../..}
+    build: {context: .}
     image: conlink
     pid: host
     network_mode: none
@@ -19,7 +19,7 @@ services:
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
       - /var/lib/docker:/var/lib/docker
-      - ../../:/test
+      - ./:/test
     working_dir: /test
-    command: /app/build/conlink.js --compose-file ${COMPOSE_FILE:-examples/test4-multiple/base-compose.yaml}
+    command: /app/build/conlink.js --compose-file ${COMPOSE_FILE:?COMPOSE_FILE must be set}
 

package/examples/test4-multiple/{node1-compose.yaml → modes/node1/compose.yaml}

@@ -5,9 +5,6 @@ x-network:
     - {service: r0, bridge: s1, dev: e1, ip: "10.1.0.100/24"}
 
 services:
-  network:
-    command: /app/build/conlink.js --compose-file ${COMPOSE_FILE:-examples/test4-multiple/node1-compose.yaml}
-
   node1:
     image: alpine
     network_mode: none

package/examples/test4-multiple/modes/node1/deps

@@ -0,0 +1 @@
+base

package/examples/test4-multiple/{nodes2-compose.yaml → modes/nodes2/compose.yaml}

@@ -4,11 +4,7 @@ x-network:
   links:
     - {service: r0, bridge: s2, dev: e2, ip: "10.2.0.100/24"}
 
-
 services:
-  network:
-    command: /app/build/conlink.js --compose-file ${COMPOSE_FILE:-examples/test4-multiple/nodes2-compose.yaml}
-
   node2:
     image: alpine
     scale: 2
@@ -17,4 +13,3 @@ services:
     x-network:
       links:
         - {bridge: s2, ip: "10.2.0.1/16", route: "default via 10.2.0.100"}
-

package/examples/test4-multiple/modes/nodes2/deps

@@ -0,0 +1 @@
+base

package/examples/test4-multiple/modes/web/compose.yaml

@@ -0,0 +1,5 @@
+version: "2.4"
+
+x-network:
+  commands:
+    - {service: r0, command: "python3 -m http.server 80"}

package/examples/test4-multiple/modes/web/deps

@@ -0,0 +1 @@
+base

package/examples/test6-cfn.yaml

@@ -88,10 +88,9 @@ Resources:
         # echo "podman ps" | sudo -i -u ubuntu bash
 
         ## Download conlink image and repo
-        docker pull lonocloud/conlink:config-and-cljs-refactor
+        docker pull lonocloud/conlink
         git clone https://github.com/LonoCloud/conlink /root/conlink
         cd /root/conlink
-        git checkout -b config-and-cljs-refactor origin/config-and-cljs-refactor
 
         #cfn-signal -e 0 --stack ${AWS::StackName} --region ${AWS::Region} --resource WaitHandle
         cat > /tmp/signal << EOF

package/mdc

@@ -0,0 +1,108 @@
+#!/bin/bash
+
+set -e
+shopt -s dotglob  # recursive copy of dot files too
+
+die() { echo >&2 "${*}"; exit 1; }
+vecho() { [ "${VERBOSE}" ] && echo >&2 "${*}" || true; }
+realpath() { [[ $1 = /* ]] && echo "$1" || echo "$PWD/${1#./}"; }
+
+[ "${*}" ] || die "Usage: ${0} MODES [DOCKER-COMPOSE-ARGS]"
+
+VERBOSE="${VERBOSE:-}"
+MODES_DIR="${MODES_DIR:-./modes}"
+ENV_FILE="${ENV_FILE:-.env}"
+MDC_FILES_DIR="${MDC_FILES_DIR:-./.files}"
+LS=$(which ls)
+RESOLVE_DEPS="${RESOLVE_DEPS-./node_modules/@lonocloud/resolve-deps/resolve-deps.py}"
+DOCKER_COMPOSE="${DOCKER_COMPOSE:-docker-compose}"
+
+MODE_SPEC="${1}"; shift
+if [ "${RESOLVE_DEPS}" ]; then
+    MODES="$(${RESOLVE_DEPS} "${MODES_DIR}" ${MODE_SPEC})"
+else
+    MODES="${MODE_SPEC//,/ }"
+fi
+
+echo >&2 "MODES:    ${MODES}"
+vecho "ENV_FILE: ${ENV_FILE}"
+
+declare -A FINISHED
+COMPOSE_FILE=./.compose-empty.yaml
+COMPOSE_PROFILES=
+MDC_MODE_DIRS=
+cat /dev/null > ${ENV_FILE}-mdc-tmp
+echo -e "version: '2.4'\nservices: {}" > ./.compose-empty.yaml
+
+vecho "Removing ${MDC_FILES_DIR}"
+case "$(basename ${MDC_FILES_DIR})" in
+    .|/) die "MDC_FILES_DIR must not be '.' or '/'";;
+esac
+[ -d "${MDC_FILES_DIR}" ] && rm -r${VERBOSE:+v} ${MDC_FILES_DIR}/
+mkdir -p "${MDC_FILES_DIR}"
+
+for mode in ${MODES}; do
+    # Only process each mode once
+    [ "${FINISHED[${mode}]}" ] && continue
+    FINISHED["${mode}"]=1
+
+    # mode dir must exist
+    [ -d "${MODES_DIR}/${mode}" ] || \
+        die "No mode dir found for ${mode}"
+
+    MDC_MODE_DIRS="${MDC_MODE_DIRS},${MODES_DIR}/${mode}"
+
+    # mode can refer to a compose file in multiple ways
+    cfiles="${MODES_DIR}/${mode}/compose.yaml ${MODES_DIR}/${mode}/compose.yml ${MODES_DIR}/${mode}/docker-compose.yaml ${MODES_DIR}/${mode}/docker-compose.yml"
+    for cfile in ${cfiles}; do
+        if [ -e "${cfile}" ]; then
+            COMPOSE_FILE="${COMPOSE_FILE}:${cfile}"
+            break
+        fi
+    done
+
+    # Add MODE_ prefixed compose profile for each mode
+    COMPOSE_PROFILES="${COMPOSE_PROFILES},MODE_${mode}"
+
+    # if there is a mode specific env file then include it
+    efiles="${MODES_DIR}/${mode}/env ${MODES_DIR}/${mode}/.env"
+    for efile in ${efiles}; do
+        if [ -e "${efile}" ]; then
+            echo "### mdc begin mode ${mode}" >> ${ENV_FILE}-mdc-tmp
+            vecho "cat ${efile} >> ${ENV_FILE}-mdc-tmp"
+            cat ${efile} >> ${ENV_FILE}-mdc-tmp
+            echo "### mdc end mode ${mode}" >> ${ENV_FILE}-mdc-tmp
+        fi
+    done
+
+    # if there are mode specific files then copy them to MDC_FILES_DIR
+    if [ -d "${MODES_DIR}/${mode}" ]; then
+        for vfd in $(cd ${MODES_DIR}/${mode} && $LS -d */files 2>/dev/null || true); do
+            dest=${MDC_FILES_DIR}/${vfd%/files}
+            mkdir -p ${dest}
+            vecho cp -a ${MODES_DIR}/${mode}/${vfd}/* ${dest}
+            cp -a ${MODES_DIR}/${mode}/${vfd}/* ${dest}
+        done
+    fi
+done
+
+COMPOSE_FILE="${COMPOSE_FILE#:}"
+vecho "COMPOSE_FILE: ${COMPOSE_FILE}"
+echo "COMPOSE_FILE=${COMPOSE_FILE}" >> ${ENV_FILE}-mdc-tmp
+echo "COMPOSE_DIR=$(realpath $(dirname ${ENV_FILE}))" >> ${ENV_FILE}-mdc-tmp
+
+COMPOSE_PROFILES="${COMPOSE_PROFILES#,}"
+vecho "COMPOSE_PROFILES: ${COMPOSE_PROFILES}"
+echo "COMPOSE_PROFILES=${COMPOSE_PROFILES}" >> ${ENV_FILE}-mdc-tmp
+
+MDC_MODE_DIRS="${MDC_MODE_DIRS#,}"
+vecho "MDC_MODE_DIRS: ${MDC_MODE_DIRS}"
+echo "MDC_MODE_DIRS=\"${MDC_MODE_DIRS}\"" >> ${ENV_FILE}-mdc-tmp
+
+vecho mv ${ENV_FILE}-mdc-tmp ${ENV_FILE}
+mv ${ENV_FILE}-mdc-tmp ${ENV_FILE}
+
+if [ "${*}" ]; then
+    vecho "Running: ${DOCKER_COMPOSE} --env-file "${ENV_FILE}" ${@}"
+    exec ${DOCKER_COMPOSE} --env-file "${ENV_FILE}" "${@}"
+fi

package/net2dot

@@ -8,4 +8,4 @@ die() { echo >&2 "${*}"; exit 1; }
 
 [ -e "${NBB}" ] || die "Missing ${NBB}. Maybe run 'npm install' in ${TOP_DIR}?"
 
-exec ${NBB} -cp "${TOP_DIR}/src" -m conlink.net2dot/main "${@}"
+exec ${NBB} "${TOP_DIR}/net2dot.cljs" "${@}"

package/net2dot.cljs

@@ -0,0 +1,113 @@
+#!/usr/bin/env nbb
+
+;; Copyright (c) 2023, Viasat, Inc
+;; Licensed under MPL 2.0
+
+(ns net2dot
+  (:require [clojure.string :as S]
+            [clojure.pprint :refer [pprint]]
+            [cljs-bean.core :refer [->clj ->js]]
+            ["fs" :as fs]
+            ["ts-graphviz" :refer [Digraph Subgraph toDot Node Edge]]))
+
+;; Reads JSON network config from stdin and outputs to dot (GraphViz)
+
+(def DEFAULT-PROPS {:shape "box" :fontsize 14 :style "filled" :penwidth 1})
+(def CONLINK-PROPS {:fillcolor "#c5d1e7" :color "#7396a0" :style "rounded,filled" :penwidth 3})
+(def CON-PROPS     {:fillcolor "#dfe8f1" :color "#7396a6" :style "rounded,filled"})
+(def SVC-PROPS     {:fillcolor "#c1d0d7" :color "#7396a6" :style "rounded,filled" :penwidth 2})
+(def BRIDGE-PROPS  {:fillcolor "#c8badc" :color "#6e509f"})
+(def HOST-PROPS    {:fillcolor "#f5f5f5" :color "#666666"})
+(def INTF-PROPS    {:fillcolor "#e8e8c8" :color "#af6b4e" :fontsize 10 :width 0.1 :height 0.1})
+(def NIC-PROPS     {:fillcolor "#e8e8c8" :color "#af6b4e" :fontsize 14})
+(def TUN-PROPS     {:fillcolor "#a5f5a5" :color "#888888"})
+
+(defn dot-id [n]
+  (-> (name n)
+      (S/replace #"[:]" "_COLON_")
+      (S/replace #"[-]" "_DASH_")
+      (S/replace #"[*]" "_STAR_")
+      (S/replace #"[$]" "_DOLLAR_")
+      (S/replace #"[{]" "_LCURLY_")
+      (S/replace #"[}]" "_LCURLY_")
+      (S/replace #"[ ]" "_SPACE_")))
+
+(defn node-props [label props]
+  (merge DEFAULT-PROPS props {:label label}))
+
+(defn digraph [props]
+  (Digraph. (->js {:splines true :compound true})))
+
+(defn subgraph [parent id label props]
+  (let [n (Subgraph. id (->js (node-props label props)))]
+    ^obj (.addSubgraph parent n)
+    n))
+
+(defn node [parent id label props]
+  (let [n (Node. id (->js (node-props label props)))]
+    ^obj (.addNode parent n)
+    n))
+
+(defn edge [parent idA idB label props] 
+  (let [n (Edge. #js [idA idB] (->js (node-props label props)))]
+    ^obj (.addEdge parent n)
+    n))
+
+(defn render [network-config]
+  (let [graph (digraph {:splines true :compound true})
+        host (subgraph graph "cluster_host" "host system" HOST-PROPS)
+        conlink (subgraph host "cluster_conlink" "conlink/network" CONLINK-PROPS)
+        bridges (reduce
+                  #(->> (subgraph conlink (str "cluster_bridge_" %2)
+                                  %2 BRIDGE-PROPS)
+                        (assoc %1 %2))
+                  {} (keep :bridge (:links network-config)))
+        services (reduce
+                   #(->> (subgraph host (str "cluster_service_" (dot-id %2))
+                                   (str "service '" (name %2) "'") SVC-PROPS)
+                         (assoc %1 %2))
+                   {} (keys (:services network-config)))
+        containers (reduce
+                     #(->> (subgraph host (str "cluster_container_" (dot-id %2))
+                                     (str "container '" (name %2) "'") CON-PROPS)
+                           (assoc %1 %2))
+                     {} (keys (:containers network-config)))]
+
+    (doseq [link (:links network-config)]
+      (let [{:keys [service container dev outer-dev bridge base]} link
+            cname (or service container)
+            cnode (get (if service services containers) (keyword cname))
+            dev-id (str cname ":" (name dev))
+            in-intf (node cnode (dot-id dev-id) dev INTF-PROPS)]
+        (when (#{:conlink :host} (keyword base))
+          (let [outer-dev (or outer-dev
+                              (str (if service (str service "_1") container)
+                                   "-" (name dev)))
+                out-id (str "out-" outer-dev)
+                out-parent (condp = (keyword base)
+                             :conlink (get bridges bridge)
+                             :host host)
+                {:keys [type vlanid]} link
+                [elabel iprops] (if (= "host" base)
+                                  [(str (name type) (when vlanid
+                                                      (str " " vlanid)))
+                                   NIC-PROPS]
+                                  ["" INTF-PROPS])
+                out-intf (node out-parent (dot-id out-id) outer-dev iprops)
+                edge (edge graph in-intf out-intf elabel {})]
+            true))))
+
+    (doseq [{:keys [type remote bridge vni]} (:tunnels network-config)]
+      (let [br (get bridges bridge)
+            rt (node graph (dot-id remote)
+                     (str "remote host " remote) TUN-PROPS)
+            intf (node br (dot-id (str type "-" vni))
+                       (str type "-" vni) INTF-PROPS)]
+        (edge graph intf rt "" {})))
+
+    (toDot graph)))
+    
+(let [stdin (fs/readFileSync "/dev/stdin" "utf8")
+      network-config (->clj (js/JSON.parse stdin))
+      dot-graph (render network-config)]
+  (println dot-graph))

package/package.json

@@ -1,11 +1,16 @@
 {
   "name": "conlink",
-  "version": "2.0.0",
+  "version": "2.0.2",
+  "description": "conlink -  Declarative Low-Level Networking for Containers",
+  "repository": "https://github.com/LonoCloud/conlink",
+  "license": "SEE LICENSE IN LICENSE",
   "dependencies": {
+    "@lonocloud/resolve-deps": "^0.0.2",
     "ajv": "^8.12.0",
     "dockerode": "^3.3.4",
     "nbb": "^1.2.179",
     "neodoc": "^2.0.2",
+    "ts-graphviz": "^1.8.1",
     "yaml": "^2.2.1"
   },
   "devDependencies": {

package/scripts/copy.sh

@@ -0,0 +1,48 @@
+#!/bin/sh
+
+# Copyright (c) 2023, Viasat, Inc
+# Licensed under MPL 2.0
+
+# Add files from SRC_DIR to DST_DIR with string interpolation.
+# Any '{{FOO}}' tokens are replaced with value of corresponding
+# environment variable FOO (but only if defined).
+
+die() { local ret=${1}; shift; echo >&2 "${*}"; exit $ret; }
+
+case "${1}" in -T|--template) TEMPLATE=1; shift ;; esac
+
+src_dir="${1}"; shift || die 2 "Usage: ${0} [-T|--template] SRC_DIR DST_DIR"
+dst_dir="${1}"; shift || die 2 "Usage: ${0} [-T|--template] SRC_DIR DST_DIR"
+[ "${1}" = "--" ] && shift
+
+[ -d "${src_dir}" ] || die 2 "Not a directory: '${src_dir}'"
+[ -d "${dst_dir}" ] || die 2 "Not a directory: '${dst_dir}'"
+
+(cd "${src_dir}" && find . -type f) | while read src_file; do
+  src="${src_dir}/${src_file}"
+  dst="${dst_dir}/${src_file}"
+  mkdir -p $(dirname "${dst}") || die 1 "Failed to make target directory"
+  echo cp -a "${src}" "${dst}"
+  cp -a "${src}" "${dst}" || die 1 "Failed to copy file"
+  # TODO: make this configurable
+  chown root.root "${dst}" || die 1 "Unable to set ownership"
+
+  [ -z "${TEMPLATE}" ] && continue
+
+  # match all {{FOO}} style variables and replace from environment
+  for v in $(cat "${dst}" | grep -o '{{[^ }{]*}}' | sed 's/[}{]//g' | sort -u); do
+    if set | grep -qs "^${v}="; then
+      val=$(set | grep "^${v}=" | cut -f 2 -d '=' \
+          | sed "s/^['\"]\(.*\)['\"]$/\1/" \
+          | sed 's/[\/&]/\\&/g')
+      echo "Replacing '{{${v}}}' with '${val}' in '${dst}'"
+      sed -i "s/{{${v}}}/${val}/g" "${dst}"
+    fi
+  done
+done
+
+if [ "${*}" ]; then
+    exec "${@}"
+else
+    true
+fi

package/scripts/wait.sh

@@ -0,0 +1,73 @@
+#!/bin/sh
+
+# Copyright (c) 2023, Viasat, Inc
+# Licensed under MPL 2.0
+
+die() { local ret=${1}; shift; echo >&2 "${*}"; exit $ret; }
+
+NC=$(command -v nc 2>/dev/null)
+SOCAT=$(command -v socat 2>/dev/null)
+BASH=$(command -v bash 2>/dev/null)
+WAIT_SLEEP=${WAIT_SLEEP:-1}
+
+do_sleep() {
+  echo "Failed: '${typ} ${arg}'. Sleep ${WAIT_SLEEP} seconds before retry"
+  sleep ${WAIT_SLEEP}
+}
+check_tcp() {
+  if   [ "${NC}" ];    then ${NC} -z -w 1 ${1} ${2} > /dev/null
+  elif [ "${SOCAT}" ]; then ${SOCAT} /dev/null TCP:${1}:${2},connect-timeout=2
+  elif [ "${BASH}" ];  then timeout 1 ${BASH} -c "echo > /dev/tcp/${1}/${2}"
+  else die 1 "Could not find nc, socat, or bash"
+  fi
+}
+
+while [ "${*}" ]; do
+  typ="${1}"; shift
+  arg="${1}"
+  [ "${arg}" = "--" ] && die 2 "No arg found for type '${typ}'"
+  case "${typ}" in
+    --) break; ;;
+    -f|--file)
+      while [ ! -e "${arg}" ]; do do_sleep; done
+      echo "File '${arg}' exists"
+      ;;
+    -i|--if|--intf)
+      while [ ! -e /sys/class/net/${arg}/ifindex ]; do do_sleep; done
+      echo "Interface '${arg}' exists"
+      ;;
+    -I|--ip)
+      while ! grep -qs "^${arg}\>" /proc/net/route; do do_sleep; done
+      echo "Interface '${arg}' has IP/routing"
+      ;;
+    -t|--tcp)
+      host=${arg%:*}
+      port=${arg##*:}
+      [ "${host}" -a "${port}" ] || die 2 "Illegal host/port '${arg}'"
+      while ! check_tcp ${host} ${port}; do do_sleep; done
+      echo "TCP listener is reachable at '${arg}' "
+      ;;
+    -u|--umask)
+      umask ${arg}
+      echo "Set umask to ${arg}"
+      ;;
+    -c|--cmd|--command)
+      while ! ${arg}; do do_sleep; done
+      echo "Command successful: ${arg}"
+      ;;
+    -s|--sleep)
+      WAIT_SLEEP=${arg}
+      echo "Changed WAIT_SLEEP from ${WAIT_SLEEP} to ${arg}"
+      ;;
+    *)
+      echo "Unknown option: ${typ}"
+      exit 1
+      ;;
+  esac
+  shift
+done
+
+if [ "${*}" ]; then
+  echo "Running: ${*}"
+  exec ${*}
+fi

package/shadow-cljs.edn

@@ -21,7 +21,7 @@
   :net2dot
   {:target :node-script
    :main conlink.net2dot/main
-   :output-dir "build/"
+   :output-dir "build/net2dot"
    :output-to "build/net2dot.js"
    ;; Don't try and connect back to shadow-cljs process
    :devtools {:enabled false :console-support false}

package/src/conlink/addrs.cljc

@@ -1,3 +1,6 @@
+;; Copyright (c) 2023, Viasat, Inc
+;; Licensed under MPL 2.0
+
 (ns conlink.addrs
   (:require [clojure.string :as string]))
 

package/src/conlink/core.cljs

@@ -1,4 +1,5 @@
-#!/usr/bin/env nbb
+;; Copyright (c) 2023, Viasat, Inc
+;; Licensed under MPL 2.0
 
 (ns conlink.core
   (:require [clojure.string :as S]
@@ -7,7 +8,7 @@
             [cljs-bean.core :refer [->clj ->js]]
             [conlink.util :refer [parse-opts Eprintln fatal
                                   trim indent interpolate-walk deep-merge
-                                  spawn read-file load-config]]
+                                  spawn read-file load-config resolve-path]]
             [conlink.addrs :as addrs]
             #_["ajv$default" :as Ajv]
             #_["dockerode$default" :as Docker]))
@@ -25,6 +26,7 @@ Usage:
 General Options:
   -v, --verbose                     Show verbose output (stderr)
                                     [env: VERBOSE]
+  --show-config                     Print loaded network config JSON and exit
   --bridge-mode BRIDGE-MODE         Bridge mode (ovs or linux) to use for
                                     bridge/switch connections
                                     [default: ovs]
@@ -45,6 +47,10 @@ General Options:
 ;; TODO: :service should require either command line option or
 ;; detection of running in a compose project (but not both).
 
+;; TODO: shadow-cljs doesn't support *file*
+;;(path/dirname *file*))
+(def SCHEMA-PATHS [(js/process.cwd) "/app/build/" "/app/" "../"])
+
 (def OVS-START-CMD (str "/usr/share/openvswitch/scripts/ovs-ctl start"
                         " --system-id=random --no-mlockall --delete-bridges"))
 
@@ -460,7 +466,7 @@ General Options:
   "Return a docker/dockerode client object for the docker/podman
   server listening at 'path'."
   [path]
-  (P/let [{:keys [error log]} @ctx]
+  (P/let [{:keys [warn log]} @ctx]
     (P/catch
       (P/let
         [client (Docker. #js {:socketPath path})
@@ -468,7 +474,7 @@ General Options:
          containers (list-containers client)]
         (log (str "Listening on " path))
         client)
-      #(error "Could not start docker client on '" path "': " %))))
+      #(warn "Could not start docker client on '" path "': " %))))
 
 (defn docker-listen
   "Listen for docker events from 'client' that match filter 'filters'.
@@ -638,9 +644,11 @@ General Options:
 (defn arg-checks
   "Check command line arguments. Exit with error if arguments are
   invalid."
-  [{:keys [network-file compose-file]}]
+  [{:keys [network-file compose-file config-schema orig-config-schema]}]
   (when (and (empty? network-file) (empty? compose-file))
-    (fatal 2 "either --network-file or --compose-file is required")))
+    (fatal 2 "either --network-file or --compose-file is required"))
+  (when (empty? config-schema)
+    (fatal 2 "Could not find config-schema" orig-config-schema)))
 
 (defn startup-checks
   "Check startup state and exit if openvswitch kernel module is not
@@ -671,11 +679,13 @@ General Options:
     "
   [& args]
   (P/let
-    [{:as opts :keys [verbose]} (parse-opts usage args)
+    [{:as opts :keys [verbose show-config]} (parse-opts usage args)
      {:keys [log info]} (swap! ctx merge (when verbose {:info Eprintln}))
      opts (merge
             opts
             {:bridge-mode (keyword (:bridge-mode opts))
+             :orig-config-schema (:config-schema opts)
+             :config-schema (resolve-path (:config-schema opts) SCHEMA-PATHS)
              :network-file (mapcat #(S/split % #":") (:network-file opts))
              :compose-file (mapcat #(S/split % #":") (:compose-file opts))})
      _ (arg-checks opts)
@@ -689,6 +699,9 @@ General Options:
                           (interpolate-walk env)
                           (check-schema schema verbose)
                           (enrich-network-config))
+     _ (when show-config
+         (println (js/JSON.stringify (->js network-config)))
+         (js/process.exit 0))
 
      docker (docker-client (:docker-socket opts))
      podman (docker-client (:podman-socket opts))
@@ -718,6 +731,7 @@ General Options:
     (js/process.on "uncaughtException" #(exit-handler %1 %2))
 
     (log "Bridge mode:" (name bridge-mode))
+    (log (str "Using schema at '" (:config-schema opts) "'"))
     (info (str "Starting network config\n"
                (indent-pprint-str network-config "  ")))
     (info (str "Starting network state:\n"