From 699ba62def21c034be8bb3950ad183eb8092f344 Mon Sep 17 00:00:00 2001 From: Samir Talwar Date: Tue, 27 Jun 2023 18:49:21 +0200 Subject: [PATCH] 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: https://github.com/hasura/graphql-engine-mono/pull/9679 GitOrigin-RevId: e3f54fd4e5eafec9b0a00128767daad0c8aeab72 --- sample.hie.yaml | 8 ++++---- server/graphql-engine.cabal | 2 +- .../hasura-error-message.cabal} | 10 +++++----- .../src/Hasura/Base/ErrorMessage.hs | 0 .../src/Hasura/Base/ErrorValue.hs | 0 .../src/Hasura/Base/ToErrorValue.hs | 0 .../test/Hasura/Base/ErrorMessageSpec.hs | 0 .../test/Main.hs | 0 server/lib/schema-parsers/schema-parsers.cabal | 4 ++-- 9 files changed, 12 insertions(+), 12 deletions(-) rename server/lib/{error-message/error-message.cabal => hasura-error-message/hasura-error-message.cabal} (94%) rename server/lib/{error-message => hasura-error-message}/src/Hasura/Base/ErrorMessage.hs (100%) rename server/lib/{error-message => hasura-error-message}/src/Hasura/Base/ErrorValue.hs (100%) rename server/lib/{error-message => hasura-error-message}/src/Hasura/Base/ToErrorValue.hs (100%) rename server/lib/{error-message => hasura-error-message}/test/Hasura/Base/ErrorMessageSpec.hs (100%) rename server/lib/{error-message => hasura-error-message}/test/Main.hs (100%) diff --git a/sample.hie.yaml b/sample.hie.yaml index 082260d0a3e09..e42a4c8935574 100644 --- 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 index 4341440fb9380..f52b1688840b4 100644 --- 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 b/server/lib/hasura-error-message/hasura-error-message.cabal similarity index 94% rename from server/lib/error-message/error-message.cabal rename to server/lib/hasura-error-message/hasura-error-message.cabal index 38875df798dbd..be36bc9bd84bd 100644 --- a/server/lib/error-message/error-message.cabal +++ b/server/lib/hasura-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/server/lib/error-message/src/Hasura/Base/ErrorMessage.hs b/server/lib/hasura-error-message/src/Hasura/Base/ErrorMessage.hs similarity index 100% rename from server/lib/error-message/src/Hasura/Base/ErrorMessage.hs rename to server/lib/hasura-error-message/src/Hasura/Base/ErrorMessage.hs diff --git a/server/lib/error-message/src/Hasura/Base/ErrorValue.hs b/server/lib/hasura-error-message/src/Hasura/Base/ErrorValue.hs similarity index 100% rename from server/lib/error-message/src/Hasura/Base/ErrorValue.hs rename to server/lib/hasura-error-message/src/Hasura/Base/ErrorValue.hs diff --git a/server/lib/error-message/src/Hasura/Base/ToErrorValue.hs b/server/lib/hasura-error-message/src/Hasura/Base/ToErrorValue.hs similarity index 100% rename from server/lib/error-message/src/Hasura/Base/ToErrorValue.hs rename to server/lib/hasura-error-message/src/Hasura/Base/ToErrorValue.hs diff --git a/server/lib/error-message/test/Hasura/Base/ErrorMessageSpec.hs b/server/lib/hasura-error-message/test/Hasura/Base/ErrorMessageSpec.hs similarity index 100% rename from server/lib/error-message/test/Hasura/Base/ErrorMessageSpec.hs rename to server/lib/hasura-error-message/test/Hasura/Base/ErrorMessageSpec.hs diff --git a/server/lib/error-message/test/Main.hs b/server/lib/hasura-error-message/test/Main.hs similarity index 100% rename from server/lib/error-message/test/Main.hs rename to 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 index 593d732d9b4f2..073f2c6cc1f13 100644 --- 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