From 45692507fd1d8b9d3ca55a69c7f5dfa856064169 Mon Sep 17 00:00:00 2001
From: Tristan Cacqueray <tdecacqu@redhat.com>
Date: Dec 11 2020 14:05:10 +0000
Subject: Update oc-deploy to use proper import and configuration file


This change improves the Dhall expression.

---

diff --git a/config.toml b/config.toml
new file mode 100644
index 0000000..bff35bf
--- /dev/null
+++ b/config.toml
@@ -0,0 +1,45 @@
+amqp_url = "amqps://fedora:@rabbitmq.fedoraproject.org/%2Fpublic_pubsub"
+
+[tls]
+ca_cert = "/etc/fedora-messaging/cacert.pem"
+keyfile = "/etc/fedora-messaging/fedora-key.pem"
+certfile = "/etc/fedora-messaging/fedora-cert.pem"
+
+[client_properties]
+app = "Fedora Messaging Zuul"
+
+[exchanges."amq.topic"]
+type = "topic"
+durable = true
+auto_delete = false
+arguments = {}
+
+[qos]
+prefetch_size = 0
+prefetch_count = 25
+
+[log_config]
+version = 1
+disable_existing_loggers = true
+
+[log_config.formatters.simple]
+format = "[%(levelname)-7s %(name)s] - %(message)s"
+
+[log_config.handlers.console]
+class = "logging.StreamHandler"
+formatter = "simple"
+stream = "ext://sys.stdout"
+
+[log_config.root]
+level = "DEBUG"
+handlers = ["console"]
+
+[consumer_config]
+# If true the payload will by written in a file but not send to webhook server url
+send_to_file = false
+verify_ssl = true
+topic_prefixes_dest = [
+    "org.fedoraproject.prod.pagure,https://softwarefactory-project.io/zuul/api/connection/src.fedoraproject.org/payload"
+]
+exclude_projects = []
+stats_server_port = 8080
diff --git a/oc-deploy.dhall b/oc-deploy.dhall
index 4d81008..919c142 100644
--- a/oc-deploy.dhall
+++ b/oc-deploy.dhall
@@ -1,55 +1,12 @@
---         https://softwarefactory-project.io/cgit/software-factory/sf-infra/plain/Infra/OpenShift/package.dhall sha256:81afaed59916e796e2ae78e9e7a34f40214a243c9b95a19c96e65e144bc9df7d
-let OpenShift =
-      ~/src/softwarefactory-project.io/software-factory/sf-infra/Infra/OpenShift/package.dhall
-
-let toml =
-      ''
-      amqp_url = "amqps://fedora:@rabbitmq.fedoraproject.org/%2Fpublic_pubsub"
-
-      [tls]
-      ca_cert = "/etc/fedora-messaging/cacert.pem"
-      keyfile = "/etc/fedora-messaging/fedora-key.pem"
-      certfile = "/etc/fedora-messaging/fedora-cert.pem"
-
-      [client_properties]
-      app = "Fedora Messaging Zuul"
-
-      [exchanges."amq.topic"]
-      type = "topic"
-      durable = true
-      auto_delete = false
-      arguments = {}
-
-      [qos]
-      prefetch_size = 0
-      prefetch_count = 25
+{-| OpenShift resources generated with dhall
 
-      [log_config]
-      version = 1
-      disable_existing_loggers = true
-
-      [log_config.formatters.simple]
-      format = "[%(levelname)-7s %(name)s] - %(message)s"
-
-      [log_config.handlers.console]
-      class = "logging.StreamHandler"
-      formatter = "simple"
-      stream = "ext://sys.stdout"
-
-      [log_config.root]
-      level = "DEBUG"
-      handlers = ["console"]
-
-      [consumer_config]
-      # If true the payload will by written in a file but not send to webhook server url
-      send_to_file = false
-      verify_ssl = true
-      topic_prefixes_dest = [
-          "org.fedoraproject.prod.pagure,https://softwarefactory-project.io/zuul/api/connection/src.fedoraproject.org/payload"
-      ]
-      exclude_projects = []
-      stats_server_port = 8080
-      ''
+This is using a `deploySimple` function provided by software factory sf-infra project.
+The import is using a cryptographic hash on a pinned commit (id=...).
+To update the import, change the sha1 and re-compute the hash using `dhall hash <<< $new_url`
+-}
+let OpenShift =
+        https://softwarefactory-project.io/cgit/software-factory/sf-infra/plain/Infra/OpenShift/package.dhall?id=ba55cc90365dea8f848b772b436d588e6651def5 sha256:b3f4bbc96f02a87b14799e1651aafde9981dd1daec53d3de4f0853de50566fb9
+      ? ~/src/softwarefactory-project.io/software-factory/sf-infra/Infra/OpenShift/package.dhall
 
 in  OpenShift.deploySimple
       "fm-gateway"
@@ -58,5 +15,5 @@ in  OpenShift.deploySimple
       "fm-gateway-rhos-org.apps.ocp.prod.psi.redhat.com"
       OpenShift.ConfigMap::{
       , metadata = OpenShift.ObjectMeta::{ name = Some "config-toml" }
-      , data = Some (toMap { `config.toml` = toml })
+      , data = Some (toMap { `config.toml` = ./config.toml as Text })
       }