Remove unnecessary check for the existence of iid

Author: FieryCod

src/fierycod/holy_lambda/core.cljc

@@ -47,27 +47,29 @@
   "
   {:added "0.0.1"}
   [lambdas & [{:keys [init-hook disable-analytics?]
-               :or {init-hook (fn [] nil)
-                    disable-analytics? false}}]]
+               :or   {init-hook          (fn [] nil)
+                      disable-analytics? false}}]]
   `(do
      (def ~'PRVL_ROUTES (into {} (mapv (fn [l#] [(str (str (:ns (meta l#)) "." (str (:name (meta l#))))) l#]) ~lambdas)))
      (defn ~'-main [& attrs#]
+       (let [runtime-api-url# (System/getenv "AWS_LAMBDA_RUNTIME_API")
+             handler-name#    (or (first attrs#) (System/getenv "_HANDLER"))]
 
-       ;; Side effect init-hook
-       (~init-hook)
+         ;; Side effect init-hook
+         (~init-hook)
 
-       ;; executor = native-agent    -- Indicates that the configuration for compiling via `native-image`
-       ;;                               will be generated via the agent.
-       ;;
-       ;; executor = anything else   -- Run provided runtime loop
-       (if (= (System/getProperty "executor") @#'fierycod.holy-lambda.agent/AGENT_EXECUTOR)
-         ;; Generate the native configuration for the lambdas
-         (#'fierycod.holy-lambda.agent/routes->reflective-call! ~'PRVL_ROUTES)
+         ;; executor = native-agent    -- Indicates that the configuration for compiling via `native-image`
+         ;;                               will be generated via the agent.
+         ;;
+         ;; executor = anything else   -- Run provided runtime loop
+         (if (= (System/getProperty "executor") @#'fierycod.holy-lambda.agent/AGENT_EXECUTOR)
+           ;; Generate the native configuration for the lambdas
+           (#'fierycod.holy-lambda.agent/routes->reflective-call! ~'PRVL_ROUTES)
 
-         ;; Start custom runtime loop
-         (while true
-           (#'fierycod.holy-lambda.custom-runtime/next-iter
-            (System/getenv "AWS_LAMBDA_RUNTIME_API")
-            (or (first attrs#) (System/getenv "_HANDLER"))
-            ~'PRVL_ROUTES
-            ~disable-analytics?))))))
+           ;; Start custom runtime loop
+           (while true
+             (#'fierycod.holy-lambda.custom-runtime/next-iter
+              runtime-api-url#
+              handler-name#
+              ~'PRVL_ROUTES
+              ~disable-analytics?)))))))

src/fierycod/holy_lambda/custom_runtime.clj

@@ -31,11 +31,10 @@
   (let [response (u/http "POST" (url runtime iid "/error")
                          {:statusCode 500
                           :headers    {"content-type" "application/json"}
-                          :body       {:runtime-error true
-                                       :err           (Throwable->map err)}}
+                          :body       (Throwable->map err)}
                          disable-analytics?)]
     (when-not (response :success?)
-      (u/println-err! (u/->str "[holy-lambda] Runtime error failed sent to AWS.\n" (str (response :body))))
+      (u/println-err! (u/->str "[holy-lambda] Runtime error sent failed.\n" (str (response :body))))
       (System/exit 1))))
 
 (defn- send-response
@@ -74,16 +73,12 @@
       (send-runtime-error runtime iid (u/->ex "Handler " ^String handler-name " not found!") disable-analitics?)
       (System/exit 1))
 
-    (when-not iid
-      (send-runtime-error runtime iid (u/->ex "Failed to determine new invocation-id") disable-analitics?)
-      (System/exit 1))
-
-    (when (and iid (aws-event :success?))
+    (when (aws-event :success?)
       (try
         (send-response runtime
                        iid
                        (handler {:event (normalize-event event)
-                                 :ctx (->aws-context iid headers event)})
+                                 :ctx   (->aws-context iid headers event)})
                        disable-analitics?)
         (catch Exception err
           (send-runtime-error runtime iid err disable-analitics?))))))