credentials 0.0.1 → 0.0.1.1

raw patch · 5 files changed

+105/−8 lines, 5 files

Files

• CHANGELOG.md +14/−0
• credentials.cabal +2/−1
• src/Credentials/DynamoDB.hs +2/−2
• src/Credentials/DynamoDB/Item.hs +0/−2
• src/Credentials/Types.hs +87/−3

@@ -0,0 +1,14 @@+# Change Log++## [0.0.1.1](https://github.com/brendanhay/credentials/tree/0.0.1.1)+Released: **10 August, 2016**, Compare: [0.0.1](https://github.com/brendanhay/credentials/compare/0.0.1...0.0.1.1)++### Changed++- TemplateHaskell is no longer used to derive `Prism`s, they are now hand written.+++## [0.0.1](https://github.com/brendanhay/credentials/tree/0.0.1)+Released: **9 August, 2016**++### Initial Release

@@ -1,5 +1,5 @@ name:                  credentials-version:               0.0.1+version:               0.0.1.1 synopsis:              Secure Credentials Storage and Distribution homepage:              https://github.com/brendanhay/credentials license:               OtherLicense@@ -9,6 +9,7 @@ copyright:             Copyright (c) 2015-2016 Brendan Hay category:              Network, AWS, Security build-type:            Simple+extra-source-files:    CHANGELOG.md cabal-version:         >= 1.10  description:

@@ -145,10 +145,10 @@     deleteMany (x:xs) = void . send $         batchWriteItem             & bwiRequestItems .~-                [ (tableName, deleteItem x :| map deleteItem (batchInit xs))+                [ (tableName, deleteKey x :| map deleteKey (batchInit xs))                 ] -    deleteItem k =+    deleteKey k =         writeRequest             & wrDeleteRequest ?~ (deleteRequest & drKey .~ k) 

@@ -25,8 +25,6 @@ import Crypto.Hash     (SHA256, digestFromByteString) import Crypto.MAC.HMAC (HMAC (..)) -import Data.Bifunctor          (bimap)-import Data.ByteArray          (convert) import Data.ByteArray.Encoding (Base (Base16), convertFromBase, convertToBase) import Data.ByteString         (ByteString) import Data.HashMap.Strict     (HashMap)

@@ -2,7 +2,6 @@ {-# LANGUAGE GeneralizedNewtypeDeriving #-} {-# LANGUAGE LambdaCase                 #-} {-# LANGUAGE OverloadedStrings          #-}-{-# LANGUAGE TemplateHaskell            #-} {-# LANGUAGE TypeFamilies               #-}  -- |@@ -16,7 +15,7 @@ module Credentials.Types where  import Control.Exception.Lens (exception)-import Control.Lens           hiding (Context)+import Control.Lens           (Prism', prism) import Control.Monad.Catch    (Exception, SomeException)  import Crypto.Hash     (SHA256)@@ -112,7 +111,92 @@  instance Exception CredentialError -makeClassyPrisms ''CredentialError+class AsCredentialError a where+    _CredentialError       :: Prism' a CredentialError+    _MasterKeyMissing      :: Prism' a (KeyId, Maybe Text)+    _IntegrityFailure      :: Prism' a (Name, ByteString, ByteString)+    _EncryptFailure        :: Prism' a (Context, Name, Text)+    _DecryptFailure        :: Prism' a (Context, Name, Text)+    _StorageMissing        :: Prism' a Text+    _StorageFailure        :: Prism' a Text+    _FieldMissing          :: Prism' a (Text, [Text])+    _FieldInvalid          :: Prism' a (Text, String)+    _SecretMissing         :: Prism' a (Name, Maybe Revision, Text)+    _OptimisticLockFailure :: Prism' a (Name, Revision, Text)++    _MasterKeyMissing      = (.) _CredentialError _MasterKeyMissing+    _IntegrityFailure      = (.) _CredentialError _IntegrityFailure+    _EncryptFailure        = (.) _CredentialError _EncryptFailure+    _DecryptFailure        = (.) _CredentialError _DecryptFailure+    _StorageMissing        = (.) _CredentialError _StorageMissing+    _StorageFailure        = (.) _CredentialError _StorageFailure+    _FieldMissing          = (.) _CredentialError _FieldMissing+    _FieldInvalid          = (.) _CredentialError _FieldInvalid+    _SecretMissing         = (.) _CredentialError _SecretMissing+    _OptimisticLockFailure = (.) _CredentialError _OptimisticLockFailure++instance AsCredentialError CredentialError where+    _CredentialError = id++    _MasterKeyMissing = prism+        (\(key, msg) -> MasterKeyMissing key msg)+        (\case+            MasterKeyMissing key msg -> Right (key, msg)+            x                        -> Left x)++    _IntegrityFailure = prism+        (\(name, a, b) -> IntegrityFailure name a b)+        (\case+            IntegrityFailure name a b -> Right (name, a, b)+            x                         -> Left x)++    _EncryptFailure = prism+        (\(ctx, name, msg) -> EncryptFailure ctx name msg)+        (\case+            EncryptFailure ctx name msg -> Right (ctx, name, msg)+            x                           -> Left x)++    _DecryptFailure = prism+        (\(ctx, name, msg) -> DecryptFailure ctx name msg)+        (\case+            DecryptFailure ctx name msg -> Right (ctx, name, msg)+            x                           -> Left x)++    _StorageMissing = prism+        StorageMissing+        (\case+            StorageMissing msg -> Right msg+            x                  -> Left x)++    _StorageFailure = prism+        StorageFailure+        (\case+            StorageFailure msg -> Right msg+            x                  -> Left x)++    _FieldMissing = prism+        (\(field, found) -> FieldMissing field found)+        (\case+            FieldMissing field found -> Right (field, found)+            x                        -> Left x)++    _FieldInvalid = prism+        (\(field, msg) -> FieldInvalid field msg)+        (\case+            FieldInvalid field msg -> Right (field, msg)+            x                      -> Left x)++    _SecretMissing = prism+        (\(name, rev, msg) -> SecretMissing name rev msg)+        (\case+            SecretMissing name rev msg -> Right (name, rev, msg)+            x                          -> Left x)++    _OptimisticLockFailure = prism+        (\(name, rev, msg) -> OptimisticLockFailure name rev msg)+        (\case+            OptimisticLockFailure name rev msg -> Right (name, rev, msg)+            x                                  -> Left x)  instance AsCredentialError SomeException where     _CredentialError = exception