Further split flow control

Otherwise weird behavior.

src/main/cljc/dda/c4k_forgejo/core.cljc

@@ -46,14 +46,16 @@
                    (postgres/generate-service)
                    (forgejo/generate-deployment config)
                    (forgejo/generate-service)
-                   (forgejo/generate-service-ssh)                   
+                   (forgejo/generate-service-ssh)
                    (forgejo/generate-data-volume config)
                    (forgejo/generate-appini-env config)
                    (forgejo/generate-secrets auth)]
-                  (if (contains? config :average)
-                      (do (forgejo/generate-rate-limit-ingress-and-cert config)
-                          (forgejo/generate-rate-limit-middleware config))
-                      (forgejo/generate-ingress-and-cert config))
+                  (when (contains? config :average)
+                    (forgejo/generate-rate-limit-ingress-and-cert config)) ; this function has a vector as output
+                  (when (contains? config :average)
+                   [(forgejo/generate-rate-limit-middleware config)]) ; this does not
+                  (when (not (contains? config :average))
+                    (forgejo/generate-ingress-and-cert config))
                   (when (contains? config :restic-repository)
                     [(backup/generate-config config)
                      (backup/generate-secret auth)

src/main/cljc/dda/c4k_forgejo/forgejo.cljc

@@ -141,8 +141,7 @@
   (->
    (yaml/load-as-edn "forgejo/middleware-ratelimit.yaml")
    (cm/replace-key-value :average average)
-   (cm/replace-key-value :burst burst)
-   )))
+   (cm/replace-key-value :burst burst))))
 
 (defn-spec generate-data-volume pred/map-or-seq?
   [config vol?]

src/main/resources/forgejo/middleware-ratelimit.yaml

@@ -1,4 +1,4 @@
-apiVersion: traefik.io/v1alpha1
+apiVersion: traefik.containo.us/v1alpha1
 kind: Middleware
 metadata:
   name: ratelimit

src/test/resources/forgejo-test/valid-config.yaml

@@ -9,6 +9,8 @@ service-noreply-address: "noreply@test.de"
 volume-total-storage-size: 6
 restic-repository: "repo-path"
 deploy-federated: "false"
+average: 10
+burst: 4
 mon-cfg: 
   grafana-cloud-url: "url-for-your-prom-remote-write-endpoint"
   cluster-name: "forgejo"