fix wrong execution job on DELETE API - for master (#705)

* fix wrong execution job

Co-authored-by: Titakis,Sebastian (BI X) BIX-DE-I <[email protected]>

Author: clemensutschig

CHANGELOG.md

@@ -39,6 +39,7 @@
 - Unknown exception (e.g. existing JIRA project) raised in REST create project endpoint / addProject causes removal of existing projects ([#514](https://github.com/opendevstack/ods-provisioning-app/issues/514))
 - Logging in debug level shows too much jwt details ([#486](https://github.com/opendevstack/ods-provisioning-app/issues/486))
 - DELETE_COMPONENTS API stores and returns project with deleted quickstarter([#702](https://github.com/opendevstack/ods-provisioning-app/issues/702))
+- API DELETE*: wrong jenkins run job (lastExecutionJobs) returned ([#790](https://github.com/opendevstack/ods-provisioning-app/issues/790))
 
 ## [3.0] - 2020-08-11
 

src/main/java/org/opendevstack/provision/controller/ProjectApiController.java

@@ -922,6 +922,7 @@ public ResponseEntity<Object> deleteComponents(@RequestBody OpenProjectData dele
       return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(error);
     } else {
       project.removeQuickstartersFromProject(deletableComponents.getQuickstarters());
+      project.setLastExecutionJobs(deletableComponents.getLastExecutionJobs());
       this.directStorage.updateStoredProject(project);
       return ResponseEntity.ok(project);
     }

src/main/java/org/opendevstack/provision/services/JenkinsPipelineAdapter.java

@@ -538,12 +538,13 @@ private Map<CLEANUP_LEFTOVER_COMPONENTS, Integer> cleanupWholeProjects(OpenProje
 
       CLEANUP_LEFTOVER_COMPONENTS objectType = CLEANUP_LEFTOVER_COMPONENTS.PLTF_PROJECT;
       // Note: the secret passed here is the corresponding to the ODS CD webhook proxy
-      return runDeleteAdminJob(
+      return runDeleteAdminJobAndSetAsLastExecutionJobToProject(
           deleteProjectAdminJob,
           project.getProjectKey(),
           openshiftJenkinsTriggerSecret,
           componentId,
-          objectType);
+          objectType,
+          project);
     }
 
     logger.debug("Project {} not affected from cleanup", project.getProjectKey());
@@ -558,13 +559,14 @@ private Map<CLEANUP_LEFTOVER_COMPONENTS, Integer> cleanupQuickstartersOnly(
             .map(q1 -> q1.get(OpenProjectData.COMPONENT_ID_KEY))
             .map(
                 component ->
-                    runDeleteAdminJob(
+                    runDeleteAdminJobAndSetAsLastExecutionJobToProject(
                         jenkinsPipelineProperties.getDeleteComponentsQuickstarter(),
                         project.getProjectKey(),
                         project.getWebhookProxySecret(), // Note: the secret passed here is the
                         // corresponding to the project CD webhook proxy
                         component,
-                        CLEANUP_LEFTOVER_COMPONENTS.QUICKSTARTER))
+                        CLEANUP_LEFTOVER_COMPONENTS.QUICKSTARTER,
+                        project))
             .filter(m -> !m.isEmpty())
             .mapToInt(e -> 1)
             .sum();
@@ -578,12 +580,14 @@ private Map<CLEANUP_LEFTOVER_COMPONENTS, Integer> cleanupQuickstartersOnly(
     }
   }
 
-  private Map<CLEANUP_LEFTOVER_COMPONENTS, Integer> runDeleteAdminJob(
-      Quickstarter adminQuickstarter,
-      String projectKey,
-      String webhookProxySecret,
-      String componentId,
-      CLEANUP_LEFTOVER_COMPONENTS objectType) {
+  private Map<CLEANUP_LEFTOVER_COMPONENTS, Integer>
+      runDeleteAdminJobAndSetAsLastExecutionJobToProject(
+          Quickstarter adminQuickstarter,
+          String projectKey,
+          String webhookProxySecret,
+          String componentId,
+          CLEANUP_LEFTOVER_COMPONENTS objectType,
+          OpenProjectData project) {
     String projectId = projectKey.toLowerCase();
     Map<String, String> options = buildAdminJobOptions(projectId, componentId);
     Job job = new Job(adminQuickstarter, odsGitRef);
@@ -592,14 +596,26 @@ private Map<CLEANUP_LEFTOVER_COMPONENTS, Integer> runDeleteAdminJob(
       logger.debug("Calling job {} for project {}", job.getId(), projectKey);
       ExecutionsData data = prepareAndExecuteJob(job, options, webhookProxySecret);
       logger.info("Result of cleanup: {}", data.toString());
+
+      if (project.getLastExecutionJobs() == null) {
+        project.setLastExecutionJobs(new ArrayList<ExecutionJob>());
+      }
+
+      ExecutionJob result = new ExecutionJob();
+      result.setName(data.getJobName());
+      result.setUrl(data.getPermalink());
+
+      project.getLastExecutionJobs().add(result);
+
       return Collections.emptyMap();
     } catch (RuntimeException | IOException e) {
       logger.debug(
           "Could not start job {} for project {}/component {} : {}",
           job.getId(),
           projectKey,
           componentId,
-          e.getMessage());
+          e.getMessage(),
+          e);
       Map<CLEANUP_LEFTOVER_COMPONENTS, Integer> leftovers = new HashMap<>();
 
       leftovers.put(objectType, 1);

src/test/java/org/opendevstack/provision/controller/E2EProjectAPIControllerTest.java

@@ -787,6 +787,17 @@ public void testQuickstarterProvisionOnNewOpenProjectInclDeleteSingleComponent()
     // repos MUST stay untouched
     assertEquals(currentRepositorySize, resultProject.getRepositories().size());
 
+    // verify delete qucikstarter job is now as last execution
+    assertTrue(
+        resultProject.getLastExecutionJobs() != null
+            && resultProject.getLastExecutionJobs().get(0) != null);
+
+    String deleteComponentJob = resultProject.getLastExecutionJobs().get(0).getUrl();
+
+    assertNotEquals(
+        createdProjectIncludingQuickstarters.getLastExecutionJobs().get(0).getUrl(),
+        deleteComponentJob);
+
     // retrieve the project again
     resultProjectGetResponse =
         mockMvc
@@ -808,6 +819,14 @@ public void testQuickstarterProvisionOnNewOpenProjectInclDeleteSingleComponent()
     // verify old (before cleaning) quickstarters are now -1
     assertEquals((currentQuickstarterSize - 1), resultProject.getQuickstarters().size());
     assertTrue(resultProject.getQuickstarters().isEmpty());
+
+    // verify delete job is persisted
+    assertTrue(
+        resultProject.getLastExecutionJobs() != null
+            && resultProject.getLastExecutionJobs().get(0) != null);
+
+    // verify delete qucikstarter job is now as last execution
+    assertEquals(resultProject.getLastExecutionJobs().get(0).getUrl(), deleteComponentJob);
   }
 
   private void mockExecuteAdminJob(String namespace, String jobName, String prefix)

src/test/java/org/opendevstack/provision/model/OpenProjectDataTest.java

@@ -0,0 +1,11 @@
+package org.opendevstack.provision.model;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import org.junit.jupiter.api.Test;
+
+class OpenProjectDataTest {
+
+  @Test
+  void removeQuickstartersFromProject() {}
+}