Merge branch 'develop' into 2.0.10-release-candidate

deployment/README.md

@@ -677,6 +677,54 @@ These secrets can be deleted from your deployment with the following steps. Howe
         ```
 1.  Create a pull request from this working branch to your specified branch, which will start the terraform plan and validation. After completion of the plan and validation, merge the pull request. That will run the terraform apply.
 
+### Whitelisting the TCP Port 10256 in the firewall when upgrading to 2.0.10 or greater
+
+One of the Backend service health checks is using the 10256 port, and it was observed this port needs to be whitelisted.
+Please follow the below steps to whitelist the port:
+1.  Update your repository with the latest changes from release 2.0.10 or greater, create a new working branch, and make the following changes.
+1.  In the deployment/terraform/<Prefix>-<env>-network/main.tf, find the section resource "google_compute_firewall" "fw_allow_k8s_ingress_lb_health_checks" { [...] } and add below script along with other port numbers script: 
+ 
+        allow {
+         protocol = "tcp"
+         ports  = ["10256"]
+        }   
+1.  Create a pull request from this working branch to your specified branch, which will start the terraform plan and validation. After completion of the plan and validation, merge the pull request. That will run the terraform apply.
+ 
+### Ingress version Upgrade when upgrading to 2.0.10 or greater
+ 
+ The Beta API versions (extensions/v1beta1 and networking.k8s.io/v1beta1) of Ingress are no longer served for GKE clusters created on versions 1.22 and later.
+ We have upgraded the API version in the deployment/kubernetes/ingress.yaml as part of this release. After updating the repo with the latest changes from release 2.0.10 or greater, please follow the below steps:
+1.  Pull the latest code from your repository and checkout your specified branch, which contains the upgraded ingress.yaml.
+1.  Run the following command to apply the latest ingress.yaml:
+ 
+         kubectl apply \
+             -f $GIT_ROOT/deployment/kubernetes/ingress.yaml
+1. Update firewalls:
+      - Run `kubectl describe ingress $PREFIX-$ENV`
+      - Look at the suggested commands under "Events", in the form of "Firewall
+        change required by network admin"
+      - Run each of the suggested commands
+1. Verify the status of your Kubernetes cluster:
+     - Check the [Kubernetes ingress dashboard](https://console.cloud.google.com/kubernetes/ingresses) in your `{PREFIX}-{ENV}-apps` project to view the status of your cluster ingress (if status is not green, repeat the firewall step above)
+    - Check the [Kubernetes workloads dashboard](https://console.cloud.google.com/kubernetes/workload) in your `{PREFIX}-{ENV}-apps` project to view the status of your applications (confirm all applications are green before proceeding)
+ 
+### Migrate to Containerd node images before GKE v1.24
+ 
+1. Update your repository with the latest changes from release 2.0.10 or greater, create a new working branch, and make the following changes.
+1. In the deployment/terraform/<Prefix>-<env>-apps/main.tf, find the section 
+module "<prefix>_<env>_gke_cluster" { [...] } and add below script at the end of this section:
+ 
+     ```
+     node_pools = [
+        {
+          name       = "default-node-pool"
+          image_type = "COS_CONTAINERD"
+        },
+      ]
+    }
+    ```
+3.  Create a pull request from this working branch to your specified branch, which will start the terraform plan and validation. After completion of the plan and validation, merge the pull request. That will run the terraform apply.
+ 
 
 ***
 <p align="center">Copyright 2020 Google LLC</p>

documentation/whats-new.md

@@ -6,8 +6,18 @@
 -->
 
 > Subscribe to [mystudies-announce@googlegroups.com](https://groups.google.com/g/mystudies-announce/) to receive release notifications and announcements
+# Release 2.0.10
+* Spring framework upgrade from version 3.0 to 5.3.18
+* Upgrade of related dependencies -- H2, Junit, Hibernate, Tiles, spring-security etc
+* Security updates
+* Introduction of Google Analytics for the iOS and Android mobile apps
+* Bug fixes and UI refinements
+* Additional code improvements and minor enhancements
+* The full list of bugs and refinements addressed in this release can be viewed [here ](https://github.com/GoogleCloudPlatform/fda-mystudies/milestone/13?closed=1).
+* Refer to [these](/deployment/README.md#whitelisting-the-tcp-port-10256-in-the-firewall-when-upgrading-to-2010-or-greater) steps when upgrading existing deployments to release 2.0.10
+
 # Release 2.0.9
-* This release fixes the security vulnerability detected with Log4j recently. More information on the vulnerability is here (https://logging.apache.org/log4j/2.x/security.html#CVE-2021-45046). 
+* This release fixes the security vulnerability detected with Log4j recently. More information on the vulnerability is [here ](https://logging.apache.org/log4j/2.x/security.html#CVE-2021-45046). 
 * Note: The platform was using a log4j version and logging framework which is not impacted by this vulnerability. However, as a safety measure, the platform is updated with release v2.0.9, to use the latest Log4j version 2.16.0 that was provided by Apache to address this issue.
 
 # Release 2.0.8

participant-manager/Dockerfile

@@ -5,7 +5,7 @@
 # https://opensource.org/licenses/MIT.
 # Stage 1
 # Installing all the dependencies and creating Dist file or building angular application
-FROM node:12.16.1 AS compile-image
+FROM node:12.20 AS compile-image
 ARG BASE_HREF=/participant-manager
 WORKDIR /app
 COPY . ./

study-builder/fdahpStudyDesigner/src/main/java/com/fdahpstudydesigner/bo/UserPermissions.java

@@ -24,60 +24,44 @@
 
 package com.fdahpstudydesigner.bo;
 
-import java.util.Set;
+import java.io.Serializable;
 import javax.persistence.Column;
 import javax.persistence.Entity;
-import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
-import javax.persistence.ManyToMany;
 import javax.persistence.Table;
 import org.hibernate.annotations.GenericGenerator;
 
 @Entity
 @Table(name = "user_permissions")
-public class UserPermissions {
+public class UserPermissions implements Serializable {
 
+  private static final long serialVersionUID = 135353554543L;
+
+  @Column(name = "permissions", nullable = false, length = 45)
   private String permissions;
 
+  @Id
+  @GeneratedValue(generator = "system-uuid")
+  @GenericGenerator(name = "system-uuid", strategy = "uuid")
+  @Column(name = "permission_id", updatable = false, nullable = false)
   private Integer userRoleId;
 
-  private Set<UserBO> users;
-
   public UserPermissions() {}
 
-  public UserPermissions(Set<UserBO> users, String permissions) {
-    this.setUsers(users);
-    this.setPermissions(permissions);
-  }
-
-  @Column(name = "permissions", nullable = false, length = 45)
   public String getPermissions() {
     return permissions;
   }
 
-  @Id
-  @GeneratedValue(generator = "system-uuid")
-  @GenericGenerator(name = "system-uuid", strategy = "uuid")
-  @Column(name = "permission_id", updatable = false, nullable = false)
   public Integer getUserRoleId() {
     return this.userRoleId;
   }
 
-  @ManyToMany(fetch = FetchType.EAGER)
-  public Set<UserBO> getUsers() {
-    return users;
-  }
-
   public void setPermissions(String permissions) {
     this.permissions = permissions;
   }
 
   public void setUserRoleId(Integer userRoleId) {
     this.userRoleId = userRoleId;
   }
-
-  public void setUsers(Set<UserBO> users) {
-    this.users = users;
-  }
 }

study-builder/fdahpStudyDesigner/src/main/java/com/fdahpstudydesigner/dao/StudyQuestionnaireDAOImpl.java

@@ -3542,8 +3542,7 @@ public QuestionnairesStepsBo saveOrUpdateFromQuestionnaireStep(
           String updateQuery =
               "update QuestionnairesStepsBo QSBO set QSBO.destinationStep=:stepId"
                   + " where "
-                  + "QSBO.destinationStep="
-                  + String.valueOf(0)
+                  + "QSBO.destinationStep='0'"
                   + " and QSBO.sequenceNo=:sequenceNo"
                   + " and QSBO.questionnairesId=:questionnairesId ";
           session

study-builder/fdahpStudyDesigner/src/main/webapp/WEB-INF/ApplicationContext.xml

@@ -60,7 +60,7 @@
         <property name="hibernateProperties">
             <props>
 
-                <prop key="hibernate.dialect">org.hibernate.dialect.MySQLDialect</prop>
+                <prop key="hibernate.dialect">org.hibernate.dialect.MySQL57Dialect</prop>
                 <prop key="hibernate.show_sql">true</prop>
                 <prop key="hibernate.hbm2ddl.auto">update</prop>
                 <prop key="hibernate.format_sql">false</prop>