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.

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: Bump io.netty.netty-bom to v4.1.108.Final to address CVE-2024-29025 #899

Closed
wants to merge 2 commits into from
Closed
Changes from 1 commit
Commits
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
Prev Previous commit
Fix failing unit test
joannatk committed Jul 2, 2024
commit 86061fa69ef0b0b1b692be6cee4518c1dbc05501
Original file line number Diff line number Diff line change
@@ -56,7 +56,7 @@ public void testNormalCheckin() {
eq(true)))
.andReturn(returnConfig)
.once();
expect(apiContainer.getProxyV2APIForTenant(CENTRAL_TENANT_NAME))
expect(apiContainer.getProxyV2APIForTenant(EasyMock.anyObject(String.class)))
.andReturn(proxyV2API)
.anyTimes();
proxyV2API.proxySaveConfig(eq(proxyId), anyObject());
@@ -108,7 +108,7 @@ public void testNormalCheckinWithRemoteShutdown() {
eq(true)))
.andReturn(returnConfig)
.anyTimes();
expect(apiContainer.getProxyV2APIForTenant(CENTRAL_TENANT_NAME))
expect(apiContainer.getProxyV2APIForTenant(EasyMock.anyObject(String.class)))
.andReturn(proxyV2API)
.anyTimes();
proxyV2API.proxySaveConfig(eq(proxyId), anyObject());
@@ -166,7 +166,7 @@ public void testNormalCheckinWithBadConsumer() {
eq(true)))
.andReturn(returnConfig)
.anyTimes();
expect(apiContainer.getProxyV2APIForTenant(CENTRAL_TENANT_NAME))
expect(apiContainer.getProxyV2APIForTenant(EasyMock.anyObject(String.class)))
.andReturn(proxyV2API)
.anyTimes();
proxyV2API.proxySaveConfig(eq(proxyId), anyObject());
@@ -210,7 +210,7 @@ public void testNetworkErrors() {
returnConfig.setPointsPerBatch(1234567L);
replay(proxyConfig);
UUID proxyId = ProxyUtil.getOrCreateProxyId(proxyConfig);
expect(apiContainer.getProxyV2APIForTenant(CENTRAL_TENANT_NAME))
expect(apiContainer.getProxyV2APIForTenant(EasyMock.anyObject(String.class)))
.andReturn(proxyV2API)
.anyTimes();
proxyV2API.proxySavePreprocessorRules(eq(proxyId), anyObject());
@@ -312,7 +312,7 @@ public void testHttpErrors() {
AgentConfiguration returnConfig = new AgentConfiguration();
replay(proxyConfig);
UUID proxyId = ProxyUtil.getOrCreateProxyId(proxyConfig);
expect(apiContainer.getProxyV2APIForTenant(CENTRAL_TENANT_NAME))
expect(apiContainer.getProxyV2APIForTenant(EasyMock.anyObject(String.class)))
.andReturn(proxyV2API)
.anyTimes();
// we need to allow 1 successful checking to prevent early termination
@@ -474,7 +474,7 @@ public void testRetryCheckinOnMisconfiguredUrl() {
eq(true)))
.andThrow(new ClientErrorException(Response.status(404).build()))
.once();
expect(apiContainer.getProxyV2APIForTenant(CENTRAL_TENANT_NAME))
expect(apiContainer.getProxyV2APIForTenant(EasyMock.anyObject(String.class)))
.andReturn(proxyV2API)
.anyTimes();
apiContainer.updateServerEndpointURL(CENTRAL_TENANT_NAME, "https://acme.corp/zzz/api/");
@@ -537,7 +537,7 @@ public void testRetryCheckinOnMisconfiguredUrlFailsTwiceTerminates() {
eq(true)))
.andThrow(new ClientErrorException(Response.status(404).build()))
.times(2);
expect(apiContainer.getProxyV2APIForTenant(CENTRAL_TENANT_NAME))
expect(apiContainer.getProxyV2APIForTenant(EasyMock.anyObject(String.class)))
.andReturn(proxyV2API)
.anyTimes();
proxyV2API.proxySaveConfig(eq(proxyId), anyObject());
@@ -579,7 +579,7 @@ public void testDontRetryCheckinOnMisconfiguredUrlThatEndsWithApi() {
returnConfig.setPointsPerBatch(1234567L);
replay(proxyConfig);
UUID proxyId = ProxyUtil.getOrCreateProxyId(proxyConfig);
expect(apiContainer.getProxyV2APIForTenant(CENTRAL_TENANT_NAME))
expect(apiContainer.getProxyV2APIForTenant(EasyMock.anyObject(String.class)))
.andReturn(proxyV2API)
.anyTimes();
expect(
@@ -629,7 +629,7 @@ public void testDontRetryCheckinOnBadCredentials() {
returnConfig.setPointsPerBatch(1234567L);
replay(proxyConfig);
UUID proxyId = ProxyUtil.getOrCreateProxyId(proxyConfig);
expect(apiContainer.getProxyV2APIForTenant(CENTRAL_TENANT_NAME))
expect(apiContainer.getProxyV2APIForTenant(EasyMock.anyObject(String.class)))
.andReturn(proxyV2API)
.anyTimes();
expect(
@@ -700,7 +700,7 @@ public void testCheckinConvergedCSPWithLogServerConfiguration() {
eq(true)))
.andReturn(returnConfig)
.once();
expect(apiContainer.getProxyV2APIForTenant(CENTRAL_TENANT_NAME))
expect(apiContainer.getProxyV2APIForTenant(EasyMock.anyObject(String.class)))
.andReturn(proxyV2API)
.anyTimes();
proxyV2API.proxySaveConfig(eq(proxyId), anyObject());
@@ -760,7 +760,7 @@ public void testCheckinConvergedCSPWithoutLogServerConfiguration() {
eq(true)))
.andReturn(returnConfig)
.once();
expect(apiContainer.getProxyV2APIForTenant(CENTRAL_TENANT_NAME))
expect(apiContainer.getProxyV2APIForTenant(EasyMock.anyObject(String.class)))
.andReturn(proxyV2API)
.anyTimes();
proxyV2API.proxySaveConfig(eq(proxyId), anyObject());