Beginnings of making frontend pretty, switched to pico css

Fix proxy config confusion
Housekeeping
2024-07-09 20:37:43 -03:00 · 2024-07-09 16:40:15 -03:00 · 2024-07-09 13:23:21 -03:00 · 2024-07-09 13:23:16 -03:00 · 2024-07-09 13:01:37 -03:00 · 2024-07-09 10:57:36 -03:00
17 changed files with 152 additions and 120 deletions
--- a/.hadolint.yml
+++ b/.hadolint.yml
@ -0,0 +1,3 @@
+ignored:
+  - DL3018
+  - DL3059
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@ -31,3 +31,8 @@ repos:
          entry: test ! -s config/funkos
          language: system
          pass_filenames: false
+    - repo: https://github.com/hadolint/hadolint
+      rev: v2.12.0
+      hooks:
+        - id: hadolint-docker
+          exclude: 'j2$'
--- a/33
+++ b/33
@ -1,5 +1,13 @@
-FROM --platform=${TARGETPLATFORM:-linux/amd64} alpine as build
-RUN apk update && apk add crystal shards yaml-dev openssl-dev zlib-dev libxml2-dev make && apk cache clean
+FROM --platform=${TARGETPLATFORM:-linux/amd64} alpine:3.20 AS build
+RUN apk add --no-cache \
+    crystal \
+    shards \
+    yaml-dev \
+    openssl-dev \
+    zlib-dev \
+    libxml2-dev \
+    make
+RUN rm -rf /var/cache/apk/*
 RUN addgroup -S app && adduser app -S -G app
 WORKDIR /home/app
 COPY shard.yml Makefile ./
@ -9,8 +17,22 @@ COPY runtimes/ runtimes/
 RUN make
 # RUN strip bin/*

-FROM --platform=${TARGETPLATFORM:-linux/amd64} alpine as ship
-RUN apk update && apk add caddy nss-tools multirun docker openssl zlib yaml pcre2 gc libevent libgcc libxml2 ttyd && apk cache clean
+FROM --platform=${TARGETPLATFORM:-linux/amd64} alpine:3.20 AS ship
+RUN apk add --no-cache \
+    caddy \
+    nss-tools \
+    multirun \
+    docker \
+    openssl \
+    zlib \
+    yaml \
+    pcre2 \
+    gc \
+    libevent \
+    libgcc \
+    libxml2 \
+    ttyd
+RUN rm -rf /var/cache/apk/*

 # Unprivileged user
 RUN addgroup -S app && adduser app -S -G app
@ -21,7 +43,6 @@ COPY public/ public/
 COPY --from=build /home/app/bin/faaso-daemon /home/app/bin/faaso /usr/bin/

 # Mount points for persistent data
-RUN mkdir /secrets
-RUN mkdir /config
+RUN mkdir /secrets /config

 CMD ["/usr/bin/multirun", "-v", "faaso-daemon", "caddy run --config config/Caddyfile"]
--- a/1
+++ b/1
@ -8,6 +8,7 @@ proxy:
 all: build proxy

 start-proxy:
+	docker network create faaso-net || true
 	docker run --name faaso-proxy-one \
 	--rm --network=faaso-net \
 	-e FAASO_SECRET_PATH=${PWD}/secrets \
--- a/TODO.md
+++ b/TODO.md
@ -12,10 +12,11 @@
  * ✅ Crystal + Kemal
  * ✅ Python + Flask
  * ✅ Nodejs + Express
+* Create a site
  * Document
-  * How to create a runtime
-  * How to create a funko
-  * How to setup the proxy
+    * FaaSO for app developers
+    * FaaSO for runtime developers
+    * FaaSO server setup
    * APIs
 * Sanitize all inputs
 * ✅ Streaming responses in slow operations like scaling down
@ -34,7 +35,8 @@
 * ✅ Fix `export examples/hello_crystal` it has a `template/`
 * ✅ Implement zero-downtime rollout (`faaso deploy`)
 * ✅ Cleanup `tmp/whatever` after use
-* `faaso scale` remote is broken
+* ✅ `faaso scale` remote is broken
+* ✅ Setup linters/pre-commit/etc

 ## Things to do but not before release

--- a/public/index.html
+++ b/public/index.html
@ -2,8 +2,8 @@

 <head>
  <meta charset="utf-8" />
-  <link rel="stylesheet" href="https://matcha.mizu.sh/matcha.css" />
-  <script src="https://unpkg.com/htmx.org@2.0.0"></script>
+  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@picocss/pico@1/css/pico.min.css" />
+  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@picocss/pico@2/css/pico.colors.min.css" />  <script src="https://unpkg.com/htmx.org@2.0.0"></script>
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
 </head>

@ -11,15 +11,20 @@
  <header class="container">
    <h1>FaaSO Admin Interface</h1>
  </header>
-  <main class=container>
-    <h2>Your Funko Collection
-      <button id="update-funkos" style="float:right; display:inline;" hx-trigger="load, click, every 60s"
+  <article>
+    <nav>
+      <ul>
+      <li><strong style="font-size: 200%;">Your Funko Collection</strong></li>
+      </ul>
+      <ul>
+      <li><button id="update-funkos" style="float:right; display:inline;" hx-trigger="load, click, every 60s"
        hx-get="funkos/?format=html" hx-target="#funko-list">
        Refresh
      </button>
-    </h2>
+      </ul>
+    </nav>
    <span id="message"></span>
-    <table hx-target="#message">
+    <table hx-target="#message" class="striped">
      <thead>
        <tr>
          <th>Name</th>
@ -31,23 +36,27 @@
      </tbody>
    </table>
    <div id="terminal" style="resize: vertical; overflow: auto;"></div>
-  </main>
+  </article>
  <script>
    update_funkos = function () {
      document.getElementById("update-funkos").click()
    }
  </script>
-  <main class=container>
-    <h2>
-      Your Secrets
-      <button id="update-secrets" style="float:right; display:inline;" hx-trigger="load, click, every 60s"
+  <article>
+    <nav>
+    <ul>
+    <li><strong style="font-size: 200%;">Your Secrets</strong>
+    </ul>
+    <ul>
+      <li><button id="update-secrets" style="float:right; display:inline;" hx-trigger="load, click, every 60s"
        hx-get="secrets/?format=html" hx-target="#secret-list">
        Refresh
      </button>
-      <button style="float:right; display:inline;" onclick="show_new_secret()">
+      <li><button style="float:right; display:inline;" onclick="show_new_secret()">
        Add
      </button>
-    </h2>
+    </ul>
+    </nav>
    <span id="message"></span>
    <table hx-target="#message">
      <thead>
@ -60,14 +69,20 @@
      <tbody id="secret-list">
      </tbody>
      <dialog id="add-secret">
-        <topic>New Secret</topic>
+      <article>
+      <header>
+        New Secret
+      </header>
        <form hx-post="secrets/">
          <input placeholder="funko name" id="new-secret-funko" name="funko">
          <input placeholder="secret name" id="new-secret-name" name="name">
          <input placeholder="secret value" type="password" id="new-secret-password" name="value">
-          <button type="submit" hx-on:htmx:after-request="hide_new_secret()">CREATE</button>
+          <fieldset role="group" style="text-align: right;">
+            <button style="width:9em; display: inline;" type="submit" hx-on:htmx:after-request="hide_new_secret()">CREATE</button>
+            <button style="width:9em; display: inline;" onclick="hide_new_secret(); close();" aria-label="Close" rel="prev">CLOSE</button>
+          </fieldset>
        </form>
-        <button onclick="hide_new_secret(); close();">CLOSE</button>
+      </article>
      </dialog>
      <script>
        update_secrets = function() {
@ -87,5 +102,5 @@
          update_secrets()
        }
      </script>
-  </main>
+  </article>
 </body>
--- a/shard.lock
+++ b/shard.lock
@ -4,6 +4,10 @@ shards:
    git: https://github.com/sija/backtracer.cr.git
    version: 1.2.2

+  base58:
+    git: https://github.com/crystal-china/base58.cr.git
+    version: 0.1.0+git.commit.d1150d4a6f086013a475640ad00e561a2fe1082a
+
  cr-config:
    git: https://github.com/crystal-community/cr-config.git
    version: 5.1.0+git.commit.5eae3dfbf97da7dfa7c6e64a2a508069948518d3
@ -40,10 +44,6 @@ shards:
    git: https://github.com/mamantoha/http_proxy.git
    version: 0.10.3

-  inotify:
-    git: https://github.com/petoem/inotify.cr.git
-    version: 1.0.3
-
  kemal:
    git: https://github.com/kemalcr/kemal.git
    version: 1.5.0
--- a/shard.yml
+++ b/shard.yml
@ -15,6 +15,8 @@ crystal: ">= 1.12.2"
 license: MIT

 dependencies:
+  base58:
+    github: crystal-china/base58.cr
  crest:
    github: mamantoha/crest
  crinja:
@ -28,8 +30,6 @@ dependencies:
  docr:
    github: ralsina/docr
    branch: add_exposed_ports
-  inotify:
-    github: petoem/inotify.cr
  kemal:
    github: kemalcr/kemal
  kemal-basic-auth:
--- a/src/commands/build.cr
+++ b/src/commands/build.cr
@ -1,3 +1,5 @@
+require "base58"
+
 module Faaso
  module Commands
    # Build images for one or more funkos from source
@ -7,7 +9,7 @@ module Faaso
        # Create temporary build location

        funkos.each do |funko|
-          tmp_dir = Path.new("tmp", UUID.random.to_s)
+          tmp_dir = Path.new("tmp", Random.base58(8))
          Dir.mkdir_p(tmp_dir) unless File.exists? tmp_dir

          funko.runtime = nil if options["--no-runtime"]
@ -56,10 +58,7 @@ module Faaso
            {"funko.tgz" => File.open(tmp), "name" => "funko.tgz"},
            user: user, password: password
          ) do |response|
-            loop do
-              Log.info { response.body_io.gets }
-              break if response.body_io.closed?
-            end
+            IO.copy(response.body_io, STDOUT)
          end
          Log.info { "Build finished successfully." }
        rescue ex : Crest::InternalServerError
--- a/src/commands/deploy.cr
+++ b/src/commands/deploy.cr
@ -41,10 +41,7 @@ module Faaso
        Crest.get(
          "#{Config.server}funkos/#{funko_name}/deploy/", \
             user: user, password: password) do |response|
-          loop do
-            Log.info { response.body_io.gets }
-            break if response.body_io.closed?
-          end
+          IO.copy(response.body_io, STDOUT)
        end
        0
      end
--- a/src/commands/scale.cr
+++ b/src/commands/scale.cr
@ -10,14 +10,14 @@ module Faaso
    # In both cases stopped instances after the required
    # scale is reached are deleted.
    struct Scale
-      def local(options, name : String, scale : Int) : Int32
+      def local(options, name : String, scale : Int | Nil) : Int32
        funko = Funko::Funko.from_names([name])[0]
        # Asked about scale
        if funko.image_history.empty?
          Log.error { "Unknown funko #{funko.name}" }
          return 1
        end
-        if !scale
+        if scale.nil?
          Log.info { "Funko #{name} has a scale of #{funko.scale}" }
          return 0
        end
@ -26,19 +26,21 @@ module Faaso
        0
      end

-      def remote(options, name : String, scale : Int) : Int32
+      def remote(options, name : String, scale : Int | Nil) : Int32
        user, password = Config.auth
        Faaso.check_version
-        if !scale
-          response = Crest.get(
+        if scale.nil?
+          Crest.get(
            "#{Config.server}funkos/#{name}/scale/", \
-               user: user, password: password)
-          Log.info { " => " + response.body }
-        else
-          response = Crest.post(
+               user: user, password: password) do |response|
+            IO.copy(response.body_io, STDOUT)
+          end
+          return 0
+        end
+        Crest.post(
          "#{Config.server}funkos/#{name}/scale/",
-            {"scale" => scale}, user: user, password: password)
-          Log.info { " => " + response.body }
+          {"scale" => scale}, user: user, password: password) do |response|
+          IO.copy(response.body_io, STDOUT)
        end
        0
      rescue ex : Crest::InternalServerError
@ -46,7 +48,8 @@ module Faaso
        1
      end

-      def run(options, name : String, scale : Int) : Int32
+      def run(options, name : String, scale) : Int32
+        scale = scale.try &.to_s.to_i
        if options["--local"]
          return local(options, name, scale)
        end
--- a/src/commands/status.cr
+++ b/src/commands/status.cr
@ -31,10 +31,7 @@ module Faaso
        Crest.get(
          "#{Config.server}funkos/#{name}/status/", \
             user: user, password: password) do |response|
-          loop do
-            Log.info { response.body_io.gets }
-            break if response.body_io.closed?
-          end
+          IO.copy(response.body_io, STDOUT)
        end
        0
      rescue ex : Crest::InternalServerError
--- a/src/daemon/funko.cr
+++ b/src/daemon/funko.cr
@ -1,3 +1,4 @@
+require "base58"
 require "docr"
 require "kemal"
 require "../funko.cr"
@ -34,7 +35,7 @@ module Funko
  # mosquito-cr/mosquito to make it a job queue
  post "/funkos/build/" do |env|
    # Create place to build funko
-    tmp_dir = Path.new("tmp", UUID.random.to_s)
+    tmp_dir = Path.new("tmp", Random.base58(8))
    Dir.mkdir_p(tmp_dir) unless File.exists? tmp_dir

    # Expand tarball in there
@ -132,20 +133,21 @@ module Funko
  end

  # Helper to run faaso locally and respond via env
-  def run_faaso(args : Array(String), env) : Bool
-    Log.info { "Running faaso [#{args.join(", ")}, -l, 2>&1]" }
+  def run_faaso(args : Array(String), env)
+    args << "-l" # Always local in the server
+    Log.info { "Running faaso [#{args}" }
    Process.run(
      command: "faaso",
-      args: args + ["-l", "2>&1"], # Always local in the server
-      shell: true,
+      args: args,
+      env: {"FAASO_SERVER_SIDE" => "true"},
    ) do |process|
      loop do
-        env.response.print process.output.gets(chomp: false)
+        data = process.output.gets(chomp: false)
+        env.response.print data
        env.response.flush
-        Fiber.yield
+        Fiber.yield # Without this the process never ends
        break if process.terminated?
      end
-      true
    end
    # FIXME: find a way to raise an exception on failure
    # of the faaso process
--- a/src/daemon/proxy.cr
+++ b/src/daemon/proxy.cr
@ -1,16 +1,11 @@
 require "./funko.cr"
 require "docr"
-require "inotify"
 require "kemal"

 module Proxy
-  CADDY_CONFIG_PATH = "config/funkos"
-  @@current_config = File.read(CADDY_CONFIG_PATH)
-
-  @@watcher = Inotify.watch(CADDY_CONFIG_PATH) do |_|
-    Log.info { "Reloading caddy config" }
-    Process.run(command: "caddy", args: ["reload", "--config", CADDY_CONFIG_PATH])
-  end
+  CADDY_CONFIG_PATH = "config/Caddyfile"
+  CADDY_CONFIG_FUNKOS = "config/funkos"
+  @@current_config = File.read(CADDY_CONFIG_FUNKOS)

  # Get current proxy config
  get "/proxy/" do
@ -25,7 +20,7 @@ module Proxy
    update_proxy_config
  end

-  def self.update_proxy_config
+  def self.update_proxy_config : Nil
    docker_api = Docr::API.new(Docr::Client.new)
    containers = docker_api.containers.list(all: true)

@ -50,13 +45,13 @@ module Proxy

    if @@current_config != config
      Log.info { "Updating proxy config" }
-      File.open(CADDY_CONFIG_PATH, "w") do |file|
+      File.open(CADDY_CONFIG_FUNKOS, "w") do |file|
        file << config
      end
      # Reload config
      @@current_config = config
+      Process.run(command: "caddy", args: ["reload", "--config", CADDY_CONFIG_PATH])
    end
-    config
  end
 end

--- a/src/funko.cr
+++ b/src/funko.cr
@ -90,7 +90,11 @@ module Funko
      docker_api = Docr::API.new(Docr::Client.new)
      current_scale = self.scale
      result = [] of String
-      return result if current_scale == new_scale
+
+      if current_scale == new_scale
+        Log.info { "Funko #{name} already at scale #{new_scale}" }
+        return result
+      end

      Log.info { "Scaling #{name} from #{current_scale} to #{new_scale}" }
      if new_scale > current_scale
@ -309,7 +313,7 @@ module Funko
      )

      docker_api = Docr::API.new(Docr::Client.new)
-      response = docker_api.containers.create(name: "faaso-#{name}-#{randstr}", config: conf)
+      response = docker_api.containers.create(name: "faaso-#{name}-#{Random.base58(6)}", config: conf)
      response.@warnings.each { |msg| Log.warn { msg } }
      docker_api.containers.start(response.@id) if autostart
      response.@id
@ -349,8 +353,3 @@ module Funko
    end
  end
 end
-
-def randstr(length = 6) : String
-  chars = "abcdefghijklmnopqrstuvwxyz0123456789"
-  String.new(Bytes.new(chars.to_slice.sample(length).to_unsafe, length))
-end
--- a/src/main.cr
+++ b/src/main.cr
@ -35,29 +35,28 @@ Options:
 DOC

 ans = Docopt.docopt(doc, ARGV)
-Oplog.setup(ans["-v"].to_s.to_i)
+Oplog.setup(ans["-v"].to_s.to_i) unless ENV.fetch("FAASO_SERVER_SIDE", nil)
 Log.debug { ans }

-status : Int32 = 0
 case ans
 when .fetch("build", false)
-  status = Faaso::Commands::Build.new.run(ans, ans["FOLDER"].as(Array(String)))
+  exit Faaso::Commands::Build.new.run(ans, ans["FOLDER"].as(Array(String)))
 when .fetch("deploy", false)
-  status = Faaso::Commands::Deploy.new.run(ans, ans["FUNKO"].as(String))
+  exit Faaso::Commands::Deploy.new.run(ans, ans["FUNKO"].as(String))
 when .fetch("export", false)
-  status = Faaso::Commands::Export.new.run(ans, ans["SOURCE"].as(String), ans["DESTINATION"].as(String))
+  exit Faaso::Commands::Export.new.run(ans, ans["SOURCE"].as(String), ans["DESTINATION"].as(String))
 when .fetch("login", false)
-  status = Faaso::Commands::Login.new.run(ans)
+  exit Faaso::Commands::Login.new.run(ans)
 when .fetch("new", false)
-  status = Faaso::Commands::New.new.run(ans, ans["FOLDER"].as(Array(String))[0])
+  exit Faaso::Commands::New.new.run(ans, ans["FOLDER"].as(Array(String))[0])
 when .fetch("scale", false)
-  status = Faaso::Commands::Scale.new.run(ans, ans["FUNKO"].as(String), ans["SCALE"].as(String).to_i)
+  exit Faaso::Commands::Scale.new.run(ans, ans["FUNKO"].as(String), ans["SCALE"])
 when .fetch("secret", false)
-  status = Faaso::Commands::Secret.new.run(ans, ans["FUNKO"].as(String), ans["SECRET"].as(String))
+  exit Faaso::Commands::Secret.new.run(ans, ans["FUNKO"].as(String), ans["SECRET"].as(String))
 when .fetch("status", false)
-  status = Faaso::Commands::Status.new.run(ans, ans["FUNKO"].as(String))
+  exit Faaso::Commands::Status.new.run(ans, ans["FUNKO"].as(String))
 when .fetch("version", false)
  Log.info { "#{version}" }
 end

-exit(status)
+exit 0
--- a/src/views/funkos.ecr
+++ b/src/views/funkos.ecr
@ -1,39 +1,32 @@
 <%- result.each do |f| -%>
 <tr hx-indicator="#spinner-<%= f["name"] %>">
-  <td>
+  <td style="vertical-align: top;">
    <%= f["name"] %>
    <img id="spinner-<%= f["name"] %>" src="bars.svg"  class="htmx-indicator">
  </td>
-  <td>
-    <table>
-      <thead>
-        <th>ID</th>
-        <th>Current?</th>
-        <th>Actions</th>
-      </thead>
-      <tbody>
+  <td style="vertical-align: top;">
    <%- f["containers"].as(Array(Docr::Types::ContainerSummary)).each do |c| -%>
-          <tr>
-            <td><tt><%= c.@names[0].split("-")[-1] %></tt></td>
-            <td>
+      <div class="grid">
+            <div>
+              <tt><%= c.@names[0].split("-")[-1] %></tt>
+            </div>
+            <div>
              <%- if c.image_id == f["latest_image"] -%>
                <span style="color:green;""> 🟢</span>
              <%- else -%>
                <span style="color:red;""> 🟢</span>
              <%- end -%>
-            </td>
-            <td>
+            </div>
+            <div role="group">
              <button hx-target="#terminal" hx-get="funkos/terminal/logs/<%= c.@names[0].lstrip("/") %>/">Logs</button>
              <button hx-target="#terminal" hx-get="funkos/terminal/shell/<%= c.@names[0].lstrip("/") %>/">Shell</button>
-            </td>
-          </tr>
+            </div>
+      </div>
    <%- end -%>
-      </tbody>
-      </p>
  </td>

-    </table>
  <td>
+  <div role="group">
  <%- if f["name"] == "proxy" -%>
  <%- else -%>
    <%- if f["scale"].as(String).to_i > 0 -%>
@ -47,6 +40,7 @@
    <%- end -%>
      <button hx-get="funkos/<%= f["name"] %>/restart" hx-on:htmx:after-request="update_funkos()">Restart</button>
  <%- end -%>
+  </div>
  </td>
 </tr>
 <%- end -%>
Author	SHA1	Message	Date
Roberto Alsina	21893fe612	Beginnings of making frontend pretty, switched to pico css	2024-07-09 20:37:43 -03:00
Roberto Alsina	665b4f9ab7	Fix proxy config confusion	2024-07-09 16:40:15 -03:00
Roberto Alsina	3b2297e954	Housekeeping	2024-07-09 13:23:21 -03:00
Roberto Alsina	4f4daf5943	Types tweak	2024-07-09 13:23:16 -03:00
Roberto Alsina	2d333c3df1	* More robust stderr/stdout mixing when running commandsserver side * More robust streaming responses client side	2024-07-09 13:01:37 -03:00
Roberto Alsina	f015afe7f0	Ensure network exists for start-proxy	2024-07-09 10:57:36 -03:00
Roberto Alsina	81ec077928	Use base58	2024-07-08 22:34:38 -03:00
Roberto Alsina	afb6e8df0c	Dockerfile linter	2024-07-08 22:34:27 -03:00
Roberto Alsina	50e8ff7e56	add check to ensure config/funkos is empty	2024-07-08 22:34:07 -03:00
Roberto Alsina	6489ec0dc2	Use base58 for random strings	2024-07-08 22:33:52 -03:00