#139 add workaround for bug in DT

see DependencyTrack/dependency-track#2439
jenkinsci · Feb 2, 2023 · c1fc0bc · c1fc0bc
1 parent b67a387
commit c1fc0bc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/DependencyTrack/ApiClient.java b/src/main/java/org/jenkinsci/plugins/DependencyTrack/ApiClient.java
@@ -332,6 +332,8 @@ public void updateProjectProperties(@NonNull final String projectUuid, @NonNull
             JSONObject newParent = new JSONObject().elementOpt("uuid", properties.getParentId());
             rawProject.element("parent", newParent);
         }
+        // remove parentUuid wich may be present but can not be consumed by Dependency-Track (https://github.com/DependencyTrack/dependency-track/issues/2439)
+        rawProject.remove("parentUuid");
         // 3. update project
         updateProject(projectUuid, rawProject);
     }

diff --git a/src/test/java/org/jenkinsci/plugins/DependencyTrack/ApiClientTest.java b/src/test/java/org/jenkinsci/plugins/DependencyTrack/ApiClientTest.java
@@ -359,7 +359,7 @@ public void updateProjectPropertiesTest() throws ApiClientException, Interrupted
                     .get(ApiClient.PROJECT_URL + "/uuid-3", (request, response) -> {
                         assertThat(request.requestHeaders().contains(ApiClient.API_KEY_HEADER, API_KEY, false)).isTrue();
                         assertThat(request.requestHeaders().contains(HttpHeaderNames.ACCEPT, HttpHeaderValues.APPLICATION_JSON, true)).isTrue();
-                        return response.sendString(Mono.just("{\"name\":\"test-project\",\"uuid\":\"uuid-3\",\"version\":\"1.2.3\",\"tags\":[{\"name\":\"tag1\"},{\"name\":\"tag2\"}],\"parent\":{\"uuid\":\"old-parent\"}}"));
+                        return response.sendString(Mono.just("{\"name\":\"test-project\",\"uuid\":\"uuid-3\",\"version\":\"1.2.3\",\"tags\":[{\"name\":\"tag1\"},{\"name\":\"tag2\"}],\"parent\":{\"uuid\":\"old-parent\"},\"parentUuid\":\"old-parent\"}"));
                     })
                     .post(ApiClient.PROJECT_URL, (request, response) -> {
                         assertThat(request.requestHeaders().contains(ApiClient.API_KEY_HEADER, API_KEY, false)).isTrue();
@@ -384,12 +384,14 @@ public void updateProjectPropertiesTest() throws ApiClientException, Interrupted
 
         assertThatCode(() -> uut.updateProjectProperties("uuid-3", props)).doesNotThrowAnyException();
         completionSignal.await(5, TimeUnit.SECONDS);
-        final Project project = ProjectParser.parse(JSONObject.fromObject(requestBody.get()));
+        final JSONObject updatedProject = JSONObject.fromObject(requestBody.get());
+        final Project project = ProjectParser.parse(updatedProject);
         assertThat(project.getTags()).containsExactlyInAnyOrder("tag1", "tag2", "tag4");
         assertThat(project.getSwidTagId()).isEqualTo(props.getSwidTagId());
         assertThat(project.getGroup()).isEqualTo(props.getGroup());
         assertThat(project.getDescription()).isEqualTo(props.getDescription());
         assertThat(project.getParent()).hasFieldOrPropertyWithValue("uuid", props.getParentId());
+        assertThat(updatedProject.has("parentUuid")).isFalse();
     }
 
     @Test