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

[JENKINS-68801] - Fix for Functions#extractPluginNameFromIconSrc #6902

Merged
merged 3 commits into from
Aug 2, 2022
Merged

[JENKINS-68801] - Fix for Functions#extractPluginNameFromIconSrc #6902

merged 3 commits into from
Aug 2, 2022

Conversation

bzzitsme
Copy link
Contributor

@bzzitsme bzzitsme commented Jul 22, 2022

See JENKINS-68801.

If our plugin's artifactId will contain "plugin-", then it will replace all "plugin-" occurences instead of first one.
Then it won't be able to correctly extract plugin name

Proposed changelog

  • Use correct icon lookup even when plugin ID includes more than one occurrence of "plugin".

Proposed upgrade guidelines

N/A

Submitter checklist

  • (If applicable) Jira issue is well described
  • Changelog entries and upgrade guidelines are appropriate for the audience affected by the change (users or developer, depending on the change) and are in the imperative mood. Examples
    • Fill-in the Proposed changelog entries section only if there are breaking changes or other changes which may require extra steps from users during the upgrade
  • Appropriate autotests or explanation to why this change has no tests
  • New public classes, fields, and methods are annotated with @Restricted or have @since TODO Javadoc, as appropriate.
  • New deprecations are annotated with @Deprecated(since = "TODO") or @Deprecated(forRemoval = true, since = "TODO") if applicable.
  • For dependency updates: links to external changelogs and, if possible, full diffs

Desired reviewers

@timja @janfaracik

Maintainer checklist

Before the changes are marked as ready-for-merge:

  • There are at least 2 approvals for the pull request and no outstanding requests for change
  • Conversations in the pull request are over OR it is explicit that a reviewer does not block the change
  • Changelog entries in the PR title and/or Proposed changelog entries are accurate, human-readable, and in the imperative mood
  • Proper changelog labels are set so that the changelog can be generated automatically
  • If the change needs additional upgrade steps from users, upgrade-guide-needed label is set and there is a Proposed upgrade guidelines section in the PR title. (example)
  • If it would make sense to backport the change to LTS, a Jira issue must exist, be a Bug or Improvement, and be labeled as lts-candidate to be considered (see query).

@bzzitsme
Copy link
Contributor Author

Hi @janfaracik @timja
Could you take a look at this PR?

@NotMyFault NotMyFault added web-ui The PR includes WebUI changes which may need special expertise bug For changelog: Minor bug. Will be listed after features needs-security-review Awaiting review by a security team member labels Jul 22, 2022
@NotMyFault NotMyFault requested a review from a team July 22, 2022 09:26
@timja
Copy link
Member

timja commented Jul 22, 2022

/reviewer @jenkinsci/sig-ux

@comment-ops-bot comment-ops-bot bot requested a review from a team July 22, 2022 09:27
@timja
Copy link
Member

timja commented Jul 22, 2022

Is this a theoretical issue or do you have a plugin which includes the text plugin- in it?

@bzzitsme
Copy link
Contributor Author

bzzitsme commented Jul 22, 2022

Is this a theoretical issue or do you have a plugin which includes the text plugin- in it?

We have plugin which contains "plugin-" in the artifactId

@timja
Copy link
Member

timja commented Jul 22, 2022

(untested, but I assume you have)

@timja
Copy link
Member

timja commented Jul 22, 2022

/reviewer @jenkinsci/sig-ux

@comment-ops-bot comment-ops-bot bot requested a review from a team July 22, 2022 18:57
@timja
Copy link
Member

timja commented Jul 24, 2022

/label ready-for-merge


This PR is now ready for merge, after ~24 hours, we will merge it if there's no negative feedback.

Thanks!

@comment-ops-bot comment-ops-bot bot added the ready-for-merge The PR is ready to go, and it will be merged soon if there is no negative feedback label Jul 24, 2022
@NotMyFault NotMyFault added ready-for-merge The PR is ready to go, and it will be merged soon if there is no negative feedback and removed ready-for-merge The PR is ready to go, and it will be merged soon if there is no negative feedback labels Jul 24, 2022
@timja timja removed the ready-for-merge The PR is ready to go, and it will be merged soon if there is no negative feedback label Jul 24, 2022
@bzzitsme
Copy link
Contributor Author

(untested, but I assume you have)

I have tested it and it works fine

Copy link
Contributor

@yaroslavafenkin yaroslavafenkin left a comment

Choose a reason for hiding this comment

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

Looks reasonable to me.
Do we maybe want to add a tiny unit test for this? E.g. FunctionsTest.java#L398

@yaroslavafenkin yaroslavafenkin added security-approved @jenkinsci/core-security-review reviewed this PR for security issues and removed needs-security-review Awaiting review by a security team member labels Jul 29, 2022
@bzzitsme
Copy link
Contributor Author

bzzitsme commented Aug 1, 2022

Do we maybe want to add a tiny unit test for this? E.g. FunctionsTest.java#L398

Added test for new functionality

@NotMyFault
Copy link
Member

NotMyFault commented Aug 1, 2022

I went ahead and fixed your spot bugs issues introduced, hope you don't mind.


/label ready-for-merge


This PR is now ready for merge. We will merge it after ~24 hours if there is no negative feedback.
Please see the merge process documentation for more information about the merge process.
Thanks!

@comment-ops-bot
Copy link

I wasn't able to add the following labels: ready-for-merge


This PR is now ready for merge

Check that the label exists and is spelt right then try again.

@NotMyFault NotMyFault added the ready-for-merge The PR is ready to go, and it will be merged soon if there is no negative feedback label Aug 1, 2022
@timja
Copy link
Member

timja commented Aug 1, 2022

(labelling with other text is currently broken, it will work on it's own)

@basil basil added the squash-merge-me Unclean or useless commit history, should be merged only with squash-merge label Aug 1, 2022
@basil basil merged commit 83bf697 into jenkinsci:master Aug 2, 2022
krisstern pushed a commit to krisstern/jenkins that referenced this pull request Aug 14, 2022
…kinsci#6902)

Co-authored-by: Temirlan Dyussyumbayev <bzzitsme@users.noreply.github.com>
Co-authored-by: Alexander Brandes <mc.cache@web.de>
(cherry picked from commit 83bf697)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug For changelog: Minor bug. Will be listed after features ready-for-merge The PR is ready to go, and it will be merged soon if there is no negative feedback security-approved @jenkinsci/core-security-review reviewed this PR for security issues squash-merge-me Unclean or useless commit history, should be merged only with squash-merge web-ui The PR includes WebUI changes which may need special expertise
Projects
None yet
6 participants