diff --git a/chpl/chpl-service/pom.xml b/chpl/chpl-service/pom.xml index 22292d4cf9..a90ac171ab 100644 --- a/chpl/chpl-service/pom.xml +++ b/chpl/chpl-service/pom.xml @@ -18,12 +18,12 @@ 0.27.1 1.4.0 9.4.0 - 3.2.0 + 3.2.1 1.5.6 6.59.0 4.5.14 5.5.1 - 42.7.11 + 42.7.12 2.5.2 1.7.0 4.0.1 @@ -126,7 +126,7 @@ org.hibernate.validator hibernate-validator - 9.1.0.Final + 9.1.3.Final @@ -278,7 +278,7 @@ org.apache.tomcat tomcat-dbcp - 11.0.23 + 11.0.24 @@ -347,7 +347,7 @@ com.datadoghq datadog-api-client - 2.48.0 + 2.56.0 diff --git a/chpl/chpl-service/src/main/java/gov/healthit/chpl/scheduler/job/urluptime/DatadogSyntheticsTestService.java b/chpl/chpl-service/src/main/java/gov/healthit/chpl/scheduler/job/urluptime/DatadogSyntheticsTestService.java index fe43232b97..ff3b323521 100644 --- a/chpl/chpl-service/src/main/java/gov/healthit/chpl/scheduler/job/urluptime/DatadogSyntheticsTestService.java +++ b/chpl/chpl-service/src/main/java/gov/healthit/chpl/scheduler/job/urluptime/DatadogSyntheticsTestService.java @@ -20,7 +20,7 @@ import com.datadog.api.client.v1.model.SyntheticsPatchTestBody; import com.datadog.api.client.v1.model.SyntheticsPatchTestOperation; import com.datadog.api.client.v1.model.SyntheticsPatchTestOperationName; -import com.datadog.api.client.v1.model.SyntheticsTestDetails; +import com.datadog.api.client.v1.model.SyntheticsTestDetailsWithoutSteps; import com.datadog.api.client.v1.model.SyntheticsTestOptions; import com.datadog.api.client.v1.model.SyntheticsTestOptionsHTTPVersion; import com.datadog.api.client.v1.model.SyntheticsTestOptionsScheduling; @@ -63,7 +63,7 @@ public DatadogSyntheticsTestApiProvider getApiProvider() { return apiProvider; } - public List getAllSyntheticsTests() { + public List getAllSyntheticsTests() { try { return apiProvider.getApiInstance().listTests().getTests(); diff --git a/chpl/chpl-service/src/main/java/gov/healthit/chpl/scheduler/job/urluptime/DatadogUrlUptimeSynchonizer.java b/chpl/chpl-service/src/main/java/gov/healthit/chpl/scheduler/job/urluptime/DatadogUrlUptimeSynchonizer.java index 639281efb1..91fc128b5a 100644 --- a/chpl/chpl-service/src/main/java/gov/healthit/chpl/scheduler/job/urluptime/DatadogUrlUptimeSynchonizer.java +++ b/chpl/chpl-service/src/main/java/gov/healthit/chpl/scheduler/job/urluptime/DatadogUrlUptimeSynchonizer.java @@ -22,7 +22,7 @@ import com.datadog.api.client.v1.model.SyntheticsAPITestResultFull; import com.datadog.api.client.v1.model.SyntheticsAPITestResultShort; import com.datadog.api.client.v1.model.SyntheticsApiTestFailureCode; -import com.datadog.api.client.v1.model.SyntheticsTestDetails; +import com.datadog.api.client.v1.model.SyntheticsTestDetailsWithoutSteps; import gov.healthit.chpl.datadog.OnDemandUrlCheckerManager; import gov.healthit.chpl.developer.search.DeveloperSearchRequest; @@ -89,7 +89,7 @@ public void synchronize() { private void synchronizeUrlUptimeMonitorTestsWithDatadogSyntheticsTestResults() { LOGGER.info("**************** Getting Test Results from Datadog and saving it locally ****************"); - List syntheticsTestDetails = datadogSyntheticsTestService.getAllSyntheticsTests(); + List syntheticsTestDetails = datadogSyntheticsTestService.getAllSyntheticsTests(); getDatesToRetrieveResultsFor().stream() .peek(testDate -> LOGGER.info("**************** Retrieving test results for: {} ****************", testDate)) @@ -136,10 +136,10 @@ private void synchronizeDatadogSyntheticsTestsWithServiceBaseUrlLists() { private void createOrUpdateSyntheticsTest() { List serviceBaseUrlLists = serviceBaseUrlListService.getAllServiceBaseUrlLists(); - List syntheticsTestDetails = datadogSyntheticsTestService.getAllSyntheticsTests(); + List syntheticsTestDetails = datadogSyntheticsTestService.getAllSyntheticsTests(); for (ServiceBaseUrlList sbu : serviceBaseUrlLists) { - Optional foundSyntheticsTestDetails = findSyntheticsTestDetails(syntheticsTestDetails, sbu.getUrl()); + Optional foundSyntheticsTestDetails = findSyntheticsTestDetails(syntheticsTestDetails, sbu.getUrl()); if (foundSyntheticsTestDetails.isEmpty()) { datadogSyntheticsTestService.createSyntheticsTest(sbu.getDatadogFormattedUrl(), sbu.getDeveloperIds()); syntheticsTestDetails = datadogSyntheticsTestService.getAllSyntheticsTests(); @@ -156,10 +156,10 @@ private void createOrUpdateSyntheticsTest() { private void removeUnusedDatadogSyntheticsTests() { List serviceBaseUrlLists = serviceBaseUrlListService.getAllServiceBaseUrlLists(); - List syntheticsTestDetails = datadogSyntheticsTestService.getAllSyntheticsTests(); + List syntheticsTestDetails = datadogSyntheticsTestService.getAllSyntheticsTests(); List syntheticsTestPublicIdsToDelete = new ArrayList(); - for (SyntheticsTestDetails std : syntheticsTestDetails) { + for (SyntheticsTestDetailsWithoutSteps std : syntheticsTestDetails) { boolean found = serviceBaseUrlLists.stream() .filter(sbu -> sbu.getUrl().equals(std.getConfig().getRequest().getUrl())) .findAny() @@ -174,7 +174,7 @@ private void removeUnusedDatadogSyntheticsTests() { } } - private Optional findSyntheticsTestDetails(List syntheticsTestDetails, String url) { + private Optional findSyntheticsTestDetails(List syntheticsTestDetails, String url) { return syntheticsTestDetails.stream() .filter(std -> std.getConfig().getRequest().getUrl().equals(url)) .findAny(); @@ -230,7 +230,7 @@ private Boolean contains(List list, UrlUptimeMonitor value) { && item.getUrl().equals(value.getUrl())); } - private List generateExpectedUrlIUpTimeMonitors(List syntheticsTestDetails) { + private List generateExpectedUrlIUpTimeMonitors(List syntheticsTestDetails) { return (List) syntheticsTestDetails.stream() .flatMap(synthTest -> getDeveloperIdsFromTags(synthTest.getTags()).stream() .map(devId -> UrlUptimeMonitor.builder() @@ -289,7 +289,7 @@ private List getDeveloperIdsFromTags(List tags) { .toList(); } - private String getDatadogPublicId(List syntheticsTestDetails, String url, Long developerId) { + private String getDatadogPublicId(List syntheticsTestDetails, String url, Long developerId) { return syntheticsTestDetails.stream() .filter(dets -> dets.getConfig().getRequest().getUrl().equals(url) && getDeveloperIdsFromTags(dets.getTags()).contains(developerId)) diff --git a/chpl/pom.xml b/chpl/pom.xml index 1e431922e7..b4b1fcaac8 100644 --- a/chpl/pom.xml +++ b/chpl/pom.xml @@ -120,7 +120,7 @@ org.apache.maven.plugins maven-site-plugin - 3.10.0 + 3.22.0 diff --git a/yarn.lock b/yarn.lock index 41ec541298..d837bd3b86 100644 --- a/yarn.lock +++ b/yarn.lock @@ -669,9 +669,9 @@ inherits@2.0.4, inherits@^2.0.1: integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== ip-address@^10.0.1: - version "10.2.0" - resolved "https://registry.yarnpkg.com/ip-address/-/ip-address-10.2.0.tgz#805fc178b20c518bd4c8548b24fe30892d7f3206" - integrity sha512-/+S6j4E9AHvW9SWMSEY9Xfy66O5PWvVEJ08O0y5JGyEKQpojb0K0GKpz/v5HJ/G0vi3D2sjGK78119oXZeE0qA== + version "10.4.0" + resolved "https://registry.yarnpkg.com/ip-address/-/ip-address-10.4.0.tgz#c5910bc541b6eae287765d1e4846be0308a05d93" + integrity sha512-oSK96Grm3aP6OrS263xVxbNDGVL7rzBtYdpGqlDG8iQdoenDoTs/nkki+DflYbAEE8Xl6o5YxhxlrKvI3nqKXQ== is-fullwidth-code-point@^3.0.0: version "3.0.0"