develop..03cc2de · typeable/pagerduty

.travis.yml+4−30

@@ -1,30 +1,4 @@

1−sudo: false

2−

3−cache:

4− apt: true

5− directories:

6− - ~/.stack

7−

8−branches:

9− only:

10− - master

11− - develop

12−

13−before_install:

14− - export PATH=/opt/ghc/$GHCVER/bin:$PATH

15− - export PATH=~/.local/bin:$PATH

16− - ./script/travis-lifecycle-before_install

17−

18−install:

19− - ./script/travis-lifecycle-install

20−

21−script:

22− - ./script/travis-lifecycle-script

23−

24−matrix:

25− fast_finish: true

26− include:

27− - env: GHCVER=8.0.1

28− addons: { apt: { packages: [ghc-8.0.1], sources: [hvr-ghc] } }

29− - env: GHCVER=7.10.3

30− addons: { apt: { packages: [ghc-7.10.3], sources: [hvr-ghc] } }

1+language: haskell

2+ghc: 7.8.4

3+install: []

4+script: [make all]

Makefilenew file+22

@@ -0,0 +1,22 @@

1+FLAGS := -j --disable-documentation

2+

3+build:

4+ cabal build $(addprefix -,$(findstring j,$(MAKEFLAGS)))

5+

6+all:

7+ make clean; make install && make build

8+

9+install: cabal.sandbox.config

10+ cabal install $(FLAGS) \

11+ --only-dependencies \

12+ --force-reinstalls

13+

14+clean:

15+ cabal clean

16+ rm -rf cabal.sandbox.config .cabal-sandbox

17+

18+doc:

19+ cabal haddock

20+

21+cabal.sandbox.config:

22+ cabal sandbox init

pagerduty.cabal+7−7

@@ -1,5 +1,5 @@

11name: pagerduty

2−version: 0.0.8

2+version: 0.0.3.1

33synopsis: Client library for PagerDuty Integration and REST APIs.

44homepage: http://github.com/brendanhay/pagerduty

55license: OtherLicense

@@ -71,16 +71,16 @@ library

7171 , Network.PagerDuty.Types

7272

7373 build-depends:

74− aeson >= 2.0

75− , base >= 4.7 && < 5

74+ aeson == 0.8.*

75+ , base >= 4.5 && < 5

7676 , bifunctors >= 4.1

7777 , bytestring >= 0.9

7878 , bytestring-conversion >= 0.2.1

79− , conduit > 1.1

79+ , conduit > 1.1 && < 1.3

8080 , data-default-class >= 0.0.1

8181 , exceptions >= 0.6

82− , generics-sop >= 0.5.0.0

83− , http-client >= 0.5 && < 1

82+ , generics-sop >= 0.1.0.2

83+ , http-client >= 0.4.3 && < 0.5

8484 , http-types >= 0.8

8585 , lens >= 4.4

8686 , lens-aeson >= 1

@@ -89,7 +89,7 @@ library

8989 , mtl >= 2.1.3.1

9090 , template-haskell >= 2.2

9191 , text >= 1.1

92− , time >= 1.2

92+ , time >= 1.2 && < 1.6

9393 , time-locale-compat >= 0.1.0.1

9494 , transformers >= 0.2

9595 , transformers-compat >= 0.3

script/generate-pagesnew file+25

@@ -0,0 +1,25 @@

1+#!/usr/bin/env bash

2+

3+set -e

4+set -x

5+set -o errexit

6+

7+branch=$(git symbolic-ref -q HEAD)

8+branch=${branch##refs/heads/}

9+branch=${branch:-HEAD}

10+

11+cabal configure --disable-tests

12+

13+DOCDIR=`mktemp -d -t pages.XXXXXX`

14+cabal haddock --haddock-option=-o$DOCDIR

15+

16+HEAD=`git rev-parse HEAD`

17+

18+git checkout gh-pages

19+

20+mv $DOCDIR/* .

21+

22+git add *.html *.js *.css *.gif *.png

23+git commit -m "Generated documentation from $HEAD on $branch"

24+git push origin gh-pages

25+git checkout $branch

script/travis-lifecycle-before_installdeleted−11

@@ -1,11 +0,0 @@

1−#!/usr/bin/env bash

2−

3−set -e

4−

5−mkdir -p ~/.local/bin

6−

7−curl -L https://www.stackage.org/stack/linux-x86_64 | \

8− tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'

9−

10−ghc --version

11−stack --version

script/travis-lifecycle-installdeleted−13

@@ -1,13 +0,0 @@

1−#!/usr/bin/env bash

2−

3−set -e

4−

5−GHCVER=${GHCVER?"GHCVER needs to be set."}

6−

7−path=$(cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)

8−

9−$path/travis-timeout \

10− stack --no-terminal --skip-ghc-check --stack-yaml stack-$GHCVER.yaml setup

11−

12−$path/travis-timeout \

13− stack --no-terminal --skip-ghc-check --stack-yaml stack-$GHCVER.yaml test pagerduty --only-snapshot

script/travis-lifecycle-scriptdeleted−9

@@ -1,9 +0,0 @@

1−#!/usr/bin/env bash

2−

3−set -e

4−

5−GHCVER=${GHCVER?"GHCVER needs to be set."}

6−

7−path=$(cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)

8−

9−stack --no-terminal --skip-ghc-check --stack-yaml stack-$GHCVER.yaml test pagerduty

script/travis-timeoutdeleted−15

@@ -1,15 +0,0 @@

1−#!/usr/bin/env bash

2−

3−$* &

4−pidA=$!

5−minutes=0

6−

7−while true; do sleep 60; ((minutes++)); echo -e "\033[0;32m$minutes minute(s) elapsed running '$*'\033[0m."; done &

8−pidB=$!

9−wait $pidA

10−resA=$?

11−

12−echo -e "\033[0;32m'$*' exited with status ${resA}.\033[0m"

13−kill -9 $pidB

14−

15−exit $resA

script/upload-documentationnew file+37

@@ -0,0 +1,37 @@

1+#!/usr/bin/env bash

2+

3+set -e

4+

5+package=${PWD##*/}

