From 8a97900cdabc7da6ee0b7178dc4fc11d5b875a2d Mon Sep 17 00:00:00 2001
From: erik <erik.seiert@meissa-gmbh.de>
Date: Tue, 18 Oct 2022 11:31:47 +0200
Subject: [PATCH] Bugfixes

Spec seems to accept a cert map for an ingress map.
---
 src/main/cljc/dda/c4k_website/website.cljc      | 16 +++++-----------
 src/test/cljc/dda/c4k_website/ingress_test.cljc |  3 +--
 valid-config.edn                                |  2 +-
 3 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/src/main/cljc/dda/c4k_website/website.cljc b/src/main/cljc/dda/c4k_website/website.cljc
index 6b1d085..5cda6e9 100644
--- a/src/main/cljc/dda/c4k_website/website.cljc
+++ b/src/main/cljc/dda/c4k_website/website.cljc
@@ -17,7 +17,7 @@
   [input]
   (every? true? (map pred/fqdn-string? input)))
 
-(s/def ::unique-name pred/fqdn-string?)
+(s/def ::unique-name string?)
 (s/def ::issuer pred/letsencrypt-issuer?)
 (s/def ::authtoken pred/bash-env-string?)
 (s/def ::fqdns fqdn-list?)
@@ -77,12 +77,6 @@
                             (str/replace % value-to-partly-match value-to-inplace) %)
                          col))
 
-; generate a list of host-rules from a list of fqdns
-(defn make-host-rules-from-fqdns
-  [rule fqdns]
-  ;function that creates a rule from host names
-  (mapv #(assoc-in rule [:host] %) fqdns))
-
 #?(:cljs
    (defmethod yaml/load-resource :website [resource-name]
      (case resource-name
@@ -115,7 +109,7 @@
   (let [{:keys [unique-name fqdns]} config]
     (ing/generate-https-ingress {:fqdns fqdns
                                  :cert-name (generate-cert-name unique-name)
-                                 :ingress-name (generate-http-ingress-name unique-name)
+                                 :ingress-name (generate-https-ingress-name unique-name)
                                  :service-name (generate-service-name unique-name)
                                  :service-port 80})))
 
@@ -123,9 +117,9 @@
   [config websitedata?]
   (let [{:keys [unique-name issuer fqdns]
          :or {issuer "staging"}} config]
-    (ing/generate-https-ingress {:fqdns fqdns
-                                 :cert-name (generate-cert-name unique-name)
-                                 :issuer issuer})))
+    (ing/generate-certificate {:fqdns fqdns
+                               :cert-name (generate-cert-name unique-name)
+                               :issuer issuer})))
 
 (defn-spec generate-nginx-configmap pred/map-or-seq?
   [config websitedata?]
diff --git a/src/test/cljc/dda/c4k_website/ingress_test.cljc b/src/test/cljc/dda/c4k_website/ingress_test.cljc
index b104b6e..43c263c 100644
--- a/src/test/cljc/dda/c4k_website/ingress_test.cljc
+++ b/src/test/cljc/dda/c4k_website/ingress_test.cljc
@@ -22,7 +22,6 @@
              :path "/",
              :backend
              {:service {:name "myservice", :port {:number 3000}}}}]}}
-
          (cut/generate-host-rule "myservice" 3000 "test.com"))))
 
 
@@ -94,7 +93,7 @@
          (:spec (cut/generate-https-ingress {:issuer "prod"
                                              :service-name "test-io-service"
                                              :service-port 80
-                                             :ingress-name "test-io-http-ingress"
+                                             :ingress-name "test-io-https-ingress"
                                              :cert-name "test-io-cert"
                                              :fqdns ["test.de" "www.test.de" "test-it.de" "www.test-it.de"]})))))
 
diff --git a/valid-config.edn b/valid-config.edn
index c932bd4..1302435 100644
--- a/valid-config.edn
+++ b/valid-config.edn
@@ -1,6 +1,6 @@
 {:issuer "staging"
  :websites
- [{:unique-name "test.io" 
+ [{:unique-name "test.io" ; todo: call this unique-name
    :fqdns ["test.de" "test.org" "www.test.de" "www.test.org"]
    :gitea-host "gitlab.de"
    :gitea-repo "repo"