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.

Sign up for GitHub

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

Jump to bottom

[JENKINS-73314] Adapt Kubernetes Credentials for Jetty 12 (EE 9) #46

Closed
wants to merge 2 commits into from
Closed

[JENKINS-73314] Adapt Kubernetes Credentials for Jetty 12 (EE 9) #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4ea324c
[JENKINS-73139] Adapt Kubernetes Credentials for Jetty 12 (EE 8)
basil Aug 13, 2024
6d32241
[JENKINS-73314] Adapt Kubernetes Credentials for Jetty 12 (EE 9)
basil Jun 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@
<gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>

<!-- jenkins versions -->
<jenkins.version>2.426.3</jenkins.version>
<!-- TODO JENKINS-73278 https://ci.jenkins.io/job/Core/job/jenkins/job/jakarta/ -->
<jenkins.version>2.472-rc35224.83b_736a_f3fc3</jenkins.version>
<bom.artifactId>bom-2.426.x</bom.artifactId>
<bom.version>3208.vb_21177d4b_cd9</bom.version>

Expand All @@ -51,6 +52,10 @@

<spotbugs.effort>Max</spotbugs.effort>
<spotbugs.threshold>Low</spotbugs.threshold>

<!-- TODO JENKINS-73339 until in parent POM -->
<jenkins-test-harness.version>2254.vcff7a_d4969e5</jenkins-test-harness.version>
<maven.compiler.release>17</maven.compiler.release>
</properties>

<dependencies>
Expand Down Expand Up @@ -118,6 +123,12 @@
<scope>import</scope>
<type>pom</type>
</dependency>
<!-- TODO JENKINS-73339 until in parent POM, work around https://github.com/jenkinsci/plugin-pom/issues/936 -->
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>5.0.0</version>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down
4 changes: 2 additions & 2 deletions ...kinsci/plugins/kubernetes/credentials/AbstractOpenShiftBearerTokenCredentialFIPSTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.server.SslConnectionFactory;
import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.servlet.ServletHolder;
import org.eclipse.jetty.ee9.servlet.ServletContextHandler;
import org.eclipse.jetty.ee9.servlet.ServletHolder;
import org.eclipse.jetty.util.ssl.SslContextFactory;
import org.junit.After;
import org.junit.Before;
Expand Down
18 changes: 10 additions & 8 deletions src/test/java/org/jenkinsci/plugins/kubernetes/credentials/MockHttpServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package org.jenkinsci.plugins.kubernetes.credentials;

import org.eclipse.jetty.server.Request;
import org.eclipse.jetty.ee9.nested.Request;

import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.ServletException;
import jakarta.servlet.http.HttpServlet;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
Expand Down Expand Up @@ -36,10 +36,12 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t
// Now create matcher object.
Matcher m = r.matcher(request.getPathInfo());
if (m.find()) {
Request jettyRequest = (Request) request;
String rootUrl = jettyRequest.getHttpURI().getScheme() + "://" + jettyRequest.getHttpURI().getHost() + ":" + jettyRequest.getHttpURI().getPort();
String responseToClient = "{\n" +
" \"issuer\": \"" + ((Request) request).getRootURL() + "\",\n" +
" \"authorization_endpoint\": \"" + ((Request) request).getRootURL() + "/" + m.group(1) + "/oauth/authorize\",\n" +
" \"token_endpoint\": \"" + ((Request) request).getRootURL() + "/oauth/token\",\n" +
" \"issuer\": \"" + rootUrl + "\",\n" +
" \"authorization_endpoint\": \"" + rootUrl + "/" + m.group(1) + "/oauth/authorize\",\n" +
" \"token_endpoint\": \"" + rootUrl + "/oauth/token\",\n" +
" \"scopes_supported\": [\n" +
" \"user:check-access\",\n" +
" \"user:full\",\n" +
Expand Down
4 changes: 2 additions & 2 deletions ...java/org/jenkinsci/plugins/kubernetes/credentials/OpenShiftBearerTokenCredentialTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
import com.cloudbees.plugins.credentials.CredentialsScope;
import hudson.util.Secret;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.servlet.ServletHolder;
import org.eclipse.jetty.ee9.servlet.ServletContextHandler;
import org.eclipse.jetty.ee9.servlet.ServletHolder;
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
Expand Down