Allow setting argoCD revision to PR git Branch #16

Oded-B · 2024-06-28T09:44:58Z

Description

New function SetArgoCDAppRevision sets ArgoCD application Target Revsion, note: It doesn't trigger a sync by itself , and it doesn't enable/disable autosync.
Create a new configuration to control which ArgoCD apps are allowed to sync to non main branch by Telefonistka
User triggers the SetArgoCDAppRevision function by checking a checkbox in the ArgoCD diff comment (the comment is displayed only for relevant apps), the will set the app target revision to the PR branch (=next commits in PR will be synced from this point and no diff will be displayed ).
On PR merge SetArgoCDAppRevision is used a gain to revert app to point to HEAD
generateListOfChangedComponentPaths function now includes the logic for promotion and "regular" PRs (for DRYness)
Refactor createArgoCdClient to create all needed clients (we need to cache those outside the stack at some point )
add analyzeCommentUpdateCheckBox function to support generic triggering of actions from checkbox

Type of Change

Checklist

I have read the contributing guidelines
Existing issues have been referenced (where applicable)
I have verified this change is not present in other open pull requests
Functionality is documented
All code style checks pass
New code contribution is covered by automated tests
All new and existing tests pass

Oded-B · 2024-06-28T11:21:22Z

/publish

github-actions · 2024-06-28T11:25:05Z

oci-image-publish-on-comment: failed ❌
https://github.com/commercetools/telefonistka/actions/runs/9711978855
ghcr.io/commercetools/telefonistka:sync_apps_to_branch
ghcr.io/commercetools/telefonistka:sha-26ad53a

github-actions · 2024-06-28T11:39:30Z

oci-image-publish-on-comment: succeeded ✅
https://github.com/commercetools/telefonistka/actions/runs/9711978855
ghcr.io/commercetools/telefonistka:sync_apps_to_branch
ghcr.io/commercetools/telefonistka:sha-26ad53a

Oded-B · 2024-06-28T12:57:05Z

/publish

github-actions · 2024-06-28T13:04:15Z

oci-image-publish-on-comment: succeeded ✅
https://github.com/commercetools/telefonistka/actions/runs/9713159072
ghcr.io/commercetools/telefonistka:sync_apps_to_branch
ghcr.io/commercetools/telefonistka:sha-0a550ec

Oded-B · 2024-06-28T14:04:12Z

/publish

github-actions · 2024-06-28T14:11:20Z

oci-image-publish-on-comment: succeeded ✅
https://github.com/commercetools/telefonistka/actions/runs/9714078263
ghcr.io/commercetools/telefonistka:sync_apps_to_branch
ghcr.io/commercetools/telefonistka:sha-63325cd

itself. Comment.User.Login isn't relevant when editing a comment made by someone else

Oded-B · 2024-06-28T14:40:21Z

/publish

github-actions · 2024-06-28T14:47:32Z

oci-image-publish-on-comment: succeeded ✅
https://github.com/commercetools/telefonistka/actions/runs/9714590552
ghcr.io/commercetools/telefonistka:sync_apps_to_branch
ghcr.io/commercetools/telefonistka:sha-f9b06af

Oded-B · 2024-06-28T14:53:25Z

/publish

github-actions · 2024-06-28T15:00:55Z

oci-image-publish-on-comment: succeeded ✅
https://github.com/commercetools/telefonistka/actions/runs/9714748106
ghcr.io/commercetools/telefonistka:sync_apps_to_branch
ghcr.io/commercetools/telefonistka:sha-82225a3

Oded-B · 2024-07-01T07:32:39Z

/publish

github-actions · 2024-07-01T07:40:13Z

oci-image-publish-on-comment: succeeded ✅
https://github.com/commercetools/telefonistka/actions/runs/9740062905
ghcr.io/commercetools/telefonistka:sync_apps_to_branch
ghcr.io/commercetools/telefonistka:sha-e4cbcad

Oded-B · 2024-07-01T08:30:39Z

/publish

github-actions · 2024-07-01T08:38:01Z

oci-image-publish-on-comment: succeeded ✅
https://github.com/commercetools/telefonistka/actions/runs/9740862636
ghcr.io/commercetools/telefonistka:sync_apps_to_branch
ghcr.io/commercetools/telefonistka:sha-0c0d06f

refacore: move some of the complexity in to generateListOfRelevantComponents to make stuff more DRY

Oded-B · 2024-07-01T09:12:26Z

/publish

github-actions · 2024-07-01T09:16:39Z

oci-image-publish-on-comment: failed ❌
https://github.com/commercetools/telefonistka/actions/runs/9741483066
ghcr.io/commercetools/telefonistka:sync_apps_to_branch
ghcr.io/commercetools/telefonistka:sha-8cb4c1a