6+

7+echo "Package: ${package}"

8+read -p "Version: " version

9+read -p "Hackage user: " user

10+read -sp "Hackage password (not echoed): " password

11+

12+echo

13+echo "BUILDING"

14+echo

15+

16+cabal configure

17+cabal build

18+cabal haddock \

19+ --hyperlink-source \

20+ --html-location='/package/$pkg-$version/docs' \

21+ --contents-location='/package/$pkg'

22+

23+echo

24+echo "ARCHIVING"

25+echo

26+

27+cd dist/doc/html

28+DDIR="${package}-${version}-docs"

29+cp -r "${package}" "${DDIR}" && gtar -c -v -z -Hustar -f "${DDIR}.tar.gz" "${DDIR}"

30+

31+echo

32+echo "UPLOADING"

33+echo

34+

35+curl -X PUT -H 'Content-Type: application/x-tar' \

36+ -H 'Content-Encoding: gzip' --data-binary "@${DDIR}.tar.gz" \

37+ "http://${user}:${password}@hackage.haskell.org/package/${package}-${version}/docs"

src/Control/Monad/Trans/PagerDuty.hs+1−2

@@ -42,10 +42,9 @@ module Control.Monad.Trans.PagerDuty

4242 ) where

4343

4444import Control.Applicative

45−import Control.Monad

4645import Control.Monad.Base

4746import Control.Monad.Catch

48−import Control.Monad.Except (MonadError (..))

47+import Control.Monad.Error (MonadError (..))

4948import Control.Monad.Morph

5049import Control.Monad.Reader

5150import Control.Monad.Trans.Control

src/Network/PagerDuty/Integration.hs+3−3

@@ -81,7 +81,8 @@ module Network.PagerDuty.Integration

8181import Control.Lens

8282import Control.Monad.IO.Class

8383import Data.Aeson

84−import qualified Data.Aeson.KeyMap as Map

84+import Data.Default.Class

85+import qualified Data.HashMap.Strict as Map

8586import Data.Text (Text)

8687import Network.HTTP.Client (Manager)

8788import qualified Network.HTTP.Client as Client

@@ -291,8 +292,7 @@ submitWith :: MonadIO m

291292 -> Event

292293 -> m (Either Error Response)

293294submitWith m l e = request m l e $

294− Client.defaultRequest

295− { Client.host = "events.pagerduty.com"

295+ def { Client.host = "events.pagerduty.com"

296296 , Client.path = "/generic/2010-04-15/create_event.json"

297297 , Client.method = "POST"

298298 }

src/Network/PagerDuty/Internal/Options.hs+3−3

@@ -14,9 +14,9 @@ module Network.PagerDuty.Internal.Options

1414 , underscored

1515 ) where

1616

17−import Data.Aeson.Types

18−import Data.Char

19−import Data.List

17+import Data.Aeson.Types

18+import Data.Char

19+import Data.List

2020

2121dropped :: Int -> Options -> Options

2222dropped n o = o

src/Network/PagerDuty/Internal/Query.hs+11−13

@@ -1,6 +1,5 @@

