Merge pull request #271 from well-typed/edsko/any

Test support for `Any`
well-typed · Jan 21, 2025 · f9a008b · f9a008b
2 parents 8b0ba47 + 54f8439
commit f9a008b
Show file tree

Hide file tree

Showing 14 changed files with 755 additions and 38 deletions.
diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml
@@ -8,9 +8,9 @@
 #
 # For more information, see https://github.com/haskell-CI/haskell-ci
 #
-# version: 0.19.20241202
+# version: 0.19.20250115
 #
-# REGENDATA ("0.19.20241202",["github","cabal.project.ci"])
+# REGENDATA ("0.19.20250115",["github","cabal.project.ci"])
 #
 name: Haskell-CI
 on:
@@ -252,6 +252,12 @@ jobs:
             tag:      c927e0341715a2ff7f87f219c9a36517f06cef80
             subdir:   proto-lens-protoc
 
+          source-repository-package
+            type:     git
+            location: https://github.com/google/proto-lens
+            tag:      c927e0341715a2ff7f87f219c9a36517f06cef80
+            subdir:   proto-lens-protobuf-types
+
           package grpc-spec
             tests:       True
             flags:       +snappy

diff --git a/cabal.project b/cabal.project
@@ -24,4 +24,4 @@ source-repository-package
   type: git
   location: https://github.com/google/proto-lens
   tag: c927e0341715a2ff7f87f219c9a36517f06cef80
-  subdir: proto-lens proto-lens-runtime proto-lens-setup proto-lens-protoc
+  subdir: proto-lens proto-lens-runtime proto-lens-setup proto-lens-protoc proto-lens-protobuf-types
diff --git a/cabal.project.ci b/cabal.project.ci
@@ -47,4 +47,4 @@ source-repository-package
   type: git
   location: https://github.com/google/proto-lens
   tag: c927e0341715a2ff7f87f219c9a36517f06cef80
-  subdir: proto-lens proto-lens-runtime proto-lens-setup proto-lens-protoc
+  subdir: proto-lens proto-lens-runtime proto-lens-setup proto-lens-protoc proto-lens-protobuf-types
diff --git a/grapesy/grapesy.cabal b/grapesy/grapesy.cabal
@@ -106,6 +106,7 @@ library
       Network.GRPC.Common.JSON
       Network.GRPC.Common.NextElem
       Network.GRPC.Common.Protobuf
+      Network.GRPC.Common.Protobuf.Any
       Network.GRPC.Common.StreamElem
       Network.GRPC.Common.StreamType
       Network.GRPC.Server
@@ -142,35 +143,36 @@ library
 
       Paths_grapesy
   build-depends:
