Remove Zuul prefix from dhall connection types

This change makes the package looks a bit better.

Change-Id: I82085d85fbb3e99a4436253ef2519a781c51c91c

Author: TristanCacqueray

hack/RenderSchemas.hs

@@ -80,8 +80,9 @@ splitModels hierarchy def
         [ModelName "Spec", ModelName attr] ->
             Just $ ModelName $ adjustName attr
         -- Zuul and Nodepool attributes are moved into dedicated models
-        [ModelName "Zuul", ModelName x] ->
-            Just $ ModelName $ "Zuul" <> adjustName (Text.replace "conns" "Conn" x)
+        [ModelName "Zuul", ModelName x]
+            | "conns" `Text.isSuffixOf` x -> Just $ ModelName $ adjustName $ Text.replace "conns" "Conn" x
+            | otherwise -> Just $ ModelName $ "Zuul" <> adjustName x
         [ModelName "Nodepool", ModelName x] ->
             Just $ ModelName $ "Nodepool" <> adjustName x
         -- Adapt MariaDB attributes

schemas/ZuulElasticsearchConn.dhall renamed to schemas/ElasticsearchConn.dhall

@@ -1,31 +1,31 @@
 { Type =
     { defaultAuthenticator : Optional Text
-    , elasticsearchconns : Optional (List (./ZuulElasticsearchConn.dhall).Type)
+    , elasticsearchconns : Optional (List (./ElasticsearchConn.dhall).Type)
     , executor : Optional (./ZuulExecutor.dhall).Type
-    , gerritconns : Optional (List (./ZuulGerritConn.dhall).Type)
-    , gitconns : Optional (List (./ZuulGitConn.dhall).Type)
-    , githubconns : Optional (List (./ZuulGithubConn.dhall).Type)
-    , gitlabconns : Optional (List (./ZuulGitlabConn.dhall).Type)
+    , gerritconns : Optional (List (./GerritConn.dhall).Type)
+    , gitconns : Optional (List (./GitConn.dhall).Type)
+    , githubconns : Optional (List (./GithubConn.dhall).Type)
+    , gitlabconns : Optional (List (./GitlabConn.dhall).Type)
     , merger : Optional (./ZuulMerger.dhall).Type
     , oidcAuthenticators : Optional (List (./ZuulOidcAuthenticators.dhall).Type)
-    , pagureconns : Optional (List (./ZuulPagureConn.dhall).Type)
+    , pagureconns : Optional (List (./PagureConn.dhall).Type)
     , scheduler : Optional (./ZuulScheduler.dhall).Type
-    , smtpconns : Optional (List (./ZuulSmtpConn.dhall).Type)
+    , smtpconns : Optional (List (./SmtpConn.dhall).Type)
     , web : Optional (./ZuulWeb.dhall).Type
     }
 , default =
   { defaultAuthenticator = None Text
-  , elasticsearchconns = None (List (./ZuulElasticsearchConn.dhall).Type)
+  , elasticsearchconns = None (List (./ElasticsearchConn.dhall).Type)
   , executor = None (./ZuulExecutor.dhall).Type
-  , gerritconns = None (List (./ZuulGerritConn.dhall).Type)
-  , gitconns = None (List (./ZuulGitConn.dhall).Type)
-  , githubconns = None (List (./ZuulGithubConn.dhall).Type)
-  , gitlabconns = None (List (./ZuulGitlabConn.dhall).Type)
+  , gerritconns = None (List (./GerritConn.dhall).Type)
+  , gitconns = None (List (./GitConn.dhall).Type)
+  , githubconns = None (List (./GithubConn.dhall).Type)
+  , gitlabconns = None (List (./GitlabConn.dhall).Type)
   , merger = None (./ZuulMerger.dhall).Type
   , oidcAuthenticators = None (List (./ZuulOidcAuthenticators.dhall).Type)
-  , pagureconns = None (List (./ZuulPagureConn.dhall).Type)
+  , pagureconns = None (List (./PagureConn.dhall).Type)
   , scheduler = None (./ZuulScheduler.dhall).Type
-  , smtpconns = None (List (./ZuulSmtpConn.dhall).Type)
+  , smtpconns = None (List (./SmtpConn.dhall).Type)
   , web = None (./ZuulWeb.dhall).Type
   }
 }

schemas/ZuulGerritConn.dhall renamed to schemas/GerritConn.dhall

@@ -1,7 +1,12 @@
 { Codesearch = ./Codesearch.dhall
 , ConfigLocation = ./ConfigLocation.dhall
+, ElasticsearchConn = ./ElasticsearchConn.dhall
 , ExtraLabels = ./ExtraLabels.dhall
 , FluentBitLogForwarding = ./FluentBitLogForwarding.dhall
+, GerritConn = ./GerritConn.dhall
+, GitConn = ./GitConn.dhall
+, GithubConn = ./GithubConn.dhall
+, GitlabConn = ./GitlabConn.dhall
 , Gitserver = ./Gitserver.dhall
 , Hostaliases = ./Hostaliases.dhall
 , Limits = ./Limits.dhall
@@ -10,21 +15,16 @@
 , Nodepool = ./Nodepool.dhall
 , NodepoolBuilder = ./NodepoolBuilder.dhall
 , NodepoolLauncher = ./NodepoolLauncher.dhall
+, PagureConn = ./PagureConn.dhall
+, SmtpConn = ./SmtpConn.dhall
 , Spec = ./Spec.dhall
 , Storage = ./Storage.dhall
 , StorageDefault = ./StorageDefault.dhall
 , Zookeeper = ./Zookeeper.dhall
 , Zuul = ./Zuul.dhall
-, ZuulElasticsearchConn = ./ZuulElasticsearchConn.dhall
 , ZuulExecutor = ./ZuulExecutor.dhall
-, ZuulGerritConn = ./ZuulGerritConn.dhall
-, ZuulGitConn = ./ZuulGitConn.dhall
-, ZuulGithubConn = ./ZuulGithubConn.dhall
-, ZuulGitlabConn = ./ZuulGitlabConn.dhall
 , ZuulMerger = ./ZuulMerger.dhall
 , ZuulOidcAuthenticators = ./ZuulOidcAuthenticators.dhall
-, ZuulPagureConn = ./ZuulPagureConn.dhall
 , ZuulScheduler = ./ZuulScheduler.dhall
-, ZuulSmtpConn = ./ZuulSmtpConn.dhall
 , ZuulWeb = ./ZuulWeb.dhall
 }