From ce8b1deca091ed23485fa9ca2eed23846e4f9b96 Mon Sep 17 00:00:00 2001 From: Kyle Van Berendonck Date: Thu, 15 Oct 2020 08:52:55 +1100 Subject: [PATCH] Rebrand ONROCK to Cuedo and update resolvers --- .github/SECURITY.md | 4 +-- AUTHORS | 2 +- CHANGELOG.md | 5 ++++ CODE_OF_CONDUCT.md | 2 +- CONTRIBUTING.md | 2 +- LICENSE | 2 +- README.md | 12 +++------ doc/cuedo-color-256.svg | 1 + doc/onrock-color-196.svg | 25 ------------------- .../github-webhooks-scotty-example.cabal | 13 +++++----- examples/scotty/package.yaml | 6 ++--- ...thub-webhooks-servant-simple-example.cabal | 13 +++++----- examples/servant-simple/package.yaml | 6 ++--- .../github-webhooks-servant-example.cabal | 13 +++++----- examples/servant/package.yaml | 6 ++--- github-webhooks.cabal | 10 ++++---- package.yaml | 7 +++--- src/GitHub/Data/Webhooks/Events.hs | 4 +-- src/GitHub/Data/Webhooks/Payload.hs | 4 +-- src/GitHub/Data/Webhooks/Secure.hs | 8 +++++- stack-nightly.yaml | 2 +- 21 files changed, 64 insertions(+), 83 deletions(-) create mode 100644 doc/cuedo-color-256.svg delete mode 100755 doc/onrock-color-196.svg diff --git a/.github/SECURITY.md b/.github/SECURITY.md index efc930a..8737027 100644 --- a/.github/SECURITY.md +++ b/.github/SECURITY.md @@ -8,12 +8,12 @@ Our nominal process for disclosure of security issues is as follows: a. The issue may have been discovered by our security team - b. The issue may have been discovered and reported via the facility we have made available to notify us of security issues privately at + b. The issue may have been discovered and reported via the facility we have made available to notify us of security issues privately at [foss@cuedo.com.au](mailto:foss@cuedo.com.au). 2. The security issue is disclosed to those affected a. If the security issue is deemed low risk or related to documentation, an issue may be raised directly and publicly. These issues are available for anyone to view, browse or contribute against under [the label "Security" on the Issue Tracker](https://github.com/onrock-eng/github-webhooks/labels/security). - b. If the security issue is deemed moderate or higher risk, the issue will be addressed internally or we will reach out to trusted contributers to have the issue addressed within 60 days. Once the issue has been fixed or if the issue has not been fixed within 60 days, we will issue a security advisory via GitHub. If you wish to be advised by email immediately when a security issue is raised, please let us know by sending an email to and we will place you on the security mailing list. + b. If the security issue is deemed moderate or higher risk, the issue will be addressed internally or we will reach out to trusted contributers to have the issue addressed within 60 days. Once the issue has been fixed or if the issue has not been fixed within 60 days, we will issue a security advisory via GitHub. If you wish to be advised by email immediately when a security issue is raised, please let us know by sending an email to [foss@cuedo.com.au](mailto:foss@cuedo.com.au) and we will place you on the security mailing list. As a user or security researcher, you have the responsibility to help us enforce this security policy by following the process of responsible disclosure, allowing us to manage security issues within the time period that we have allocated and hence mitigate damage. Your support of this arrangement is highly appreciated. diff --git a/AUTHORS b/AUTHORS index 9fb6900..1fb6c2b 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,4 +1,4 @@ -Kyle Van Berendonck +Kyle Van Berendonck Christian Sakai Thomas DuBuisson Rob Berry diff --git a/CHANGELOG.md b/CHANGELOG.md index 992546e..bd3d117 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +# 0.16.0 + +* The invitation and membership fields were made optional for `OrganizationEvent` (resolves #37) +* The maintaining sponsor [onrock.online](https://onrock.online) has rebranded to [Cuedo Business Solutions](https://cuedo.com.au) + # 0.15.0 * Corrected false failures in the test suite when using `time-1.9` and later (by Julien Debon) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index d4062f9..6658bec 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -34,7 +34,7 @@ This Code of Conduct applies both within project spaces and in public spaces whe ## Enforcement -Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at foss@onrock.online. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately. +Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at [foss@cuedo.com.au](mailto:foss@cuedo.com.au). The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately. Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 3e936ab..e5493b9 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -4,4 +4,4 @@ Contributions are welcome! Please file an active issue to further discuss how we can collaborate together. -To discuss opportunities, you can email the team at foss@onrock.online. +To discuss opportunities, you can email the team at [foss@cuedo.com.au](mailto:foss@cuedo.com.au). diff --git a/LICENSE b/LICENSE index c0b6cec..0359739 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2017 ONROCK (https://onrock.online) +Copyright (c) 2017-2020 Cuedo Business Solutions (https://cuedo.com.au) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index 25790bb..9c17f0e 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ Complete Haskell types and instances for decoding GitHub API [Webhook] payloads. * Full support for [these event types](https://developer.github.com/v3/activity/events/types/#event-types--payloads). ## Installation -`github-webhooks` is available via installation on [Hackage](https://hackage.haskell.org/package/github-webhooks). +`github-webhooks` is available via installation on [Hackage](https://hackage.haskell.org/package/github-webhooks) and [Stackage](https://www.stackage.org/package/github-webhooks). ## Examples Minimal working example: @@ -64,13 +64,9 @@ See [AUTHORS](./AUTHORS) for a list of significant authors. ## License - - - - MIT License - Copyright (c) 2017 ONROCK (https://onrock.online) + Copyright (c) 2017-2020 Cuedo Business Solutions (https://cuedo.com.au) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -90,9 +86,9 @@ See [AUTHORS](./AUTHORS) for a list of significant authors. OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -Free open source software, sponsored by \ +Free open source software, sponsored by [cuedo.com.au](https://cuedo.com.au). \ \ -![ONROCK](./doc/onrock-color-196.svg) +![Cuedo Business Solutions](./doc/cuedo-color-256.svg) [Webhook]: https://developer.github.com/webhooks/ diff --git a/doc/cuedo-color-256.svg b/doc/cuedo-color-256.svg new file mode 100644 index 0000000..24e1204 --- /dev/null +++ b/doc/cuedo-color-256.svg @@ -0,0 +1 @@ + diff --git a/doc/onrock-color-196.svg b/doc/onrock-color-196.svg deleted file mode 100755 index 7582a9f..0000000 --- a/doc/onrock-color-196.svg +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/examples/scotty/github-webhooks-scotty-example.cabal b/examples/scotty/github-webhooks-scotty-example.cabal index 3c0eb69..450db67 100644 --- a/examples/scotty/github-webhooks-scotty-example.cabal +++ b/examples/scotty/github-webhooks-scotty-example.cabal @@ -1,16 +1,15 @@ -cabal-version: 1.12 - --- This file has been generated from package.yaml by hpack version 0.31.2. +-- This file has been generated from package.yaml by hpack version 0.21.2. -- -- see: https://github.com/sol/hpack -- --- hash: ec9a5d0f673953f16afca93ad06e6d3722f9d853a5901b2a9f499d67ea2d0258 +-- hash: 05938c93633bfc6a6dc46b8492aec232e08d2d0cd35104ab17b4188b2d42357d +cabal-version: >= 1.10 name: github-webhooks-scotty-example version: 0.0.0 -author: Kyle Van Berendonck -maintainer: Kyle Van Berendonck -copyright: (c) 2017-2019 ONROCK +author: Kyle Van Berendonck +maintainer: Kyle Van Berendonck +copyright: (c) 2017-2020 Cuedo Business Solutions license: MIT build-type: Simple diff --git a/examples/scotty/package.yaml b/examples/scotty/package.yaml index 47c722d..168d14f 100644 --- a/examples/scotty/package.yaml +++ b/examples/scotty/package.yaml @@ -1,9 +1,9 @@ name: github-webhooks-scotty-example version: 0.0.0 license: MIT -copyright: (c) 2017-2019 ONROCK -author: Kyle Van Berendonck -maintainer: Kyle Van Berendonck +copyright: (c) 2017-2020 Cuedo Business Solutions +author: Kyle Van Berendonck +maintainer: Kyle Van Berendonck ghc-options: - -Wall diff --git a/examples/servant-simple/github-webhooks-servant-simple-example.cabal b/examples/servant-simple/github-webhooks-servant-simple-example.cabal index 3ba8ec7..2633b8a 100644 --- a/examples/servant-simple/github-webhooks-servant-simple-example.cabal +++ b/examples/servant-simple/github-webhooks-servant-simple-example.cabal @@ -1,16 +1,15 @@ -cabal-version: 1.12 - --- This file has been generated from package.yaml by hpack version 0.31.2. +-- This file has been generated from package.yaml by hpack version 0.21.2. -- -- see: https://github.com/sol/hpack -- --- hash: a3c0d3d7bac698ce0b40f6b9756567525932ef5c8b4aa36d056016cc4b36fddc +-- hash: a995e3a50a7f087a88a196f99eb845fc9a70c51f73a879bc4256a6f7522ebbd8 +cabal-version: >= 1.10 name: github-webhooks-servant-simple-example version: 0.0.0 -author: Kyle Van Berendonck -maintainer: Kyle Van Berendonck -copyright: (c) 2017-2019 ONROCK +author: Kyle Van Berendonck +maintainer: Kyle Van Berendonck +copyright: (c) 2017-2020 Cuedo Business Solutions license: MIT build-type: Simple diff --git a/examples/servant-simple/package.yaml b/examples/servant-simple/package.yaml index 27201a2..0968e6c 100644 --- a/examples/servant-simple/package.yaml +++ b/examples/servant-simple/package.yaml @@ -1,9 +1,9 @@ name: github-webhooks-servant-simple-example version: 0.0.0 license: MIT -copyright: (c) 2017-2019 ONROCK -author: Kyle Van Berendonck -maintainer: Kyle Van Berendonck +copyright: (c) 2017-2020 Cuedo Business Solutions +author: Kyle Van Berendonck +maintainer: Kyle Van Berendonck ghc-options: - -Wall diff --git a/examples/servant/github-webhooks-servant-example.cabal b/examples/servant/github-webhooks-servant-example.cabal index 0031532..a041314 100644 --- a/examples/servant/github-webhooks-servant-example.cabal +++ b/examples/servant/github-webhooks-servant-example.cabal @@ -1,16 +1,15 @@ -cabal-version: 1.12 - --- This file has been generated from package.yaml by hpack version 0.31.2. +-- This file has been generated from package.yaml by hpack version 0.21.2. -- -- see: https://github.com/sol/hpack -- --- hash: 879ccec7655889178f4f20000e981739dc2ba5ebb75109f1ddc36b1c572bdfa0 +-- hash: f135d8842861c67778a51759adb2b9e5ec97bac79e2da1e9b019b9c0a71c5943 +cabal-version: >= 1.10 name: github-webhooks-servant-example version: 0.0.0 -author: Kyle Van Berendonck -maintainer: Kyle Van Berendonck -copyright: (c) 2017-2019 ONROCK +author: Kyle Van Berendonck +maintainer: Kyle Van Berendonck +copyright: (c) 2017-2020 Cuedo Business Solutions license: MIT build-type: Simple diff --git a/examples/servant/package.yaml b/examples/servant/package.yaml index 3bd04c4..7df875a 100644 --- a/examples/servant/package.yaml +++ b/examples/servant/package.yaml @@ -1,9 +1,9 @@ name: github-webhooks-servant-example version: 0.0.0 license: MIT -copyright: (c) 2017-2019 ONROCK -author: Kyle Van Berendonck -maintainer: Kyle Van Berendonck +copyright: (c) 2017-2020 Cuedo Business Solutions +author: Kyle Van Berendonck +maintainer: Kyle Van Berendonck ghc-options: - -Wall diff --git a/github-webhooks.cabal b/github-webhooks.cabal index f52dceb..c6dd06f 100644 --- a/github-webhooks.cabal +++ b/github-webhooks.cabal @@ -4,16 +4,16 @@ cabal-version: 1.12 -- -- see: https://github.com/sol/hpack -- --- hash: fc4ab955c62cdd181b1557e931d1c790d5b28eb4ca7c837d32a3c0749f8d412d +-- hash: 5a028828c4e5056c7fc8d333f19dd2540fcc483536c4181b5ce34c987f1066be name: github-webhooks version: 0.15.0 synopsis: Aeson instances for GitHub Webhook payloads. -description: Complete instances for decoding GitHub Webhook payloads (using @aeson@). See the README at for examples. +description: Complete instances for decoding GitHub Webhook payloads (using @aeson@). See the README at for examples. Sponsored by . category: GitHub homepage: https://github.com/onrock-eng/github-webhooks#readme bug-reports: https://github.com/onrock-eng/github-webhooks/issues -author: Kyle Van Berendonck , +author: Kyle Van Berendonck , Christian Sakai , Thomas DuBuisson , Rob Berry, @@ -21,8 +21,8 @@ author: Kyle Van Berendonck , Alistair Burrowes, Matthew Bauer, Julien Debon -maintainer: Kyle Van Berendonck -copyright: (c) 2017-2020 ONROCK +maintainer: Kyle Van Berendonck +copyright: (c) 2017-2020 Cuedo Business Solutions license: MIT license-file: LICENSE build-type: Simple diff --git a/package.yaml b/package.yaml index f9a4152..26fd202 100644 --- a/package.yaml +++ b/package.yaml @@ -10,9 +10,9 @@ extra-source-files: - CHANGELOG.md - fixtures/*.json synopsis: Aeson instances for GitHub Webhook payloads. -copyright: (c) 2017-2020 ONROCK +copyright: (c) 2017-2020 Cuedo Business Solutions author: - - Kyle Van Berendonck + - Kyle Van Berendonck - Christian Sakai - Thomas DuBuisson - Rob Berry @@ -20,11 +20,12 @@ author: - Alistair Burrowes - Matthew Bauer - Julien Debon -maintainer: Kyle Van Berendonck +maintainer: Kyle Van Berendonck github: onrock-eng/github-webhooks description: Complete instances for decoding GitHub Webhook payloads (using @aeson@). See the README at for examples. + Sponsored by . flags: ci: description: A stricter build designed for continuous integration. diff --git a/src/GitHub/Data/Webhooks/Events.hs b/src/GitHub/Data/Webhooks/Events.hs index fb76d55..f64438d 100644 --- a/src/GitHub/Data/Webhooks/Events.hs +++ b/src/GitHub/Data/Webhooks/Events.hs @@ -1,9 +1,9 @@ {-# LANGUAGE Trustworthy #-} {-| Module : Github.Data.Webhooks.Events -Copyright : (c) ONROCK, 2018 +Copyright : (c) Cuedo Business Solutions 2017-2020 License : MIT -Maintainer : Kyle Van Berendonck +Maintainer : Kyle Van Berendonck This module contains types that represent GitHub webhook's events. -} diff --git a/src/GitHub/Data/Webhooks/Payload.hs b/src/GitHub/Data/Webhooks/Payload.hs index c1ffa45..2d99bc7 100644 --- a/src/GitHub/Data/Webhooks/Payload.hs +++ b/src/GitHub/Data/Webhooks/Payload.hs @@ -1,9 +1,9 @@ {-# LANGUAGE Trustworthy #-} {-| Module : Github.Data.Webhooks.Payload -Copyright : (c) ONROCK, 2018 +Copyright : (c) Cuedo Business Solutions 2017-2020 License : MIT -Maintainer : Kyle Van Berendonck +Maintainer : Kyle Van Berendonck This module contains types that represent GitHub webhook's payload contents. -} diff --git a/src/GitHub/Data/Webhooks/Secure.hs b/src/GitHub/Data/Webhooks/Secure.hs index fc89b30..0c76cf2 100644 --- a/src/GitHub/Data/Webhooks/Secure.hs +++ b/src/GitHub/Data/Webhooks/Secure.hs @@ -1,6 +1,12 @@ {-# LANGUAGE Trustworthy #-} +{-| +Module : Github.Data.Webhooks.Secure +Copyright : (c) Cuedo Business Solutions 2017-2020 +License : MIT +Maintainer : Kyle Van Berendonck --- | See . +See . +-} module GitHub.Data.Webhooks.Secure ( PayloadNotSecure(..) , isSecurePayload diff --git a/stack-nightly.yaml b/stack-nightly.yaml index 38662c8..2fbd985 100644 --- a/stack-nightly.yaml +++ b/stack-nightly.yaml @@ -1 +1 @@ -resolver: nightly-2020-07-22 +resolver: nightly-2020-10-20