Merge branch 'develop' into bugfix-2672/address-test-warnings

Author: mkimberlin

.github/workflows/gradle-build-feature.yml

@@ -16,10 +16,10 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
-      - name: Set up Node LTS
+      - name: Set up Node Stable
         uses: actions/setup-node@v4
         with:
-          node-version: '20'
+          node-version: '22'
       - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:

.github/workflows/gradle-build-native-feature.yml

@@ -16,10 +16,10 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - name: Set up Node LTS
+      - name: Set up Node Stable
         uses: actions/setup-node@v4
         with:
-          node-version: '20'
+          node-version: '22'
       - name: Set up GraalVM 21
         uses: graalvm/[email protected]
         with:

.github/workflows/gradle-build-production.yml

@@ -3,28 +3,28 @@ on:
   push:
     branches:
       - "master"
-
 env:
   PROJECT_ID: ${{ secrets.RUN_PROJECT }}
   RUN_REGION: us-central1
   SERVICE_NAME: checkins-master
+  TARGET_URL: https://checkins.objectcomputing.com
 jobs:
   build:
     runs-on: ubuntu-latest
     permissions:
-      contents: read
-      packages: write
+      contents: 'read'
+      id-token: 'write'
     environment:
       name: Production
-      url: https://checkins.objectcomputing.com/
+      url: ${{ env.TARGET_URL }}
     steps:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
       - name: Set up Node LTS
         uses: actions/setup-node@v4
         with:
-          node-version: '20'
+          node-version: '22'
       - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
@@ -36,42 +36,29 @@ jobs:
           path: ~/.gradle/caches
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
           restore-keys: ${{ runner.os }}-gradle
-      - name: Validate Gradle wrapper
-        uses: gradle/wrapper-validation-action@e6e38bacfdf1a337459f332974bb2327a31aaf4b
-      - name: Build with Gradle
-        uses: gradle/gradle-build-action@4137be6a8bf7d7133955359dbd952c0ca73b1021
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+      - id: 'auth'
+        uses: 'google-github-actions/auth@v2'
         with:
-          arguments: assemble
-        env:
-          VITE_APP_API_URL: https://checkins.objectcomputing.com
-#      - name: Publish package
-#        uses: gradle/gradle-build-action@4137be6a8bf7d7133955359dbd952c0ca73b1021
-#        with:
-#          arguments: publish
-#        env:
-#          GITHUB_TOKEN: ${{ secrets.GIT_HUB_TOKEN }}
-      - name: Setup python
-        run: |
-          sudo apt-get install python2.7
-      - name: Export gcloud related env variable
-        run: export CLOUDSDK_PYTHON="/usr/bin/python2"
-      - name: Setup gcloud CLI
-        uses: google-github-actions/setup-gcloud@v0
+          project_id: 'oci-intern-2019'
+          workload_identity_provider: 'projects/832140020593/locations/global/workloadIdentityPools/github/providers/my-repo'
+      - name: 'Set up Cloud SDK'
+        uses: google-github-actions/setup-gcloud@v2
         with:
-          version: "290.0.1"
-          service_account_key: ${{ secrets.RUN_SA_KEY }}
-          project_id: ${{ secrets.RUN_PROJECT }}
-      - name: Auth Configure Docker
+          version: '>= 363.0.0'
+      - name: 'Auth Configure Docker'
         run: |-
           gcloud --quiet auth configure-docker
       - name: Build the Docker image
         run: |-
+          ./gradlew assemble
           cd server
           docker build --tag "gcr.io/$PROJECT_ID/$SERVICE_NAME:$GITHUB_SHA" .
+        env:
+          VITE_APP_API_URL: ${{ env.TARGET_URL }}
       - name: Push the Docker image to Google Container Registry
-        run: |-
-          cd server
-          docker push "gcr.io/$PROJECT_ID/$SERVICE_NAME:$GITHUB_SHA"
+        run: docker push "gcr.io/$PROJECT_ID/$SERVICE_NAME:$GITHUB_SHA"
       - name: Deploy image to Cloud Run
         run: |-
           gcloud run deploy "$SERVICE_NAME" \
@@ -89,21 +76,12 @@ jobs:
             --set-env-vars "OAUTH_CLIENT_SECRET=${{ secrets.OAUTH_CLIENT_SECRET }}" \
             --set-env-vars "OAUTH_CALLBACK_URI"=${{ secrets.OAUTH_CALLBACK_URI }} \
             --set-env-vars "DIRECTORY_ID=${{ secrets.DIRECTORY_ID }}" \
