From 610f3787ee23ba3e022a73037e2560b7252649f8 Mon Sep 17 00:00:00 2001
From: joss <joss@chi.swan.ac.uk>
Date: Wed, 6 Mar 2024 17:03:41 +0000
Subject: [PATCH] refactor: move container out of guacamole subdir

---
 .github/workflows/controller-container.yaml                | 7 ++++---
 .github/workflows/flake8.yaml                              | 4 ++--
 containers/{guacamole => }/controller/Dockerfile           | 0
 containers/{guacamole => }/controller/src/api/__init__.py  | 0
 .../controller/src/api/authenticate_user.py                | 0
 containers/{guacamole => }/controller/src/api/build_url.py | 0
 containers/{guacamole => }/controller/src/controller.py    | 0
 .../{guacamole => }/controller/src/database/__init__.py    | 0
 .../{guacamole => }/controller/src/database/connection.py  | 0
 .../controller/src/database/create_service_user.py         | 0
 .../{guacamole => }/controller/src/directory/__init__.py   | 0
 .../controller/src/directory/authenticate_user.py          | 0
 .../controller/src/directory/iter_group_members.py         | 0
 .../controller/src/directory/iter_search.py                | 0
 containers/{guacamole => }/controller/src/requirements.txt | 0
 15 files changed, 6 insertions(+), 5 deletions(-)
 rename containers/{guacamole => }/controller/Dockerfile (100%)
 rename containers/{guacamole => }/controller/src/api/__init__.py (100%)
 rename containers/{guacamole => }/controller/src/api/authenticate_user.py (100%)
 rename containers/{guacamole => }/controller/src/api/build_url.py (100%)
 rename containers/{guacamole => }/controller/src/controller.py (100%)
 rename containers/{guacamole => }/controller/src/database/__init__.py (100%)
 rename containers/{guacamole => }/controller/src/database/connection.py (100%)
 rename containers/{guacamole => }/controller/src/database/create_service_user.py (100%)
 rename containers/{guacamole => }/controller/src/directory/__init__.py (100%)
 rename containers/{guacamole => }/controller/src/directory/authenticate_user.py (100%)
 rename containers/{guacamole => }/controller/src/directory/iter_group_members.py (100%)
 rename containers/{guacamole => }/controller/src/directory/iter_search.py (100%)
 rename containers/{guacamole => }/controller/src/requirements.txt (100%)

diff --git a/.github/workflows/controller-container.yaml b/.github/workflows/controller-container.yaml
index 63458d4..1b37eb6 100644
--- a/.github/workflows/controller-container.yaml
+++ b/.github/workflows/controller-container.yaml
@@ -3,12 +3,12 @@ name: Controller Container
 on:
   pull_request:
     paths:
-      - 'containers/guacamole/controller/**'
+      - 'containers/controller/**'
   push:
     branches:
       - main
     paths:
-      - 'containers/guacamole/controller/**'
+      - 'containers/controller/**'
 
 permissions:
   contents: write
@@ -30,7 +30,8 @@ jobs:
       release-tag-format: 'controller-container-${version}'
       cosign-public-key: ${{ vars.COSIGN_PUBLIC_KEY }}
       slack-channel: ${{ vars.SLACK_CHANNEL }}
-      build-file: containers/guacamole/controller/Dockerfile
+      build-file: containers/controller/Dockerfile
+      build-context: containers/controller
     secrets:
       cosign-private-key: ${{ secrets.COSIGN_PRIVATE_KEY }}
       cosign-password: ${{ secrets.COSIGN_PASSWORD }}
diff --git a/.github/workflows/flake8.yaml b/.github/workflows/flake8.yaml
index fb4a196..82b08a5 100644
--- a/.github/workflows/flake8.yaml
+++ b/.github/workflows/flake8.yaml
@@ -4,7 +4,7 @@ on:
   pull_request:
     paths:
       - '.flake8'
-      - 'containers/guacamole/controller/src/**.py'
+      - 'containers/controller/src/**.py'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -28,4 +28,4 @@ jobs:
           
       - name: run flake8
         run: |
-          flake8 containers/guacamole/controller/src
+          flake8 containers/controller/src
diff --git a/containers/guacamole/controller/Dockerfile b/containers/controller/Dockerfile
similarity index 100%
rename from containers/guacamole/controller/Dockerfile
rename to containers/controller/Dockerfile
diff --git a/containers/guacamole/controller/src/api/__init__.py b/containers/controller/src/api/__init__.py
similarity index 100%
rename from containers/guacamole/controller/src/api/__init__.py
rename to containers/controller/src/api/__init__.py
diff --git a/containers/guacamole/controller/src/api/authenticate_user.py b/containers/controller/src/api/authenticate_user.py
similarity index 100%
rename from containers/guacamole/controller/src/api/authenticate_user.py
rename to containers/controller/src/api/authenticate_user.py
diff --git a/containers/guacamole/controller/src/api/build_url.py b/containers/controller/src/api/build_url.py
similarity index 100%
rename from containers/guacamole/controller/src/api/build_url.py
rename to containers/controller/src/api/build_url.py
diff --git a/containers/guacamole/controller/src/controller.py b/containers/controller/src/controller.py
similarity index 100%
rename from containers/guacamole/controller/src/controller.py
rename to containers/controller/src/controller.py
diff --git a/containers/guacamole/controller/src/database/__init__.py b/containers/controller/src/database/__init__.py
similarity index 100%
rename from containers/guacamole/controller/src/database/__init__.py
rename to containers/controller/src/database/__init__.py
diff --git a/containers/guacamole/controller/src/database/connection.py b/containers/controller/src/database/connection.py
similarity index 100%
rename from containers/guacamole/controller/src/database/connection.py
rename to containers/controller/src/database/connection.py
diff --git a/containers/guacamole/controller/src/database/create_service_user.py b/containers/controller/src/database/create_service_user.py
similarity index 100%
rename from containers/guacamole/controller/src/database/create_service_user.py
rename to containers/controller/src/database/create_service_user.py
diff --git a/containers/guacamole/controller/src/directory/__init__.py b/containers/controller/src/directory/__init__.py
similarity index 100%
rename from containers/guacamole/controller/src/directory/__init__.py
rename to containers/controller/src/directory/__init__.py
diff --git a/containers/guacamole/controller/src/directory/authenticate_user.py b/containers/controller/src/directory/authenticate_user.py
similarity index 100%
rename from containers/guacamole/controller/src/directory/authenticate_user.py
rename to containers/controller/src/directory/authenticate_user.py
diff --git a/containers/guacamole/controller/src/directory/iter_group_members.py b/containers/controller/src/directory/iter_group_members.py
similarity index 100%
rename from containers/guacamole/controller/src/directory/iter_group_members.py
rename to containers/controller/src/directory/iter_group_members.py
diff --git a/containers/guacamole/controller/src/directory/iter_search.py b/containers/controller/src/directory/iter_search.py
similarity index 100%
rename from containers/guacamole/controller/src/directory/iter_search.py
rename to containers/controller/src/directory/iter_search.py
diff --git a/containers/guacamole/controller/src/requirements.txt b/containers/controller/src/requirements.txt
similarity index 100%
rename from containers/guacamole/controller/src/requirements.txt
rename to containers/controller/src/requirements.txt