From 25bf64cbc9a8ed4fef36c15756f9d7f8e96e2d06 Mon Sep 17 00:00:00 2001
From: Clement Delafargue <clement.delafargue@fretlink.com>
Date: Thu, 3 Oct 2019 11:31:56 +0200
Subject: upgrade dhall to 1.26.1 and merge types and terms

Previously, types were flattened and terms were nested (as are the
directories). For consistency, I made the types nested as well.
---
 dhall/server/service/plugin/CorrelationId.dhall | 23 -----------------------
 dhall/server/service/plugin/correlationId.dhall | 23 +++++++++++++++++++++++
 dhall/server/service/plugin/functions.dhall     |  9 ---------
 dhall/server/service/plugin/package.dhall       |  6 ++++++
 4 files changed, 29 insertions(+), 32 deletions(-)
 delete mode 100644 dhall/server/service/plugin/CorrelationId.dhall
 create mode 100644 dhall/server/service/plugin/correlationId.dhall
 delete mode 100644 dhall/server/service/plugin/functions.dhall
 create mode 100644 dhall/server/service/plugin/package.dhall

(limited to 'dhall/server/service/plugin')

diff --git a/dhall/server/service/plugin/CorrelationId.dhall b/dhall/server/service/plugin/CorrelationId.dhall
deleted file mode 100644
index fc69f4f..0000000
--- a/dhall/server/service/plugin/CorrelationId.dhall
+++ /dev/null
@@ -1,23 +0,0 @@
-let Plugin = ./Plugin.dhall
-
-let config = ./Config.dhall
-
-in    λ(generator : Optional Text)
-	→   { name =
-			"correlation-id"
-		, config =
-			config.CorrelationId
-			{ header_name =
-				"X-correl"
-			, echo_downstream =
-				True
-			, generator =
-				Optional/fold
-				Text
-				generator
-				Text
-				(λ(t : Text) → t)
-				"uuid#counter"
-			}
-		}
-	  : Plugin
diff --git a/dhall/server/service/plugin/correlationId.dhall b/dhall/server/service/plugin/correlationId.dhall
new file mode 100644
index 0000000..d5d5928
--- /dev/null
+++ b/dhall/server/service/plugin/correlationId.dhall
@@ -0,0 +1,23 @@
+let Plugin = ./Plugin.dhall
+
+let config = ./Config.dhall
+
+in    λ(generator : Optional Text)
+    →   { name =
+            "correlation-id"
+        , config =
+            config.CorrelationId
+            { header_name =
+                "X-correl"
+            , echo_downstream =
+                True
+            , generator =
+                Optional/fold
+                Text
+                generator
+                Text
+                (λ(t : Text) → t)
+                "uuid#counter"
+            }
+        }
+      : Plugin
diff --git a/dhall/server/service/plugin/functions.dhall b/dhall/server/service/plugin/functions.dhall
deleted file mode 100644
index dcf2c9a..0000000
--- a/dhall/server/service/plugin/functions.dhall
+++ /dev/null
@@ -1,9 +0,0 @@
-{ mkRequestTermination =
-    ./mkRequestTermination.dhall
-, mkRequestTransformer =
-    ./mkRequestTransformer.dhall
-, mkIPRestriction =
-    ./mkIPRestriction.dhall
-, CorrelationId =
-    ./CorrelationId.dhall
-}
diff --git a/dhall/server/service/plugin/package.dhall b/dhall/server/service/plugin/package.dhall
new file mode 100644
index 0000000..872c53b
--- /dev/null
+++ b/dhall/server/service/plugin/package.dhall
@@ -0,0 +1,6 @@
+{ Type = ./Plugin.dhall
+, mkRequestTermination = ./mkRequestTermination.dhall
+, mkRequestTransformer = ./mkRequestTransformer.dhall
+, mkIPRestriction = ./mkIPRestriction.dhall
+, correlationId = ./correlationId.dhall
+}
-- 
cgit v1.2.3