cb03f1d...develop · typeable/pagerduty

.gitignore+1

since splitsnapshots

unifiedsplit

@@ -9,6 +9,7 @@

9cabal.sandbox.config

10

11# Dirs

12+.stack-work

12cabal-dev

13cabal-dev

13bin

14bin

14dist

15dist

.travis.yml+30−4

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

1−language: haskell

1+sudo: false

2−ghc: 7.8.4

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+

3−install: []

18+install:

4−script: [make all]

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] } }

Makefiledeleted−22

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

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+16−14

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

1name: pagerduty

2−version: 0.0.1.1

2+version: 0.0.8

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

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

5license: OtherLicense

@@ -26,7 +26,7 @@ description:

26 /Warning:/ This is an experimental preview release which is still under

27 heavy development and not intended for public consumption, caveat emptor!

28 .

29− /Note:/ An alternative source for Haddock documentation can be found <here http://brendanhay.nz/pagerduty>.

29+ /Note:/ An alternative source for Haddock documentation can be found <http://brendanhay.nz/pagerduty here>.

30

31extra-source-files:

32 README.md

@@ -71,25 +71,27 @@ library

71 , Network.PagerDuty.Types

72

73 build-depends:

74− aeson == 0.8.*

74+ aeson >= 2.0

75− , base >= 4.5 && < 5

75+ , base >= 4.7 && < 5

76− , bifunctors >= 4.1 && < 5

76+ , bifunctors >= 4.1

77 , bytestring >= 0.9

78 , bytestring-conversion >= 0.2.1

79− , conduit > 1.1 && < 1.3

79+ , conduit > 1.1

80 , data-default-class >= 0.0.1

81 , exceptions >= 0.6

82− , generics-sop >= 0.1.0.2

82+ , generics-sop >= 0.5.0.0

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

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

84 , http-types >= 0.8

85− , lens >= 4.4 && < 5

85+ , lens >= 4.4

86 , lens-aeson >= 1

87− , mmorph >= 1 && < 2

87+ , mmorph >= 1

88− , monad-control >= 1 && < 2

88+ , monad-control >= 1

89− , mtl >= 2.2.1 && < 2.3

89+ , mtl >= 2.1.3.1

90 , template-haskell >= 2.2

91 , text >= 1.1

92− , time >= 1.5

92+ , time >= 1.2

93+ , time-locale-compat >= 0.1.0.1

93− , transformers == 0.4.*

94+ , transformers >= 0.2

95+ , transformers-compat >= 0.3

94 , transformers-base >= 0.4.2

96 , transformers-base >= 0.4.2

95 , unordered-containers >= 0.2.3

97 , unordered-containers >= 0.2.3

script/generate-pagesdeleted−25

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

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_installnew file+11

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

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-installnew file+13

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

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-scriptnew file+9

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

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-timeoutnew file+15

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

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-documentationdeleted−37

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

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+3−1

@@ -42,12 +42,14 @@ module Control.Monad.Trans.PagerDuty

42 ) where

43

44import Control.Applicative

45+import Control.Monad

45import Control.Monad.Base

46import Control.Monad.Base

46import Control.Monad.Catch

47import Control.Monad.Catch

47−import Control.Monad.Except

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

48import Control.Monad.Morph

49import Control.Monad.Morph

49import Control.Monad.Reader

50import Control.Monad.Reader

50import Control.Monad.Trans.Control

51import Control.Monad.Trans.Control

52+import Control.Monad.Trans.Except

51import Data.Aeson

53import Data.Aeson

52import Data.Conduit

54import Data.Conduit

53import Network.PagerDuty.Integration (Event, Response)

55import Network.PagerDuty.Integration (Event, Response)

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

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

81import Control.Lens

82import Control.Monad.IO.Class

83import Data.Aeson

84−import Data.Default.Class

85−import qualified Data.HashMap.Strict as Map

84+import qualified Data.Aeson.KeyMap as Map

86import Data.Text (Text)

85import Data.Text (Text)

87import Network.HTTP.Client (Manager)

86import Network.HTTP.Client (Manager)

88import qualified Network.HTTP.Client as Client

87import qualified Network.HTTP.Client as Client

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

292 -> Event

291 -> Event

293 -> m (Either Error Response)

292 -> m (Either Error Response)

294submitWith m l e = request m l e $

