#2486 Create a new pipeline for updated development environment

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

@@ -0,0 +1,125 @@
+name: Gradle Build & Deploy - POC
+on:
+  push:
+    branches:
+      # - 'develop'
+      - '2486-create-new-pipeline-for-updated-build-deployment'
+
+jobs:
+  build:
+    permissions:
+     id-token: 'write'
+    runs-on: ubuntu-latest
+    environment:
+      name: DEV-POC
+      # url: ${{ env.CLOUD_RUN_ADDRESS }}/
+    env:
+      PROJECT_NUMBER : ${{ secrets.PROJECT_NUM }}
+      PROJECT_ID: ${{ secrets.PROJECT_ID }}
+      PROJECT_NAME: ${{ secrets.PROJECT_NAME }}
+      RUN_REGION: us-central1
+      SERVICE_NAME: checkins-develop
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
+      - id: 'auth_with_gcp'
+        uses: 'google-github-actions/auth@v2'
+        with:
+          project_id: '${{secrets.PROJECT_NUM}}'
+          workload_identity_provider: '${{secrets.WORKLOAD_IDENTITY_PROVIDER}}'
+          service_account: '${{secrets.AUTOMATION_SERVICE_ACCOUNT}}'
+      - id: 'secrets'
+        uses: 'google-github-actions/get-secretmanager-secrets@v2'
+        with:
+          secrets: |-
+            cloud_run_address:${{secrets.PROJECT_NUM}}/CLOUD_RUN_ADDRESS
+            cloud_db_connection_name:${{secrets.PROJECT_NUM}}/CLOUD_DB_CONNECTION_NAME
+            connector_id:${{secrets.PROJECT_NUM}}/CONNECTOR_ID
+      - name: Set up Node LTS
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20'
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin' # See 'Supported distributions' for available options
+          java-version: 21
+      - name: Cache SonarQube packages
+        uses: actions/cache@v4
+        with:
+          path: ~/.sonar/cache
+          key: ${{ runner.os }}-sonar
+          restore-keys: ${{ runner.os }}-sonar
+      - name: Cache Gradle packages
+        uses: actions/cache@v4
+        with:
+          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
+        with:
+          arguments: assemble
+        env:
+          VITE_APP_API_URL: ${{steps.secrets.outputs.cloud_run_address}}
+      - name: Gradle runs tests
+        uses: gradle/gradle-build-action@4137be6a8bf7d7133955359dbd952c0ca73b1021
+        with:
+          arguments: check
+#      - name: Do SonarQube checks
+#        uses: gradle/gradle-build-action@4137be6a8bf7d7133955359dbd952c0ca73b1021
+#        with:
+#          arguments: sonarqube --info
+#        env:
+#          GITHUB_TOKEN: ${{ secrets.GIT_HUB_TOKEN }}
+#          SONAR_HOST_URL: ${{ secrets.SONAR_HOST_URL }}
+#          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+      - name: Setup python
+        run: |
+          sudo apt-get install python2.7
+      - name: Export gcloud related env variable
+        run: export CLOUDSDK_PYTHON="/usr/bin/python2"
+      # Setup gcloud CLI
+      - uses: google-github-actions/setup-gcloud@v2
+        with:
+          version: "477.0.0"
+          # service_account_key: ${{ secrets.RUN_SA_KEY }}
+          # project_id: ${{ secrets.RUN_PROJECT }}
+      - name: Auth Configure Docker
+        run: |-
+          gcloud --quiet auth configure-docker
+      - name: Build the Docker image
+        run: |-
+          cd server
+          docker build --tag "gcr.io/$PROJECT_ID/$SERVICE_NAME:$GITHUB_SHA" .
+      - name: Push the Docker image to Google Container Registry
+        run: |-
+          cd server
+          docker push "gcr.io/$PROJECT_ID/$SERVICE_NAME:$GITHUB_SHA"
+      - name: Deploy image to Cloud Run
+        run: |-
+          gcloud run deploy "$SERVICE_NAME" \
+            --project "$PROJECT_ID" \
+            --region "$RUN_REGION" \
+            --image "gcr.io/$PROJECT_ID/$SERVICE_NAME:$GITHUB_SHA" \
+            --memory 1Gi \
+            --add-cloudsql-instances ${{steps.secrets.outputs.cloud_db_connection_name }} \
+            --vpc-connector ${{steps.secrets.outputs.connector_id}} \
+            --set-secrets "CLOUD_DB_CONNECTION_NAME=CLOUD_DB_CONNECTION_NAME:latest" \
+            --set-secrets "DB_NAME=DB_NAME:latest" \
+            --set-secrets "DATASOURCES_DEFAULT_PASSWORD=DATASOURCES_DEFAULT_PASSWORD:latest" \
+            --set-secrets "DATASOURCES_DEFAULT_USERNAME=DATASOURCES_DEFAULT_USERNAME:latest" \
+            --set-secrets "AES_KEY=AES_KEY:latest" \
+            --set-secrets "OAUTH_CLIENT_ID=OAUTH_CLIENT_ID:latest" \
+            --set-secrets "OAUTH_CLIENT_SECRET=OAUTH_CLIENT_SECRET:latest" \
+            --set-secrets "GSUITE_SUPER_ADMIN=GSUITE_SUPER_ADMIN:latest" \
+            --set-secrets "SERVICE_ACCOUNT_CREDENTIALS=SERVICE_ACCOUNT_CREDENTIALS:latest" \
+            --set-secrets "WEB_ADDRESS=CLOUD_RUN_ADDRESS:latest" \
+            --set-secrets "MICRONAUT_ENVIRONMENTS=MICRONAUT_ENVIRONMENTS:latest" \
+            --platform "managed" \
+            --max-instances 2 \
+            --allow-unauthenticated
+

