Skip to content

Commit

Permalink
Remove flake-compat. Just use flakes
Browse files Browse the repository at this point in the history
  • Loading branch information
john-shaffer committed Jul 9, 2023
1 parent 9839ac7 commit bdd0e9b
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/salmon/cloudformation.clj
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,14 @@
[:string {:min 1 :max 128}]
[:re re-stack-name]]]])

(defn- validate [{::ds/keys [config system]} schema template & {:keys [pre?]}]
(defn- validate [{::ds/keys [component-id config system]} schema template & {:keys [pre?]}]
(let [errors (and schema (m/explain schema config))
resolved-template (val/resolve-refs system template)
{:keys [lint?]} config]
(cond
errors {:errors errors
:message (merr/humanize errors)}
(and pre? (not (val/refs-resolveable? system template))) nil
(and pre? (not (val/refs-resolveable? system component-id template))) nil
(not (map? resolved-template)) {:message "Template must be a map."}
(empty? resolved-template) {:message "Template must not be empty."}
lint? (let [{:keys [message]} (template-data :template resolved-template)]
Expand Down

0 comments on commit bdd0e9b

Please sign in to comment.