From 41f8b53069522011fea62204f855fd238a6d17f6 Mon Sep 17 00:00:00 2001 From: Solomon Hykes Date: Wed, 28 Apr 2021 22:27:14 +0000 Subject: [PATCH] Prototype: better git-flow Signed-off-by: Solomon Hykes --- .dagger/env/hello-world | 1 + .dagger/env/sandbox/sandbox.cue | 21 +++++++ cmd/dgr | 105 ++++++++++++++++++++++++++++++++ 3 files changed, 127 insertions(+) create mode 120000 .dagger/env/hello-world create mode 100644 .dagger/env/sandbox/sandbox.cue create mode 100755 cmd/dgr diff --git a/.dagger/env/hello-world b/.dagger/env/hello-world new file mode 120000 index 00000000..a69ee1e0 --- /dev/null +++ b/.dagger/env/hello-world @@ -0,0 +1 @@ +../../examples/hello-world \ No newline at end of file diff --git a/.dagger/env/sandbox/sandbox.cue b/.dagger/env/sandbox/sandbox.cue new file mode 100644 index 00000000..5b6ddea2 --- /dev/null +++ b/.dagger/env/sandbox/sandbox.cue @@ -0,0 +1,21 @@ +package main + +import ( + "dagger.io/docker" + "dagger.io/io" +) + +let ctr = docker.#Container & { + command: "echo 'hello world!' > /etc/motd" +} + +motd: (io.#File & { + from: ctr + path: "/etc/motd" + read: format: "string" +}).read.data + +etc: (io.#Dir & { + from: ctr + path: "/etc" +}).read.tree diff --git a/cmd/dgr b/cmd/dgr new file mode 100755 index 00000000..756eef45 --- /dev/null +++ b/cmd/dgr @@ -0,0 +1,105 @@ +#!/bin/bash + +set -e + +if [ "$DEBUG" ]; then + set -x +fi + +function main() { + cmd="$1"; shift + case "$cmd" in + info) + cat <<-EOF + repo: $(repo) + branch: $(branch) + EOF + ;; + list) + { + ls "$(envdir)" 2>/dev/null || true + } | sort + ;; + up) + env="$1"; shift + dagger "$env" up "$@" + ;; + query) + env="$1"; shift + dagger "$env" query "$@" + ;; + set) + env="$1"; shift + dagger "$env" input json "$@" + ;; + dir) + env="$1"; shift + dagger "$env" input dir "$@" + ;; + *) + env="$1"; shift + dagger "$env" "$cmd" "$@" + ;; + esac +} + +function envdir() { + echo "$(repo)/.dagger/env/${1:-}" +} + +function repo() { + git rev-parse --show-toplevel +} + +function branch() { + git branch --show-current +} + +function dagger() { + local env="$1"; shift + + # Check that env exists + if [ ! -d "$(envdir $env)" ]; then + echo >&2 "no such environment: $env" + return 1 + fi + + tmpHome="$(mktemp -d)" + tmpState="${tmpHome}/.dagger/store/$env/deployment.json" + mkdir -p "$(dirname $tmpState)" + loadState "$env" > "$tmpState" + HOME="$tmpHome" "$(which dagger)" -e "$env" "$@" + cat "$tmpState" | saveState "$env" +} + +function loadState() { + local env="$1"; shift + # echo >&2 "Loading state for $(branch)::$env" + loadStore | jq ".env[\"$env\"]" | + jq ".name=\"$env\"" | + jq ".plan.type=\"dir\"" | + jq ".plan.dir.path=\"$(envdir $env)\"" | + jq ".id=\"$env\"" +} + +function saveState() { + local env="$1"; shift + # echo >&2 "Saving state for $(branch)::$env" + newState="$(cat)" + loadStore | jq ".env[\"$env\"]=$newState" | saveStore +} + +function saveStore() { + git config "branch.$(branch).dagger" "$(cat)" +} + +function loadStore() { + git config "branch.$(branch).dagger" || echo '{}' +} + +function fatal() { + echo >&2 "$@" + exit 1 +} + +main "$@"