From cc9ee4ee32c0a67c7e4d77fa089071daca269fc4 Mon Sep 17 00:00:00 2001
From: Darren Shepherd <darren@acorn.io>
Date: Sun, 17 Nov 2024 00:28:55 -0700
Subject: [PATCH] chore: refactor docker build

---
 Dockerfile                 | 31 ++++++++++++++++++----------
 Makefile                   |  2 --
 apiclient/emailreceiver.go | 41 ++++++++++++++++++++++++++++++++++++++
 pkg/alias/get.go           | 22 +++++++++++++++-----
 tools/package-tools.sh     | 19 +++++++++++++++++-
 5 files changed, 96 insertions(+), 19 deletions(-)
 create mode 100644 apiclient/emailreceiver.go

diff --git a/Dockerfile b/Dockerfile
index 756ff6cf..784cb799 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,12 +1,25 @@
-FROM cgr.dev/chainguard/wolfi-base AS builder
+FROM cgr.dev/chainguard/wolfi-base AS base
 
-RUN apk add --no-cache go npm make git pnpm curl
+RUN apk add --no-cache go make git npm pnpm
+
+FROM base AS bin
 WORKDIR /app
 COPY . .
 RUN --mount=type=cache,id=pnpm,target=/root/.local/share/pnpm/store \
     --mount=type=cache,target=/root/.cache/go-build \
+    --mount=type=cache,target=/root/.cache/uv \
     --mount=type=cache,target=/root/go/pkg/mod \
-    make in-docker-build
+    make all
+
+FROM base AS tools
+RUN apk add --no-cache curl python-3.13 py3.13-pip
+WORKDIR /app
+COPY . .
+RUN --mount=type=cache,id=pnpm,target=/root/.local/share/pnpm/store \
+    --mount=type=cache,target=/root/.cache/go-build \
+    --mount=type=cache,target=/root/.cache/uv \
+    --mount=type=cache,target=/root/go/pkg/mod \
+    UV_LINK_MODE=copy BIN_DIR=/bin make package-tools
 
 FROM cgr.dev/chainguard/wolfi-base AS final
 RUN apk add --no-cache git python-3.13 py3.13-pip openssh-server npm bash tini procps libreoffice
@@ -16,13 +29,6 @@ RUN sed -E 's/^#(PermitRootLogin)no/\1yes/' /etc/ssh/sshd_config -i
 RUN ssh-keygen -A
 RUN mkdir /run/sshd && /usr/sbin/sshd
 COPY encryption.yaml /
-COPY --from=builder /app/bin/otto8 /bin/
-COPY --link --from=builder /app/otto8-tools /otto8-tools
-RUN <<EOF
-for i in $(find /otto8-tools/[^k]* -name requirements.txt -exec cat {} \; -exec echo \; | sort -u); do
-    pip install "$i"
-done
-EOF
 COPY --chmod=0755 <<EOF /bin/run.sh
 #!/bin/bash
 set -e
@@ -46,9 +52,12 @@ VERSIONS
 exec tini -- otto8 server
 EOF
 
+COPY --link --from=tools /app/otto8-tools /otto8-tools
+COPY --from=bin /app/bin/otto8 /bin/
+
 EXPOSE 22
 # libreoffice executables
-ENV PATH=$PATH:/usr/lib/libreoffice/program
+ENV PATH=/otto8-tools/venv/bin:$PATH:/usr/lib/libreoffice/program
 ENV HOME=/data
 ENV XDG_CACHE_HOME=/data/cache
 ENV GPTSCRIPT_SYSTEM_TOOLS_DIR=/otto8-tools/
diff --git a/Makefile b/Makefile
index 21007cfb..1daa4d70 100644
--- a/Makefile
+++ b/Makefile
@@ -48,8 +48,6 @@ lint-admin:
 package-tools:
 	./tools/package-tools.sh
 