server/src/main/java/com/objectcomputing/checkins/notifications/email/MailJetFactory.java

@@ -4,9 +4,13 @@
 import com.mailjet.client.MailjetClient;
 
 import com.mailjet.client.resource.Emailv31;
+import com.objectcomputing.checkins.exceptions.NotFoundException;
+import com.objectcomputing.checkins.services.settings.SettingOption;
+import com.objectcomputing.checkins.services.settings.SettingsServices;
 import io.micronaut.context.annotation.Bean;
 import io.micronaut.context.annotation.Factory;
 
+import jakarta.inject.Inject;
 import jakarta.inject.Named;
 import jakarta.inject.Singleton;
 
@@ -17,13 +21,33 @@ public class MailJetFactory {
     public static final String MJML_FORMAT = "mjml";
     public static final String TEXT_FORMAT = "text";
 
+    @Inject
+    SettingsServices settingsServices;
+
     @Bean
     MailjetClient getClient() {
+
+        String mj_apikey_public;
+        String mj_apikey_private;
+
+        try {
+            mj_apikey_public = settingsServices.findByName(SettingOption.MJ_APIKEY_PUBLIC.name()).getValue();
+        } catch (NotFoundException e) {
+            mj_apikey_public = "";
+        }
+        try {
+            mj_apikey_private = settingsServices.findByName(SettingOption.MJ_APIKEY_PRIVATE.name()).getValue();
+        } catch (NotFoundException e) {
+            mj_apikey_private = "";
+        }
+
+
+
         return new MailjetClient(
                 ClientOptions
                         .builder()
-                        .apiKey(System.getenv("MJ_APIKEY_PUBLIC"))
-                        .apiSecretKey(System.getenv("MJ_APIKEY_PRIVATE"))
+                        .apiKey(mj_apikey_public)
+                        .apiSecretKey(mj_apikey_private)
                         .build()
         );
     }

server/src/main/java/com/objectcomputing/checkins/notifications/email/MailJetSender.java

@@ -7,6 +7,9 @@
 import com.mailjet.client.resource.Emailv31;
 import ch.digitalfondue.mjml4j.Mjml4j;
 import com.objectcomputing.checkins.exceptions.BadArgException;
+import com.objectcomputing.checkins.exceptions.NotFoundException;
+import com.objectcomputing.checkins.services.settings.SettingOption;
+import com.objectcomputing.checkins.services.settings.SettingsServices;
 import io.micronaut.context.annotation.Prototype;
 import io.micronaut.context.annotation.Requires;
 import org.json.JSONArray;
@@ -19,27 +22,40 @@
 import java.util.List;
 
 @Prototype
-@Requires(bean = MailJetConfiguration.class)
 public class MailJetSender implements EmailSender {
     public static final String MJMLPART = "MJMLPART";
 
     private static final Logger LOG = LoggerFactory.getLogger(MailJetSender.class);
     private final MailjetClient client;
+    private final SettingsServices settingsServices;
 
     public static final int MAILJET_RECIPIENT_LIMIT = 49;
 
-    private final String fromAddress;
-    private final String fromName;
     private String emailFormat;
 
+    private String getFromAddress() {
+        try {
+            return settingsServices.findByName(SettingOption.FROM_ADDRESS.name()).getValue();
+        } catch (NotFoundException e) {
+            return "";
+        }
+    }
+
+    private String getFromName() {
+        try {
+            return settingsServices.findByName(SettingOption.FROM_NAME.name()).getValue();
+        } catch (NotFoundException e) {
+            return "";
+        }
+    }
+
     public MailJetSender(
             MailjetClient client,
-            MailJetConfiguration configuration
+            SettingsServices settingsServices
     ) {
         this.client = client;
-        this.fromAddress = configuration.getFromAddress();
-        this.fromName = configuration.getFromName();
         this.emailFormat = Emailv31.Message.HTMLPART;
+        this.settingsServices = settingsServices;
     }
 
     /**
@@ -82,10 +98,23 @@ public static List<JSONArray> getEmailBatches(String... recipients) {
      */
     @Override
     public void sendEmail(String fromName, String fromAddress, String subject, String content, String... recipients) {
-        if(fromName == null) fromName = this.fromName;
-        if(fromAddress == null) fromAddress = this.fromAddress;
+        if(fromName == null) fromName = getFromName();
+        if(fromAddress == null) fromAddress = getFromAddress();
+
+        String mj_apikey_public;
+        String mj_apikey_private;
+        try {
+            mj_apikey_public = settingsServices.findByName(SettingOption.MJ_APIKEY_PUBLIC.name()).getValue();
+        } catch (NotFoundException e) {
+            mj_apikey_public = "";
+        }
+        try {
+            mj_apikey_private = settingsServices.findByName(SettingOption.MJ_APIKEY_PRIVATE.name()).getValue();
+        } catch (NotFoundException e) {
+            mj_apikey_private = "";
+        }
 
-        if(System.getenv("MJ_APIKEY_PUBLIC") == null || System.getenv("MJ_APIKEY_PRIVATE") == null) {
+        if(mj_apikey_public == "" || mj_apikey_private == "") {
             LOG.error("API key(s) are missing for MailJetSender");
             return;
         }
@@ -117,7 +146,7 @@ public void sendEmail(String fromName, String fromAddress, String subject, Strin
             List<JSONArray> failedBatches = new ArrayList<>();
             final JSONArray to =
                 new JSONArray()
-                .put(new JSONObject().put("Email", this.fromAddress));
+                .put(new JSONObject().put("Email", fromAddress));
             emailBatches.forEach((recipientList) -> {
                 try {
                     send(sender, to, recipientList,

server/src/main/java/com/objectcomputing/checkins/security/GoogleServiceConfiguration.java

@@ -7,7 +7,6 @@
 import io.micronaut.validation.validator.constraints.ConstraintValidator;
 import jakarta.inject.Singleton;
 import jakarta.validation.Constraint;
-import jakarta.validation.constraints.NotNull;
 import lombok.Getter;
 import lombok.Setter;
 import org.slf4j.Logger;
@@ -29,9 +28,6 @@ public class GoogleServiceConfiguration {
 
     private static final Logger LOG = LoggerFactory.getLogger(GoogleServiceConfiguration.class);
 
-    @NotNull
-    private String directoryId;
-
     @ValidEncodedGoogleServiceConfiguration
     private String encodedValue;
 

server/src/main/java/com/objectcomputing/checkins/services/file/FileServicesImpl.java

@@ -5,6 +5,7 @@
 import com.google.api.services.drive.Drive;
 import com.google.api.services.drive.model.File;
 import com.google.api.services.drive.model.FileList;
+import com.objectcomputing.checkins.exceptions.NotFoundException;
 import com.objectcomputing.checkins.security.GoogleServiceConfiguration;
 import com.objectcomputing.checkins.services.checkindocument.CheckinDocument;
 import com.objectcomputing.checkins.services.checkindocument.CheckinDocumentServices;
@@ -14,10 +15,11 @@
 import com.objectcomputing.checkins.services.memberprofile.MemberProfileServices;
 import com.objectcomputing.checkins.services.memberprofile.MemberProfileUtils;
 import com.objectcomputing.checkins.services.memberprofile.currentuser.CurrentUserServices;
+import com.objectcomputing.checkins.services.settings.SettingOption;
+import com.objectcomputing.checkins.services.settings.SettingsServices;
 import com.objectcomputing.checkins.util.googleapiaccess.GoogleApiAccess;
 import io.micronaut.http.MediaType;
 import io.micronaut.http.multipart.CompletedFileUpload;
-
 import jakarta.inject.Singleton;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -38,17 +40,20 @@ public class FileServicesImpl extends FileServicesBaseImpl {
 
     private final GoogleApiAccess googleApiAccess;
     private final GoogleServiceConfiguration googleServiceConfiguration;
+    private SettingsServices settingsServices;
 
     public FileServicesImpl(GoogleApiAccess googleApiAccess,
                             CheckInServices checkInServices,
                             CheckinDocumentServices checkinDocumentServices,
                             MemberProfileServices memberProfileServices,
                             CurrentUserServices currentUserServices,
-                            GoogleServiceConfiguration googleServiceConfiguration) {
+                            GoogleServiceConfiguration googleServiceConfiguration,
+                            SettingsServices settingsServices) {
         super(checkInServices, checkinDocumentServices, memberProfileServices,
               currentUserServices);
         this.googleApiAccess = googleApiAccess;
         this.googleServiceConfiguration = googleServiceConfiguration;
+        this.settingsServices = settingsServices;
     }
 
     @Override
@@ -58,8 +63,8 @@ protected void getCheckinDocuments(
         Drive drive = googleApiAccess.getDrive();
         validate(drive == null, "Unable to access Google Drive");
 
-        String rootDirId = googleServiceConfiguration.getDirectoryId();
-        validate(rootDirId == null, "No destination folder has been configured. Contact your administrator for assistance.");
+            String rootDirId = getRootDirId();
+            validate(rootDirId == null || rootDirId == "", "No destination folder has been configured. Contact your administrator for assistance.");
 
         if (checkinDocuments.isEmpty()) {
             FileList driveIndex = getFoldersInRoot(drive, rootDirId);
@@ -87,6 +92,17 @@ protected void getCheckinDocuments(
         }
     }
 
+    private String getRootDirId() {
+        String rootDirId;
+        try {
+            rootDirId = settingsServices.findByName(SettingOption.DIRECTORY_ID.name()).getValue();
+        }
+        catch (NotFoundException e ) {
+            rootDirId = "";
+        }
+        return rootDirId;
+    }
+
     @Override
     protected void downloadSingleFile(String docId, FileOutputStream myWriter) throws IOException {
         Drive drive = googleApiAccess.getDrive();
@@ -103,7 +119,7 @@ protected FileInfoDTO uploadSingleFile(CompletedFileUpload file, String director
             Drive drive = googleApiAccess.getDrive();
             validate(drive == null, "Unable to access Google Drive");
 
-            String rootDirId = googleServiceConfiguration.getDirectoryId();
+            String rootDirId = getRootDirId();
             validate(rootDirId == null, "No destination folder has been configured. Contact your administrator for assistance.");
 
             // Check if folder already exists on google drive. If exists, return folderId and name
@@ -153,7 +169,7 @@ public FileInfoDTO uploadDocument(String directoryName, String name, String text
             Drive drive = googleApiAccess.getDrive();
             validate(drive == null, "Unable to access Google Drive");
 
-            String rootDirId = googleServiceConfiguration.getDirectoryId();
+            String rootDirId = getRootDirId();
             validate(rootDirId == null, "No destination folder has been configured. Contact your administrator for assistance.");
 
             // Check if folder already exists on google drive. If exists, return folderId and name