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-74031] [JENKINS-74847] Migrate legacy checkUrl attributes in org/jvnet/hudson/plugins/SSHBuildWrapper/global.jelly #31

Merged
merged 6 commits into from
Nov 14, 2024

Conversation

shlomomdahan
Copy link
Contributor

@shlomomdahan shlomomdahan commented Nov 14, 2024

JENKINS-74031
JENKINS-74847

Problem:

Solution

  • Add back the value field to the respective entires.

Testing done

  1. Tested by entering relevant fields and saving form, refreshing page and verifying values persist.
  2. Tested with CSP restrictive enabled to ensure there are no further regressions.

Before Changes
Regression
After Changes with CSP Restrictive

Submitter checklist

  • Make sure you are opening from a topic/feature/bugfix branch (right side) and not your main branch!
  • Ensure that the pull request title represents the desired changelog entry
  • Please describe what you did
  • Link to relevant issues in GitHub or Jira
  • Link to relevant pull requests, esp. upstream and downstream changes
  • Ensure you have provided tests - that demonstrates feature works or fixes the issue

@shlomomdahan shlomomdahan requested a review from a team as a code owner November 14, 2024 02:04
@shlomomdahan shlomomdahan marked this pull request as draft November 14, 2024 02:19
@shlomomdahan shlomomdahan marked this pull request as ready for review November 14, 2024 02:21
@shlomomdahan shlomomdahan marked this pull request as draft November 14, 2024 02:23
@shlomomdahan shlomomdahan marked this pull request as ready for review November 14, 2024 02:28
@shlomomdahan shlomomdahan marked this pull request as draft November 14, 2024 02:29
@shlomomdahan shlomomdahan marked this pull request as ready for review November 14, 2024 02:38
Copy link
Member

@basil basil left a comment

Choose a reason for hiding this comment

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

Thanks for the PR! Testing looks good.

Diff from original attempt:

--- /tmp/global.jelly   2024-11-14 06:50:07.082934928 -0800
+++ src/main/resources/org/jvnet/hudson/plugins/SSHBuildWrapper/global.jelly    2024-11-14 06:50:36.478897814 -0800
@@ -7,14 +7,14 @@
       <f:repeatable var="site" name="sites" items="${descriptor.sites}">
         <table width="100%">
           <f:entry title="${%Hostname}" field="hostname" help="/plugin/ssh/help-hostname.html">
-            <f:textbox/>
+            <f:textbox value="${site.hostname}"/>
           </f:entry>
           <f:entry title="${%Port}" help="/plugin/ssh/help-port.html">
             <f:textbox name="port" value="${site.port}"/>
           </f:entry>
 
           <f:entry title="${%Credentials}" field="credentialId">
-            <c:select/>
+            <c:select value="${site.credentialId}"/>
           </f:entry>
 
           <f:entry title="${%Pty}" help="/plugin/ssh/help-pty.html">

@basil basil added the internal label Nov 14, 2024
@basil basil merged commit f051f0f into jenkinsci:master Nov 14, 2024
17 checks passed
@basil basil changed the title [JENKINS-74031] [JENKINS-74847] Fix regression created in 74031 [JENKINS-74031] [JENKINS-74847] Migrate legacy checkUrl attributes in org/jvnet/hudson/plugins/SSHBuildWrapper/global.jelly Nov 14, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants