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

fix(build.gradle): update to fix some cve in 13sep23 report #13

Draft
wants to merge 3 commits into
base: OES-1.30.1
Choose a base branch
from
Draft

fix(build.gradle): update to fix some cve in 13sep23 report #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
05ca23f
fix(build.gradle): update to fix some cve in 13sep23 report
SheetalAtre Sep 14, 2023
5082f6a
fix(kayenta-signalfx): moved from build.gradle to kayenta-signalfx.gr…
SheetalAtre Sep 14, 2023
6d89391
fix(kayenta-standalone-canary-analysis): fix compilation error
SheetalAtre Sep 14, 2023
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
3 changes: 3 additions & 0 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,16 +116,19 @@ subprojects { project ->
api "com.squareup.okhttp:okhttp-urlconnection:2.7.5"
api "com.squareup.okhttp:okhttp-apache:2.7.5"
api "org.jsoup:jsoup:1.15.3" //CVE-2022-36033:jinjava-2.6.0 > jsoup-1.14.2
implementation "org.apache.ivy:ivy:2.5.2"


testImplementation "org.springframework.boot:spring-boot-starter-test"
testImplementation "org.spockframework:spock-core"
testImplementation "org.spockframework:spock-spring"
testImplementation "org.springframework:spring-test"
testImplementation "org.hamcrest:hamcrest-core"

//testImplementation "org.apache.groovy:groovy-all"
testRuntimeOnly "cglib:cglib-nodep"
testRuntimeOnly "org.objenesis:objenesis"

}
}

Expand Down
2 changes: 1 addition & 1 deletion kayenta-signalfx/kayenta-signalfx.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ integrationTest {
dependencies {
implementation project(":kayenta-core")

api 'com.signalfx.public:signalfx-java:1.0.31'
api 'com.signalfx.public:signalfx-java:1.0.34'

testImplementation 'com.tngtech.java:junit-dataprovider:1.13.1'
testImplementation project(":kayenta-standalone-canary-analysis")
Expand Down
7 changes: 5 additions & 2 deletions ...netflix/kayenta/standalonecanaryanalysis/orca/stage/SetupAndExecuteCanariesStageTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import java.time.Duration;
import java.time.Instant;
import java.time.temporal.ChronoUnit;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.Mock;
Expand Down Expand Up @@ -77,11 +78,13 @@ public void test_that_calculateLifetime_uses_supplied_start_and_end_time_if_prov
assertEquals("The duration should be 5 minutes", expected, actual);
}

@Test(expected = IllegalArgumentException.class)
@Test
public void
test_that_calculateLifetime_throws_an_error_if_lifetime_and_start_and_endtime_not_provided() {
Instant now = Instant.now();
stage.calculateLifetime(now, null, CanaryAnalysisExecutionRequest.builder().build());
Assertions.assertThrows(
IllegalArgumentException.class,
() -> stage.calculateLifetime(now, null, CanaryAnalysisExecutionRequest.builder().build()));
}

@Test
Expand Down