Refactor to support modular routing (#40)

* Refactor app to support multiple endpoints.

* Update Readme

* Update git workflows

* Bump versions

* rename keip controller artifact to 'webapp'

* Update operator image

---------

Co-authored-by: Josh Hunziker <joshua.hunziker@octo.us>

Author: jhunzik

.github/workflows/README.md

@@ -2,7 +2,7 @@
 This monorepo consists of 3 artifacts that are versioned, built, and released separately.
 - minimal-app
 - operator
-- operator/webhook
+- operator/webapp
 
 ## PR builds
 When a PR is opened or updated, it will determine if any files changed in each of the sub-project directories.

.github/workflows/operator.yml

@@ -6,15 +6,15 @@ on:
       - operator/**
       - .github/workflows/operator.yml
       - .github/workflows/scripts
-      - "!operator/webhook/**"
+      - "!operator/webapp/**"
       - '!**.md'
       - '!operator/examples/**'
   push:
     branches:
       - main
     paths:
       - operator/**
-      - "!operator/webhook/**"
+      - "!operator/webapp/**"
       - '!**.md'
       - '!operator/examples/**'
 

.github/workflows/scripts/shared/verify_current_webapp_img.sh

@@ -0,0 +1,15 @@
+OPERATOR_DIR=operator
+OPERATOR_CONTROLLER_YAML=$OPERATOR_DIR/controller/core-controller.yaml
+
+verify_current_webapp_img() {
+  current_webapp_img=$(make --no-print-directory -C operator/webapp get-image-name)
+  webapp_image_used=$(yq eval '.spec.template.spec.containers[].image' $OPERATOR_CONTROLLER_YAML)
+
+  test -n "$current_webapp_img"
+  test -n "$webapp_image_used"
+
+  error_message="Operator is using $webapp_image_used but should be using the most recent $current_webapp_img."
+  test "$webapp_image_used" = "$current_webapp_img" || (echo $error_message && exit 1)
+}
+
+verify_current_webapp_img

.github/workflows/scripts/shared/verify_current_webhook_img.sh

@@ -7,8 +7,8 @@ verify_version_bump() {
   sh .github/workflows/scripts/shared/verify_changes_update_version.sh $potential_tag $OPERATOR_DIR \
   '-e ^operator/examples/
   -e ^operator/example/
-  -e ^operator/webhook/'
+  -e ^operator/webapp/'
 }
 
-sh .github/workflows/scripts/shared/verify_current_webhook_img.sh
+sh .github/workflows/scripts/shared/verify_current_webapp_img.sh
 verify_version_bump

.github/workflows/scripts/verify_operator_releasable.sh

@@ -0,0 +1,13 @@
+set -eux
+
+WEBAPP_DIR=operator/webapp
+
+verify_version_bump() {
+  potential_tag=$(make --no-print-directory -C $WEBAPP_DIR get-tag)
+
+  # Changes to the Makefile are excluded since they will not change the webhook image
+  sh .github/workflows/scripts/shared/verify_changes_update_version.sh $potential_tag $WEBAPP_DIR '-e Makefile$'
+}
+
+sh .github/workflows/scripts/shared/verify_current_webapp_img.sh
+verify_version_bump

.github/workflows/scripts/verify_webapp_releasable.sh

@@ -1,31 +1,31 @@
-name: webhook
+name: webapp
 on:
   workflow_dispatch:
   pull_request:
     paths:
-      - operator/webhook/**
-      - .github/workflows/webhook.yml
+      - operator/webapp/**
+      - .github/workflows/webapp.yml
       - .github/workflows/scripts
       - '!**.md'
   push:
     branches:
       - main
     paths:
-      - operator/webhook/**
+      - operator/webapp/**
       - '!**.md'
 
 env:
   PYTHON_VERSION: 3.11
-  WORKING_DIR: ./operator/webhook
+  WORKING_DIR: ./operator/webapp
 
 jobs:
   verify-versions:
     if: github.ref != 'refs/heads/main'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - run: sh .github/workflows/scripts/verify_webhook_releasable.sh
-        name: Verify webhook is in a state to be released on merge
+      - run: sh .github/workflows/scripts/verify_webapp_releasable.sh
+        name: Verify webapp is in a state to be released on merge
   test:
     name: unit test
     runs-on: ubuntu-latest

.github/workflows/scripts/verify_webhook_releasable.sh

@@ -1,4 +1,4 @@
-VERSION ?= 0.13.0
+VERSION ?= 0.13.1
 GIT_TAG := operator_v$(VERSION)
 KEIP_INTEGRATION_IMAGE ?= ghcr.io/codice/keip/minimal-app:latest
 

.github/workflows/webhook.yml .github/workflows/webapp.yml.github/workflows/webhook.yml renamed to .github/workflows/webapp.yml

@@ -31,7 +31,7 @@ spec:
   hooks:
     sync:
       webhook:
-        url: http://integrationroute-webhook.keip/sync
+        url: http://integrationroute-webhook.keip/webhook/sync
         timeout: 10s
 ---
 apiVersion: v1
@@ -56,7 +56,7 @@ spec:
     spec:
       containers:
         - name: webhook
-          image: ghcr.io/codice/keip/route-webhook:0.15.0
+          image: ghcr.io/codice/keip/webapp:0.16.0
           ports:
             - containerPort: 7080
               name: webhook-http