From 50edd008f802d749bfa41a7669db02e86f9a75d5 Mon Sep 17 00:00:00 2001
From: Eric <eric.smalling@snyk.io>
Date: Mon, 31 Jan 2022 09:18:36 -0600
Subject: [PATCH] Split tests and add smoke for log4shell-goof-server

---
 .../log4shell-goof-server-docker-image.yaml   | 47 +++++++++++++++++++
 ...ge.yml => todolist-goof-docker-image.yaml} | 30 +++++-------
 2 files changed, 58 insertions(+), 19 deletions(-)
 create mode 100644 .github/workflows/log4shell-goof-server-docker-image.yaml
 rename .github/workflows/{docker-image.yml => todolist-goof-docker-image.yaml} (61%)

diff --git a/.github/workflows/log4shell-goof-server-docker-image.yaml b/.github/workflows/log4shell-goof-server-docker-image.yaml
new file mode 100644
index 0000000000..d40f327d36
--- /dev/null
+++ b/.github/workflows/log4shell-goof-server-docker-image.yaml
@@ -0,0 +1,47 @@
+name: log4shell-goof-server Docker image build and test
+
+on:
+  push:
+    branches:
+      - 'main'
+    paths:
+      - 'log4shell-goof/log4shell-goof-server/**'
+      - '.github/workflows/log4shell-goof-server-docker-image.yaml'
+  pull_request:
+    branches:
+      - 'main'
+    paths:
+      - 'log4shell-goof/log4shell-goof-server/**'
+      - '.github/workflows/log4shell-goof-server-docker-image.yaml'
+jobs:
+
+  build-log4shell-server-image:
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: log4shell-goof/log4shell-server
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Build
+        uses: docker/build-push-action@v2
+        with:
+          load: true
+          context: log4shell-goof/log4shell-server
+          push: false
+          tags: log4shell-server:latest
+
+      - name: Run container
+        run: docker run -d --rm --name log4shell-server log4shell-server:latest && sleep 5
+
+      - name: Smoke test LDAP running in container
+        run: docker logs log4shell-server | grep "LDAP server listening on 0.0.0.0:8000"
+
+      - name: Smoke test HTTP running in container
+        run: docker logs log4shell-server | grep "HTTP server listening on 0.0.0.0:9999"
+
+      - name: Cleanup container
+        run: docker kill log4shell-server
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/todolist-goof-docker-image.yaml
similarity index 61%
rename from .github/workflows/docker-image.yml
rename to .github/workflows/todolist-goof-docker-image.yaml
index 6cf9e583e3..bc4742cee2 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/todolist-goof-docker-image.yaml
@@ -1,8 +1,18 @@
-name: Docker Image Java-Goof
+name: todolost-goof Docker image build and test
 
 on:
   push:
+    branches:
+      - 'main'
+    paths:
+      - 'todolist-goof/**'
+      - '.github/workflows/todolist-goof-docker-image.yaml'
   pull_request:
+    branches:
+      - 'main'
+    paths:
+      - 'todolist-goof/**'
+      - '.github/workflows/todolist-goof-docker-image.yaml'
 
 jobs:
   build-todolist-image:
@@ -32,21 +42,3 @@ jobs:
         
       - name: Cleanup container
         run: docker kill java-goof
-                
-  build-log4shell-server-image:
-    runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: log4shell-goof/log4shell-server
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-
-      - name: Build
-        uses: docker/build-push-action@v2
-        with:
-          context: log4shell-goof/log4shell-server
-          push: false
-          tags: log4shell-server:latest