fix more jenknis tests

ls1intum · Jan 3, 2025 · f2f4fa9 · f2f4fa9
1 parent cd964b3
commit f2f4fa9
Show file tree

Hide file tree

Showing 10 changed files with 59 additions and 57 deletions.
diff --git a/...a/de/tum/cit/aet/artemis/programming/service/jenkins/JenkinsAuthorizationInterceptor.java b/...a/de/tum/cit/aet/artemis/programming/service/jenkins/JenkinsAuthorizationInterceptor.java
@@ -3,7 +3,7 @@
 import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_JENKINS;
 
 import java.io.IOException;
-import java.net.URL;
+import java.net.URI;
 
 import jakarta.validation.constraints.NotNull;
 
@@ -37,7 +37,7 @@ public class JenkinsAuthorizationInterceptor implements ClientHttpRequestInterce
     private String password;
 
     @Value("${artemis.continuous-integration.url}")
-    private URL jenkinsURL;
+    private URI jenkinsServerUri;
 
     @Value("${jenkins.use-crumb:#{true}}")
     private boolean useCrumb;
@@ -64,7 +64,7 @@ private void setCrumb(final HttpHeaders headersToAuthenticate) {
         final var entity = new HttpEntity<>(headers);
 
         try {
-            final var response = restTemplate.exchange(jenkinsURL.toString() + "/crumbIssuer/api/json", HttpMethod.GET, entity, JsonNode.class);
+            final var response = restTemplate.exchange(jenkinsServerUri.toString() + "/crumbIssuer/api/json", HttpMethod.GET, entity, JsonNode.class);
             final var sessionId = response.getHeaders().get("Set-Cookie").getFirst();
             headersToAuthenticate.add("Jenkins-Crumb", response.getBody().get("crumb").asText());
             headersToAuthenticate.add("Cookie", sessionId);

diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/JenkinsInfoContributor.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/JenkinsInfoContributor.java
@@ -2,7 +2,7 @@
 
 import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_JENKINS;
 
-import java.net.URL;
+import java.net.URI;
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.actuate.info.Info;
@@ -17,11 +17,11 @@
 public class JenkinsInfoContributor implements InfoContributor {
 
     @Value("${artemis.continuous-integration.url}")
-    private URL JENKINS_SERVER_URL;
+    private URI jenkinsServerUri;
 
     @Override
     public void contribute(Info.Builder builder) {
-        final var buildPlanURLTemplate = JENKINS_SERVER_URL + "/job/{projectKey}/job/{buildPlanId}";
+        final var buildPlanURLTemplate = jenkinsServerUri + "/job/{projectKey}/job/{buildPlanId}";
         builder.withDetail(Constants.INFO_BUILD_PLAN_URL_DETAIL, buildPlanURLTemplate);
 
         // Store name of the continuous integration system

diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/JenkinsService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/JenkinsService.java
@@ -48,7 +48,7 @@ public class JenkinsService extends AbstractContinuousIntegrationService {
     private final ObjectMapper mapper = new ObjectMapper();
 
     @Value("${artemis.continuous-integration.url}")
-    protected URI serverUri;
+    private URI jenkinsServerUri;
 
     private final JenkinsBuildPlanService jenkinsBuildPlanService;
 
@@ -168,7 +168,7 @@ public String getPlanKey(Object requestBody) throws JenkinsException {
     @Override
     public Optional<String> getWebHookUrl(String projectKey, String buildPlanId) {
         // TODO: use UriComponentsBuilder
-        var urlString = serverUri + "/project/" + projectKey + "/" + buildPlanId;
+        var urlString = jenkinsServerUri + "/project/" + projectKey + "/" + buildPlanId;
         return Optional.of(jenkinsInternalUrlService.toInternalCiUrl(urlString));
     }
 
@@ -231,9 +231,9 @@ public void removeAllDefaultProjectPermissions(String projectKey) {
 
     @Override
     public ConnectorHealth health() {
-        Map<String, Object> additionalInfo = Map.of("url", serverUri);
+        Map<String, Object> additionalInfo = Map.of("url", jenkinsServerUri);
         try {
-            URI uri = JenkinsEndpoints.HEALTH.buildEndpoint(serverUri).build(true).toUri();
+            URI uri = JenkinsEndpoints.HEALTH.buildEndpoint(jenkinsServerUri).build(true).toUri();
             // Note: we simply check if the login page is reachable
             shortTimeoutRestTemplate.getForObject(uri, String.class);
             return new ConnectorHealth(true, additionalInfo);

diff --git a/...t/artemis/programming/service/jenkins/build_plan/JenkinsBuildPlanLinkInfoContributor.java b/...t/artemis/programming/service/jenkins/build_plan/JenkinsBuildPlanLinkInfoContributor.java
@@ -2,7 +2,7 @@
 
 import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_JENKINS;
 
-import java.net.URL;
+import java.net.URI;
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.actuate.info.Info;
@@ -17,11 +17,11 @@
 public class JenkinsBuildPlanLinkInfoContributor implements InfoContributor {
 
     @Value("${artemis.continuous-integration.url}")
-    private URL jenkinsServerUrl;
+    private URI jenkinsServerUri;
 
     @Override
     public void contribute(Info.Builder builder) {
-        final var buildPlanURLTemplate = jenkinsServerUrl + "/job/{projectKey}/job/{buildPlanId}";
+        final var buildPlanURLTemplate = jenkinsServerUri + "/job/{projectKey}/job/{buildPlanId}";
         builder.withDetail(Constants.INFO_BUILD_PLAN_URL_DETAIL, buildPlanURLTemplate);
     }
 }
diff --git a/...e/tum/cit/aet/artemis/programming/service/jenkins/build_plan/JenkinsBuildPlanService.java b/...e/tum/cit/aet/artemis/programming/service/jenkins/build_plan/JenkinsBuildPlanService.java
@@ -63,7 +63,7 @@ public class JenkinsBuildPlanService {
     private static final Logger log = LoggerFactory.getLogger(JenkinsBuildPlanService.class);
 
     @Value("${artemis.continuous-integration.url}")
-    protected URI serverUri;
+    private URI jenkinsServerUri;
 
     private final RestTemplate restTemplate;
 
@@ -308,7 +308,7 @@ private String getCleanPlanName(String name) {
      */
     public void triggerBuild(String projectKey, String planKey) {
         try {
-            URI uri = JenkinsEndpoints.TRIGGER_BUILD.buildEndpoint(serverUri, projectKey, planKey).build(true).toUri();
+            URI uri = JenkinsEndpoints.TRIGGER_BUILD.buildEndpoint(jenkinsServerUri, projectKey, planKey).build(true).toUri();
             restTemplate.postForEntity(uri, new HttpEntity<>(null, new HttpHeaders()), Void.class);
         }
         catch (RestClientException e) {
@@ -337,7 +337,7 @@ public ContinuousIntegrationService.BuildStatus getBuildStatusOfPlan(String proj
         }
 
         try {
-            URI uri = JenkinsEndpoints.LAST_BUILD.buildEndpoint(serverUri, projectKey, planKey).build(true).toUri();
+            URI uri = JenkinsEndpoints.LAST_BUILD.buildEndpoint(jenkinsServerUri, projectKey, planKey).build(true).toUri();
             var buildStatus = restTemplate.getForObject(uri, JenkinsBuildStatusDTO.class);
             return buildStatus != null && buildStatus.building ? ContinuousIntegrationService.BuildStatus.BUILDING : ContinuousIntegrationService.BuildStatus.INACTIVE;
         }
@@ -422,7 +422,7 @@ public void givePlanPermissions(ProgrammingExercise programmingExercise, String
      */
     public void enablePlan(String projectKey, String planKey) {
         try {
-            URI uri = JenkinsEndpoints.ENABLE.buildEndpoint(serverUri, projectKey, planKey).build(true).toUri();
+            URI uri = JenkinsEndpoints.ENABLE.buildEndpoint(jenkinsServerUri, projectKey, planKey).build(true).toUri();
             restTemplate.postForEntity(uri, new HttpEntity<>(null, new HttpHeaders()), Void.class);
         }
         catch (HttpClientErrorException e) {

diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/jobs/JenkinsJobService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/jenkins/jobs/JenkinsJobService.java
@@ -37,7 +37,7 @@ public class JenkinsJobService {
     private final RestTemplate restTemplate;
 
     @Value("${artemis.continuous-integration.url}")
-    protected URI serverUri;
+    private URI jenkinsServerUri;
 
     public JenkinsJobService(@Qualifier("jenkinsRestTemplate") RestTemplate restTemplate) {
         this.restTemplate = restTemplate;
@@ -57,7 +57,7 @@ public JobWithDetails getJob(String folderJobName, String jobName) {
         }
 
         try {
-            URI uri = JenkinsEndpoints.GET_JOB.buildEndpoint(serverUri, folderJobName, jobName).build(true).toUri();
+            URI uri = JenkinsEndpoints.GET_JOB.buildEndpoint(jenkinsServerUri, folderJobName, jobName).build(true).toUri();
             return restTemplate.getForObject(uri, JobWithDetails.class);
         }
         catch (HttpClientErrorException.NotFound notFound) {
@@ -88,7 +88,7 @@ public record FolderJob(String name, String description, String url) {
      */
     public FolderJob getFolderJob(String folderName) {
         try {
-            URI uri = JenkinsEndpoints.GET_FOLDER_JOB.buildEndpoint(serverUri, folderName).build(true).toUri();
+            URI uri = JenkinsEndpoints.GET_FOLDER_JOB.buildEndpoint(jenkinsServerUri, folderName).build(true).toUri();
             return restTemplate.getForObject(uri, FolderJob.class);
         }
         catch (HttpClientErrorException.NotFound notFound) {
@@ -114,7 +114,7 @@ public Document getJobConfig(String folderName, String jobName) {
                 throw new JenkinsException("The folder " + folderName + " does not exist.");
             }
 
-            URI uri = JenkinsEndpoints.PLAN_CONFIG.buildEndpoint(serverUri, folderName, jobName).build(true).toUri();
+            URI uri = JenkinsEndpoints.PLAN_CONFIG.buildEndpoint(jenkinsServerUri, folderName, jobName).build(true).toUri();
             String xmlString = restTemplate.getForObject(uri, String.class);
 
             // Replace the old reference to the master and main branch by a reference to the default branch
@@ -145,14 +145,14 @@ public Document getFolderConfig(String folderName) throws IOException {
             return null;
         }
 
-        URI uri = JenkinsEndpoints.FOLDER_CONFIG.buildEndpoint(serverUri, folderName).build(true).toUri();
+        URI uri = JenkinsEndpoints.FOLDER_CONFIG.buildEndpoint(jenkinsServerUri, folderName).build(true).toUri();
         String folderXml = restTemplate.getForObject(uri, String.class);
         return JenkinsXmlFileUtils.readFromString(folderXml);
     }
 
     public void createFolder(String projectKey) {
         //@formatter:off
-        URI uri = JenkinsEndpoints.NEW_FOLDER.buildEndpoint(serverUri)
+        URI uri = JenkinsEndpoints.NEW_FOLDER.buildEndpoint(jenkinsServerUri)
             .queryParam("name", projectKey)
             .queryParam("mode", "com.cloudbees.hudson.plugins.folder.Folder")
             .queryParam("from", "")
@@ -182,7 +182,7 @@ public void createJobInFolder(Document jobConfig, String folderName, String jobN
                 return;
             }
 
-            URI uri = JenkinsEndpoints.NEW_PLAN.buildEndpoint(serverUri, folderName).queryParam("name", jobName).build(true).toUri();
+            URI uri = JenkinsEndpoints.NEW_PLAN.buildEndpoint(jenkinsServerUri, folderName).queryParam("name", jobName).build(true).toUri();
 
             final var headers = new HttpHeaders();
             headers.setContentType(MediaType.APPLICATION_XML);
@@ -207,7 +207,7 @@ public void createJobInFolder(Document jobConfig, String folderName, String jobN
     public void updateJob(String folderName, String jobName, Document jobConfig) {
         final var errorMessage = "Error trying to configure build plan in Jenkins " + jobName;
         try {
-            URI uri = JenkinsEndpoints.PLAN_CONFIG.buildEndpoint(serverUri, folderName, jobName).build(true).toUri();
+            URI uri = JenkinsEndpoints.PLAN_CONFIG.buildEndpoint(jenkinsServerUri, folderName, jobName).build(true).toUri();
 
             final var headers = new HttpHeaders();
             headers.setContentType(MediaType.APPLICATION_XML);
@@ -236,7 +236,7 @@ public void updateJob(String folderName, String jobName, Document jobConfig) {
      */
     public void updateFolderJob(String folderName, Document folderConfig) throws IOException {
         try {
-            URI uri = JenkinsEndpoints.FOLDER_CONFIG.buildEndpoint(serverUri, folderName).build(true).toUri();
+            URI uri = JenkinsEndpoints.FOLDER_CONFIG.buildEndpoint(jenkinsServerUri, folderName).build(true).toUri();
 
             final var headers = new HttpHeaders();
             headers.setContentType(MediaType.APPLICATION_XML);
@@ -257,7 +257,7 @@ public void updateFolderJob(String folderName, Document folderConfig) throws IOE
 
     public void deleteJob(String folderName, String jobName) {
         try {
-            URI uri = JenkinsEndpoints.DELETE_JOB.buildEndpoint(serverUri, folderName, jobName).build(true).toUri();
+            URI uri = JenkinsEndpoints.DELETE_JOB.buildEndpoint(jenkinsServerUri, folderName, jobName).build(true).toUri();
             restTemplate.postForEntity(uri, new HttpEntity<>(null, new HttpHeaders()), Void.class);
         }
         catch (HttpClientErrorException.NotFound e) {
@@ -277,7 +277,7 @@ public void deleteJob(String folderName, String jobName) {
      */
     public void deleteFolderJob(String folderName) {
         try {
-            URI uri = JenkinsEndpoints.DELETE_FOLDER.buildEndpoint(serverUri, folderName).build(true).toUri();
+            URI uri = JenkinsEndpoints.DELETE_FOLDER.buildEndpoint(jenkinsServerUri, folderName).build(true).toUri();
             restTemplate.postForEntity(uri, new HttpEntity<>(null, new HttpHeaders()), Void.class);
         }
         catch (HttpClientErrorException.NotFound e) {