-in-docker-build: all package-tools
-
 no-changes:
 	@if [ -n "$$(git status --porcelain)" ]; then \
 		git status --porcelain; \
diff --git a/apiclient/emailreceiver.go b/apiclient/emailreceiver.go
new file mode 100644
index 00000000..63623e57
--- /dev/null
+++ b/apiclient/emailreceiver.go
@@ -0,0 +1,41 @@
+package apiclient
+
+import (
+	"context"
+	"fmt"
+	"net/http"
+	"sort"
+
+	"github.com/otto8-ai/otto8/apiclient/types"
+)
+
+func (c *Client) ListEmailReceivers(ctx context.Context) (result types.EmailReceiverList, _ error) {
+	defer func() {
+		sort.Slice(result.Items, func(i, j int) bool {
+			return result.Items[i].Metadata.Created.Time.Before(result.Items[j].Metadata.Created.Time)
+		})
+	}()
+
+	_, resp, err := c.doRequest(ctx, http.MethodGet, "/email-receivers", nil)
+	if err != nil {
+		return
+	}
+	defer resp.Body.Close()
+
+	_, err = toObject(resp, &result)
+	if err != nil {
+		return result, err
+	}
+
+	return result, nil
+}
+
+func (c *Client) DeleteEmailReceiver(ctx context.Context, id string) error {
+	_, resp, err := c.doRequest(ctx, http.MethodDelete, fmt.Sprintf("/email-receivers/"+id), nil)
+	if err != nil {
+		return err
+	}
+	defer resp.Body.Close()
+
+	return nil
+}
diff --git a/pkg/alias/get.go b/pkg/alias/get.go
index a3fe3e37..56d19862 100644
--- a/pkg/alias/get.go
+++ b/pkg/alias/get.go
@@ -14,11 +14,23 @@ import (
 )
 
 func Get(ctx context.Context, c kclient.Client, obj v1.Aliasable, namespace string, name string) error {
-	errLookup := c.Get(ctx, router.Key(namespace, name), obj.(kclient.Object))
-	if kclient.IgnoreNotFound(errLookup) != nil {
-		return errLookup
-	} else if errLookup == nil {
-		return nil
+	var errLookup error
+	if namespace == "" {
+		gvk, err := c.GroupVersionKindFor(obj.(kclient.Object))
+		if err != nil {
+			return err
+		}
+		errLookup = apierrors.NewNotFound(schema.GroupResource{
+			Group:    gvk.Group,
+			Resource: gvk.Kind,
+		}, name)
+	} else {
+		errLookup = c.Get(ctx, router.Key(namespace, name), obj.(kclient.Object))
+		if kclient.IgnoreNotFound(errLookup) != nil {
+			return errLookup
+		} else if errLookup == nil {
+			return nil
+		}
 	}
 
 	gvk, err := c.GroupVersionKindFor(obj.(kclient.Object))
diff --git a/tools/package-tools.sh b/tools/package-tools.sh
index 91223d7d..5eeecf55 100755
--- a/tools/package-tools.sh
+++ b/tools/package-tools.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
 set -e -x -o pipefail
 
+BIN_DIR=${BIN_DIR:-./bin}
+
 cd $(dirname $0)/..
 
 if [ ! -e otto8-tools ]; then
@@ -44,4 +46,19 @@ if [ ! -e aws-encryption-provider ]; then
 fi
 
 cd aws-encryption-provider
-go build -o /bin/aws-encryption-provider cmd/server/main.go
+go build -o ${BIN_DIR}/aws-encryption-provider cmd/server/main.go
+
+cd ../..
+
+if ! command -v uv; then
+    pip install uv
+fi
+
+if [ ! -e otto8-tools/venv ]; then
+    uv venv otto8-tools/venv
+fi
+
+source otto8-tools/venv/bin/activate
+
+find otto8-tools -name requirements.txt -exec cat {} \; -exec echo \; | sort -u > requirements.txt
+uv pip install -r requirements.txt