server: Rename "error-message" to "hasura-error-message".

There is already a library in Hackage called "error-message". This breaks the Nix build as we end up overriding that library, which causes a change to any of its dependents. Outside Nix, Shadowing isn't strictly a problem, but it's prudent to avoid it in case we accidentally end up with the other library in edge cases. PR-URL: hasura/graphql-engine-mono#9679 GitOrigin-RevId: e3f54fd4e5eafec9b0a00128767daad0c8aeab72
hasura · Jun 27, 2023 · 699ba62 · 699ba62
1 parent 4049fbd
commit 699ba62
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 12 deletions.
diff --git a/sample.hie.yaml b/sample.hie.yaml
@@ -28,10 +28,10 @@ cradle:
     - path: "server/lib/aeson-ordered/src"
       component: "aeson-ordered:lib:aeson-ordered"
 
-    - path: "server/lib/error-message/src"
-      component: "error-message:lib:error-message"
-    - path: "server/lib/error-message/test"
-      component: "error-message:test:error-message-tests"
+    - path: "server/lib/hasura-error-message/src"
+      component: "hasura-error-message:lib:hasura-error-message"
+    - path: "server/lib/hasura-error-message/test"
+      component: "hasura-error-message:test:hasura-error-message-tests"
 
     - path: "server/lib/schema-parsers/src"
       component: "schema-parsers:lib:schema-parsers"

diff --git a/server/graphql-engine.cabal b/server/graphql-engine.cabal
@@ -280,7 +280,7 @@ common lib-depends
                      , dependent-sum
                      , dependent-sum-template
                      , either
-                     , error-message
+                     , hasura-error-message
                      , exceptions
                      , fast-logger
                      , free

diff --git a/server/lib/error-message/error-message.cabal → ...-error-message/hasura-error-message.cabal b/server/lib/error-message/error-message.cabal → ...-error-message/hasura-error-message.cabal
@@ -1,6 +1,6 @@
 cabal-version:  3.6
 
-name:           error-message
+name:           hasura-error-message
 version:        1.0.0
 description:    An error message type that makes it difficult to convert back to text.
 homepage:       https://github.com/hasura/github-engine#readme
@@ -51,7 +51,7 @@ library
       Hasura.Base.ErrorValue
       Hasura.Base.ToErrorValue
   other-modules:
-      Paths_error_message
+      Paths_hasura_error_message
   hs-source-dirs:
       src
   default-extensions:
@@ -76,13 +76,13 @@ library
     ghc-options: -O0
   default-language: Haskell2010
 
-test-suite error-message-tests
+test-suite hasura-error-message-tests
   import: common-all
   type: exitcode-stdio-1.0
   main-is: Main.hs
   other-modules:
       Hasura.Base.ErrorMessageSpec
-      Paths_error_message
+      Paths_hasura_error_message
   hs-source-dirs:
       test
   default-extensions:
@@ -98,7 +98,7 @@ test-suite error-message-tests
     , base
     , graphql-parser
     , hashable
-    , error-message
+    , hasura-error-message
     , hspec
     , text
     , unordered-containers

diff --git a/...r-message/src/Hasura/Base/ErrorMessage.hs → ...r-message/src/Hasura/Base/ErrorMessage.hs b/...r-message/src/Hasura/Base/ErrorMessage.hs → ...r-message/src/Hasura/Base/ErrorMessage.hs
diff --git a/...ror-message/src/Hasura/Base/ErrorValue.hs → ...ror-message/src/Hasura/Base/ErrorValue.hs b/...ror-message/src/Hasura/Base/ErrorValue.hs → ...ror-message/src/Hasura/Base/ErrorValue.hs
diff --git a/...r-message/src/Hasura/Base/ToErrorValue.hs → ...r-message/src/Hasura/Base/ToErrorValue.hs b/...r-message/src/Hasura/Base/ToErrorValue.hs → ...r-message/src/Hasura/Base/ToErrorValue.hs
diff --git a/...sage/test/Hasura/Base/ErrorMessageSpec.hs → ...sage/test/Hasura/Base/ErrorMessageSpec.hs b/...sage/test/Hasura/Base/ErrorMessageSpec.hs → ...sage/test/Hasura/Base/ErrorMessageSpec.hs
diff --git a/server/lib/error-message/test/Main.hs → server/lib/hasura-error-message/test/Main.hs b/server/lib/error-message/test/Main.hs → server/lib/hasura-error-message/test/Main.hs
diff --git a/server/lib/schema-parsers/schema-parsers.cabal b/server/lib/schema-parsers/schema-parsers.cabal
@@ -118,7 +118,7 @@ library
     , dependent-sum
     , graphql-parser
     , hashable
-    , error-message
+    , hasura-error-message
     , insert-ordered-containers
     , lens
     , mtl
@@ -200,7 +200,7 @@ test-suite schema-parsers-tests
       , base
       , dependent-map
       , dependent-sum
-      , error-message
+      , hasura-error-message
       , graphql-parser
       , hashable
       , insert-ordered-containers