puppet_webhook 1.6.2 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ed278f549c585151ba3bbb7b57e3e04ad14790d
-  data.tar.gz: a6d0eb7a04bb324c23b21b56badb309214206d45
+  metadata.gz: 1cdcbe080e4194ca1c71141582598485ad0034fb
+  data.tar.gz: cb970f5f9ca4e30cd45adb0ea2e20bfe8204fae2
 SHA512:
-  metadata.gz: 37d39b4ee20fd892843b639300114f908f4ab3187c5cc79b19c6f5a192dca6fa74aa32fe315ccc250d8510ac78d00a0430ccf7d2aeb2eaa1eb13e0537d367812
-  data.tar.gz: 26dd12e232e6ef9879163cafd67183f6f6b7fb1f8337a17b980ea9abc451a3c8b73240d070e79487c9f3f4cc11a5be8bdafeae9ea93dbf27cf7d02cc34ea7e69
+  metadata.gz: 44a02e6abe9bb252501ec8d03688d846165c1f2e0d38518ff552fde01dd28264bb30c951aef9680d54078472356b094f8cb881480c0e5f316f471714647ab65c
+  data.tar.gz: c0b25a2c51b5c59066b59fb457933ec8249715b4ae64185a8712e9e140aed15e60ac7c70eef129fdcfb7687d92115211e6de2da4478ec73607f39110dfc4b19b

data/CHANGELOG.md

@@ -1,11 +1,16 @@
 # Changelog
 
 All notable changes to this project will be documented in this file.
-Each new release typically also includes the latest modulesync defaults.
-These should not affect the functionality of the module.
 
-## [v1.6.1](https://github.com/voxpupuli/puppet_webhook/tree/v1.6.1) (2019-01-15)
-[Full Changelog](https://github.com/voxpupuli/puppet_webhook/compare/v1.6.1...v1.6.1)
+## [v1.7.0](https://github.com/voxpupuli/puppet_webhook/tree/v1.7.0) (2019-02-18)
+[Full Changelog](https://github.com/voxpupuli/puppet_webhook/compare/v1.6.2...v1.7.0)
+
+**Merged pull requests:**
+
+- Re-enable `stash` \(post receive hook plugin\) support [\#90](https://github.com/voxpupuli/puppet_webhook/pull/90) ([alexjfisher](https://github.com/alexjfisher))
+
+## [v1.6.2](https://github.com/voxpupuli/puppet_webhook/tree/v1.6.2) (2019-01-15)
+[Full Changelog](https://github.com/voxpupuli/puppet_webhook/compare/v1.6.1...v1.6.2)
 
 **Fixed bugs:**
 
@@ -166,4 +171,4 @@ These should not affect the functionality of the module.
 
 
 
-\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

data/lib/parsers/webhook_parser.rb

@@ -19,11 +19,12 @@ module Sinatra
       end
 
       def detect_vcs
-        return 'github'    if github_webhook?
-        return 'gitlab'    if gitlab_webhook?
-        return 'stash'     if stash_webhook?
-        return 'bitbucket' if bitbucket_webhook?
-        return 'tfs'       if tfs_webhook?
+        return 'github'           if github_webhook?
+        return 'gitlab'           if gitlab_webhook?
+        return 'bitbucket-server' if bitbucket_server_webhook?
+        return 'bitbucket'        if bitbucket_webhook?
+        return 'stash'            if stash_webhook?
+        return 'tfs'              if tfs_webhook?
 
         raise StandardError, 'payload not recognised'
       end
@@ -38,8 +39,8 @@ module Sinatra
         env.key?('HTTP_X_GITLAB_EVENT')
       end
 
-      # stash/bitbucket server
-      def stash_webhook?
+      # bitbucket server
+      def bitbucket_server_webhook?
         # https://confluence.atlassian.com/bitbucketserver/event-payload-938025882.html
         env.key?('HTTP_X_EVENT_KEY') && env.key?('HTTP_X_REQUEST_ID')
       end
@@ -49,6 +50,11 @@ module Sinatra
         env.key?('HTTP_X_EVENT_KEY') && env.key?('HTTP_X_HOOK_UUID')
       end
 
+      def stash_webhook?
+        # https://confluence.atlassian.com/bitbucketserver/post-service-webhook-for-bitbucket-server-776640367.html
+        env.key?('HTTP_X_ATLASSIAN_TOKEN')
+      end
+
       def tfs_webhook?
         # https://docs.microsoft.com/en-us/vsts/service-hooks/services/webhooks
         return false unless @data.key? 'resource'
@@ -67,12 +73,14 @@ module Sinatra
           end
         when 'gitlab'
           @data['ref'].sub('refs/heads/', '')
-        when 'stash'
+        when 'bitbucket-server'
           @data['changes'][0]['refId'].sub('refs/heads/', '')
         when 'bitbucket'
           return @data['push']['changes'][0]['new']['name'] unless deleted?
 
           @data['push']['changes'][0]['old']['name']
+        when 'stash'
+          @data['refChanges'][0]['refId'].sub('refs/heads/', '')
         when 'tfs'
           @data['resource']['refUpdates'][0]['name'].sub('refs/heads/', '')
         end
@@ -84,10 +92,12 @@ module Sinatra
           @data['deleted']
         when 'gitlab'
           @data['after'] == '0000000000000000000000000000000000000000'
-        when 'stash'
+        when 'bitbucket-server'
           @data['changes'][0]['type'] == 'DELETE'
         when 'bitbucket'
           @data['push']['changes'][0]['closed']
+        when 'stash'
+          @data['refChanges'][0]['type'] == 'DELETE'
         when 'tfs'
           @data['resource']['refUpdates'][0]['newObjectId'] == '0000000000000000000000000000000000000000'
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet_webhook
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.7.0
 platform: ruby
 authors:
 - Vox Pupuli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-15 00:00:00.000000000 Z
+date: 2019-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json