diff --git a/get-new-tool-versions/helpers.psm1 b/get-new-tool-versions/helpers.psm1 index 2f9d582..fb63f61 100644 --- a/get-new-tool-versions/helpers.psm1 +++ b/get-new-tool-versions/helpers.psm1 @@ -70,4 +70,43 @@ function Skip-ExistingVersions { ) return $VersionsFromDist | Where-Object { $VersionsFromManifest -notcontains $_ } +} + +<# +.SYNOPSIS +Sending messages using Incoming Webhooks +https://api.slack.com/messaging/webhooks +#> + +function Send-SlackPostMessageIncomingWebHook +{ + param( + [Parameter(Mandatory)] + [ValidateNotNullOrEmpty()] + [System.Uri]$Uri, + + [Parameter(Mandatory)] + [ValidateNotNullOrEmpty()] + [System.Object]$Body + ) + + try + { + $response = Invoke-RestMethod -Uri $uri -Method POST -Body $body -ErrorAction Stop + if ($response -eq 'ok') + { + return $response + } + else + { + Write-Host "##vso[task.LogIssue type=error;] Something went wrong. Response is '$response'" + } + } + catch + { + Write-Host "##vso[task.LogIssue type=error;] Slack send post message failed: '$_'" + } + + Write-Host "##vso[task.complete result=Failed;]" + exit 1 } \ No newline at end of file diff --git a/slack-notification/send-slack-notification.ps1 b/get-new-tool-versions/send-slack-notification.ps1 similarity index 95% rename from slack-notification/send-slack-notification.ps1 rename to get-new-tool-versions/send-slack-notification.ps1 index a465d2d..0e6fbc5 100644 --- a/slack-notification/send-slack-notification.ps1 +++ b/get-new-tool-versions/send-slack-notification.ps1 @@ -35,7 +35,7 @@ param( ) # Import helpers module -Import-Module $PSScriptRoot/slack.helpers.psm1 -DisableNameChecking +Import-Module $PSScriptRoot/helpers.psm1 -DisableNameChecking # Create JSON body $text = "The following versions of '$toolName' are available to upload: $toolVersion\nLink to the pipeline: $pipelineUrl" diff --git a/slack-notification/slack.helpers.psm1 b/slack-notification/slack.helpers.psm1 deleted file mode 100644 index 208f1c1..0000000 --- a/slack-notification/slack.helpers.psm1 +++ /dev/null @@ -1,38 +0,0 @@ -<# -.SYNOPSIS -Sending messages using Incoming Webhooks -https://api.slack.com/messaging/webhooks -#> - -function Send-SlackPostMessageIncomingWebHook -{ - param( - [Parameter(Mandatory)] - [ValidateNotNullOrEmpty()] - [System.Uri]$Uri, - - [Parameter(Mandatory)] - [ValidateNotNullOrEmpty()] - [System.Object]$Body - ) - - try - { - $response = Invoke-RestMethod -Uri $uri -Method POST -Body $body -ErrorAction Stop - if ($response -eq 'ok') - { - return $response - } - else - { - Write-Host "##vso[task.LogIssue type=error;] Something went wrong. Response is '$response'" - } - } - catch - { - Write-Host "##vso[task.LogIssue type=error;] Slack send post message failed: '$_'" - } - - Write-Host "##vso[task.complete result=Failed;]" - exit 1 -} \ No newline at end of file