293submitWith m l e = request m l e $

294+ Client.defaultRequest

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

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

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

297 , Client.method = "POST"

298 }

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

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

14 , underscored

15 ) where

16

17−import Data.Aeson.Types

17+import Data.Aeson.Types

18−import Data.Char

18+import Data.Char

19−import Data.List

19+import Data.List

20

21dropped :: Int -> Options -> Options

22dropped n o = o

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

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

1{-# LANGUAGE ConstraintKinds #-}

2{-# LANGUAGE DefaultSignatures #-}

3+{-# LANGUAGE FlexibleContexts #-}

3{-# LANGUAGE GADTs #-}

4{-# LANGUAGE GADTs #-}

4{-# LANGUAGE OverloadedStrings #-}

5{-# LANGUAGE OverloadedStrings #-}

5{-# LANGUAGE ScopedTypeVariables #-}

6{-# LANGUAGE ScopedTypeVariables #-}

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

23

24

24import Data.Aeson.Types

25import Data.Aeson.Types

25import Data.Bifunctor

26import Data.Bifunctor

26−import Data.ByteString (ByteString)

27+import Data.ByteString (ByteString)

27−import qualified Data.ByteString.Char8 as BS

28+import qualified Data.ByteString.Char8 as BS

28import Data.ByteString.Conversion

29import Data.ByteString.Conversion

29−import Data.Function (on)

30+import Data.Function (on)

30−import Data.List (groupBy)

31+import Data.List (groupBy)

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

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

32−import Data.Text (Text)

33+import Data.Text (Text)

33−import qualified Data.Text.Encoding as Text

34+import qualified Data.Text.Encoding as Text

34import Generics.SOP

35import Generics.SOP

35import Network.HTTP.Types

36import Network.HTTP.Types

36import Network.PagerDuty.Internal.Options

37import Network.PagerDuty.Internal.Options

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

58 -> a

59 -> a

59 -> Query

60 -> Query

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

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

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

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

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

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

63 where

64 where

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

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

65 => NP ConstructorInfo xss

66 => NP ConstructorInfo xss

66 -> SOP I xss

67 -> SOP I xss

67 -> Query

68 -> Query

69+ go cs (SOP sop) =

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

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

69

71

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

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

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

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

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

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

40

41import Control.Applicative

42import Control.Lens

43−import qualified Data.Aeson.TH as Aeson

43+import qualified Data.Aeson.TH as Aeson

44import Data.Aeson.Types

45−import Data.ByteString (ByteString)

45+import Data.ByteString (ByteString)

46−import qualified Data.Text.Encoding as Text

46+import qualified Data.Text.Encoding as Text

47import Generics.SOP.TH

48import Language.Haskell.TH

49import Network.HTTP.Types.QueryLike

50−import Network.PagerDuty.Internal.Query

51import Network.PagerDuty.Internal.Options

50import Network.PagerDuty.Internal.Options

51+import Network.PagerDuty.Internal.Query

52

53jsonRequest :: Name -> Q [Dec]

54jsonRequest n = concat <$> sequence

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

61queryRequest n = concat <$> sequence

62 [ deriveGeneric n

63 , makeLenses n

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

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

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

66 ]

67

src/Network/PagerDuty/Internal/Types.hs+23−15

@@ -27,32 +27,33 @@

27module Network.PagerDuty.Internal.Types where

28

29import Control.Applicative

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

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

31import Control.Monad.IO.Class

32−import Data.Aeson hiding (Error)

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

33+import qualified Data.Aeson.KeyMap as Map

33import Data.Aeson.Types (Parser)

34import Data.Aeson.Types (Parser)

34import Data.ByteString (ByteString)

35import Data.ByteString (ByteString)

35import qualified Data.ByteString.Char8 as BS

36import qualified Data.ByteString.Char8 as BS

36import Data.ByteString.Conversion hiding (List)

37import Data.ByteString.Conversion hiding (List)

37import Data.Default.Class

38import Data.Default.Class

38import Data.Function (on)

39import Data.Function (on)

39−import qualified Data.HashMap.Strict as Map

40import Data.List (deleteBy, intersperse)

41import Data.Monoid

42import Data.String

43import Data.Text (Text)

44import qualified Data.Text as Text

45import qualified Data.Text.Encoding as Text

46−import Data.Time

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

47import GHC.TypeLits

48import Network.HTTP.Client (Manager)

49import Network.HTTP.Types

50import Network.HTTP.Types.QueryLike

51import Network.PagerDuty.Internal.Query

52import Network.PagerDuty.Internal.TH

53+import Data.Time.Locale.Compat

53

54

54newtype CSV a = CSV [a]

55newtype CSV a = CSV [a]

55− deriving (Eq, Show, Monoid)

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

56

57

57makePrisms ''CSV

58makePrisms ''CSV

58

59

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

69 toJSON = String . Text.decodeUtf8 . toByteString'

70 toJSON = String . Text.decodeUtf8 . toByteString'

70

71

71newtype List a = L [a]

72newtype List a = L [a]

72− deriving (Eq, Show, Monoid)

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

73

74

74deriveJSON ''List

75deriveJSON ''List

75makePrisms ''List

76makePrisms ''List

@@ -105,7 +106,7 @@ instance ToJSON Date where

105

106

106instance ToByteString Date where

107instance ToByteString Date where

107 builder (D d) = builder

108 builder (D d) = builder

108− (formatTime defaultTimeLocale (iso8601DateFormat $ Just "%XZ") d)

109+ (formatTime defaultTimeLocale ("%Y-%m-%dT%XZ") d)

109

110

110instance QueryValues Date

111instance QueryValues Date

111

112

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

132 deriving (Eq, Show)

133 deriving (Eq, Show)

133

134

134data Auth (a :: Security) where

135data Auth (a :: Security) where

135− AuthBasic :: ByteString -> ByteString -> Auth Basic

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

136− AuthToken :: ByteString -> Auth Token

137+ AuthToken :: ByteString -> Auth 'Token

137

138

138deriving instance Eq (Auth a)

139deriving instance Eq (Auth a)

139deriving instance Show (Auth a)

140deriving instance Show (Auth a)

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

278

279

279makeLenses ''Pager

280makeLenses ''Pager

280

281

282+data Page a = Page

283+ { _pgItem :: a

284+ , _pgPager :: Maybe Pager

285+ }

286+

281−instance FromJSON a => FromJSON (a, Maybe Pager) where

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

282− parseJSON = withObject "paginated" $ \o -> (,)

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

283 <$> parseJSON (Object o)

289 <$> parseJSON (Object o)

284 <*> optional (parse o)

290 <*> optional (parse o)

285 where

291 where

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

304 Path :: Path

310 Path :: Path

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

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

306

312

313+instance Semigroup Path where

314+ x <> Path = x

315+ Path <> y = y

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

317+

307instance Monoid Path where

318instance Monoid Path where

308− mempty = Path

319+ mempty = Path

309− mappend x Path = x

310− mappend Path y = y

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

312

320

313instance IsString Path where

321instance IsString Path where

314 fromString = Seg

322 fromString = Seg

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

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

13

14module Network.PagerDuty.REST

15 (

16−

17 -- * Sending requests

16 -- * Sending requests

18 send

17 send

19 , sendWith

18 , sendWith

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

30import Control.Monad.Trans

29import Control.Monad.Trans

31import Data.Aeson (FromJSON)

30import Data.Aeson (FromJSON)

32import Data.Conduit

31import Data.Conduit

33−import Data.Default.Class

34import Data.Monoid

32import Data.Monoid

35import Network.HTTP.Client (Manager)

33import Network.HTTP.Client (Manager)

36import qualified Network.HTTP.Client as Client

34import qualified Network.HTTP.Client as Client

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

56 => Env s

54 => Env s

57 -> Request a s b

55 -> Request a s b

58 -> m (Either Error b)

56 -> m (Either Error b)

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

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

60

58

61-- | /See:/ 'paginateWith'

59-- | /See:/ 'paginateWith'

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

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

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

75 where

73 where

76 go rq = do

74 go rq = do

77 rs <- lift (http e rq)

75 rs <- lift (http e rq)

78− yield (fst <$> rs)

76+ yield (_pgItem <$> rs)

79 either (const (return ()))

77 either (const (return ()))

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

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

81 rs

79 rs

82

80

83http :: (MonadIO m, FromJSON b)

81http :: (MonadIO m, FromJSON b)

84 => Env s

82 => Env s

85 -> Request a s b

83 -> Request a s b

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

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

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

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

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

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

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

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

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

91 }

89 }

92 where

90 where

93 raw = case e ^. envAuth of

91 raw = case e ^. envAuth of

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

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

95− AuthToken t -> def

93+ AuthToken t -> Client.defaultRequest

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

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

97 }

95 }

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

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

43 , alertAddress

44 ) where

45

46−import Control.Lens

46+import Control.Lens hiding (Empty)

47−import Data.Aeson.Lens

47+import Data.Aeson.Lens

48−import Data.Time

48+import Data.Time

49+import Network.PagerDuty.Internal.TH

50+import Network.PagerDuty.Internal.Types

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

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

50−import Network.PagerDuty.Internal.TH

51−import Network.PagerDuty.Internal.Types

52

53alerts :: Path

54alerts = "alerts"

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

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

1+{-# LANGUAGE DataKinds #-}

1−{-# LANGUAGE ExtendedDefaultRules #-}

2+{-# LANGUAGE ExtendedDefaultRules #-}

2−{-# LANGUAGE DataKinds #-}

3−{-# LANGUAGE OverloadedStrings #-}

3+{-# LANGUAGE OverloadedStrings #-}

4−{-# LANGUAGE TemplateHaskell #-}

4+{-# LANGUAGE TemplateHaskell #-}

5−{-# LANGUAGE TypeFamilies #-}

5+{-# LANGUAGE TypeFamilies #-}

6

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

8

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

60 , pServices

61 ) where

62

63−import Control.Lens

63+import Control.Lens hiding (Empty)

64−import Data.Aeson.Lens

64+import Data.Aeson.Lens

65−import Data.Text (Text)

65+import Data.Text (Text)

66−import Network.HTTP.Types

66+import Network.HTTP.Types

67+import Network.PagerDuty.Internal.TH

68+import Network.PagerDuty.Internal.Types

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

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

68−import Network.PagerDuty.Internal.TH

69−import Network.PagerDuty.Internal.Types

70

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

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

72

73default (Path)

74

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

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

1−{-# LANGUAGE ExtendedDefaultRules #-}

1+{-# LANGUAGE ExtendedDefaultRules #-}

2−{-# LANGUAGE FlexibleInstances #-}

2+{-# LANGUAGE FlexibleInstances #-}

3−{-# LANGUAGE OverloadedStrings #-}

3+{-# LANGUAGE OverloadedStrings #-}

4−{-# LANGUAGE TemplateHaskell #-}

4+{-# LANGUAGE TemplateHaskell #-}

5

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

7

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

64 , rTargets

65 ) where

66

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

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

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

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

69import Data.Aeson

70−import qualified Data.HashMap.Strict as Map

70+import qualified Data.Aeson.KeyMap as Map

71−import Data.Text (Text)

71+import Data.Text (Text)

72import Network.HTTP.Types

73−import Network.PagerDuty.REST.Users

74import Network.PagerDuty.Internal.TH

73import Network.PagerDuty.Internal.TH

75import Network.PagerDuty.Internal.Types

74import Network.PagerDuty.Internal.Types

75+import Network.PagerDuty.REST.Users

76

77default (Path)

78

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

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

130 ) where

131

132import Control.Applicative hiding (empty)

133−import Control.Lens

133+import Control.Lens hiding (Empty)

134import Data.Aeson

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

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

136+ toByteString')

136import Data.Default.Class

137import Data.Default.Class

137import Data.Maybe

138import Data.Maybe

138import Data.Monoid hiding (All)

139import Data.Monoid hiding (All)

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

566

567

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

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

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

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

569−updateIncidentsBasic :: Request UpdateIncidents Basic [UpdatedIncidents]

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

570updateIncidentsBasic =

571updateIncidentsBasic =

571 mk UpdateIncidents

572 mk UpdateIncidents

572 { _uiIncidents' = []

573 { _uiIncidents' = []

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

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

1−{-# LANGUAGE ExtendedDefaultRules #-}

1+{-# LANGUAGE ExtendedDefaultRules #-}

2−{-# LANGUAGE OverloadedStrings #-}

2+{-# LANGUAGE OverloadedStrings #-}

3−{-# LANGUAGE TemplateHaskell #-}

3+{-# LANGUAGE TemplateHaskell #-}

4

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

6

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

36 , nContent

37 ) where

38

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

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

40−import Data.Aeson

40+import Data.Aeson

41−import Data.Text (Text)

41+import Data.Text (Text)

42−import Data.Time

42+import Data.Time

43−import Network.HTTP.Types

43+import Network.HTTP.Types

44+import Network.PagerDuty.Internal.TH

45+import Network.PagerDuty.Internal.Types

44−import Network.PagerDuty.REST.Users

46+import Network.PagerDuty.REST.Users

45−import Network.PagerDuty.Internal.TH

46−import Network.PagerDuty.Internal.Types

47

48default (Path)

49

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

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

111 , nAddress

112 ) where

113

114−import Control.Applicative

114+import Control.Lens hiding (Empty)

115−import Control.Lens

116import Data.Aeson

115import Data.Aeson

117import Data.Aeson.Lens

116import Data.Aeson.Lens

117+import qualified Data.Aeson.KeyMap as Map

118import Data.Default.Class

119−import qualified Data.HashMap.Strict as Map

120−import Data.Text (Text)

119+import Data.Text (Text)

121−import qualified Data.Text as Text

120+import qualified Data.Text as Text

122import Data.Time

121import Data.Time

123import Network.HTTP.Types

122import Network.HTTP.Types

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

125import Network.PagerDuty.Internal.TH

123import Network.PagerDuty.Internal.TH

126import Network.PagerDuty.Internal.Types

124import Network.PagerDuty.Internal.Types

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

127

126

128logs :: Path

127logs :: Path

129logs = "log_entries"

128logs = "log_entries"

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

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

74 , mwServices

75 ) where

76

77−import Control.Lens

77+import Control.Lens hiding (Empty)

78−import Data.Monoid

78+import Data.Monoid

79−import Data.Text (Text)

79+import Data.Text (Text)

80−import Data.Time

80+import Data.Time

81−import Network.HTTP.Types

81+import Network.HTTP.Types

82+import Network.PagerDuty.Internal.TH

83+import Network.PagerDuty.Internal.Types

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

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

83−import Network.PagerDuty.Internal.TH

84−import Network.PagerDuty.Internal.Types

85

86windows :: Path

87windows = "maintenance_windows"

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

214createWindowBasic :: UTCTime -- ^ 'cwStartTime'

215 -> UTCTime -- ^ 'cwEndTime'

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

217− -> Request CreateWindow Basic MaintenanceWindow

217+ -> Request CreateWindow 'Basic MaintenanceWindow

218createWindowBasic s e xs =

219 mk CreateWindow

220 { _cwRequesterId' = Nothing

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

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

1−{-# LANGUAGE DataKinds #-}

1+{-# LANGUAGE DataKinds #-}

2−{-# LANGUAGE ExtendedDefaultRules #-}

2+{-# LANGUAGE ExtendedDefaultRules #-}

3−{-# LANGUAGE OverloadedStrings #-}

3+{-# LANGUAGE OverloadedStrings #-}

4−{-# LANGUAGE TemplateHaskell #-}

4+{-# LANGUAGE TemplateHaskell #-}

5−{-# LANGUAGE TypeFamilies #-}

5+{-# LANGUAGE TypeFamilies #-}

6

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

8

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

58 , irNumberOfIncidents

59 ) where

60

61−import Control.Lens

61+import Control.Lens hiding (Empty)

62−import Data.Aeson.Lens

62+import Data.Aeson.Lens

63−import Data.Time

63+import Data.Time

64−import Network.PagerDuty.Internal.TH

64+import Network.PagerDuty.Internal.TH

65−import Network.PagerDuty.Internal.Types

65+import Network.PagerDuty.Internal.Types

66

67default (Path)

68

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

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

1−{-# LANGUAGE DataKinds #-}

1+{-# LANGUAGE DataKinds #-}

2−{-# LANGUAGE ExtendedDefaultRules #-}

2+{-# LANGUAGE ExtendedDefaultRules #-}

3−{-# LANGUAGE OverloadedStrings #-}

3+{-# LANGUAGE OverloadedStrings #-}

4−{-# LANGUAGE TemplateHaskell #-}

4+{-# LANGUAGE TemplateHaskell #-}

5−{-# LANGUAGE TypeFamilies #-}

5+{-# LANGUAGE TypeFamilies #-}

6

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

8

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

110 , sFinalSchedule

111 ) where

112

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

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

114−import Data.Aeson

114+import Data.Aeson

115−import Data.Text (Text)

115+import Data.Text (Text)

116−import Data.Time

116+import Data.Time

117−import Network.HTTP.Types

117+import Network.HTTP.Types

118+import Network.PagerDuty.Internal.TH

119+import Network.PagerDuty.Internal.Types

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

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

119−import Network.PagerDuty.Internal.TH

120−import Network.PagerDuty.Internal.Types

121

122default (Path)

123

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

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

1−{-# LANGUAGE DataKinds #-}

1+{-# LANGUAGE DataKinds #-}

2−{-# LANGUAGE ExtendedDefaultRules #-}

2+{-# LANGUAGE ExtendedDefaultRules #-}

3−{-# LANGUAGE OverloadedStrings #-}

3+{-# LANGUAGE OverloadedStrings #-}

4−{-# LANGUAGE TemplateHaskell #-}

4+{-# LANGUAGE TemplateHaskell #-}

5−{-# LANGUAGE TypeFamilies #-}

5+{-# LANGUAGE TypeFamilies #-}

6

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

8

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

50 , oUser

51 ) where

52

53−import Control.Lens

53+import Control.Lens

54−import Data.Time

54+import Data.Time

55−import Network.HTTP.Types

55+import Network.HTTP.Types

56+import Network.PagerDuty.Internal.TH

57+import Network.PagerDuty.Internal.Types

56−import Network.PagerDuty.REST.Users

58+import Network.PagerDuty.REST.Users

57−import Network.PagerDuty.Internal.TH

58−import Network.PagerDuty.Internal.Types

59

60overrides :: ScheduleId -> Path

61overrides i = "schedules" % i % "overrides"

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

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

1−{-# LANGUAGE DataKinds #-}

1+{-# LANGUAGE DataKinds #-}

2−{-# LANGUAGE ExtendedDefaultRules #-}

2+{-# LANGUAGE ExtendedDefaultRules #-}

3−{-# LANGUAGE OverloadedStrings #-}

3+{-# LANGUAGE OverloadedStrings #-}

4−{-# LANGUAGE TemplateHaskell #-}

4+{-# LANGUAGE TemplateHaskell #-}

5−{-# LANGUAGE TypeFamilies #-}

5+{-# LANGUAGE TypeFamilies #-}

6

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

8

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

106 , svcSeverityFilter

107 ) where

108

109−import Control.Lens

109+import Control.Lens hiding (Empty)

110−import Data.Aeson.Lens

110+import Data.Aeson.Lens

111−import Data.Text (Text)

111+import Data.Text (Text)

112−import Data.Time

112+import Data.Time

113−import Network.HTTP.Types

113+import Network.HTTP.Types

114+import Network.PagerDuty.Internal.TH

115+import Network.PagerDuty.Internal.Types

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

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

115−import Network.PagerDuty.Internal.TH

116−import Network.PagerDuty.Internal.Types

117

118default (Path)

119

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

483

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

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

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

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

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

488

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

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

498

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

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

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

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

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

503

504-- | 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 #-}

1+{-# LANGUAGE ExtendedDefaultRules #-}

2−{-# LANGUAGE OverloadedStrings #-}

2+{-# LANGUAGE OverloadedStrings #-}

3−{-# LANGUAGE TemplateHaskell #-}

3+{-# LANGUAGE TemplateHaskell #-}

4

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

6

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

39 , efId

40 ) where

41

42−import Control.Applicative hiding (empty)

42+import Control.Applicative hiding (empty)

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

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

44−import Data.Aeson

44+import Data.Aeson

45−import Data.Default.Class

45+import Data.Default.Class

46−import Data.Monoid

46+import Data.Monoid

47−import Data.Text (Text)

47+import Data.Text (Text)

48−import Network.HTTP.Types

48+import Network.HTTP.Types

49−import Network.PagerDuty.Internal.TH

49+import Network.PagerDuty.Internal.TH

50−import Network.PagerDuty.Internal.Types

50+import Network.PagerDuty.Internal.Types

51

52default (Path)

53

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

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

66-- encode the conditional invariants.

67data EmailFilterInfo = EmailFilterInfo

68− { _efSubjectMode' :: Maybe MatchMode

68+ { _efSubjectMode' :: Maybe MatchMode

69 , _efSubjectRegex' :: Maybe Text

70 , _efBodyMode' :: Maybe MatchMode

71 , _efBodyRegex' :: Maybe Text

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

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

1−{-# LANGUAGE DataKinds #-}

1+{-# LANGUAGE DataKinds #-}

2−{-# LANGUAGE ExtendedDefaultRules #-}

2+{-# LANGUAGE ExtendedDefaultRules #-}

3−{-# LANGUAGE OverloadedStrings #-}

3+{-# LANGUAGE OverloadedStrings #-}

4−{-# LANGUAGE TemplateHaskell #-}

4+{-# LANGUAGE TemplateHaskell #-}

5−{-# LANGUAGE TypeFamilies #-}

5+{-# LANGUAGE TypeFamilies #-}

6

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

8

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

81 , uJobTitle

82 ) where

83

84−import Control.Applicative hiding (empty)

84+import Control.Applicative hiding (empty)

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

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

86−import Data.Aeson

86+import Data.Aeson

87−import Data.Default.Class

87+import Data.Default.Class

88−import Data.Monoid

88+import Data.Monoid

89−import Data.Text (Text)

89+import Data.Text (Text)

90−import Data.Time

90+import Data.Time

91−import Network.HTTP.Types

91+import Network.HTTP.Types

92−import Network.PagerDuty.Internal.TH

92+import Network.PagerDuty.Internal.TH

93−import Network.PagerDuty.Internal.Types

93+import Network.PagerDuty.Internal.Types

94

95default (Path)

96

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

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

316createUserBasic :: Text -- ^ 'cuName'

317 -> Address -- ^ 'cuEmail'

318− -> Request CreateUser Basic User

318+ -> Request CreateUser 'Basic User

319createUserBasic n e =

320 mk CreateUser

321 { _cuName' = n

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

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

1−{-# LANGUAGE ExtendedDefaultRules #-}

1+{-# LANGUAGE ExtendedDefaultRules #-}

2−{-# LANGUAGE OverloadedStrings #-}

2+{-# LANGUAGE OverloadedStrings #-}

3−{-# LANGUAGE TemplateHaskell #-}

3+{-# LANGUAGE TemplateHaskell #-}

4

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

6

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

56 , Contact

57 ) where

58

59−import Control.Lens

59+import Control.Lens

60−import Data.Aeson.Lens

60+import Data.Aeson.Lens

61−import Data.Text (Text)

61+import Data.Text (Text)

62−import Network.HTTP.Types

62+import Network.HTTP.Types

63−import Network.PagerDuty.Internal.TH

63+import Network.PagerDuty.Internal.TH

64−import Network.PagerDuty.Internal.Types

64+import Network.PagerDuty.Internal.Types

65

66default (Path)

67

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

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

1−{-# LANGUAGE ExtendedDefaultRules #-}

1+{-# LANGUAGE ExtendedDefaultRules #-}

2−{-# LANGUAGE OverloadedStrings #-}

2+{-# LANGUAGE OverloadedStrings #-}

3−{-# LANGUAGE TemplateHaskell #-}

3+{-# LANGUAGE TemplateHaskell #-}

4

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

6

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

51 , rContactMethod

52 ) where

53

54−import Control.Lens

54+import Control.Lens

55−import Data.Aeson.Lens

55+import Data.Aeson.Lens

56−import Network.HTTP.Types

56+import Network.HTTP.Types

57+import Network.PagerDuty.Internal.TH

58+import Network.PagerDuty.Internal.Types

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

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

58−import Network.PagerDuty.Internal.TH

59−import Network.PagerDuty.Internal.Types

60

61default (Path)

62

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

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

35import Control.Applicative hiding (empty)

36import Control.Lens

37import Data.Aeson

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

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

39+ toByteString')

39import Data.Text (Text)

40import Data.Text (Text)

40import qualified Data.Text.Encoding as Text

41import qualified Data.Text.Encoding as Text

41import Data.Time

42import Data.Time

42−import Network.PagerDuty.REST.Incidents

43import Network.PagerDuty.Internal.TH

44import Network.PagerDuty.Internal.Types

45+import Network.PagerDuty.REST.Incidents

45

46

46data WebhookType

47data WebhookType

47 = WTrigger

48 = WTrigger

stack.yamlnew file+7

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

1+resolver: lts-19.23

2+

3+packages:

4+- .

5+

6+nix:

7+ packages: [zlib]