-    , aeson                >= 1.5     && < 2.3
-    , async                >= 2.2     && < 2.3
-    , binary               >= 0.8     && < 0.9
-    , bytestring           >= 0.10.12 && < 0.13
-    , conduit              >= 1.3     && < 1.4
-    , containers           >= 0.6     && < 0.8
-    , crypton-x509         >= 1.7     && < 1.8
-    , crypton-x509-store   >= 1.6     && < 1.7
-    , crypton-x509-system  >= 1.6     && < 1.7
-    , data-default         >= 0.7     && < 0.9
-    , deepseq              >= 1.4     && < 1.6
-    , exceptions           >= 0.10    && < 0.11
-    , grpc-spec            >= 0.1     && < 0.2
-    , http-types           >= 0.12    && < 0.13
-    , http2-tls            >= 0.4.5   && < 0.5
-    , lens                 >= 5.0     && < 5.4
-    , mtl                  >= 2.2     && < 2.4
-    , network              >= 3.2.4   && < 3.3
-    , network-run          >= 0.4.3   && < 0.5
-    , proto-lens           >= 0.7     && < 0.8
-    , random               >= 1.2     && < 1.3
-    , recv                 >= 0.1     && < 0.2
-    , stm                  >= 2.5     && < 2.6
-    , text                 >= 1.2     && < 2.2
-    , time-manager         >= 0.2.2   && < 0.3
-    , tls                  >= 1.7     && < 2.2
-    , unbounded-delays     >= 0.1.1   && < 0.2
-    , unordered-containers >= 0.2     && < 0.3
-    , utf8-string          >= 1.0     && < 1.1
+    , aeson                     >= 1.5     && < 2.3
+    , async                     >= 2.2     && < 2.3
+    , binary                    >= 0.8     && < 0.9
+    , bytestring                >= 0.10.12 && < 0.13
+    , conduit                   >= 1.3     && < 1.4
+    , containers                >= 0.6     && < 0.8
+    , crypton-x509              >= 1.7     && < 1.8
+    , crypton-x509-store        >= 1.6     && < 1.7
+    , crypton-x509-system       >= 1.6     && < 1.7
+    , data-default              >= 0.7     && < 0.9
+    , deepseq                   >= 1.4     && < 1.6
+    , exceptions                >= 0.10    && < 0.11
+    , grpc-spec                 >= 0.1     && < 0.2
+    , http-types                >= 0.12    && < 0.13
+    , http2-tls                 >= 0.4.5   && < 0.5
+    , lens                      >= 5.0     && < 5.4
+    , mtl                       >= 2.2     && < 2.4
+    , network                   >= 3.2.4   && < 3.3
+    , network-run               >= 0.4.3   && < 0.5
+    , proto-lens                >= 0.7     && < 0.8
+    , proto-lens-protobuf-types >= 0.7     && < 0.8
+    , random                    >= 1.2     && < 1.3
+    , recv                      >= 0.1     && < 0.2
+    , stm                       >= 2.5     && < 2.6
+    , text                      >= 1.2     && < 2.2
+    , time-manager              >= 0.2.2   && < 0.3
+    , tls                       >= 1.7     && < 2.2
+    , unbounded-delays          >= 0.1.1   && < 0.2
+    , unordered-containers      >= 0.2     && < 0.3
+    , utf8-string               >= 1.0     && < 1.1
 
       -- We pin very specific versions of http2.
       --
@@ -225,6 +227,7 @@ test-suite test-grapesy
       Test.Prop.Dialogue
       Test.Regression.Issue102
       Test.Regression.Issue238
+      Test.Sanity.Any
       Test.Sanity.BrokenDeployments
       Test.Sanity.Compression
       Test.Sanity.Disconnect
@@ -243,13 +246,15 @@ test-suite test-grapesy
       Proto.API.Interop
       Proto.API.Ping
       Proto.API.RouteGuide
+      Proto.API.TestAny
       Proto.API.Trivial
       Proto.Empty
       Proto.Helloworld
       Proto.Messages
       Proto.Ping
       Proto.RouteGuide
       Proto.Test
+      Proto.TestAny
 
   build-depends:
       -- Inherited dependencies
@@ -262,6 +267,7 @@ test-suite test-grapesy
     , http2
     , mtl
     , network
+    , proto-lens-protobuf-types
     , stm
     , text
     , tls

diff --git a/grapesy/proto/Proto/API/Ping.hs b/grapesy/proto/Proto/API/Ping.hs
@@ -1,4 +1,3 @@
-{-# LANGUAGE OverloadedStrings #-}
 {-# OPTIONS_GHC -Wno-orphans #-}
 
 module Proto.API.Ping (

diff --git a/grapesy/proto/Proto/API/TestAny.hs b/grapesy/proto/Proto/API/TestAny.hs
@@ -0,0 +1,23 @@
+{-# OPTIONS_GHC -Wno-orphans #-}
+
+module Proto.API.TestAny (
+    Reverse
+
+    -- * Re-exports
+  , module Proto.TestAny
+  ) where
+
+import Network.GRPC.Common
+import Network.GRPC.Common.Protobuf
+
+import Proto.TestAny
+
+{-------------------------------------------------------------------------------
+  TestAnyService
+-------------------------------------------------------------------------------}
+
+type Reverse = Protobuf TestAnyService "reverse"
+
+type instance RequestMetadata          (Protobuf TestAnyService meth) = NoMetadata
+type instance ResponseInitialMetadata  (Protobuf TestAnyService meth) = NoMetadata
+type instance ResponseTrailingMetadata (Protobuf TestAnyService meth) = NoMetadata