Oded-B · 2024-07-01T09:24:49Z

/publish

Oded-B · 2024-07-02T12:59:19Z

/publish

github-actions · 2024-07-02T13:06:46Z

oci-image-publish-on-comment: succeeded ✅
https://github.com/commercetools/telefonistka/actions/runs/9761425159
ghcr.io/commercetools/telefonistka:sync_apps_to_branch
ghcr.io/commercetools/telefonistka:sha-b69e031

Oded-B · 2024-07-03T07:33:16Z

/publish

github-actions · 2024-07-03T07:40:34Z

oci-image-publish-on-comment: succeeded ✅
https://github.com/commercetools/telefonistka/actions/runs/9773720588
ghcr.io/commercetools/telefonistka:sync_apps_to_branch
ghcr.io/commercetools/telefonistka:sha-1f3ee4b

Oded-B · 2024-07-03T09:27:37Z

/publish

github-actions · 2024-07-03T09:35:13Z

oci-image-publish-on-comment: succeeded ✅
https://github.com/commercetools/telefonistka/actions/runs/9775336954
ghcr.io/commercetools/telefonistka:sync_apps_to_branch
ghcr.io/commercetools/telefonistka:sha-4d88126

Cleanup some debug lines and comments

gitstream-cm · 2024-07-04T11:16:21Z

This PR is missing a Jira ticket reference in the title or description.
Please add a Jira ticket reference to the title or description of this PR.

gitstream-cm · 2024-07-04T11:16:31Z

🥷 Code experts: no user but you matched threshold 10

Oded-B has most 👩‍💻 activity in the files.
Oded-B has most 🧠 knowledge in the files.

See details

docs/installation.md

Activity based on git-commit:

	Oded-B
JUL
JUN	13 additions & 3 deletions
MAY	4 additions & 0 deletions
APR	11 additions & 0 deletions
MAR
FEB

Knowledge based on git-blame:
Oded-B: 36%

internal/pkg/argocd/argocd.go

Activity based on git-commit:

	Oded-B
JUL
JUN	118 additions & 34 deletions
MAY	6 additions & 0 deletions
APR	273 additions & 0 deletions
MAR
FEB

Knowledge based on git-blame:
Oded-B: 100%

internal/pkg/configuration/config.go

Activity based on git-commit:

	Oded-B
JUL
JUN	20 additions & 17 deletions
MAY	1 additions & 0 deletions
APR	5 additions & 3 deletions
MAR
FEB

Knowledge based on git-blame:
Oded-B: 41%

internal/pkg/githubapi/github.go

Activity based on git-commit:

	Oded-B
JUL
JUN	127 additions & 22 deletions
MAY	8 additions & 1 deletions
APR	51 additions & 10 deletions
MAR
FEB

Knowledge based on git-blame:
Oded-B: 50%

internal/pkg/githubapi/github_test.go

Activity based on git-commit:

	Oded-B
JUL
JUN	64 additions & 0 deletions
MAY
APR
MAR
FEB

Knowledge based on git-blame:
Oded-B: 100%

internal/pkg/githubapi/promotion.go

Activity based on git-commit:

	Oded-B
JUL
JUN	27 additions & 7 deletions
MAY
APR	46 additions & 18 deletions
MAR
FEB

Knowledge based on git-blame:
Oded-B: 28%

templates/argoCD-diff-pr-comment.gotmpl

Activity based on git-commit:

	Oded-B
JUL
JUN
MAY
APR	35 additions & 0 deletions
MAR
FEB

Knowledge based on git-blame:
Oded-B: 100%

To learn more about /:\ gitStream - Visit our Docs

internal/pkg/argocd/argocd.go

internal/pkg/githubapi/github.go

internal/pkg/githubapi/github_test.go

internal/pkg/githubapi/promotion.go

internal/pkg/githubapi/github.go

Co-authored-by: Hannes Gustafsson <[email protected]>

Removed unneeded JSON marshel error handeling(it should never fail) Switched back Const to String - I need a pointer for it

the identifier paramatize) This addresses a PR analyzeCommentUpdateCheckBox

Oded-B added 3 commits June 28, 2024 11:42

Allow setting argoCD revision to PR git SHA

1a0b2dc

Address linter issues

d22f30a

Linter issue

26ad53a

debug defer issue

0a550ec

Adress "diffOfChangedComponents is an unexported field of struct" issue

63325cd

Use comemnt sender login to check in event was triggered by Telefonistka

f9b06af

itself. Comment.User.Login isn't relevant when editing a comment made by someone else

Use the correct field in the event payload

82225a3

Oded-B added 2 commits July 1, 2024 09:31

fix some whitespace issue

b2ed2bc

debug some panic

e4cbcad

Only check for checkbox event on **updates** on comment the bot created.

0c0d06f

