Teamcity webhook #18668

firephreek · 2022-02-08T07:19:57Z

Implements a basic TeamCity Webhook.

TC Webhooks require:

HostUrl
Auth Token
VCS Root Id/Name

TC Hook is just a REST API that takes a POST with no body and an "Authorization: Bearer " Header.

Translations properties added, templates created, logo included.

Go isn't my primary or even secondary language, so happy to hear changes that would be needed.
Adding the BearerToken property to the HookTask seemed the least problematic approach to getting the AuthToken included in the final POST, but if there's a more 'GO' approach or something specific to the project, I don't know it.

Add enum/strings referencing TeamCity

…t have a body for posts. Add teamcity to webhook types

Add handling for TeamCity Hook Task. TeamCity needs an 'Authorization: Bearer <token>' header to work. Added a new property to models\HookTask and a check for value. If the value is there, the header is added. Otherwise, it's omitted.

lunny · 2022-02-08T07:42:41Z

Hi, you have an outdate code base.

techknowlogick

Haven't taken a look at the code, but there are a few nitpicks that the CI will likely fail on.

Thanks for the PR :)

modules/webhook/teamcity.go

options/locale/locale_fa-IR.ini

templates/swagger/v1_json.tmpl

templates/admin/hook_new.tmpl

Add enum/strings referencing TeamCity

…t have a body for posts. Add teamcity to webhook types

Add handling for TeamCity Hook Task. TeamCity needs an 'Authorization: Bearer <token>' header to work. Added a new property to models\HookTask and a check for value. If the value is there, the header is added. Otherwise, it's omitted.

…webhook # Conflicts: # models/webhook.go # modules/auth/repo_form.go # modules/setting/webhook.go # modules/webhook/deliver.go # modules/webhook/webhook.go # options/locale/locale_cs-CZ.ini # options/locale/locale_de-DE.ini # options/locale/locale_en-US.ini # options/locale/locale_es-ES.ini # options/locale/locale_fa-IR.ini # options/locale/locale_fi-FI.ini # options/locale/locale_fr-FR.ini # options/locale/locale_hu-HU.ini # options/locale/locale_it-IT.ini # options/locale/locale_ja-JP.ini # options/locale/locale_ko-KR.ini # options/locale/locale_lv-LV.ini # options/locale/locale_nl-NL.ini # options/locale/locale_pl-PL.ini # options/locale/locale_pt-BR.ini # options/locale/locale_pt-PT.ini # options/locale/locale_ru-RU.ini # options/locale/locale_sr-SP.ini # options/locale/locale_sv-SE.ini # options/locale/locale_tr-TR.ini # options/locale/locale_uk-UA.ini # options/locale/locale_zh-CN.ini # options/locale/locale_zh-TW.ini # routers/repo/webhook.go # routers/routes/routes.go # templates/admin/hook_new.tmpl # templates/org/settings/hook_new.tmpl # templates/repo/settings/webhook/list.tmpl # templates/repo/settings/webhook/new.tmpl

This reverts commit 6c68fa57ece29258f0e5cdf0a0b962d0d2f34265.

Add Authorization Header when Bearer Token is present during Webhook delivery. Add empty TeamCity Payload builder to accommodate future expansion and stay consistent with existing patterns.

firephreek · 2022-02-09T00:26:44Z

PR Rebased. Thought I was at latest but upstream wasn't pulling correctly, should be resolved.
Added a small unit test for the webhook, just checks that the payload isn't altered and that the Meta content is marshalled correctly.

Delete obsolete files left behind in rebase. Fix linting issues.

KN4CK3R · 2022-02-09T14:06:37Z

This contains changes which should not be part of this PR.

This reverts commit c14ca34.

)" This reverts commit df44017.

firephreek · 2022-02-09T14:50:32Z

This contains changes which should not be part of this PR.

Found and reverted the offending files. I think they got picked up when I rebased.

silverwind · 2022-02-09T16:41:50Z

templates/admin/hook_new.tmpl

 				{{else if eq .HookType "msteams"}}
 					<img width="26" height="26" src="{{AssetUrlPrefix}}/img/msteams.png">
+				{{else if eq .HookType "teamcity"}}
+					<img width="26" height="26" src="{{AssetUrlPrefix}}/img/teamcity.png">


Duplicate image?

silverwind · 2022-02-09T16:42:06Z

templates/org/settings/hook_new.tmpl

 						{{else if eq .HookType "msteams"}}
 							<img width="26" height="26" src="{{AssetUrlPrefix}}/img/msteams.png">
+						{{else if eq .HookType "teamcity"}}
+							<img width="26" height="26" src="{{AssetUrlPrefix}}/img/teamcity.png">


silverwind · 2022-02-09T16:42:15Z

templates/org/settings/hook_new.tmpl

 					{{template "repo/settings/webhook/msteams" .}}
+					{{template "repo/settings/webhook/teamcity" .}}


I hate rebasing so much sometimes....resolved! Thanks for the catch!

zeripath · 2022-02-09T18:50:29Z

This branch is a total mess. You've reverted lots of important things and caused loads of conflicts.

Do you have a SHA from before you attempted to rebase?

zeripath

There are lots of serious reversions here due to mismerges. This cannot merge as is.

LecrisUT · 2022-02-18T14:21:11Z

@firephreek don't be afraid to cherrypick/rebase and force push on your own branch to clean up the commit history.

devInteam · 2022-04-13T13:27:42Z

any news on this issue?

wxiaoguang · 2022-05-03T12:46:00Z

any news on this issue?

This PR's merge history is still broken.

And in future I think all webhooks could be covered by a general mechanism, instead of hard-code more and more webhooks.

WIP: Custom Webhooks #19307

techknowlogick · 2022-05-03T19:44:36Z

closing per above comment