-            --set-env-vars "TYPE=${{ secrets.SA_KEY_TYPE }}" \
-            --set-env-vars "PROJECT_ID=${{ secrets.RUN_PROJECT }}" \
-            --set-env-vars "PRIVATE_KEY_ID=${{ secrets.SA_PRIVATE_KEY_ID }}" \
-            --set-env-vars "PRIVATE_KEY=${{ secrets.SA_PRIVATE_KEY }}" \
-            --set-env-vars "CLIENT_EMAIL=${{ secrets.SA_CLIENT_EMAIL }}" \
-            --set-env-vars "CLIENT_ID=${{ secrets.SA_CLIENT_ID }}" \
-            --set-env-vars "AUTH_URI=${{ secrets.SA_AUTH_URI }}" \
-            --set-env-vars "TOKEN_URI=${{ secrets.SA_TOKEN_URI }}" \
-            --set-env-vars "AUTH_PROVIDER_X509_CERT_URL=${{ secrets.SA_AUTH_PROVIDER_X509_CERT_URL }}" \
-            --set-env-vars "CLIENT_X509_CERT_URL=${{ secrets.SA_CLIENT_X509_CERT_URL }}" \
+            --set-env-vars "SERVICE_ACCOUNT_CREDENTIALS=${{ secrets.SERVICE_ACCOUNT_CREDENTIALS }}" \
             --set-env-vars "GSUITE_SUPER_ADMIN=${{ secrets.GSUITE_SUPER_ADMIN }}" \
             --set-env-vars "MJ_APIKEY_PUBLIC=${{ secrets.MJ_APIKEY_PUBLIC }}" \
             --set-env-vars "MJ_APIKEY_PRIVATE=${{ secrets.MJ_APIKEY_PRIVATE }}" \
             --set-env-vars "GIT_HUB_TOKEN=${{ secrets.GIT_HUB_TOKEN }}" \
-            --set-env-vars "WEB_ADDRESS=https://checkins.objectcomputing.com" \
+            --set-env-vars "WEB_ADDRESS=${{ env.TARGET_URL }}" \
             --set-env-vars "[email protected]" \
             --set-env-vars "FROM_NAME=Check-Ins" \
             --set-env-vars "^@^MICRONAUT_ENVIRONMENTS=cloud,google,gcp" \

.github/workflows/gradle-build-publish.yml

@@ -10,10 +10,10 @@ jobs:
       packages: write
     steps:
       - uses: actions/checkout@v4
-      - name: Set up Node LTS
+      - name: Set up Node Stable
         uses: actions/setup-node@v2-beta
         with:
-          node-version: '20'
+          node-version: '22'
       - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:

.github/workflows/gradle-deploy-develop.yml

@@ -15,10 +15,10 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - name: Set up Node LTS
+      - name: Set up Node Stable
         uses: actions/setup-node@v4
         with:
-          node-version: '20'
+          node-version: '22'
       - name: Set up Temurin 21
         uses: actions/setup-java@v4
         with:
@@ -49,7 +49,7 @@ jobs:
       - name: Set up Node LTS
         uses: actions/setup-node@v4
         with:
-          node-version: '20'
+          node-version: '22'
       - name: Set up Temurin 21
         uses: actions/setup-java@v4
         with:

.github/workflows/gradle-deploy-native-develop.yml

@@ -15,10 +15,10 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - name: Set up Node LTS
+      - name: Set up Node Stable
         uses: actions/setup-node@v4
         with:
-          node-version: '20'
+          node-version: '22'
       - name: Set up GraalVM 21
         uses: graalvm/[email protected]
         with:

server/build.gradle

@@ -7,7 +7,7 @@ plugins {
     id "jacoco"
 }
 
-version "0.7.0"
+version "0.8.1"
 group "com.objectcomputing.checkins"
 
 repositories {

server/src/main/java/com/objectcomputing/checkins/services/reviews/ReviewPeriodServicesImpl.java

@@ -24,6 +24,7 @@
 import org.slf4j.LoggerFactory;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.LocalTime;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Objects;
@@ -162,7 +163,7 @@ public ReviewPeriod update(@NotNull ReviewPeriod reviewPeriod) {
             if (launchDate == null) {
                 throw new BadArgException("Cannot open a review period without a launch date.");
             }
-            if (launchDate.isBefore(LocalDateTime.now())) {
+            if (launchDate.isBefore(LocalDateTime.now().with(LocalTime.MIN))) {
                 throw new BadArgException("Cannot open a review period with a launch date in the past.");
             }
         }
@@ -264,7 +265,6 @@ private String constructReviewPeriodAnnouncementEmail(
                             new BufferedReader(
                                 reviewPeriodAnnouncementTemplate.asReader())),
                             reviewPeriodName, reviewPeriodName,
-                            dateAsString(startDate), dateAsString(endDate),
                             dateAsString(launchDate),
                             dateAsString(selfReviewDate),
                             dateAsString(closeDate));

server/src/main/java/com/objectcomputing/checkins/services/role/member_roles/MemberRoleController.java

@@ -6,6 +6,7 @@
 import io.micronaut.scheduling.annotation.ExecuteOn;
 import io.micronaut.security.annotation.Secured;
 import io.micronaut.security.rules.SecurityRule;
+import io.micronaut.cache.annotation.CacheInvalidate;
 import jakarta.validation.constraints.NotNull;
 
 import java.util.List;
@@ -34,6 +35,7 @@ HttpResponse<?> deleteMemberRole(@NotNull UUID roleId, @NotNull UUID memberId){
     }
 
     @Post
+    @CacheInvalidate(cacheNames = {"role-permission-cache"})
     HttpResponse<MemberRole> saveMemberRole(@NotNull @Body MemberRoleId id){
         MemberRole memberRole = memberRoleServices.saveByIds(id.getMemberId(), id.getRoleId());
         return HttpResponse.ok(memberRole);