-
Notifications
You must be signed in to change notification settings - Fork 2
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
WPB-2970 Update dependencies, cleanup, add unit test #25
Merged
battermann
merged 19 commits into
master
from
WPB-2970-support-team-roles-in-ldap-scim-bridge
Mar 14, 2024
Merged
Changes from 15 commits
Commits
Show all changes
19 commits
Select commit
Hold shift + click to select a range
6fbdacc
update packages
battermann bb77162
dup dependency
battermann 212c148
use nix for ghc cabal etc
battermann 7d0e05d
update ghc in dockerfile
battermann d55c6ca
load cabal.project in dockerfile
battermann 6d4dfeb
add formatters/tools to env
battermann 7580b95
reformat cabal file
battermann e7cac80
add ormolu to treefmt
battermann bd36e95
format hs
battermann 383065f
lower bound of hscim set to 0.4.0.2
battermann d98bef0
make run.sh script work
battermann 01764b6
clean up
battermann fd8ecec
unit test mapping
battermann 327bb43
update gh action
battermann 910e370
better naming
battermann 50402fe
added some comments
battermann 023e94e
gh action
battermann ccaf664
try fix gh action
battermann 08ce76a
try fix gh action (1)
battermann File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| use nix |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -52,3 +52,6 @@ TAGS | |
|
|
||
| # other | ||
| .DS_Store | ||
|
|
||
| # nix | ||
| .direnv | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| source-repository-package | ||
| type: git | ||
| location: https://gitlab.com/leif.battermann/tinylog.git | ||
| tag: c570eaec033766b49ed394feb9638bfc0bd247e2 | ||
|
|
||
| packages: ldap-scim-bridge.cabal | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,121 +1,138 @@ | ||
| cabal-version: 2.4 | ||
| name: ldap-scim-bridge | ||
| version: 0.8 | ||
| synopsis: See README for synopsis | ||
| description: See README for description | ||
| homepage: https://github.com/wireapp/ldap-scim-bridge | ||
| bug-reports: https://github.com/wireapp/ldap-scim-bridge/issues | ||
| license: AGPL-3.0-or-later | ||
| license-file: LICENSE | ||
| author: Matthias Fischmann | ||
| maintainer: Matthias Fischmann <[email protected]> | ||
| copyright: (c) 2021 wire.com | ||
| category: System | ||
| build-type: Simple | ||
| extra-doc-files: README.md | ||
| CHANGELOG.md | ||
| extra-source-files: examples/wire-server/run.sh | ||
| examples/wire-server/conf1.yaml | ||
| examples/wire-server/conf2.yaml | ||
| examples/wire-server/runlog | ||
| tested-with: GHC == 8.8.3 | ||
| cabal-version: 2.4 | ||
| name: ldap-scim-bridge | ||
| version: 0.8 | ||
| synopsis: See README for synopsis | ||
| description: See README for description | ||
| homepage: https://github.com/wireapp/ldap-scim-bridge | ||
| bug-reports: https://github.com/wireapp/ldap-scim-bridge/issues | ||
| license: AGPL-3.0-or-later | ||
| license-file: LICENSE | ||
| author: Matthias Fischmann | ||
| maintainer: Matthias Fischmann <[email protected]> | ||
| copyright: (c) 2021 wire.com | ||
| category: System | ||
| build-type: Simple | ||
| extra-doc-files: | ||
| CHANGELOG.md | ||
| README.md | ||
|
|
||
| extra-source-files: | ||
| examples/wire-server/conf1.yaml | ||
| examples/wire-server/conf2.yaml | ||
| examples/wire-server/run.sh | ||
| examples/wire-server/runlog | ||
|
|
||
| tested-with: GHC ==8.8.3 | ||
|
|
||
| source-repository head | ||
| type: git | ||
| location: https://github.com/wireapp/ldap-scim-bridge.git | ||
| type: git | ||
| location: https://github.com/wireapp/ldap-scim-bridge.git | ||
|
|
||
| common common-options | ||
| build-depends: base >=4.13 && <4.15 | ||
| , relude | ||
| , hscim >=0.3.6 && <0.4 | ||
| , ldap-client >=0.4.1 && <0.5 | ||
| , network >=3.1.1.1 && <3.2 | ||
| , text >=1.2.4.1 && <1.3 | ||
| , yaml >=0.11.5.0 && <0.12 | ||
| , aeson >=1.4.7.1 && <1.5 | ||
| , aeson-pretty >=0.8.8 && <0.9 | ||
| , containers >=0.6.2.1 && <0.7 | ||
| , bytestring >=0.10.12 && <0.11 | ||
| , email-validate >=2.3.2.13 && <2.4 | ||
| , string-conversions >=0.4.0.1 && <0.5 | ||
| , servant-client >=0.18.3 && <0.19 | ||
| , unordered-containers >= 0.2.14.0 && <0.3 | ||
| , servant-client-core >=0.18.3 && <0.19 | ||
| , servant >=0.18.3 && <0.19 | ||
| , http-types >=0.12.3 && <0.13 | ||
| , string-conversions >=0.4.0.1 && <0.5 | ||
| , http-client >=0.7.8 && <0.8 | ||
| , http-client-tls >=0.3.5 && <0.4 | ||
| , tinylog >=0.15 && <0.16 | ||
| build-depends: | ||
| , aeson >=2.1.2 && <2.2 | ||
| , aeson-pretty >=0.8.10 && <0.9 | ||
| , base >=4.17.2 && <4.18 | ||
| , bytestring >=0.11.5 && <0.12 | ||
| , containers >=0.6.7 && <0.7 | ||
| , email-validate >=2.3.2 && <2.4 | ||
| , hscim >=0.4.0.2 && <0.5 | ||
| , http-client >=0.7.16 && <0.8 | ||
| , http-client-tls >=0.3.6 && <0.4 | ||
| , http-types >=0.12.4 && <0.13 | ||
| , ldap-client >=0.4.2 && <0.5 | ||
| , network >=3.1.4 && <3.2 | ||
| , relude >=1.2.1 && <1.3 | ||
| , servant >=0.19.1 && <0.20 | ||
| , servant-client >=0.19 && <0.20 | ||
| , servant-client-core >=0.19 && <0.20 | ||
| , string-conversions >=0.4.0 && <0.5 | ||
| , text >=2.0.2 && <2.1 | ||
| , tinylog >=0.15.0 && <0.16 | ||
| , unordered-containers >=0.2.20 && <0.3 | ||
| , yaml >=0.11.11 && <0.12 | ||
|
|
||
| mixins: base hiding (Prelude) | ||
| , relude (Relude as Prelude) | ||
| mixins: | ||
| base hiding (Prelude), | ||
| relude (Relude as Prelude) | ||
|
|
||
| ghc-options: -Wall | ||
| -Wcompat | ||
| -Widentities | ||
| -Wincomplete-uni-patterns | ||
| -Wincomplete-record-updates | ||
| if impl(ghc >= 8.0) | ||
| ghc-options: -Wredundant-constraints | ||
| if impl(ghc >= 8.2) | ||
| ghc-options: -fhide-source-paths | ||
| if impl(ghc >= 8.4) | ||
| ghc-options: -Wmissing-export-lists | ||
| -Wpartial-fields | ||
| if impl(ghc >= 8.8) | ||
| ghc-options: -Wmissing-deriving-strategies | ||
| ghc-options: | ||
| -O2 -Wall -Wcompat -Widentities -Wincomplete-uni-patterns | ||
| -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs | ||
| -optP-Wno-nonportable-include-path -Wredundant-constraints | ||
| -fhide-source-paths -Wmissing-export-lists -Wpartial-fields | ||
| -Wmissing-deriving-strategies | ||
|
|
||
| default-language: Haskell2010 | ||
| default-extensions: AllowAmbiguousTypes | ||
| BangPatterns | ||
| ConstraintKinds | ||
| DataKinds | ||
| DefaultSignatures | ||
| DeriveFunctor | ||
| DeriveGeneric | ||
| DeriveLift | ||
| DeriveTraversable | ||
| DerivingStrategies | ||
| EmptyCase | ||
| FlexibleContexts | ||
| FlexibleInstances | ||
| FunctionalDependencies | ||
| GADTs | ||
| InstanceSigs | ||
| KindSignatures | ||
| LambdaCase | ||
| MultiParamTypeClasses | ||
| MultiWayIf | ||
| NamedFieldPuns | ||
| OverloadedStrings | ||
| PackageImports | ||
| PatternSynonyms | ||
| PolyKinds | ||
| QuasiQuotes | ||
| RankNTypes | ||
| RecordWildCards | ||
| ScopedTypeVariables | ||
| StandaloneDeriving | ||
| TemplateHaskell | ||
| TupleSections | ||
| TypeApplications | ||
| TypeFamilies | ||
| TypeFamilyDependencies | ||
| TypeOperators | ||
| UndecidableInstances | ||
| ViewPatterns | ||
| default-language: Haskell2010 | ||
| default-extensions: | ||
| AllowAmbiguousTypes | ||
| BangPatterns | ||
| ConstraintKinds | ||
| DataKinds | ||
| DefaultSignatures | ||
| DeriveFunctor | ||
| DeriveGeneric | ||
| DeriveLift | ||
| DeriveTraversable | ||
| DerivingStrategies | ||
| DerivingVia | ||
| EmptyCase | ||
| FlexibleContexts | ||
| FlexibleInstances | ||
| FunctionalDependencies | ||
| GADTs | ||
| InstanceSigs | ||
| KindSignatures | ||
| LambdaCase | ||
| MultiParamTypeClasses | ||
| MultiWayIf | ||
| NamedFieldPuns | ||
| NoImplicitPrelude | ||
| OverloadedStrings | ||
| PackageImports | ||
| PatternSynonyms | ||
| PolyKinds | ||
| QuasiQuotes | ||
| RankNTypes | ||
| RecordWildCards | ||
| ScopedTypeVariables | ||
| StandaloneDeriving | ||
| TemplateHaskell | ||
| TupleSections | ||
| TypeApplications | ||
| TypeFamilies | ||
| TypeFamilyDependencies | ||
| TypeOperators | ||
| UndecidableInstances | ||
| ViewPatterns | ||
|
|
||
| library | ||
| import: common-options | ||
| hs-source-dirs: src | ||
| exposed-modules: LdapScimBridge | ||
| import: common-options | ||
| hs-source-dirs: src | ||
| exposed-modules: LdapScimBridge | ||
|
|
||
| executable ldap-scim-bridge | ||
| import: common-options | ||
| hs-source-dirs: app | ||
| main-is: Main.hs | ||
| build-depends: ldap-scim-bridge | ||
| ghc-options: -threaded | ||
| -rtsopts | ||
| -with-rtsopts=-N | ||
| import: common-options | ||
| hs-source-dirs: app | ||
| main-is: Main.hs | ||
| build-depends: ldap-scim-bridge | ||
| ghc-options: -threaded -rtsopts -with-rtsopts=-N | ||
|
|
||
| test-suite ldap-scim-bridge-test | ||
| main-is: Spec.hs | ||
| type: exitcode-stdio-1.0 | ||
| build-depends: | ||
| , base | ||
| , bytestring >=0.11.5 && <0.12 | ||
| , email-validate >=2.3.2 && <2.4 | ||
| , hscim >=0.4.0.2 && <0.5 | ||
| , hspec | ||
| , ldap-client >=0.4.2 && <0.5 | ||
| , ldap-scim-bridge | ||
| , QuickCheck | ||
| , string-conversions | ||
| , text >=2.0.2 && <2.1 | ||
| , yaml >=0.11.11 && <0.12 | ||
|
|
||
| hs-source-dirs: test | ||
| default-language: Haskell2010 |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
would be nice to have a link to the upstream PR here so it's easier to check whether we can bump this (not urgent).