freckle-app 1.0.2.6 → 1.0.2.7
raw patch · 7 files changed
+105/−92 lines, 7 filesdep ~Globdep ~MonadRandomdep ~aeson
Dependency ranges changed: Glob, MonadRandom, aeson, ansi-terminal, base, bytestring, case-insensitive, conduit, containers, datadog, directory, doctest, ekg-core, exceptions, fast-logger, filepath, hashable, hspec, hspec-core, hspec-junit-formatter, http-client, http-conduit, http-link-header, http-types, iproute, lens, lens-aeson, load-env, monad-control, monad-logger, network, network-uri, persistent, persistent-postgresql, postgresql-simple, primitive, process, retry, rio, safe, semigroupoids, template-haskell, text, time, transformers, transformers-base, unliftio, unliftio-core, unordered-containers, vector, wai, wai-extra, yaml, yesod, yesod-core
Files
- CHANGELOG.md +7/−2
- freckle-app.cabal +70/−70
- library/Freckle/App/Database.hs +7/−2
- library/Freckle/App/Test.hs +2/−1
- library/Freckle/App/Wai.hs +1/−1
- package.yaml +12/−12
- tests/Freckle/App/HttpSpec.hs +6/−4
CHANGELOG.md view
@@ -1,8 +1,13 @@-## [_Unreleased_](https://github.com/freckle/freckle-app/compare/v1.0.2.6...main)+## [_Unreleased_](https://github.com/freckle/freckle-app/compare/v1.0.2.7...main) - None. -## [v1.0.2.5](https://github.com/freckle/freckle-app/compare/v1.0.2.5...v1.0.2.6)+## [v1.0.2.7](https://github.com/freckle/freckle-app/compare/v1.0.2.6...v1.0.2.7)++- Remove explicit `--region` in IAM DB token call+- Relax lower-bounds throughout++## [v1.0.2.6](https://github.com/freckle/freckle-app/compare/v1.0.2.5...v1.0.2.6) - Add a looser lower-bound on `containers`
freckle-app.cabal view
@@ -1,6 +1,6 @@ cabal-version: 1.12 name: freckle-app-version: 1.0.2.6+version: 1.0.2.7 license: MIT license-file: LICENSE maintainer: Freckle Education@@ -62,65 +62,65 @@ TypeApplications TypeFamilies build-depends:- Glob >=0.10.2,- MonadRandom >=0.5.3,- aeson >=1.5.6.0,- ansi-terminal >=0.11,- base ==4.*,- bytestring >=0.10,- case-insensitive >=1.2.1.0,- conduit >=1.3.4.2,- containers >=0.6,+ Glob >=0.9.3,+ MonadRandom >=0.5.1.1,+ aeson >=1.3.1.1,+ ansi-terminal >=0.8.2,+ base >=4.11.1.0 && <5,+ bytestring >=0.10.8.2,+ case-insensitive >=1.2.0.11,+ conduit >=1.3.1,+ containers >=0.5.11.0, data-default >=0.7.1.1,- datadog >=0.2.5.0,- doctest >=0.17,- ekg-core >=0.1.1.7,+ datadog >=0.2.3.0,+ doctest >=0.16.0.1,+ ekg-core >=0.1.1.6, errors >=2.3.0,- exceptions >=0.10.4,- fast-logger >=3.0.5,- filepath >=1.4.2.1,- hashable >=1.3.0.0,- hspec >=2.9.3,- hspec-core >=2.9.3,+ exceptions >=0.10.0,+ fast-logger >=2.4.11,+ filepath >=1.4.2,+ hashable >=1.2.7.0,+ hspec >=2.8.1,+ hspec-core >=2.8.1, hspec-expectations-lifted >=0.10.0,- hspec-junit-formatter >=1.1.0.0,- http-client >=0.6.4.1,- http-conduit >=2.3.8,- http-link-header >=1.2.1,- http-types >=0.12.3,+ hspec-junit-formatter >=1.1.0.1,+ http-client >=0.5.14,+ http-conduit >=2.3.5,+ http-link-header >=1.0.3.1,+ http-types >=0.12.2, immortal >=0.3,- iproute >=1.7.12,- lens >=4.19.2,- load-env >=0.2.1.0,- monad-control >=1.0.3.1,- monad-logger >=0.3.36,+ iproute >=1.7.7,+ lens >=4.16.1,+ load-env >=0.2.0.2,+ monad-control >=1.0.2.3,+ monad-logger >=0.3.31, mtl >=2.2.2,- network >=3.1.1.1,- network-uri >=2.6.4.1,- persistent >=2.13.2.1,- persistent-postgresql >=2.13.2.1,- postgresql-simple >=0.6.4,- primitive >=0.7.3.0,- process >=1.6.13.2,+ network >=2.6.3.6,+ network-uri >=2.6.1.0,+ persistent >=2.8.2,+ persistent-postgresql >=2.8.2.0,+ postgresql-simple >=0.5.4.0,+ primitive >=0.6.3.0,+ process >=1.6.3.0, resource-pool >=0.2.3.2,- retry >=0.8.1.2,- rio >=0.1.21.0,- safe >=0.3.19,- semigroupoids >=5.3.6,- template-haskell >=2.16,- text >=1.2.4.1,- time >=1.9.3,- transformers >=0.5.6.2,- transformers-base >=0.4.6,- unliftio >=0.2.20,- unliftio-core >=0.2.0.1,- unordered-containers >=0.2.15.0,- vector >=0.12.3.1,- wai >=3.2.3,- wai-extra >=3.1.7,- yaml >=0.11.7.0,- yesod >=1.6.1.2,- yesod-core >=1.6.21.0+ retry >=0.8.1.0,+ rio >=0.1.7.0,+ safe >=0.3.17,+ semigroupoids >=5.2.2,+ template-haskell >=2.13.0.0,+ text >=1.2.3.1,+ time >=1.8.0.2,+ transformers >=0.5.5.0,+ transformers-base >=0.4.5.2,+ unliftio >=0.2.9.0,+ unliftio-core >=0.1.2.0,+ unordered-containers >=0.2.9.0,+ vector >=0.12.0.2,+ wai >=3.2.1.2,+ wai-extra >=3.0.24.3,+ yaml >=0.8.32,+ yesod >=1.6.0,+ yesod-core >=1.6.9 test-suite doctest type: exitcode-stdio-1.0@@ -138,7 +138,7 @@ TypeApplications TypeFamilies build-depends:- base ==4.*,+ base >=4.11.1.0 && <5, freckle-app -any test-suite gittest@@ -161,14 +161,14 @@ TypeApplications TypeFamilies build-depends:- base ==4.*,- directory >=1.3.6.0,+ base >=4.11.1.0 && <5,+ directory >=1.3.1.5, freckle-app -any,- hspec >=2.9.3,- process >=1.6.13.2,+ hspec >=2.8.1,+ process >=1.6.3.0, temporary >=1.3,- text >=1.2.4.1,- time >=1.9.3+ text >=1.2.3.1,+ time >=1.8.0.2 if flag(test-git) @@ -198,13 +198,13 @@ ghc-options: -threaded -rtsopts -with-rtsopts=-N build-depends:- aeson >=1.5.6.0,- base ==4.*,- bytestring >=0.10,+ aeson >=1.3.1.1,+ base >=4.11.1.0 && <5,+ bytestring >=0.10.8.2, freckle-app -any,- hspec >=2.9.3,- http-types >=0.12.3,- lens >=4.19.2,- lens-aeson >=1.1.3,- wai >=3.2.3,- wai-extra >=3.1.7+ hspec >=2.8.1,+ http-types >=0.12.2,+ lens >=4.16.1,+ lens-aeson >=1.0.2,+ wai >=3.2.1.2,+ wai-extra >=3.0.24.3
library/Freckle/App/Database.hs view
@@ -35,6 +35,13 @@ import Data.Pool import qualified Data.Text as T import Database.Persist.Postgresql+ ( SqlBackend+ , SqlPersistT+ , createPostgresqlPoolModified+ , createSqlPool+ , openSimpleConn+ , runSqlPool+ ) import Database.PostgreSQL.Simple (Connection, Only(..), connectPostgreSQL, execute) import Database.PostgreSQL.Simple.SqlQQ (sql)@@ -174,8 +181,6 @@ , pccHost , "--port" , show pccPort- , "--region"- , "us-east-1" , "--username" , pccUser ]
library/Freckle/App/Test.hs view
@@ -15,6 +15,7 @@ import Control.Monad.Base import Control.Monad.Catch+import qualified Control.Monad.Fail as Fail import Control.Monad.Logger import Control.Monad.Primitive import Control.Monad.Random (MonadRandom(..))@@ -42,8 +43,8 @@ , MonadReader app , MonadThrow , MonadUnliftIO- , MonadFail , MonadLogger+ , Fail.MonadFail ) instance MonadRandom (AppExample app) where
library/Freckle/App/Wai.hs view
@@ -159,7 +159,7 @@ sockAddrToIp :: SockAddr -> ByteString sockAddrToIp (SockAddrInet _ h) = BS8.pack $ show $ fromHostAddress h sockAddrToIp (SockAddrInet6 _ _ h _) = BS8.pack $ show $ fromHostAddress6 h-sockAddrToIp (SockAddrUnix _) = "<socket>"+sockAddrToIp _ = "<socket>" makeRequestMetricsMiddleware :: (HasDogStatsClient env, HasDogStatsTags env)
package.yaml view
@@ -1,6 +1,6 @@ --- name: freckle-app-version: 1.0.2.6+version: 1.0.2.7 maintainer: Freckle Education category: Utils github: freckle/freckle-app@@ -19,7 +19,7 @@ default: true dependencies:- - base >= 4 && < 5+ - base < 5 default-extensions: - BangPatterns@@ -54,10 +54,10 @@ - MonadRandom - aeson - ansi-terminal- - bytestring >= 0.10+ - bytestring - case-insensitive - conduit- - containers >= 0.6+ - containers - data-default - datadog - doctest@@ -67,12 +67,12 @@ - fast-logger - filepath - hashable- - hspec- - hspec-core+ - hspec >= 2.8.1+ - hspec-core >= 2.8.1 - hspec-expectations-lifted- - hspec-junit-formatter+ - hspec-junit-formatter >= 1.1.0.1 - http-client- - http-conduit+ - http-conduit >= 2.3.5 - http-link-header - http-types - immortal@@ -80,7 +80,7 @@ - lens - load-env - monad-control- - monad-logger+ - monad-logger >= 0.3.31 - mtl - network - network-uri@@ -90,11 +90,11 @@ - primitive - process - resource-pool- - retry+ - retry >= 0.8.1.0 - rio - safe - semigroupoids- - template-haskell >= 2.16+ - template-haskell - text - time - transformers@@ -116,7 +116,7 @@ ghc-options: -threaded -rtsopts "-with-rtsopts=-N" dependencies: - aeson- - bytestring >= 0.10+ - bytestring - freckle-app - hspec - http-types
tests/Freckle/App/HttpSpec.hs view
@@ -32,12 +32,14 @@ $ parseRequest_ "https://www.stackage.org/lts-17.10" let- expectedErrorMessage- = "Error in $: parsing [] failed, expected Array, but encountered Object"+ expectedErrorMessages =+ [ "Error in $: expected [a], encountered Object"+ , "Error in $: parsing [] failed, expected Array, but encountered Object"+ ] getResponseStatus resp `shouldBe` status200 getResponseBody resp ^? _Left . to hdeErrors- . to NE.toList- `shouldBe` Just [expectedErrorMessage]+ . to NE.head+ `shouldSatisfy` maybe False (`elem` expectedErrorMessages)