Merge pull request #244 from well-typed/edsko/cleanup-proto

Cleanup proto generation
well-typed · Oct 24, 2024 · 4c8402f · 4c8402f
2 parents 4c1c976 + 5f95d65
commit 4c8402f
Show file tree

Hide file tree

Showing 39 changed files with 139 additions and 156 deletions.
diff --git a/grapesy/dev/disable-ipv6.sh → dev/disable-ipv6.sh b/grapesy/dev/disable-ipv6.sh → dev/disable-ipv6.sh
diff --git a/grapesy/dev/gencert.sh → dev/gencert.sh b/grapesy/dev/gencert.sh → dev/gencert.sh
diff --git a/dev/genproto.sh b/dev/genproto.sh
@@ -0,0 +1,50 @@
+#!/bin/bash
+
+##
+## grpc-spec, definitions from the main gRPC repo
+##
+
+for i in proto/official/grpc-spec/*
+do
+  protoc \
+    --plugin=protoc-gen-haskell=`which proto-lens-protoc` \
+    --haskell_out=grpc-spec/proto \
+    --proto_path=proto/official/grpc-spec \
+    $i
+done
+
+##
+## test-grapesy, definitions from the main gRPC repo
+##
+
+for i in proto/official/test-grapesy/*
+do
+  protoc \
+    --plugin=protoc-gen-haskell=`which proto-lens-protoc` \
+    --haskell_out=grapesy/proto \
+    --proto_path=proto/official/test-grapesy \
+    $i
+done
+
+##
+## test-grapesy, bespoke definitions
+##
+
+for i in proto/bespoke/test-grapesy/*
+do
+  protoc \
+    --plugin=protoc-gen-haskell=`which proto-lens-protoc` \
+    --haskell_out=grapesy/proto \
+    --proto_path=proto/bespoke/test-grapesy \
+    $i
+done
+
+##
+## Disable some warnings in the generated modules, so that we can keep these
+## warnings enabled for the test suite.
+##
+
+for i in grpc-spec/proto/Proto/*.hs grapesy/proto/Proto/*.hs
+do
+  sed -i '1i{-# OPTIONS_GHC -Wno-prepositive-qualified-module -Wno-identities #-}' $i
+done
diff --git a/grapesy/dev/grapesy-deps-docker/Dockerfile → dev/grapesy-deps-docker/Dockerfile b/grapesy/dev/grapesy-deps-docker/Dockerfile → dev/grapesy-deps-docker/Dockerfile
diff --git a/grapesy/dev/grapesy-deps-docker/README.md → dev/grapesy-deps-docker/README.md b/grapesy/dev/grapesy-deps-docker/README.md → dev/grapesy-deps-docker/README.md
diff --git a/grapesy/dev/interop.md → dev/interop.md b/grapesy/dev/interop.md → dev/interop.md
diff --git a/grapesy/dev/kvstore.md → dev/kvstore.md b/grapesy/dev/kvstore.md → dev/kvstore.md
diff --git a/grapesy/dev/reset-docker.sh → dev/reset-docker.sh b/grapesy/dev/reset-docker.sh → dev/reset-docker.sh
diff --git a/grapesy/dev/wireshark.md → dev/wireshark.md b/grapesy/dev/wireshark.md → dev/wireshark.md
diff --git a/grapesy/dev/genproto.sh b/grapesy/dev/genproto.sh
diff --git a/grapesy/docs/internals.md b/grapesy/docs/internals.md
diff --git a/grapesy/proto/Proto/Empty.hs b/grapesy/proto/Proto/Empty.hs
@@ -1,9 +1,9 @@
+{-# OPTIONS_GHC -Wno-prepositive-qualified-module -Wno-identities #-}
 {- This file was auto-generated from empty.proto by the proto-lens-protoc program. -}
 {-# LANGUAGE ScopedTypeVariables, DataKinds, TypeFamilies, UndecidableInstances, GeneralizedNewtypeDeriving, MultiParamTypeClasses, FlexibleContexts, FlexibleInstances, PatternSynonyms, MagicHash, NoImplicitPrelude, DataKinds, BangPatterns, TypeApplications, OverloadedStrings, DerivingStrategies#-}
 {-# OPTIONS_GHC -Wno-unused-imports#-}
 {-# OPTIONS_GHC -Wno-duplicate-exports#-}
 {-# OPTIONS_GHC -Wno-dodgy-exports#-}
-{-# OPTIONS_GHC -Wno-prepositive-qualified-module #-}
 module Proto.Empty (
         Empty()
     ) where

diff --git a/grapesy/proto/Proto/Empty_Fields.hs b/grapesy/proto/Proto/Empty_Fields.hs
@@ -1,9 +1,9 @@
+{-# OPTIONS_GHC -Wno-prepositive-qualified-module -Wno-identities #-}
 {- This file was auto-generated from empty.proto by the proto-lens-protoc program. -}
 {-# LANGUAGE ScopedTypeVariables, DataKinds, TypeFamilies, UndecidableInstances, GeneralizedNewtypeDeriving, MultiParamTypeClasses, FlexibleContexts, FlexibleInstances, PatternSynonyms, MagicHash, NoImplicitPrelude, DataKinds, BangPatterns, TypeApplications, OverloadedStrings, DerivingStrategies#-}
 {-# OPTIONS_GHC -Wno-unused-imports#-}
 {-# OPTIONS_GHC -Wno-duplicate-exports#-}
 {-# OPTIONS_GHC -Wno-dodgy-exports#-}
-{-# OPTIONS_GHC -Wno-prepositive-qualified-module #-}
 module Proto.Empty_Fields where
 import qualified Data.ProtoLens.Runtime.Prelude as Prelude
 import qualified Data.ProtoLens.Runtime.Data.Int as Data.Int

diff --git a/grapesy/proto/Proto/Helloworld.hs b/grapesy/proto/Proto/Helloworld.hs
@@ -1,9 +1,9 @@
+{-# OPTIONS_GHC -Wno-prepositive-qualified-module -Wno-identities #-}
 {- This file was auto-generated from helloworld.proto by the proto-lens-protoc program. -}
 {-# LANGUAGE ScopedTypeVariables, DataKinds, TypeFamilies, UndecidableInstances, GeneralizedNewtypeDeriving, MultiParamTypeClasses, FlexibleContexts, FlexibleInstances, PatternSynonyms, MagicHash, NoImplicitPrelude, DataKinds, BangPatterns, TypeApplications, OverloadedStrings, DerivingStrategies#-}
 {-# OPTIONS_GHC -Wno-unused-imports#-}
 {-# OPTIONS_GHC -Wno-duplicate-exports#-}
 {-# OPTIONS_GHC -Wno-dodgy-exports#-}
-{-# OPTIONS_GHC -Wno-prepositive-qualified-module #-}
 module Proto.Helloworld (
         Greeter(..), HelloReply(), HelloRequest()
     ) where
@@ -33,7 +33,7 @@ import qualified Data.ProtoLens.Runtime.Data.Vector.Generic as Data.Vector.Gener
 import qualified Data.ProtoLens.Runtime.Data.Vector.Unboxed as Data.Vector.Unboxed
 import qualified Data.ProtoLens.Runtime.Text.Read as Text.Read
 {- | Fields :
-
+     
          * 'Proto.Helloworld_Fields.message' @:: Lens' HelloReply Data.Text.Text@ -}
 data HelloReply
   = HelloReply'_constructor {_HelloReply'message :: !Data.Text.Text,
@@ -145,7 +145,7 @@ instance Control.DeepSeq.NFData HelloReply where
              (_HelloReply'_unknownFields x__)
              (Control.DeepSeq.deepseq (_HelloReply'message x__) ())
 {- | Fields :
-
+     
          * 'Proto.Helloworld_Fields.name' @:: Lens' HelloRequest Data.Text.Text@ -}
 data HelloRequest
   = HelloRequest'_constructor {_HelloRequest'name :: !Data.Text.Text,

diff --git a/grapesy/proto/Proto/Helloworld_Fields.hs b/grapesy/proto/Proto/Helloworld_Fields.hs
@@ -1,9 +1,9 @@
+{-# OPTIONS_GHC -Wno-prepositive-qualified-module -Wno-identities #-}
 {- This file was auto-generated from helloworld.proto by the proto-lens-protoc program. -}
 {-# LANGUAGE ScopedTypeVariables, DataKinds, TypeFamilies, UndecidableInstances, GeneralizedNewtypeDeriving, MultiParamTypeClasses, FlexibleContexts, FlexibleInstances, PatternSynonyms, MagicHash, NoImplicitPrelude, DataKinds, BangPatterns, TypeApplications, OverloadedStrings, DerivingStrategies#-}
 {-# OPTIONS_GHC -Wno-unused-imports#-}
 {-# OPTIONS_GHC -Wno-duplicate-exports#-}
 {-# OPTIONS_GHC -Wno-dodgy-exports#-}
-{-# OPTIONS_GHC -Wno-prepositive-qualified-module #-}
 module Proto.Helloworld_Fields where
 import qualified Data.ProtoLens.Runtime.Prelude as Prelude
 import qualified Data.ProtoLens.Runtime.Data.Int as Data.Int

diff --git a/grapesy/proto/Proto/Kvstore.hs b/grapesy/proto/Proto/Kvstore.hs
@@ -1,9 +1,9 @@
+{-# OPTIONS_GHC -Wno-prepositive-qualified-module -Wno-identities #-}
 {- This file was auto-generated from kvstore.proto by the proto-lens-protoc program. -}
 {-# LANGUAGE ScopedTypeVariables, DataKinds, TypeFamilies, UndecidableInstances, GeneralizedNewtypeDeriving, MultiParamTypeClasses, FlexibleContexts, FlexibleInstances, PatternSynonyms, MagicHash, NoImplicitPrelude, DataKinds, BangPatterns, TypeApplications, OverloadedStrings, DerivingStrategies#-}
 {-# OPTIONS_GHC -Wno-unused-imports#-}
 {-# OPTIONS_GHC -Wno-duplicate-exports#-}
 {-# OPTIONS_GHC -Wno-dodgy-exports#-}
-{-# OPTIONS_GHC -Wno-prepositive-qualified-module #-}
 module Proto.Kvstore (
         KeyValueService(..), CreateRequest(), CreateResponse(),
         DeleteRequest(), DeleteResponse(), RetrieveRequest(),
@@ -1081,4 +1081,4 @@ packedFileDescriptor
     \\f\n\
     \\ENQ\ACK\NUL\STX\ETX\STX\DC2\ETX*\r\SUB\n\
     \\f\n\
-    \\ENQ\ACK\NUL\STX\ETX\ETX\DC2\ETX*%3b\ACKproto3"
+    \\ENQ\ACK\NUL\STX\ETX\ETX\DC2\ETX*%3b\ACKproto3"
diff --git a/grapesy/proto/Proto/Kvstore_Fields.hs b/grapesy/proto/Proto/Kvstore_Fields.hs
@@ -1,9 +1,9 @@
+{-# OPTIONS_GHC -Wno-prepositive-qualified-module -Wno-identities #-}
 {- This file was auto-generated from kvstore.proto by the proto-lens-protoc program. -}
 {-# LANGUAGE ScopedTypeVariables, DataKinds, TypeFamilies, UndecidableInstances, GeneralizedNewtypeDeriving, MultiParamTypeClasses, FlexibleContexts, FlexibleInstances, PatternSynonyms, MagicHash, NoImplicitPrelude, DataKinds, BangPatterns, TypeApplications, OverloadedStrings, DerivingStrategies#-}
 {-# OPTIONS_GHC -Wno-unused-imports#-}
 {-# OPTIONS_GHC -Wno-duplicate-exports#-}
 {-# OPTIONS_GHC -Wno-dodgy-exports#-}
-{-# OPTIONS_GHC -Wno-prepositive-qualified-module #-}
 module Proto.Kvstore_Fields where
 import qualified Data.ProtoLens.Runtime.Prelude as Prelude
 import qualified Data.ProtoLens.Runtime.Data.Int as Data.Int
@@ -37,4 +37,4 @@ value ::
   forall f s a.
   (Prelude.Functor f, Data.ProtoLens.Field.HasField s "value" a) =>
   Lens.Family2.LensLike' f s a
-value = Data.ProtoLens.Field.field @"value"
+value = Data.ProtoLens.Field.field @"value"