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

Jump to bottom

(Backend) - Update Google Dependencies to Address Vulnerabilities and General Tech Debt #2415

Merged
merged 8 commits into from
May 24, 2024
Merged

(Backend) - Update Google Dependencies to Address Vulnerabilities and General Tech Debt #2415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b7b6875
Bump Micronaut to 4.4.2
timyates May 21, 2024
4043c7a
Update selenium to latest
timyates May 21, 2024
a9602fa
Update micronaut plugin
timyates May 21, 2024
ad56689
Latest rewrite recipe
timyates May 21, 2024
d3a2243
Update webdrivermanager to latest
timyates May 21, 2024
d34daec
MAJOR: Update Google API libs to latest
timyates May 21, 2024
9a9bdde
Merge branch 'develop' into feature-2367/dependency-updates
timyates May 22, 2024
b71350f
Merge branch 'develop' into feature-2367/dependency-updates
mkimberlin May 24, 2024
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
18 changes: 9 additions & 9 deletions server/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform

plugins {
id("com.github.johnrengelman.shadow") version "8.1.1"
id("io.micronaut.application") version "4.3.6"
id("io.micronaut.application") version "4.3.8"
id "idea"
id "jacoco"
id("org.openrewrite.rewrite") version "latest.release"
Expand Down Expand Up @@ -35,7 +35,7 @@ configurations {
}

dependencies {
rewrite('org.openrewrite.recipe:rewrite-micronaut:2.1.1')
rewrite('org.openrewrite.recipe:rewrite-micronaut:2.5.0')

runtimeOnly("org.flywaydb:flyway-database-postgresql")
runtimeOnly("org.yaml:snakeyaml")
Expand Down Expand Up @@ -76,13 +76,13 @@ dependencies {
implementation "jakarta.annotation:jakarta.annotation-api"
implementation "jakarta.persistence:jakarta.persistence-api"

implementation "com.google.api-client:google-api-client:1.30.9"
implementation "com.google.oauth-client:google-oauth-client-jetty:1.28.0"
implementation "com.google.apis:google-api-services-drive:v3-rev20200326-1.30.9"
implementation "com.google.apis:google-api-services-gmail:v1-rev20200203-1.30.9"
implementation "com.google.apis:google-api-services-admin-directory:directory_v1-rev118-1.25.0"
implementation "com.google.api-client:google-api-client:2.5.1"
implementation "com.google.oauth-client:google-oauth-client-jetty:1.36.0"
implementation "com.google.apis:google-api-services-drive:v3-rev20240509-2.0.0"
implementation "com.google.apis:google-api-services-gmail:v1-rev20240422-2.0.0"
implementation "com.google.apis:google-api-services-admin-directory:directory_v1-rev20240509-2.0.0"

implementation 'com.google.cloud.sql:postgres-socket-factory:1.0.15'
implementation 'com.google.cloud.sql:postgres-socket-factory:1.18.1'

implementation("io.micronaut.reactor:micronaut-reactor")
implementation("io.micrometer:context-propagation")
Expand All @@ -91,7 +91,7 @@ dependencies {
testRuntimeOnly "org.seleniumhq.selenium:selenium-firefox-driver:$seleniumVersion"

testImplementation('io.projectreactor:reactor-test')
testImplementation 'io.github.bonigarcia:webdrivermanager:4.1.0'
testImplementation 'io.github.bonigarcia:webdrivermanager:5.8.0'
testImplementation "org.seleniumhq.selenium:selenium-java:$seleniumVersion"
testImplementation "org.seleniumhq.selenium:selenium-support:$seleniumVersion"
testImplementation "org.seleniumhq.selenium:selenium-api:$seleniumVersion"
Expand Down
4 changes: 2 additions & 2 deletions server/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
micronautVersion=4.4.1
seleniumVersion=3.141.59
micronautVersion=4.4.2
seleniumVersion=4.21.0
4 changes: 2 additions & 2 deletions server/src/main/java/com/objectcomputing/checkins/services/file/GoogleDriveAccessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import com.google.api.client.http.HttpRequestInitializer;
import com.google.api.client.http.javanet.NetHttpTransport;
import com.google.api.client.json.JsonFactory;
import com.google.api.client.json.jackson2.JacksonFactory;
import com.google.api.client.json.gson.GsonFactory;
import com.google.api.services.drive.Drive;
import com.google.auth.http.HttpCredentialsAdapter;
import io.micronaut.context.annotation.Property;
Expand All @@ -16,7 +16,7 @@
@Singleton
public class GoogleDriveAccessor {

private static final JsonFactory JSON_FACTORY = JacksonFactory.getDefaultInstance();
private static final JsonFactory JSON_FACTORY = GsonFactory.getDefaultInstance();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any particular driver for this change? Just curious.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

They removed JacksonFactory in favor of GsonFactory

https://cloud.google.com/java/docs/reference/google-http-client/latest/com.google.api.client.json.jackson2.JacksonFactory

private final NetHttpTransport httpTransport;
private final String applicationName;
private final GoogleAuthenticator authenticator;
Expand Down
4 changes: 2 additions & 2 deletions ...m/objectcomputing/checkins/services/memberprofile/memberphoto/MemberPhotoServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

import com.google.api.client.googleapis.json.GoogleJsonResponseException;
import com.google.api.client.http.HttpStatusCodes;
import com.google.api.services.admin.directory.Directory;
import com.google.api.services.admin.directory.model.UserPhoto;
import com.google.api.services.directory.Directory;
import com.google.api.services.directory.model.UserPhoto;
import com.objectcomputing.checkins.util.googleapiaccess.GoogleApiAccess;
import io.micronaut.cache.annotation.CacheConfig;
import io.micronaut.cache.annotation.Cacheable;
Expand Down
7 changes: 3 additions & 4 deletions server/src/main/java/com/objectcomputing/checkins/util/googleapiaccess/GoogleAccessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,10 @@
import com.google.api.client.http.HttpRequestInitializer;
import com.google.api.client.http.javanet.NetHttpTransport;
import com.google.api.client.json.JsonFactory;
import com.google.api.client.json.jackson2.JacksonFactory;
import com.google.api.services.admin.directory.Directory;
import com.google.api.client.json.gson.GsonFactory;
import com.google.api.services.directory.Directory;
import com.google.api.services.drive.Drive;
import com.google.auth.http.HttpCredentialsAdapter;
import com.objectcomputing.checkins.security.GoogleServiceConfiguration;
import io.micronaut.context.annotation.Property;
import io.micronaut.context.annotation.Requires;
import io.micronaut.context.env.Environment;
Expand All @@ -24,7 +23,7 @@
@Singleton
public class GoogleAccessor {

private final JsonFactory JSON_FACTORY = JacksonFactory.getDefaultInstance();
private final JsonFactory JSON_FACTORY = GsonFactory.getDefaultInstance();
private final NetHttpTransport httpTransport = GoogleNetHttpTransport.newTrustedTransport();
private final String applicationName;
private final GoogleAuthenticator authenticator;
Expand Down
2 changes: 1 addition & 1 deletion server/src/main/java/com/objectcomputing/checkins/util/googleapiaccess/GoogleApiAccess.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.objectcomputing.checkins.util.googleapiaccess;

import com.google.api.services.admin.directory.Directory;
import com.google.api.services.directory.Directory;
import com.google.api.services.drive.Drive;
import io.micronaut.context.annotation.Requires;
import io.micronaut.context.env.Environment;
Expand Down
11 changes: 5 additions & 6 deletions ...ctcomputing/checkins/services/feedback/suggestions/FeedbackSuggestionsControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
import jakarta.inject.Inject;
import java.util.*;

import org.mortbay.util.ajax.JSON;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import static org.junit.jupiter.api.Assertions.*;
Expand Down Expand Up @@ -59,7 +58,7 @@ void testGetRecsIfPdl() {
FeedbackSuggestionDTO idealOne = createFeedbackSuggestion(supervisorReason, supervisor.getId());
FeedbackSuggestionDTO idealTwo = createFeedbackSuggestion(teamLeadReason, requesteeTeamLead.getId());

assertNotNull(JSON.toString(response.getBody().get()));
assertNotNull(response.getBody().get());
assertEquals(HttpStatus.OK, response.getStatus());
assertEquals(response.getBody().get().size(), 2 );
assertContentEqualsEntity(idealOne, response.getBody().get().get(0));
Expand Down Expand Up @@ -87,7 +86,7 @@ void testGetRecsIfSupervisor() {
FeedbackSuggestionDTO idealOne = createFeedbackSuggestion(pdlReason, pdlProfile.getId());
FeedbackSuggestionDTO idealTwo = createFeedbackSuggestion(teamLeadReason, requesteeTeamLead.getId());

assertNotNull(JSON.toString(response.getBody().get()));
assertNotNull(response.getBody().get());
assertEquals(HttpStatus.OK, response.getStatus());
assertEquals(response.getBody().get().size(), 2 );
assertContentEqualsEntity(idealOne, response.getBody().get().get(0));
Expand Down Expand Up @@ -117,7 +116,7 @@ void testGetRecsIfTeamLead() {
FeedbackSuggestionDTO idealOne = createFeedbackSuggestion(supervisorReason, supervisor.getId());
FeedbackSuggestionDTO idealTwo = createFeedbackSuggestion(pdlReason, pdlProfile.getId());

assertNotNull(JSON.toString(response.getBody().get()));
assertNotNull(response.getBody().get());
assertEquals(HttpStatus.OK, response.getStatus());
assertEquals(response.getBody().get().size(), 2 );
assertContentEqualsEntity(idealOne, response.getBody().get().get(0));
Expand Down Expand Up @@ -149,7 +148,7 @@ void testGetRecsIfTeamMember() {
FeedbackSuggestionDTO idealTwo = createFeedbackSuggestion(pdlReason, pdlProfile.getId());
FeedbackSuggestionDTO idealThree = createFeedbackSuggestion(teamLeadReason, requesteeTeamLead.getId());

assertNotNull(JSON.toString(response.getBody().get()));
assertNotNull(response.getBody().get());
assertEquals(HttpStatus.OK, response.getStatus());
assertEquals( 3, response.getBody().get().size() );
assertContentEqualsEntity(idealOne, response.getBody().get().get(0));
Expand Down Expand Up @@ -184,7 +183,7 @@ void testDoesNotIncludeTerminatedTeamMembers() {
FeedbackSuggestionDTO idealTwo = createFeedbackSuggestion(pdlReason, pdlProfile.getId());
FeedbackSuggestionDTO idealThree = createFeedbackSuggestion(teamLeadReason, requesteeTeamLead.getId());

assertNotNull(JSON.toString(response.getBody().get()));
assertNotNull(response.getBody().get());
assertEquals(HttpStatus.OK, response.getStatus());
assertEquals( 3, response.getBody().get().size() );
assertContentEqualsEntity(idealOne, response.getBody().get().get(0));
Expand Down
4 changes: 2 additions & 2 deletions ...jectcomputing/checkins/services/memberprofile/memberphoto/MemberPhotoServiceImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.objectcomputing.checkins.services.memberprofile.memberphoto;

import com.google.api.client.googleapis.json.GoogleJsonResponseException;
import com.google.api.services.admin.directory.Directory;
import com.google.api.services.admin.directory.model.UserPhoto;
import com.google.api.services.directory.Directory;
import com.google.api.services.directory.model.UserPhoto;
import com.objectcomputing.checkins.services.memberprofile.MemberProfileServices;
import com.objectcomputing.checkins.util.googleapiaccess.GoogleApiAccess;
import io.micronaut.context.env.Environment;
Expand Down
Loading