On PR merge - set apps TargetRef to HEAD

8cb4c1a

refacore: move some of the complexity in to generateListOfRelevantComponents to make stuff more DRY

Linter issues

ea57c0e

Add debug statements

b69e031

Add more debug statements

1f3ee4b

Use PR Branch HEAD instead of commit

4d88126

Oded-B added 2 commits July 4, 2024 11:45

Use an anonymous struct to create the patch

c72229e

Cleanup some debug lines and comments

Document new config key

e587299

Oded-B marked this pull request as ready for review July 4, 2024 11:14

gitstream-cm bot added the missing-jira label Jul 4, 2024

Oded-B changed the title ~~Allow setting argoCD revision to PR git SHA~~ Allow setting argoCD revision to PR git Branch Jul 9, 2024

ashvarts reviewed Jul 10, 2024

View reviewed changes

internal/pkg/argocd/argocd.go Outdated Show resolved Hide resolved

hnnsgstfssn reviewed Jul 11, 2024

View reviewed changes

internal/pkg/githubapi/github.go Show resolved Hide resolved

Oded-B and others added 7 commits July 11, 2024 10:56

Apply suggestions from code review

c93a0c0

Co-authored-by: Hannes Gustafsson <[email protected]>

Use "%w" for warapped errors

6a131d3

Removed unneeded JSON marshel error handeling(it should never fail) Switched back Const to String - I need a pointer for it

Use table tests

47e002b

Address PR comments

efbe16e

Group ArgoCD clients in a struct per Arthur's PR comment

80601dd

Move the Regex pattern in analyzeCommentUpdateCheckBox (while keeping

0a7eee2

the identifier paramatize) This addresses a PR analyzeCommentUpdateCheckBox

Improve log message to address PR comment

3834ddd

Oded-B requested review from hnnsgstfssn and ashvarts July 12, 2024 09:29

hnnsgstfssn approved these changes Jul 12, 2024

View reviewed changes

Oded-B merged commit 2a96ff7 into main Jul 12, 2024
7 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Allow setting argoCD revision to PR git Branch #16

Allow setting argoCD revision to PR git Branch #16

Oded-B commented Jun 28, 2024 •

edited

Loading

Oded-B commented Jun 28, 2024

github-actions bot commented Jun 28, 2024

github-actions bot commented Jun 28, 2024

Oded-B commented Jun 28, 2024

github-actions bot commented Jun 28, 2024

Oded-B commented Jun 28, 2024

github-actions bot commented Jun 28, 2024

Oded-B commented Jun 28, 2024

github-actions bot commented Jun 28, 2024

Oded-B commented Jun 28, 2024

github-actions bot commented Jun 28, 2024

Oded-B commented Jul 1, 2024

github-actions bot commented Jul 1, 2024

Oded-B commented Jul 1, 2024

github-actions bot commented Jul 1, 2024

Oded-B commented Jul 1, 2024

github-actions bot commented Jul 1, 2024

Oded-B commented Jul 1, 2024

Oded-B commented Jul 2, 2024

github-actions bot commented Jul 2, 2024

Oded-B commented Jul 3, 2024

github-actions bot commented Jul 3, 2024

Oded-B commented Jul 3, 2024

github-actions bot commented Jul 3, 2024

gitstream-cm bot commented Jul 4, 2024

gitstream-cm bot commented Jul 4, 2024

Allow setting argoCD revision to PR git Branch #16

Allow setting argoCD revision to PR git Branch #16

Conversation

Oded-B commented Jun 28, 2024 • edited Loading

Description

Type of Change

Checklist

Oded-B commented Jun 28, 2024

github-actions bot commented Jun 28, 2024

github-actions bot commented Jun 28, 2024

Oded-B commented Jun 28, 2024

github-actions bot commented Jun 28, 2024

Oded-B commented Jun 28, 2024

github-actions bot commented Jun 28, 2024

Oded-B commented Jun 28, 2024

github-actions bot commented Jun 28, 2024

Oded-B commented Jun 28, 2024

github-actions bot commented Jun 28, 2024

Oded-B commented Jul 1, 2024

github-actions bot commented Jul 1, 2024

Oded-B commented Jul 1, 2024

github-actions bot commented Jul 1, 2024

Oded-B commented Jul 1, 2024

github-actions bot commented Jul 1, 2024

Oded-B commented Jul 1, 2024

Oded-B commented Jul 2, 2024

github-actions bot commented Jul 2, 2024

Oded-B commented Jul 3, 2024

github-actions bot commented Jul 3, 2024

Oded-B commented Jul 3, 2024

github-actions bot commented Jul 3, 2024

gitstream-cm bot commented Jul 4, 2024

gitstream-cm bot commented Jul 4, 2024

Oded-B commented Jun 28, 2024 •

edited

Loading