strangedreamsNY added 7 commits February 8, 2022 01:27

Create templates and translation strings.

c33926d

Create TeamCityHook form model.

1585424

Add enum/strings referencing TeamCity

Add translations

90890b8

Add Meta and HookHandler. No interface matching since TeamCity doesn'…

626c5d3

…t have a body for posts. Add teamcity to webhook types

Wire in TeamCity Webhook New/Edit post handlers.

e26ea44

Add handling for TeamCity Hook Task. TeamCity needs an 'Authorization: Bearer <token>' header to work. Added a new property to models\HookTask and a check for value. If the value is there, the header is added. Otherwise, it's omitted.

Add Routes

faa0f98

Update Teamcity.png, remove hidden whitespace.

a04e2b8

GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Feb 8, 2022

techknowlogick reviewed Feb 8, 2022

View reviewed changes

modules/webhook/teamcity.go Outdated Show resolved Hide resolved

modules/webhook/teamcity.go Outdated Show resolved Hide resolved

options/locale/locale_fa-IR.ini Outdated Show resolved Hide resolved

templates/swagger/v1_json.tmpl Outdated Show resolved Hide resolved

silverwind reviewed Feb 8, 2022

View reviewed changes

templates/admin/hook_new.tmpl Outdated Show resolved Hide resolved

strangedreamsNY added 17 commits February 8, 2022 18:54

Create templates and translation strings.

f7a5427

Create TeamCityHook form model.

b4f1d8a

Add enum/strings referencing TeamCity

Add translations

af787b4

Add Meta and HookHandler. No interface matching since TeamCity doesn'…

6f685b7

…t have a body for posts. Add teamcity to webhook types

Wire in TeamCity Webhook New/Edit post handlers.

0c00340

Add handling for TeamCity Hook Task. TeamCity needs an 'Authorization: Bearer <token>' header to work. Added a new property to models\HookTask and a check for value. If the value is there, the header is added. Otherwise, it's omitted.

Add Routes

e5fd009

Update Teamcity.png, remove hidden whitespace.

634db8f

Rebase onto latest. Resolve merge conflicts.

ffea42e

Revert "Add translations"

ec32633

This reverts commit 6c68fa57ece29258f0e5cdf0a0b962d0d2f34265.

Add TeamCityHookForm.

86435f9

Add Repo Webhooks for TeamCity with New and Edit handlers.

cc51e42

Add TeamCity New/Edit Post webhooks to routes.

47805cb

Fix TeamCity hook signatures and templates. Use new references.

cd5bbce

Added BearerToken property to HookTask

199510e

Add Authorization Header when Bearer Token is present during Webhook delivery. Add empty TeamCity Payload builder to accommodate future expansion and stay consistent with existing patterns.

Replace Teamcity png logo with svg version

d0b1a3d

Add unit tests for Teamcity meta and payload.

25f83a9

Fix linting issues.

7580432

strangedreamsNY added 2 commits February 8, 2022 21:22

Rename properties/variables to use URL and ID instead of "Url" and "Id"

33e6466

Delete obsolete files left behind in rebase. Fix linting issues.

Add teamcity hook to docs for swagger gen.

d76ee61

firephreek mentioned this pull request Feb 9, 2022

TeamCity Webhooks #18667

Closed

strangedreamsNY added 2 commits February 9, 2022 09:46

Revert "update the comparison documents (go-gitea#18669)"

03f671a

This reverts commit c14ca34.

Revert "Restart zero worker if there is still work to do (go-gitea#18658

cc9af8d

)" This reverts commit df44017.

silverwind reviewed Feb 9, 2022

View reviewed changes

strangedreamsNY and others added 2 commits February 9, 2022 13:21

Remove duplicate entries from rebase.

b3f8e4b

Merge branch 'main' into teamcity_webhook

0b7a62e

zeripath suggested changes Feb 9, 2022

View reviewed changes

techknowlogick closed this May 3, 2022

oliverpool mentioned this pull request Jul 8, 2022

WIP: Add authorization header support for Gitea webhooks #20267

Closed

go-gitea locked and limited conversation to collaborators May 3, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Teamcity webhook #18668

Teamcity webhook #18668

firephreek commented Feb 8, 2022

lunny commented Feb 8, 2022

techknowlogick left a comment

firephreek commented Feb 9, 2022

KN4CK3R commented Feb 9, 2022

firephreek commented Feb 9, 2022

silverwind Feb 9, 2022

silverwind Feb 9, 2022

silverwind Feb 9, 2022

firephreek Feb 9, 2022

zeripath commented Feb 9, 2022

zeripath left a comment

LecrisUT commented Feb 18, 2022

devInteam commented Apr 13, 2022

wxiaoguang commented May 3, 2022

techknowlogick commented May 3, 2022

		{{template "repo/settings/webhook/msteams" .}}
		{{template "repo/settings/webhook/teamcity" .}}

Teamcity webhook #18668

Teamcity webhook #18668

Conversation

firephreek commented Feb 8, 2022

lunny commented Feb 8, 2022

techknowlogick left a comment

Choose a reason for hiding this comment

firephreek commented Feb 9, 2022

KN4CK3R commented Feb 9, 2022

firephreek commented Feb 9, 2022

silverwind Feb 9, 2022

Choose a reason for hiding this comment

silverwind Feb 9, 2022

Choose a reason for hiding this comment

silverwind Feb 9, 2022

Choose a reason for hiding this comment

firephreek Feb 9, 2022

Choose a reason for hiding this comment

zeripath commented Feb 9, 2022

zeripath left a comment

Choose a reason for hiding this comment

LecrisUT commented Feb 18, 2022

devInteam commented Apr 13, 2022

wxiaoguang commented May 3, 2022

techknowlogick commented May 3, 2022