11{-# LANGUAGE ConstraintKinds #-}

22{-# LANGUAGE DefaultSignatures #-}

3−{-# LANGUAGE FlexibleContexts #-}

43{-# LANGUAGE GADTs #-}

54{-# LANGUAGE OverloadedStrings #-}

65{-# LANGUAGE ScopedTypeVariables #-}

@@ -24,14 +23,14 @@ module Network.PagerDuty.Internal.Query

2423

2524import Data.Aeson.Types

2625import Data.Bifunctor

27−import Data.ByteString (ByteString)

28−import qualified Data.ByteString.Char8 as BS

26+import Data.ByteString (ByteString)

27+import qualified Data.ByteString.Char8 as BS

2928import Data.ByteString.Conversion

30−import Data.Function (on)

31−import Data.List (groupBy)

32−import Data.Monoid ((<>))

33−import Data.Text (Text)

34−import qualified Data.Text.Encoding as Text

29+import Data.Function (on)

30+import Data.List (groupBy)

31+import Data.Monoid ((<>))

32+import Data.Text (Text)

33+import qualified Data.Text.Encoding as Text

3534import Generics.SOP

3635import Network.HTTP.Types

3736import Network.PagerDuty.Internal.Options

@@ -59,15 +58,14 @@ gqueryWith :: forall a. (Generic a, HasDatatypeInfo a, All2 QueryValues (Code a)

5958 -> a

6059 -> Query

6160gqueryWith o a = case datatypeInfo (Proxy :: Proxy a) of

62− ADT _ _ cs _ -> go cs (from a)

63− Newtype _ _ c -> go (c :* Nil) (from a)

61+ ADT _ _ cs -> go cs (from a)

62+ Newtype _ _ c -> go (c :* Nil) (from a)

6463 where

65− go :: (All2 QueryValues xss, SListI xss)

64+ go :: (All2 QueryValues xss, SingI xss)

6665 => NP ConstructorInfo xss

6766 -> SOP I xss

6867 -> Query

69− go cs (SOP sop) =

70− group . hcollapse $ hcliftA2' p (gctor o) cs sop

68+ go cs (SOP sop) = group . unI . hcollapse $ hcliftA2' p (gctor o) cs sop

7169

7270 group :: [(ByteString, ByteString)] -> Query

7371 group = concatMap f . groupBy ((==) `on` fst)

src/Network/PagerDuty/Internal/TH.hs+5−5

@@ -40,15 +40,15 @@ module Network.PagerDuty.Internal.TH

4040

4141import Control.Applicative

4242import Control.Lens

43−import qualified Data.Aeson.TH as Aeson

43+import qualified Data.Aeson.TH as Aeson

4444import Data.Aeson.Types

45−import Data.ByteString (ByteString)

46−import qualified Data.Text.Encoding as Text

45+import Data.ByteString (ByteString)

46+import qualified Data.Text.Encoding as Text

4747import Generics.SOP.TH

4848import Language.Haskell.TH

4949import Network.HTTP.Types.QueryLike

50−import Network.PagerDuty.Internal.Options

5150import Network.PagerDuty.Internal.Query

51+import Network.PagerDuty.Internal.Options

5252

5353jsonRequest :: Name -> Q [Dec]

5454jsonRequest n = concat <$> sequence

@@ -61,7 +61,7 @@ queryRequest :: Name -> Q [Dec]

6161queryRequest n = concat <$> sequence

6262 [ deriveGeneric n

6363 , makeLenses n

64− , [d|instance ToJSON $(conT n) where toJSON = const emptyObject|]

64+ , [d|instance ToJSON $(conT n) where toJSON = const (toJSON (object []))|]

6565 , [d|instance QueryLike $(conT n) where toQuery = gquery|]

6666 ]

6767

src/Network/PagerDuty/Internal/Types.hs+14−21

@@ -27,23 +27,23 @@

2727module Network.PagerDuty.Internal.Types where

2828

2929import Control.Applicative

30−import Control.Lens hiding ((.=), Empty)

30+import Control.Lens hiding ((.=))

3131import Control.Monad.IO.Class

32−import Data.Aeson hiding (Error, Key)

33−import qualified Data.Aeson.KeyMap as Map

32+import Data.Aeson hiding (Error)

3433import Data.Aeson.Types (Parser)

3534import Data.ByteString (ByteString)

3635import qualified Data.ByteString.Char8 as BS

3736import Data.ByteString.Conversion hiding (List)

3837import Data.Default.Class

3938import Data.Function (on)

39+import qualified Data.HashMap.Strict as Map

4040import Data.List (deleteBy, intersperse)

4141import Data.Monoid

4242import Data.String

4343import Data.Text (Text)

4444import qualified Data.Text as Text

4545import qualified Data.Text.Encoding as Text

46−import Data.Time (UTCTime, TimeZone, formatTime, utc, timeZoneName)

46+import Data.Time

4747import GHC.TypeLits

4848import Network.HTTP.Client (Manager)

4949import Network.HTTP.Types

@@ -53,7 +53,7 @@ import Network.PagerDuty.Internal.TH

5353import Data.Time.Locale.Compat

5454

5555newtype CSV a = CSV [a]

56− deriving (Eq, Show, Semigroup, Monoid)

56+ deriving (Eq, Show, Monoid)

5757

5858makePrisms ''CSV

5959

@@ -70,7 +70,7 @@ instance ToByteString a => ToJSON (CSV a) where

7070 toJSON = String . Text.decodeUtf8 . toByteString'

7171

7272newtype List a = L [a]

73− deriving (Eq, Show, Semigroup, Monoid)

73+ deriving (Eq, Show, Monoid)

7474

7575deriveJSON ''List

7676makePrisms ''List

@@ -133,8 +133,8 @@ data Security = Basic | Token

133133 deriving (Eq, Show)

134134

135135data Auth (a :: Security) where

136− AuthBasic :: ByteString -> ByteString -> Auth 'Basic

137− AuthToken :: ByteString -> Auth 'Token

136+ AuthBasic :: ByteString -> ByteString -> Auth Basic

137+ AuthToken :: ByteString -> Auth Token

138138

139139deriving instance Eq (Auth a)

140140deriving instance Show (Auth a)

@@ -279,13 +279,8 @@ data Pager = Pager

279279

280280makeLenses ''Pager

281281

282−data Page a = Page

283− { _pgItem :: a

284− , _pgPager :: Maybe Pager

285− }

286−

287−instance FromJSON a => FromJSON (Page a) where

288− parseJSON = withObject "paginated" $ \o -> Page

282+instance FromJSON a => FromJSON (a, Maybe Pager) where

283+ parseJSON = withObject "paginated" $ \o -> (,)

289284 <$> parseJSON (Object o)

290285 <*> optional (parse o)

291286 where

@@ -310,13 +305,11 @@ data Path where

310305 Path :: Path

311306 Seg :: ToByteString a => a -> Path

312307

313−instance Semigroup Path where

314− x <> Path = x

315− Path <> y = y

316− Seg x <> Seg y = Seg (builder x <> "/" <> builder y)

317−

318308instance Monoid Path where

319− mempty = Path

309+ mempty = Path

310+ mappend x Path = x

311+ mappend Path y = y

312+ mappend (Seg x) (Seg y) = Seg (builder x <> "/" <> builder y)

320313

321314instance IsString Path where

322315 fromString = Seg

src/Network/PagerDuty/REST.hs+8−6

@@ -13,6 +13,7 @@

1313

1414module Network.PagerDuty.REST

1515 (

16+

1617 -- * Sending requests

1718 send

1819 , sendWith

@@ -29,6 +30,7 @@ import Control.Monad.IO.Class

2930import Control.Monad.Trans

3031import Data.Aeson (FromJSON)

3132import Data.Conduit

33+import Data.Default.Class

3234import Data.Monoid

3335import Network.HTTP.Client (Manager)

3436import qualified Network.HTTP.Client as Client

@@ -54,7 +56,7 @@ sendWith :: (MonadIO m, FromJSON b)

5456 => Env s

5557 -> Request a s b

5658 -> m (Either Error b)

57−sendWith e = liftM (fmap _pgItem) . http e

59+sendWith e = liftM (fmap fst) . http e

5860

5961-- | /See:/ 'paginateWith'

6062paginate :: (MonadIO m, Paginate a, FromJSON b)

@@ -73,15 +75,15 @@ paginateWith e = go

7375 where

7476 go rq = do

7577 rs <- lift (http e rq)

76− yield (_pgItem <$> rs)

78+ yield (fst <$> rs)

7779 either (const (return ()))

78− (maybe (return ()) go . next rq . _pgPager)

80+ (maybe (return ()) go . next rq . snd)

7981 rs

8082

8183http :: (MonadIO m, FromJSON b)

8284 => Env s

8385 -> Request a s b

84− -> m (Either Error (Page b))

86+ -> m (Either Error (b, Maybe Pager))

8587http e rq = request (e ^. envManager) (e ^. envLogger) rq $ raw

8688 { Client.host = domain (e ^. envDomain)

8789 , Client.path = renderPath (rq ^. path)

@@ -89,7 +91,7 @@ http e rq = request (e ^. envManager) (e ^. envLogger) rq $ raw

8991 }

9092 where

9193 raw = case e ^. envAuth of

92− AuthBasic u p -> Client.applyBasicAuth u p Client.defaultRequest

93− AuthToken t -> Client.defaultRequest

94+ AuthBasic u p -> Client.applyBasicAuth u p def

95+ AuthToken t -> def

9496 { Client.requestHeaders = [("Authorization", "Token token=" <> t)]

9597 }

src/Network/PagerDuty/REST/Alerts.hs+6−6

@@ -43,12 +43,12 @@ module Network.PagerDuty.REST.Alerts

4343 , alertAddress

4444 ) where

4545

46−import Control.Lens hiding (Empty)

47−import Data.Aeson.Lens

48−import Data.Time

49−import Network.PagerDuty.Internal.TH

50−import Network.PagerDuty.Internal.Types

51−import Network.PagerDuty.REST.Users (User)

46+import Control.Lens

47+import Data.Aeson.Lens

48+import Data.Time

49+import Network.PagerDuty.REST.Users (User)

50+import Network.PagerDuty.Internal.TH

51+import Network.PagerDuty.Internal.Types

5252

5353alerts :: Path

5454alerts = "alerts"

src/Network/PagerDuty/REST/EscalationPolicies.hs+13−13

@@ -1,8 +1,8 @@

1−{-# LANGUAGE DataKinds #-}

2−{-# LANGUAGE ExtendedDefaultRules #-}

3−{-# LANGUAGE OverloadedStrings #-}

4−{-# LANGUAGE TemplateHaskell #-}

5−{-# LANGUAGE TypeFamilies #-}

1+{-# LANGUAGE ExtendedDefaultRules #-}

2+{-# LANGUAGE DataKinds #-}

3+{-# LANGUAGE OverloadedStrings #-}

4+{-# LANGUAGE TemplateHaskell #-}

5+{-# LANGUAGE TypeFamilies #-}

66

77{-# OPTIONS_GHC -fno-warn-type-defaults #-}

88

@@ -60,15 +60,15 @@ module Network.PagerDuty.REST.EscalationPolicies

6060 , pServices

6161 ) where

6262

63−import Control.Lens hiding (Empty)

64−import Data.Aeson.Lens

65−import Data.Text (Text)

66−import Network.HTTP.Types

67−import Network.PagerDuty.Internal.TH

68−import Network.PagerDuty.Internal.Types

69−import Network.PagerDuty.REST.Services (Service)

63+import Control.Lens

64+import Data.Aeson.Lens

65+import Data.Text (Text)

66+import Network.HTTP.Types

67+import Network.PagerDuty.REST.Services (Service)

68+import Network.PagerDuty.Internal.TH

69+import Network.PagerDuty.Internal.Types

7070

71−import Network.PagerDuty.REST.EscalationPolicies.EscalationRules

71+import Network.PagerDuty.REST.EscalationPolicies.EscalationRules

7272

7373default (Path)

7474

src/Network/PagerDuty/REST/EscalationPolicies/EscalationRules.hs+9−9

@@ -1,7 +1,7 @@

1−{-# LANGUAGE ExtendedDefaultRules #-}

2−{-# LANGUAGE FlexibleInstances #-}

3−{-# LANGUAGE OverloadedStrings #-}

4−{-# LANGUAGE TemplateHaskell #-}

1+{-# LANGUAGE ExtendedDefaultRules #-}

2+{-# LANGUAGE FlexibleInstances #-}

3+{-# LANGUAGE OverloadedStrings #-}

4+{-# LANGUAGE TemplateHaskell #-}

55

66{-# OPTIONS_GHC -fno-warn-type-defaults #-}

77

@@ -64,15 +64,15 @@ module Network.PagerDuty.REST.EscalationPolicies.EscalationRules

6464 , rTargets

6565 ) where

6666

67−import Control.Applicative ((<$>))

68−import Control.Lens hiding ((.=))

67+import Control.Applicative ((<$>))

68+import Control.Lens hiding ((.=))

6969import Data.Aeson

70−import qualified Data.Aeson.KeyMap as Map

71−import Data.Text (Text)

70+import qualified Data.HashMap.Strict as Map

71+import Data.Text (Text)

7272import Network.HTTP.Types

73+import Network.PagerDuty.REST.Users

7374import Network.PagerDuty.Internal.TH

7475import Network.PagerDuty.Internal.Types

75−import Network.PagerDuty.REST.Users

7676

7777default (Path)

7878

src/Network/PagerDuty/REST/Incidents.hs+3−4

@@ -130,10 +130,9 @@ module Network.PagerDuty.REST.Incidents

130130 ) where

131131

132132import Control.Applicative hiding (empty)

133−import Control.Lens hiding (Empty)

133+import Control.Lens

134134import Data.Aeson

135−import Data.ByteString.Conversion (ToByteString (..),

136− toByteString')

135+import Data.ByteString.Conversion (ToByteString(..), toByteString')

137136import Data.Default.Class

138137import Data.Maybe

139138import Data.Monoid hiding (All)

@@ -567,7 +566,7 @@ updateIncidents r = auth updateIncidentsBasic & query .~ [("requester_id", r)]

567566

568567-- | A version of 'updateIncidents' which uses HTTP Basic authentication and

569568-- doesn't require a 'RequesterId'.

570−updateIncidentsBasic :: Request UpdateIncidents 'Basic [UpdatedIncidents]

569+updateIncidentsBasic :: Request UpdateIncidents Basic [UpdatedIncidents]

571570updateIncidentsBasic =

572571 mk UpdateIncidents

573572 { _uiIncidents' = []

src/Network/PagerDuty/REST/Incidents/Notes.hs+11−11

@@ -1,6 +1,6 @@

1−{-# LANGUAGE ExtendedDefaultRules #-}

2−{-# LANGUAGE OverloadedStrings #-}

3−{-# LANGUAGE TemplateHaskell #-}

1+{-# LANGUAGE ExtendedDefaultRules #-}

2+{-# LANGUAGE OverloadedStrings #-}

3+{-# LANGUAGE TemplateHaskell #-}

44

55{-# OPTIONS_GHC -fno-warn-type-defaults #-}

66

@@ -36,14 +36,14 @@ module Network.PagerDuty.REST.Incidents.Notes

3636 , nContent

3737 ) where

3838

39−import Control.Lens hiding ((.=))

40−import Data.Aeson

41−import Data.Text (Text)

42−import Data.Time

43−import Network.HTTP.Types

44−import Network.PagerDuty.Internal.TH

45−import Network.PagerDuty.Internal.Types

46−import Network.PagerDuty.REST.Users

39+import Control.Lens hiding ((.=))

40+import Data.Aeson

41+import Data.Text (Text)

42+import Data.Time

43+import Network.HTTP.Types

44+import Network.PagerDuty.REST.Users

45+import Network.PagerDuty.Internal.TH

46+import Network.PagerDuty.Internal.Types

4747

4848default (Path)

4949

src/Network/PagerDuty/REST/LogEntries.hs+6−5

@@ -111,18 +111,19 @@ module Network.PagerDuty.REST.LogEntries

111111 , nAddress

112112 ) where

113113

114−import Control.Lens hiding (Empty)

114+import Control.Applicative

115+import Control.Lens

115116import Data.Aeson

116117import Data.Aeson.Lens

117−import qualified Data.Aeson.KeyMap as Map

118118import Data.Default.Class

119−import Data.Text (Text)

120−import qualified Data.Text as Text

119+import qualified Data.HashMap.Strict as Map

120+import Data.Text (Text)

121+import qualified Data.Text as Text

121122import Data.Time

122123import Network.HTTP.Types

124+import Network.PagerDuty.REST.Users (User)

123125import Network.PagerDuty.Internal.TH

124126import Network.PagerDuty.Internal.Types

125−import Network.PagerDuty.REST.Users (User)

126127

127128logs :: Path

128129logs = "log_entries"

src/Network/PagerDuty/REST/MaintenanceWindows.hs+9−9

@@ -74,14 +74,14 @@ module Network.PagerDuty.REST.MaintenanceWindows

7474 , mwServices

7575 ) where

7676

77−import Control.Lens hiding (Empty)

78−import Data.Monoid

79−import Data.Text (Text)

80−import Data.Time

81−import Network.HTTP.Types

82−import Network.PagerDuty.Internal.TH

83−import Network.PagerDuty.Internal.Types

84−import Network.PagerDuty.REST.Users (User)

77+import Control.Lens

78+import Data.Monoid

79+import Data.Text (Text)

80+import Data.Time

81+import Network.HTTP.Types

82+import Network.PagerDuty.REST.Users (User)

83+import Network.PagerDuty.Internal.TH

84+import Network.PagerDuty.Internal.Types

8585

8686windows :: Path

8787windows = "maintenance_windows"

@@ -214,7 +214,7 @@ createWindow r s e xs =

214214createWindowBasic :: UTCTime -- ^ 'cwStartTime'

215215 -> UTCTime -- ^ 'cwEndTime'

216216 -> [ServiceId] -- ^ 'cwServiceIds'

217− -> Request CreateWindow 'Basic MaintenanceWindow

217+ -> Request CreateWindow Basic MaintenanceWindow

218218createWindowBasic s e xs =

219219 mk CreateWindow

220220 { _cwRequesterId' = Nothing

src/Network/PagerDuty/REST/Reports.hs+10−10

@@ -1,8 +1,8 @@

1−{-# LANGUAGE DataKinds #-}

2−{-# LANGUAGE ExtendedDefaultRules #-}

3−{-# LANGUAGE OverloadedStrings #-}

4−{-# LANGUAGE TemplateHaskell #-}

5−{-# LANGUAGE TypeFamilies #-}

1+{-# LANGUAGE DataKinds #-}

2+{-# LANGUAGE ExtendedDefaultRules #-}

3+{-# LANGUAGE OverloadedStrings #-}

4+{-# LANGUAGE TemplateHaskell #-}

5+{-# LANGUAGE TypeFamilies #-}

66

77{-# OPTIONS_GHC -fno-warn-type-defaults #-}

88

@@ -58,11 +58,11 @@ module Network.PagerDuty.REST.Reports

5858 , irNumberOfIncidents

5959 ) where

6060

61−import Control.Lens hiding (Empty)

62−import Data.Aeson.Lens

63−import Data.Time

64−import Network.PagerDuty.Internal.TH

65−import Network.PagerDuty.Internal.Types

61+import Control.Lens

62+import Data.Aeson.Lens

63+import Data.Time

64+import Network.PagerDuty.Internal.TH

65+import Network.PagerDuty.Internal.Types

6666

6767default (Path)

6868

src/Network/PagerDuty/REST/Schedules.hs+13−13

@@ -1,8 +1,8 @@

1−{-# LANGUAGE DataKinds #-}

2−{-# LANGUAGE ExtendedDefaultRules #-}

3−{-# LANGUAGE OverloadedStrings #-}

4−{-# LANGUAGE TemplateHaskell #-}

5−{-# LANGUAGE TypeFamilies #-}

1+{-# LANGUAGE DataKinds #-}

2+{-# LANGUAGE ExtendedDefaultRules #-}

3+{-# LANGUAGE OverloadedStrings #-}

4+{-# LANGUAGE TemplateHaskell #-}

5+{-# LANGUAGE TypeFamilies #-}

66

77{-# OPTIONS_GHC -fno-warn-type-defaults #-}

88

@@ -110,14 +110,14 @@ module Network.PagerDuty.REST.Schedules

110110 , sFinalSchedule

111111 ) where

112112

113−import Control.Lens hiding (Empty, (.=))

114−import Data.Aeson

115−import Data.Text (Text)

116−import Data.Time

117−import Network.HTTP.Types

118−import Network.PagerDuty.Internal.TH

119−import Network.PagerDuty.Internal.Types

120−import Network.PagerDuty.REST.Users (User)

113+import Control.Lens hiding ((.=))

114+import Data.Aeson

115+import Data.Text (Text)

116+import Data.Time

117+import Network.HTTP.Types

118+import Network.PagerDuty.REST.Users (User)

119+import Network.PagerDuty.Internal.TH

120+import Network.PagerDuty.Internal.Types

121121

122122default (Path)

123123

src/Network/PagerDuty/REST/Schedules/Overrides.hs+11−11

@@ -1,8 +1,8 @@

1−{-# LANGUAGE DataKinds #-}

2−{-# LANGUAGE ExtendedDefaultRules #-}

3−{-# LANGUAGE OverloadedStrings #-}

4−{-# LANGUAGE TemplateHaskell #-}

5−{-# LANGUAGE TypeFamilies #-}

1+{-# LANGUAGE DataKinds #-}

2+{-# LANGUAGE ExtendedDefaultRules #-}

3+{-# LANGUAGE OverloadedStrings #-}

4+{-# LANGUAGE TemplateHaskell #-}

5+{-# LANGUAGE TypeFamilies #-}

66

77{-# OPTIONS_GHC -fno-warn-type-defaults #-}

88

@@ -50,12 +50,12 @@ module Network.PagerDuty.REST.Schedules.Overrides

5050 , oUser

5151 ) where

5252

53−import Control.Lens

54−import Data.Time

55−import Network.HTTP.Types

56−import Network.PagerDuty.Internal.TH

57−import Network.PagerDuty.Internal.Types

58−import Network.PagerDuty.REST.Users

53+import Control.Lens

54+import Data.Time

55+import Network.HTTP.Types

56+import Network.PagerDuty.REST.Users

57+import Network.PagerDuty.Internal.TH

58+import Network.PagerDuty.Internal.Types

5959

6060overrides :: ScheduleId -> Path

6161overrides i = "schedules" % i % "overrides"

src/Network/PagerDuty/REST/Services.hs+15−15

@@ -1,8 +1,8 @@

1−{-# LANGUAGE DataKinds #-}

2−{-# LANGUAGE ExtendedDefaultRules #-}

3−{-# LANGUAGE OverloadedStrings #-}

4−{-# LANGUAGE TemplateHaskell #-}

5−{-# LANGUAGE TypeFamilies #-}

1+{-# LANGUAGE DataKinds #-}

2+{-# LANGUAGE ExtendedDefaultRules #-}

3+{-# LANGUAGE OverloadedStrings #-}

4+{-# LANGUAGE TemplateHaskell #-}

5+{-# LANGUAGE TypeFamilies #-}

66

77{-# OPTIONS_GHC -fno-warn-type-defaults #-}

88

@@ -106,14 +106,14 @@ module Network.PagerDuty.REST.Services

106106 , svcSeverityFilter

107107 ) where

108108

109−import Control.Lens hiding (Empty)

110−import Data.Aeson.Lens

111−import Data.Text (Text)

112−import Data.Time

113−import Network.HTTP.Types

114−import Network.PagerDuty.Internal.TH

115−import Network.PagerDuty.Internal.Types

116−import Network.PagerDuty.REST.Services.EmailFilters

109+import Control.Lens

110+import Data.Aeson.Lens

111+import Data.Text (Text)

112+import Data.Time

113+import Network.HTTP.Types

114+import Network.PagerDuty.REST.Services.EmailFilters

115+import Network.PagerDuty.Internal.TH

116+import Network.PagerDuty.Internal.Types

117117

118118default (Path)

119119

@@ -483,7 +483,7 @@ enableService r i =

483483

484484-- | A version of 'enableService' which uses HTTP Basic authentication and

485485-- doesn't require a 'RequesterId'.

486−enableServiceBasic :: ServiceId -> Request Empty 'Basic Empty

486+enableServiceBasic :: ServiceId -> Request Empty Basic Empty

487487enableServiceBasic i = empty & meth .~ PUT & path .~ services % i % "enable"

488488

489489-- | Disable a service. Once a service is disabled, it will not be able to

@@ -498,7 +498,7 @@ disableService r i =

498498

499499-- | A version of 'disableService' which uses HTTP Basic authentication and

500500-- doesn't require a 'RequesterId'.

501−disableServiceBasic :: ServiceId -> Request Empty 'Basic Empty

501+disableServiceBasic :: ServiceId -> Request Empty Basic Empty

502502disableServiceBasic i = empty & meth .~ PUT & path .~ services % i % "disable"

503503

504504-- | Regenerate a new service key for an existing service.

src/Network/PagerDuty/REST/Services/EmailFilters.hs+13−13

@@ -1,6 +1,6 @@

1−{-# LANGUAGE ExtendedDefaultRules #-}

2−{-# LANGUAGE OverloadedStrings #-}

3−{-# LANGUAGE TemplateHaskell #-}

1+{-# LANGUAGE ExtendedDefaultRules #-}

2+{-# LANGUAGE OverloadedStrings #-}

3+{-# LANGUAGE TemplateHaskell #-}

44

55{-# OPTIONS_GHC -fno-warn-type-defaults #-}

66

@@ -39,15 +39,15 @@ module Network.PagerDuty.REST.Services.EmailFilters

3939 , efId

4040 ) where

4141

42−import Control.Applicative hiding (empty)

43−import Control.Lens hiding ((.=))

44−import Data.Aeson

45−import Data.Default.Class

46−import Data.Monoid

47−import Data.Text (Text)

48−import Network.HTTP.Types

49−import Network.PagerDuty.Internal.TH

50−import Network.PagerDuty.Internal.Types

42+import Control.Applicative hiding (empty)

43+import Control.Lens hiding ((.=))

44+import Data.Aeson

45+import Data.Default.Class

46+import Data.Monoid

47+import Data.Text (Text)

48+import Network.HTTP.Types

49+import Network.PagerDuty.Internal.TH

50+import Network.PagerDuty.Internal.Types

5151

5252default (Path)

5353

@@ -65,7 +65,7 @@ deriveNullaryWith hyphenated ''MatchMode

6565-- FIXME: Tighten up this type! Make the regex required for match/no-match and

6666-- encode the conditional invariants.

6767data EmailFilterInfo = EmailFilterInfo

68− { _efSubjectMode' :: Maybe MatchMode

68+ { _efSubjectMode' :: Maybe MatchMode

6969 , _efSubjectRegex' :: Maybe Text

7070 , _efBodyMode' :: Maybe MatchMode

7171 , _efBodyRegex' :: Maybe Text

src/Network/PagerDuty/REST/Users.hs+16−16

@@ -1,8 +1,8 @@

1−{-# LANGUAGE DataKinds #-}

2−{-# LANGUAGE ExtendedDefaultRules #-}

3−{-# LANGUAGE OverloadedStrings #-}

4−{-# LANGUAGE TemplateHaskell #-}

5−{-# LANGUAGE TypeFamilies #-}

1+{-# LANGUAGE DataKinds #-}

2+{-# LANGUAGE ExtendedDefaultRules #-}

3+{-# LANGUAGE OverloadedStrings #-}

4+{-# LANGUAGE TemplateHaskell #-}

5+{-# LANGUAGE TypeFamilies #-}

66

77{-# OPTIONS_GHC -fno-warn-type-defaults #-}

88

@@ -81,16 +81,16 @@ module Network.PagerDuty.REST.Users

8181 , uJobTitle

8282 ) where

8383

84−import Control.Applicative hiding (empty)

85−import Control.Lens hiding (Empty, (.=))

86−import Data.Aeson

87−import Data.Default.Class

88−import Data.Monoid

89−import Data.Text (Text)

90−import Data.Time

91−import Network.HTTP.Types

92−import Network.PagerDuty.Internal.TH

93−import Network.PagerDuty.Internal.Types

84+import Control.Applicative hiding (empty)

85+import Control.Lens hiding ((.=))

86+import Data.Aeson

87+import Data.Default.Class

88+import Data.Monoid

89+import Data.Text (Text)

90+import Data.Time

91+import Network.HTTP.Types

92+import Network.PagerDuty.Internal.TH

93+import Network.PagerDuty.Internal.Types

9494

9595default (Path)

9696

@@ -315,7 +315,7 @@ createUser r n e = auth (createUserBasic n e) & query .~ [("requester_id", r)]

315315-- doesn't require a 'RequesterId'.

316316createUserBasic :: Text -- ^ 'cuName'

317317 -> Address -- ^ 'cuEmail'

318− -> Request CreateUser 'Basic User

318+ -> Request CreateUser Basic User

319319createUserBasic n e =

320320 mk CreateUser

321321 { _cuName' = n

src/Network/PagerDuty/REST/Users/ContactMethods.hs+9−9

@@ -1,6 +1,6 @@

1−{-# LANGUAGE ExtendedDefaultRules #-}

2−{-# LANGUAGE OverloadedStrings #-}

3−{-# LANGUAGE TemplateHaskell #-}

1+{-# LANGUAGE ExtendedDefaultRules #-}

2+{-# LANGUAGE OverloadedStrings #-}

3+{-# LANGUAGE TemplateHaskell #-}

44

55{-# OPTIONS_GHC -fno-warn-type-defaults #-}

66

@@ -56,12 +56,12 @@ module Network.PagerDuty.REST.Users.ContactMethods

5656 , Contact

5757 ) where

5858

59−import Control.Lens

60−import Data.Aeson.Lens

61−import Data.Text (Text)

62−import Network.HTTP.Types

63−import Network.PagerDuty.Internal.TH

64−import Network.PagerDuty.Internal.Types

59+import Control.Lens

60+import Data.Aeson.Lens

61+import Data.Text (Text)

62+import Network.HTTP.Types

63+import Network.PagerDuty.Internal.TH

64+import Network.PagerDuty.Internal.Types

6565

6666default (Path)

6767

src/Network/PagerDuty/REST/Users/NotificationRules.hs+9−9

@@ -1,6 +1,6 @@

1−{-# LANGUAGE ExtendedDefaultRules #-}

2−{-# LANGUAGE OverloadedStrings #-}

3−{-# LANGUAGE TemplateHaskell #-}

1+{-# LANGUAGE ExtendedDefaultRules #-}

2+{-# LANGUAGE OverloadedStrings #-}

3+{-# LANGUAGE TemplateHaskell #-}

44

55{-# OPTIONS_GHC -fno-warn-type-defaults #-}

66

@@ -51,12 +51,12 @@ module Network.PagerDuty.REST.Users.NotificationRules

5151 , rContactMethod

5252 ) where

5353

54−import Control.Lens

55−import Data.Aeson.Lens

56−import Network.HTTP.Types

57−import Network.PagerDuty.Internal.TH

58−import Network.PagerDuty.Internal.Types

59−import Network.PagerDuty.REST.Users.ContactMethods

54+import Control.Lens

55+import Data.Aeson.Lens

56+import Network.HTTP.Types

57+import Network.PagerDuty.REST.Users.ContactMethods

58+import Network.PagerDuty.Internal.TH

59+import Network.PagerDuty.Internal.Types

6060

6161default (Path)

6262

src/Network/PagerDuty/REST/Webhooks.hs+2−3

@@ -35,14 +35,13 @@ module Network.PagerDuty.REST.Webhooks

3535import Control.Applicative hiding (empty)

3636import Control.Lens

3737import Data.Aeson

38−import Data.ByteString.Conversion (ToByteString (..),

39− toByteString')

38+import Data.ByteString.Conversion (ToByteString(..), toByteString')

4039import Data.Text (Text)

4140import qualified Data.Text.Encoding as Text

4241import Data.Time

42+import Network.PagerDuty.REST.Incidents

4343import Network.PagerDuty.Internal.TH

4444import Network.PagerDuty.Internal.Types

45−import Network.PagerDuty.REST.Incidents

4645

4746data WebhookType

4847 = WTrigger

stack.yaml+4−6

@@ -1,7 +1,5 @@

1−resolver: lts-19.23

2−

1+flags: {}

32packages:

4−- .

5−

6−nix:

7− packages: [zlib]

3+- '.'

4+extra-deps: []

5+resolver: nightly-2015-06-17