From 0a18f47dc1160e7a3d3c2f73fb5d49e2720c9661 Mon Sep 17 00:00:00 2001 From: bom Date: Thu, 10 Feb 2022 16:55:39 +0100 Subject: [PATCH] shortened unchanged file creation --- src/main/cljc/dda/c4k_jitsi/core.cljc | 4 +--- src/main/cljc/dda/c4k_jitsi/jitsi.cljc | 25 +++++-------------------- 2 files changed, 6 insertions(+), 23 deletions(-) diff --git a/src/main/cljc/dda/c4k_jitsi/core.cljc b/src/main/cljc/dda/c4k_jitsi/core.cljc index 57ffbd0..3297e7f 100644 --- a/src/main/cljc/dda/c4k_jitsi/core.cljc +++ b/src/main/cljc/dda/c4k_jitsi/core.cljc @@ -18,9 +18,7 @@ (map yaml/to-string [(jitsi/generate-ingress config) (jitsi/generate-secret config) - (jitsi/generate-jvb-service) - (jitsi/generate-deployment) - (jitsi/generate-web-service)])) + (jitsi/generate-unchanged-files)])) (defn-spec generate any? [my-config config? diff --git a/src/main/cljc/dda/c4k_jitsi/jitsi.cljc b/src/main/cljc/dda/c4k_jitsi/jitsi.cljc index 3094419..a4b092e 100644 --- a/src/main/cljc/dda/c4k_jitsi/jitsi.cljc +++ b/src/main/cljc/dda/c4k_jitsi/jitsi.cljc @@ -45,23 +45,8 @@ (cm/replace-key-value :JICOFO_AUTH_PASSWORD (b64/encode jicofo-auth-password)) (cm/replace-key-value :JICOFO_COMPONENT_SECRET (b64/encode jicofo-component-secret))))) -(defn generate-jvb-service [] - (yaml/from-string (yaml/load-resource "jitsi/jvb-service.yaml"))) - -(defn generate-web-service [] - (yaml/from-string (yaml/load-resource "jitsi/web-service.yaml"))) - -(defn generate-deployment [] - (yaml/from-string (yaml/load-resource "jitsi/deployment.yaml"))) - -(defn generate-pod-security-policy [] - (yaml/from-string (yaml/load-resource "jitsi/pod-security-policy.yaml"))) - -(defn generate-role-binding [] - (yaml/from-string (yaml/load-resource "jitsi/role-binding.yaml"))) - -(defn generate-role [] - (yaml/from-string (yaml/load-resource "jitsi/role.yaml"))) - -(defn generate-service-account [] - (yaml/from-string (yaml/load-resource "jitsi/service-account.yaml"))) \ No newline at end of file +(defn generate-unchanged-files [] + (map (comp yaml/from-string yaml/load-resource) + ["jitsi/jvb-service.yaml" + "jitsi/web-service.yaml" + "jitsi/deployment.yaml"])) \ No newline at end of file