Skip to content
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.

Sign up for GitHub

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

Updated for new aeson, updated stack resolver #5

Merged
merged 1 commit into from
Jan 10, 2025
Merged

Updated for new aeson, updated stack resolver #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion stack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
resolver: lts-22.30
resolver: lts-23.3
flags: {}
packages:
- vault-tool
Expand Down
8 changes: 4 additions & 4 deletions stack.yaml.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
packages: []
snapshots:
- completed:
sha256: 795b7a893148a42f09956611a0fa1139293fe6ef934d053468d8e53e3e013390
size: 719577
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/30.yaml
original: lts-22.30
sha256: dd89d2322cb5af74c6ab9d96c0c5f6c8e6653e0c991d619b4bb141a49cb98668
size: 679282
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/23/3.yaml
original: lts-23.3
2 changes: 1 addition & 1 deletion vault-tool-server/vault-tool-server.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: vault-tool-server
version: 0.2.0.0
version: 0.2.1.0
synopsis: Utility library for spawning a HashiCorp Vault process
description: Utility library for spawning a HashiCorp Vault process
license: MIT
Expand Down
4 changes: 2 additions & 2 deletions vault-tool/src/Data/Aeson/Utils.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ import Data.Maybe (catMaybes)
object :: [Maybe Pair] -> Value
object = Aeson.object . catMaybes

(.=!) :: (KeyValue a, ToJSON b) => Key -> b -> Maybe a
(.=!) :: (KeyValue e a, ToJSON b) => Key -> b -> Maybe a
k .=! v = Just $ k .= v

(.=?) :: (Functor f, KeyValue a, ToJSON b) => Key -> f b -> f a
(.=?) :: (Functor f, KeyValue e a, ToJSON b) => Key -> f b -> f a
k .=? v = (k .=) <$> v

newtype DataWrapper a = DataWrapper {unDataWrapper :: a}
Expand Down
5 changes: 2 additions & 3 deletions vault-tool/vault-tool.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: vault-tool
version: 0.2.0.0
version: 0.2.1.0
synopsis: Client library for HashiCorp's Vault tool (via HTTP API)
description: Client library for HashiCorp's Vault tool (via HTTP API)
license: MIT
Expand Down Expand Up @@ -33,8 +33,7 @@ library
http-client,
http-types,
http-client-tls,
-- vault-tool doesn't yet work with new KeyValue constraint from aeson-2.2
aeson < 2.2,
aeson >=2.2,
unordered-containers,
time

Expand Down
Loading