Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Adding author/creator as a template key for Pull Request Generator #18974

Merged
merged 3 commits into from
Jul 30, 2024

Conversation

vfaergestad
Copy link
Contributor

@vfaergestad vfaergestad commented Jul 7, 2024

Fixes [ISSUE #18826].

Adding an ´author´ template key for the pull request generator. This is retrieved from the SCM api together with the other template keys. This makes it possible to reference the author of an pull-request in the generator-template, for example in the image tag.

Checklist:

  • Either (a) I've created an enhancement proposal and discussed it with the community, (b) this is a bug fix, or (c) this does not need to be in the release notes.
  • The title of the PR states what changed and the related issues number (used for the release note).
  • The title of the PR conforms to the Toolchain Guide
  • I've included "Closes [ISSUE #]" or "Fixes [ISSUE #]" in the description to automatically close the associated issue.
  • I've updated both the CLI and UI to expose my feature, or I plan to submit a second PR with them.
  • Does this PR require documentation updates?
  • I've updated documentation as required by this PR.
  • I have signed off all my commits as required by DCO
  • I have written unit and/or e2e tests for my change. PRs without these are unlikely to be merged.
  • My build is green (troubleshooting builds).
  • My new feature complies with the feature status guidelines.
  • I have added a brief description of why this PR is necessary and/or what this PR solves.
  • Optional. My organization is added to USERS.md.
  • Optional. For bug fixes, I've indicated what older releases this fix should be cherry-picked into (this may or may not happen depending on risk/complexity).

Copy link

bunnyshell bot commented Jul 7, 2024

❌ Preview Environment deleted from Bunnyshell

Available commands (reply to this comment):

  • 🚀 /bns:deploy to deploy the environment

Copy link

bunnyshell bot commented Jul 7, 2024

❌ Preview Environment deleted from Bunnyshell

Available commands (reply to this comment):

  • 🚀 /bns:deploy to deploy the environment

Copy link

codecov bot commented Jul 8, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 50.71%. Comparing base (8b1bddd) to head (b6a4459).

Additional details and impacted files
@@           Coverage Diff           @@
##           master   #18974   +/-   ##
=======================================
  Coverage   50.70%   50.71%           
=======================================
  Files         316      316           
  Lines       43496    43503    +7     
=======================================
+ Hits        22054    22061    +7     
  Misses      18930    18930           
  Partials     2512     2512           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@vfaergestad
Copy link
Contributor Author

The tests that fials are the e2e integration-tests. They error while waiting for an application. Not sure how to fix this.

=== FAIL: test/e2e TestMergeTerminalMergeGeneratorSelector (32.18s)
time="2024-07-09T14:53:01Z" level=info msg="mkdir -p /tmp/applicationset-e2e" dir= execID=f1fe6
time="2024-07-09T14:53:01Z" level=debug duration=1.643737ms execID=f1fe6
time="2024-07-09T14:53:02Z" level=info msg="clean state" duration=1.130094059s id= name=TestMergeTerminalMergeGeneratorSelector *** username=admin
time="2024-07-09T14:53:03Z" level=info msg="action: creating ApplicationSet '/merge-generator-nested-merge'"
time="2024-07-09T14:53:03Z" level=info msg="expectation succeeded: no error and output contained ''"
time="2024-07-09T14:53:03Z" level=info msg="expectation pending: missing app 'argocd-e2e/kustomize-guestbook-1'"
time="2024-07-09T14:53:06Z" level=info msg="expectation pending: missing app 'argocd-e2e/kustomize-guestbook-1'"
time="2024-07-09T14:53:09Z" level=info msg="expectation pending: missing app 'argocd-e2e/kustomize-guestbook-1'"
time="2024-07-09T14:53:12Z" level=info msg="expectation pending: missing app 'argocd-e2e/kustomize-guestbook-1'"
time="2024-07-09T14:53:15Z" level=info msg="expectation pending: missing app 'argocd-e2e/kustomize-guestbook-1'"
time="2024-07-09T14:53:18Z" level=info msg="expectation pending: missing app 'argocd-e2e/kustomize-guestbook-1'"
time="2024-07-09T14:53:21Z" level=info msg="expectation pending: missing app 'argocd-e2e/kustomize-guestbook-1'"
time="2024-07-09T14:53:24Z" level=info msg="expectation pending: missing app 'argocd-e2e/kustomize-guestbook-1'"
time="2024-07-09T14:53:27Z" level=info msg="expectation pending: missing app 'argocd-e2e/kustomize-guestbook-1'"
time="2024-07-09T14:53:30Z" level=info msg="expectation pending: missing app 'argocd-e2e/kustomize-guestbook-1'"
    consequences.go:26: timeout waiting for: missing app 'argocd-e2e/kustomize-guestbook-1'

@vfaergestad
Copy link
Contributor Author

Other then that, I think this PR is ready for review. Atleast ready for some critique of the PR itself, all comments are welcome.

@vfaergestad vfaergestad marked this pull request as ready for review July 9, 2024 15:23
@vfaergestad vfaergestad requested review from a team as code owners July 9, 2024 15:23
@ggjulio
Copy link
Contributor

ggjulio commented Jul 21, 2024

@vfaergestad for e2e failing please look at the PR #17907 for files to update, they are similar.

Btw @agaudreault, I saw you updated some files I rebased to fix conflicts, any way I could get a review of #17907 ?
Off topic but It's been a while this PR is open and waiting for a review 😄

@vfaergestad
Copy link
Contributor Author

All test are now successful, and the PR is ready for review.

Copy link
Member

@agaudreault agaudreault left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

Copy link
Member

@ishitasequeira ishitasequeira left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The changes LGTM.
@vfaergestad the commit history looks messed up. Could you try to fix that?

@vfaergestad
Copy link
Contributor Author

@ishitasequeira Good point! I cleaned it up now.

@ggjulio
Copy link
Contributor

ggjulio commented Jul 23, 2024

Hey @vfaergestad , there is an issue with the number of files changed.
Wrong master ? (origin/master vs upstream/master)

git remote add upstream https://github.com/argoproj/argo-cd.git`
git checkout master # origin master
git rebase upstream/master

@vfaergestad vfaergestad force-pushed the master branch 2 times, most recently from 5ac7c88 to c72c86f Compare July 23, 2024 13:02
Signed-off-by: Vegard Færgestad <vegardf@mnemonic.no>
@vfaergestad
Copy link
Contributor Author

Thank you for the notice @ggjulio . I did not release I had made that error. Thank you for your patience, I learn something new everyday.

I believe I have fixed it now. Let me know if there is anything else.

@vfaergestad
Copy link
Contributor Author

@ishitasequeira Is it anything else needed from my side in this PR? :D

@ishitasequeira ishitasequeira merged commit ad74383 into argoproj:master Jul 30, 2024
28 of 29 checks passed
rhyswilliamsza pushed a commit to rhyswilliamsza/argo-cd that referenced this pull request Aug 12, 2024
…tor (argoproj#18974)

Signed-off-by: Vegard Færgestad <vegardf@mnemonic.no>
Co-authored-by: Vegard Færgestad <vegardf@mnemonic.no>
Signed-off-by: Rhys Williams <rhys.williams@electrum.co.za>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants