[WPA-16535] Remove weed from saml2-web-sso (#4520)

* rm weed (1)

* rm weed (2)

* rm weed (3)

* rm weed (4)

* rm weed (5)

* rm weed (6)

* sort weeder.toml alphabetically.

* weeder.toml: remove duplicate entries.

* Fixup

* found more...

* Remove copies of tinylog's Level type.

* re-add non-weed

(maybe weeder caught it because of outdated .hie files in spar?)

* make sanitize-pr

Author: fisx

libs/polysemy-wire-zoo/polysemy-wire-zoo.cabal

@@ -22,7 +22,6 @@ library
     Wire.Sem.FromUTC
     Wire.Sem.Jwk
     Wire.Sem.Logger
-    Wire.Sem.Logger.Level
     Wire.Sem.Logger.TinyLog
     Wire.Sem.Metrics
     Wire.Sem.Metrics.IO

libs/polysemy-wire-zoo/src/Wire/Sem/Logger.hs

@@ -19,13 +19,13 @@
 
 module Wire.Sem.Logger
   ( module Wire.Sem.Logger,
-    module Wire.Sem.Logger.Level,
+    Level (..),
   )
 where
 
 import Imports hiding (log)
 import Polysemy
-import Wire.Sem.Logger.Level
+import System.Logger (Level (..))
 
 data Logger msg m a where
   Log :: Level -> msg -> Logger msg m ()

libs/polysemy-wire-zoo/src/Wire/Sem/Logger/Level.hs

@@ -22,7 +22,7 @@ module Wire.Sem.Logger.TinyLog
     loggerToTinyLogReqId,
     stringLoggerToTinyLog,
     discardTinyLogs,
-    module Wire.Sem.Logger.Level,
+    module System.Logger,
     LogRecorder (..),
     newLogRecorder,
     recordLogs,
@@ -33,9 +33,9 @@ import Data.Id
 import Imports
 import Polysemy
 import Polysemy.TinyLog (TinyLog)
+import System.Logger (Level (..))
 import qualified System.Logger as Log
 import Wire.Sem.Logger
-import Wire.Sem.Logger.Level
 
 loggerToTinyLog ::
   (Member (Embed IO) r) =>
@@ -44,7 +44,7 @@ loggerToTinyLog ::
   Sem r a
 loggerToTinyLog tinylog = interpret $ \case
   Log lvl msg ->
-    embed @IO $ Log.log tinylog (toLevel lvl) msg
+    embed @IO $ Log.log tinylog lvl msg
 
 -- | Log the request ID along with the message
 loggerToTinyLogReqId ::

libs/polysemy-wire-zoo/src/Wire/Sem/Logger/TinyLog.hs

@@ -62,14 +62,14 @@
 , temporary
 , text
 , time
+, tinylog
 , transformers
 , types-common
 , uniplate
 , uri-bytestring
 , uuid
 , wai
 , wai-extra
-, wai-utilities
 , warp
 , word8
 , xml-conduit
@@ -82,8 +82,6 @@ mkDerivation {
   pname = "saml2-web-sso";
   version = "0.20";
   src = gitignoreSource ./.;
-  isLibrary = true;
-  isExecutable = true;
   libraryHaskellDepends = [
     aeson
     asn1-encoding
@@ -140,6 +138,7 @@ mkDerivation {
     temporary
     text
     time
+    tinylog
     transformers
     types-common
     uniplate
@@ -155,74 +154,6 @@ mkDerivation {
     xml-types
     yaml
   ];
-  executableHaskellDepends = [
-    aeson
-    asn1-encoding
-    asn1-parse
-    asn1-types
-    base
-    base64-bytestring
-    binary
-    bytestring
-    case-insensitive
-    containers
-    cookie
-    crypton
-    crypton-x509
-    data-default
-    directory
-    dns
-    email-validate
-    errors
-    exceptions
-    extra
-    filepath
-    foundation
-    ghc-prim
-    hedgehog
-    hedgehog-quickcheck
-    hourglass
-    hsaml2
-    hspec
-    hspec-wai
-    http-media
-    http-types
-    hxt
-    imports
-    lens
-    lens-datetime
-    memory
-    mtl
-    network-uri
-    pretty-show
-    process
-    QuickCheck
-    quickcheck-instances
-    random
-    servant
-    servant-multipart
-    servant-server
-    shelly
-    silently
-    string-conversions
-    temporary
-    text
-    time
-    transformers
-    uniplate
-    uri-bytestring
-    uuid
-    wai
-    wai-extra
-    wai-utilities
-    warp
-    word8
-    xml-conduit
-    xml-conduit-writer
-    xml-hamlet
-    xml-types
-    yaml
-  ];
   testHaskellDepends = [
     aeson
     asn1-encoding
@@ -278,6 +209,7 @@ mkDerivation {
     temporary
     text
     time
+    tinylog
     transformers
     types-common
     uniplate
@@ -296,5 +228,4 @@ mkDerivation {
   testToolDepends = [ hspec-discover ];
   description = "Library and example web app for the SAML Web-based SSO profile";
   license = lib.licenses.agpl3Only;
-  mainProgram = "toy-sp";
 }

libs/saml2-web-sso/default.nix

@@ -133,6 +133,7 @@ library
     , temporary             >=1.3
     , text                  >=1.2.3.1
     , time                  >=1.8.0.2
+    , tinylog
     , transformers          >=0.5.6.2
     , types-common
     , uniplate              >=1.6.12
@@ -150,121 +151,13 @@ library
 
   default-language:   GHC2021
 
-executable toy-sp
-  main-is:            Main.hs
-  other-modules:      Paths_saml2_web_sso
-  hs-source-dirs:     toy-sp
-  default-extensions:
-    ConstraintKinds
-    DataKinds
-    DefaultSignatures
-    DeriveGeneric
-    FlexibleContexts
-    FlexibleInstances
-    GADTs
-    InstanceSigs
-    KindSignatures
-    LambdaCase
-    MultiParamTypeClasses
-    NoMonomorphismRestriction
-    NoOverloadedStrings
-    PolyKinds
-    QuasiQuotes
-    RankNTypes
-    RecordWildCards
-    ScopedTypeVariables
-    StandaloneDeriving
-    TemplateHaskell
-    TupleSections
-    TypeApplications
-    TypeFamilies
-    TypeOperators
-    TypeSynonymInstances
-    ViewPatterns
-
-  ghc-options:
-    -j -O2 -Wall -Wcompat -Wincomplete-record-updates
-    -Wincomplete-uni-patterns -Wtabs -Werror
-
-  build-depends:
-    , aeson                 >=1.4.5.0
-    , asn1-encoding         >=0.9.6
-    , asn1-parse            >=0.9.5
-    , asn1-types            >=0.3.3
-    , base                  >=4.12.0.0
-    , base64-bytestring     >=1.0.0.2
-    , binary                >=0.8.6.0
-    , bytestring            >=0.10.8.2
-    , case-insensitive      >=1.2.1.0
-    , containers            >=0.6.0.1
-    , cookie                >=0.4.4
-    , crypton               >=0.30
-    , crypton-x509          >=1.7.5
-    , data-default          >=0.7.1.1
-    , directory             >=1.3.6.0
-    , dns                   >=4.0.0
-    , email-validate        >=2.3.2.12
-    , errors                >=2.3.0
-    , exceptions            >=0.10.3
-    , extra                 >=1.6.18
-    , filepath              >=1.4.2.1
-    , foundation            >=0.0.25
-    , ghc-prim              >=0.5.3
-    , hedgehog              >=1.0.1
-    , hedgehog-quickcheck   >=0.1.1
-    , hourglass             >=0.2.12
-    , hsaml2                >=0.1
-    , hspec                 >=2.7.1
-    , hspec-wai             >=0.9.0
-    , http-media            >=0.8.0.0
-    , http-types            >=0.12.3
-    , hxt                   >=9.3.1.18
-    , imports
-    , lens                  >=4.17.1
-    , lens-datetime         >=0.3
-    , memory                >=0.14.18
-    , mtl                   >=2.2.2
-    , network-uri           >=2.6.1.0
-    , pretty-show           >=1.9.5
-    , process               >=1.6.5.0
-    , QuickCheck            >=2.13.2
-    , quickcheck-instances  >=0.3.22
-    , random                >=1.1
-    , saml2-web-sso
-    , servant               >=0.16.2
-    , servant-multipart     >=0.12
-    , servant-server        >=0.16.2
-    , shelly                >=1.8.1
-    , silently              >=1.2.5.1
-    , string-conversions    >=0.4.0.1
-    , temporary             >=1.3
-    , text                  >=1.2.3.1
-    , time                  >=1.8.0.2
-    , transformers          >=0.5.6.2
-    , uniplate              >=1.6.12
-    , uri-bytestring        >=0.3.2.2
-    , uuid                  >=1.3.13
-    , wai                   >=3.2.2.1
-    , wai-extra             >=3.0.28
-    , wai-utilities
-    , warp                  >=3.2.28
-    , word8                 >=0.1.3
-    , xml-conduit           >=1.8.0.1
-    , xml-conduit-writer    >=0.1.1.2
-    , xml-hamlet            >=0.5.0.1
-    , xml-types             >=0.3.6
-    , yaml                  >=0.8.25.1
-
-  default-language:   GHC2021
-
 test-suite spec
   type:               exitcode-stdio-1.0
   main-is:            Spec.hs
   other-modules:
     Paths_saml2_web_sso
     Samples
     Test.SAML2.UtilSpec
-    Test.SAML2.WebSSO.API.ExampleSpec
     Test.SAML2.WebSSO.APISpec
     Test.SAML2.WebSSO.ConfigSpec
     Test.SAML2.WebSSO.RoundtripSpec
@@ -365,6 +258,7 @@ test-suite spec
     , temporary             >=1.3
     , text                  >=1.2.3.1
     , time                  >=1.8.0.2
+    , tinylog
     , transformers          >=0.5.6.2
     , types-common
     , uniplate              >=1.6.12