Remove assumption code is handling event JSON directly

lehigh-university-libraries · Apr 26, 2024 · 320c0af · 320c0af
1 parent 121f476
commit 320c0af
Show file tree

Hide file tree

Showing 9 changed files with 186 additions and 304 deletions.
diff --git a/.github/workflows/lint-test-build.yml b/.github/workflows/lint-test-build.yml
@@ -18,6 +18,9 @@ jobs:
         uses: golangci/golangci-lint-action@v3
         with:
           version: v1.54
+
+      - name: check valid yml
+        run: yq . ./docker-images/*/scyllaridae.yml
 
       - name: Install dependencies
         run: go get .

diff --git a/docker-images/ffmpeg/scyllaridae.yml b/docker-images/ffmpeg/scyllaridae.yml
@@ -1,98 +1,89 @@
 destinationHttpMethod: PUT
-allowedMimeTypes: [
-  "audio/*",
-  "video/*",
-  "image/jpeg",
-  "image/png"
-]
+allowedMimeTypes:
+  - "audio/*"
+  - "video/*"
+  - "image/jpeg"
+  - "image/png"
 cmdByMimeType:
-  "video/x-msvideo"
-    cmd: "ffmpeg"
-    args: [
-      "-i",
-      "-",
-      "%s",
-      "-f",
-      "avi"
-    ]
-  "video/ogg"
-    cmd: "ffmpeg"
-    args: [
-      "-i",
-      "-",
-      "%s",
-      "-f",
-      "ogg"
-    ]
-  "audio/x-wav"
-    cmd: "ffmpeg"
-    args: [
-      "-i",
-      "-",
-      "%s",
-      "-f",
-      "wav"
-    ]
-  "audio/mpeg"
-    cmd: "ffmpeg"
-    args: [
-      "-i",
-      "-",
-      "%s",
-      "-f",
-      "mp3"
-    ]
-  "audio/aac"
-    cmd: "ffmpeg"
-    args: [
-      "-i",
-      "-",
-      "%s",
-      "-f",
-      "m4a"
-    ]
-  "image/jpeg"
-    cmd: "ffmpeg"
-    args: [
-      "-i",
-      "-",
-      "%s",
-      "-f",
-      "image2pipe"
-    ]
-  "image/png"
-    cmd: "ffmpeg"
-    args: [
-      "-i",
-      "-",
-      "%s",
-      "-f",
-      "image2pipe"
-    ]
+  "video/x-msvideo":
+    cmd: ffmpeg
+    args:
+      - "-i"
+      - "-"
+      - "%s"
+      - "-f"
+      - "avi"
+  "video/ogg":
+    cmd: ffmpeg
+    args:
+      - "-i"
+      - "-"
+      - "%s"
+      - "-f"
+      - "ogg"
+  "audio/x-wav":
+    cmd: ffmpeg
+    args:
+      - "-i"
+      - "-"
+      - "%s"
+      - "-f"
+      - "wav"
+  "audio/mpeg":
+    cmd: ffmpeg
+    args:
+      - "-i"
+      - "-"
+      - "%s"
+      - "-f"
+      - "mp3"
+  "audio/aac":
+    cmd: ffmpeg
+    args:
+      - "-i"
+      - "-"
+      - "%s"
+      - "-f"
+      - "m4a"
+  "image/jpeg":
+    cmd: ffmpeg
+    args:
+      - "-i"
+      - "-"
+      - "%s"
+      - "-f"
+      - "image2pipe"
+  "image/png":
+    cmd: ffmpeg
+    args:
+      - "-i"
+      - "-"
+      - "%s"
+      - "-f"
+      - "image2pipe"
   "video/mp4":
-    cmd: "ffmpeg"
-    args: [
-      "-i",
-      "-",
-      "%s",
-      "-vcodec",
-      "libx264",
-      "-preset",
-      "medium",
-      "-acodec",
-      "aac",
-      "-strict",
-      "-2",
-      "-ab",
-      "128k",
-      "-ac",
-      "2",
-      "-async",
-      "1",
-      "-movflags",
-      "faststart",
-      "-y",
-      "-f",
-      "mp4",
-      "-"
-    ]
+    cmd: ffmpeg
+    args:
+      - "-i"
+      - "-"
+      - "%s"
+      - "-vcodec"
+      - "libx264"
+      - "-preset"
+      - "medium"
+      - "-acodec"
+      - "aac"
+      - "-strict"
+      - "-2"
+      - "-ab"
+      - "128k"
+      - "-ac"
+      - "2"
+      - "-async"
+      - "1"
+      - "-movflags"
+      - "faststart"
+      - "-y"
+      - "-f"
+      - "mp4"
+      - "-"
diff --git a/docker-images/fits/scyllaridae.yml b/docker-images/fits/scyllaridae.yml
@@ -1,15 +1,13 @@
 destinationHttpMethod: GET
 forwardAuth: false
-allowedMimeTypes: [
-  "*"
-]
+allowedMimeTypes:
+  - "*"
 cmdByMimeType:
   default:
     cmd: "curl"
-    args: [
-      "http://fits:8080/fits/examine",
-      "-X",
-      "POST",
-      "-F",
-      "datafile=@-"
-    ]
+    args:
+      - "http://fits:8080/fits/examine"
+      - "-X"
+      - "POST"
+      - "-F"
+      - "datafile=@-"
diff --git a/docker-images/imagemagick/scyllaridae.yml b/docker-images/imagemagick/scyllaridae.yml
@@ -1,7 +1,17 @@
 destinationHttpMethod: PUT
-allowedMimeTypes: [
-  "text/html"
-]
+allowedMimeTypes:
+  - "application/pdf"
+  - "image/*"
 cmdByMimeType:
+  "application/pdf":
+    cmd: convert
+    args:
+      - "pdf:-[0]"
+      - "%s"
+      - "pdf:-"
   default:
-    cmd: "convert"
+    cmd: convert
+    args:
+      - "-"
+      - "%s"
+      - "image:-"
diff --git a/docker-images/tesseract/scyllaridae.yml b/docker-images/tesseract/scyllaridae.yml
@@ -1,20 +1,17 @@
 destinationHttpMethod: PUT
-allowedMimeTypes: [
-  "application/pdf",
-  "image/*"
-]
+allowedMimeTypes:
+  - "application/pdf"
+  - "image/*"
 cmdByMimeType:
   "application/pdf":
     cmd: pdftotext
-    args: [
-      "%s",
-      "-",
-      "-"
-    ]
+    args:
+      - "%s"
+      - "-"
+      - "-"
   default:
     cmd: tesseract
-    args: [
-      "stdin",
-      "stdout",
-      "%s"
-    ]
+    args:
+      - "stdin"
+      - "stdout"
+      - "%s"
diff --git a/main.go b/main.go
@@ -2,7 +2,6 @@ package main
 
 import (
 	"bytes"
-	"fmt"
 	"log/slog"
 	"net/http"
 	"os"
@@ -39,11 +38,10 @@ func main() {
 }
 
 func MessageHandler(w http.ResponseWriter, r *http.Request) {
-	if r.Method != http.MethodPost && r.Method != http.MethodPut {
+	if r.Method != http.MethodGet {
 		w.WriteHeader(http.StatusMethodNotAllowed)
 		return
 	}
-
 	defer r.Body.Close()
 
 	// Read the Alpaca message payload
@@ -73,51 +71,15 @@ func MessageHandler(w http.ResponseWriter, r *http.Request) {
 	cmd.Stdin = sourceResp.Body
 
 	// Create a buffer to store the output
-	var outBuf, stdErr bytes.Buffer
-	cmd.Stdout = &outBuf
+	var stdErr bytes.Buffer
+	cmd.Stdout = w
 	cmd.Stderr = &stdErr
 
 	slog.Info("Running command", "cmd", cmd.String())
 
 	if err := cmd.Run(); err != nil {
 		slog.Error("Error running command", "cmd", cmd.String(), "err", stdErr.String())
-		http.Error(w, "Error running convert command", http.StatusInternalServerError)
-		return
-	}
-
-	// Create the PUT request
-	req, err := http.NewRequest(config.DestinationHTTPMethod, message.Attachment.Content.DestinationURI, &outBuf)
-	if err != nil {
-		slog.Error("Error creating HTTP request", "err", err)
-		http.Error(w, "Error creating HTTP request", http.StatusInternalServerError)
-		return
-	}
-	if config.ForwardAuth {
-		auth := r.Header.Get("Authorization")
-		req.Header.Set("Authorization", auth)
-	}
-	req.Header.Set("Content-Type", message.Attachment.Content.MimeType)
-	req.Header.Set("Content-Location", message.Attachment.Content.FileUploadURI)
-
-	// Execute the PUT request
-	client := http.DefaultClient
-	resp, err := client.Do(req)
-	if err != nil {
-		slog.Error("Error sending request", "method", config.DestinationHTTPMethod, "err", err)
-		http.Error(w, "Internal error.", http.StatusInternalServerError)
-		return
-	}
-	defer resp.Body.Close()
-
-	if resp.StatusCode > 299 {
-		slog.Error("Request failed on destination server", "code", resp.StatusCode)
-		http.Error(w, fmt.Sprintf("%s request failed with status code %d", config.DestinationHTTPMethod, resp.StatusCode), resp.StatusCode)
+		http.Error(w, "Error running command", http.StatusInternalServerError)
 		return
 	}
-
-	w.WriteHeader(http.StatusNoContent)
-	_, err = w.Write([]byte(""))
-	if err != nil {
-		slog.Error("Error writing response", "err", err)
-	}
 }