Testing codecov report with cloudbuild

cloudbuild.yml

@@ -0,0 +1,38 @@
+steps:
+  - name: maven:3.8.3-openjdk-17-slim
+    entrypoint: mvn
+    args: [ 'fmt:check','pmd:check', '--no-transfer-progress', '-B' ]
+    id: mvn-format
+  - id: docker-compose
+    name: 'docker/compose:1.29.0'
+    args: ['-f', '/workspace/src/test/resources/docker-compose-ci.yml', 'up', '-d']
+  - name: maven:3.8.3-openjdk-17-slim
+    entrypoint: mvn
+    args: [ 'verify','jacoco:report', '-DdockerCompose.skip=true', '-Dspring.profiles.active=test-ci', '--no-transfer-progress', '-B' ]
+  - name: gcr.io/cloud-builders/curl
+    entrypoint: bash
+    secretEnv: [ CODECOV_TOKEN_CP ]
+    args:
+      - '-eEuo'
+      - 'pipefail'
+      - '-c'
+      - |-
+        apt-get update
+        apt-get install -y gnupg
+        apt-get install -y git
+        gpg --no-default-keyring --keyring trustedkeys.gpg --import codecov_public_key.asc
+        curl -Os https://uploader.codecov.io/latest/linux/codecov
+        curl -Os https://uploader.codecov.io/latest/linux/codecov.SHA256SUM
+        curl -Os https://uploader.codecov.io/latest/linux/codecov.SHA256SUM.sig
+
+        # NOTE: the "|| exit 1"'s are required to stop travis continuing to run subsequent steps even if the integrity checks failed
+        gpgv codecov.SHA256SUM.sig codecov.SHA256SUM || exit 1
+        shasum -a 256 -c codecov.SHA256SUM || exit 1
+
+        chmod +x codecov
+        ./codecov -t $$CODECOV_TOKEN_CP -C $COMMIT_SHA -B $BRANCH_NAME -r "ONSdigital/ssdc-rm-caseprocessor" -P $_PR_NUMBER
+
+availableSecrets:
+  secretManager:
+    - versionName: projects/$PROJECT_NUMBER/secrets/codecov-token-case-processor/versions/1
+      env: CODECOV_TOKEN_CP

codecov_checks.sh

@@ -0,0 +1,19 @@
+ls
+echo $_HEAD_BRANCH
+echo $_PR_NUMBER
+apt-get update
+apt-get install -y gnupg
+apt-get install -y git
+gpg --no-default-keyring --keyring trustedkeys.gpg --import codecov_public_key.asc
+curl -Os https://uploader.codecov.io/latest/linux/codecov
+curl -Os https://uploader.codecov.io/latest/linux/codecov.SHA256SUM
+curl -Os https://uploader.codecov.io/latest/linux/codecov.SHA256SUM.sig
+
+  # NOTE: the "|| exit 1"'s are required to stop travis continuing to run subsequent steps even if the integrity checks failed
+gpgv codecov.SHA256SUM.sig codecov.SHA256SUM || exit 1
+shasum -a 256 -c codecov.SHA256SUM || exit 1
+
+chmod +x codecov
+COMMIT_SHA_LONG = $COMMIT_SHA
+echo $COMMIT_SHA_LONG
+./codecov -C $COMMIT_SHA_LONG  -r "ONSdigital/ssdc-rm-caseprocessor

src/test/java/uk/gov/ons/ssdc/caseprocessor/healthcheck/HealthCheckIT.java

@@ -15,7 +15,7 @@
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
-@ActiveProfiles("test")
+@ActiveProfiles("${spring.profiles.active}")
 @SpringBootTest
 @ExtendWith(SpringExtension.class)
 public class HealthCheckIT {

src/test/java/uk/gov/ons/ssdc/caseprocessor/messaging/DeactivateUacReceiverIT.java

@@ -30,7 +30,7 @@
 import uk.gov.ons.ssdc.common.model.entity.UacQidLink;
 
 @ContextConfiguration
-@ActiveProfiles("test")
+@ActiveProfiles("${spring.profiles.active}")
 @SpringBootTest
 @ExtendWith(SpringExtension.class)
 public class DeactivateUacReceiverIT {

src/test/java/uk/gov/ons/ssdc/caseprocessor/messaging/EmailFulfilmentReceiverIT.java

@@ -33,7 +33,7 @@
 import uk.gov.ons.ssdc.common.model.entity.UacQidLink;
 
 @ContextConfiguration
-@ActiveProfiles("test")
+@ActiveProfiles("${spring.profiles.active}")
 @SpringBootTest
 @ExtendWith(SpringExtension.class)
 class EmailFulfilmentReceiverIT {

src/test/java/uk/gov/ons/ssdc/caseprocessor/messaging/EqLaunchReceiverIT.java

@@ -31,7 +31,7 @@
 import uk.gov.ons.ssdc.common.model.entity.UacQidLink;
 
 @ContextConfiguration
-@ActiveProfiles("test")
+@ActiveProfiles("${spring.profiles.active}")
 @SpringBootTest
 @ExtendWith(SpringExtension.class)
 public class EqLaunchReceiverIT {

src/test/java/uk/gov/ons/ssdc/caseprocessor/messaging/InvalidCaseReceiverIT.java

@@ -28,7 +28,7 @@
 import uk.gov.ons.ssdc.common.model.entity.EventType;
 
 @ContextConfiguration
-@ActiveProfiles("test")
+@ActiveProfiles("${spring.profiles.active}")
 @SpringBootTest
 @ExtendWith(SpringExtension.class)
 public class InvalidCaseReceiverIT {

src/test/java/uk/gov/ons/ssdc/caseprocessor/messaging/NewCaseReceiverIT.java

@@ -36,7 +36,7 @@
 import uk.gov.ons.ssdc.common.model.entity.EventType;
 
 @ContextConfiguration
-@ActiveProfiles("test")
+@ActiveProfiles("${spring.profiles.active}")
 @SpringBootTest
 @ExtendWith(SpringExtension.class)
 public class NewCaseReceiverIT {

src/test/java/uk/gov/ons/ssdc/caseprocessor/messaging/PrintFulfilmentReceiverIT.java

@@ -33,7 +33,7 @@
 import uk.gov.ons.ssdc.common.model.entity.FulfilmentToProcess;
 
 @ContextConfiguration
-@ActiveProfiles("test")
+@ActiveProfiles("${spring.profiles.active}")
 @SpringBootTest
 @ExtendWith(SpringExtension.class)
 class PrintFulfilmentReceiverIT {

src/test/java/uk/gov/ons/ssdc/caseprocessor/messaging/ReceiptReceiverIT.java

@@ -32,7 +32,7 @@
 import uk.gov.ons.ssdc.common.model.entity.UacQidLink;
 
 @ContextConfiguration
-@ActiveProfiles("test")
+@ActiveProfiles("${spring.profiles.active}")
 @SpringBootTest
 @ExtendWith(SpringExtension.class)
 public class ReceiptReceiverIT {

src/test/java/uk/gov/ons/ssdc/caseprocessor/messaging/RefusalReceiverIT.java

@@ -29,7 +29,7 @@
 import uk.gov.ons.ssdc.common.model.entity.EventType;
 
 @ContextConfiguration
-@ActiveProfiles("test")
+@ActiveProfiles("${spring.profiles.active}")
 @SpringBootTest
 @ExtendWith(SpringExtension.class)
 public class RefusalReceiverIT {

src/test/java/uk/gov/ons/ssdc/caseprocessor/messaging/SmsFulfilmentReceiverIT.java

@@ -33,7 +33,7 @@
 import uk.gov.ons.ssdc.common.model.entity.UacQidLink;
 
 @ContextConfiguration
-@ActiveProfiles("test")
+@ActiveProfiles("${spring.profiles.active}")
 @SpringBootTest
 @ExtendWith(SpringExtension.class)
 class SmsFulfilmentReceiverIT {

src/test/java/uk/gov/ons/ssdc/caseprocessor/messaging/TelephoneCaptureReceiverIT.java

@@ -33,7 +33,7 @@
 import uk.gov.ons.ssdc.common.model.entity.UacQidLink;
 
 @ContextConfiguration
-@ActiveProfiles("test")
+@ActiveProfiles("${spring.profiles.active}")
 @SpringBootTest
 @ExtendWith(SpringExtension.class)
 class TelephoneCaptureReceiverIT {

src/test/java/uk/gov/ons/ssdc/caseprocessor/messaging/UacAuthenticationReceiverIT.java

@@ -26,7 +26,7 @@
 import uk.gov.ons.ssdc.common.model.entity.UacQidLink;
 
 @ContextConfiguration
-@ActiveProfiles("test")
+@ActiveProfiles("${spring.profiles.active}")
 @SpringBootTest
 @ExtendWith(SpringExtension.class)
 public class UacAuthenticationReceiverIT {

src/test/java/uk/gov/ons/ssdc/caseprocessor/messaging/UpdateSampleReceiverIT.java

@@ -39,7 +39,7 @@
 import uk.gov.ons.ssdc.common.validation.Rule;
 
 @ContextConfiguration
-@ActiveProfiles("test")
+@ActiveProfiles("${spring.profiles.active}")
 @SpringBootTest
 @ExtendWith(SpringExtension.class)
 public class UpdateSampleReceiverIT {

src/test/java/uk/gov/ons/ssdc/caseprocessor/messaging/UpdateSampleSensitiveReceiverIT.java

@@ -42,7 +42,7 @@
 import uk.gov.ons.ssdc.common.validation.Rule;
 
 @ContextConfiguration
-@ActiveProfiles("test")
+@ActiveProfiles("${spring.profiles.active}")
 @SpringBootTest
 @ExtendWith(SpringExtension.class)
 public class UpdateSampleSensitiveReceiverIT {

src/test/java/uk/gov/ons/ssdc/caseprocessor/model/repository/ActionRuleSurveyExportFileTemplateRepository.java

@@ -7,6 +7,6 @@
 import uk.gov.ons.ssdc.common.model.entity.ActionRuleSurveyExportFileTemplate;
 
 @Component
-@ActiveProfiles("test")
+@ActiveProfiles("${spring.profiles.active}")
 public interface ActionRuleSurveyExportFileTemplateRepository
     extends JpaRepository<ActionRuleSurveyExportFileTemplate, UUID> {}

src/test/java/uk/gov/ons/ssdc/caseprocessor/model/repository/EmailTemplateRepository.java

@@ -6,5 +6,5 @@
 import uk.gov.ons.ssdc.common.model.entity.EmailTemplate;
 
 @Component
-@ActiveProfiles("test")
+@ActiveProfiles("${spring.profiles.active}")
 public interface EmailTemplateRepository extends JpaRepository<EmailTemplate, String> {}

src/test/java/uk/gov/ons/ssdc/caseprocessor/model/repository/FulfilmentSurveyExportFileTemplateRepository.java

@@ -7,6 +7,6 @@
 import uk.gov.ons.ssdc.common.model.entity.FulfilmentSurveyExportFileTemplate;
 
 @Component
-@ActiveProfiles("test")
+@ActiveProfiles("${spring.profiles.active}")
 public interface FulfilmentSurveyExportFileTemplateRepository
     extends JpaRepository<FulfilmentSurveyExportFileTemplate, UUID> {}

src/test/java/uk/gov/ons/ssdc/caseprocessor/model/repository/SmsTemplateRepository.java

@@ -6,5 +6,5 @@
 import uk.gov.ons.ssdc.common.model.entity.SmsTemplate;
 
 @Component
-@ActiveProfiles("test")
+@ActiveProfiles("${spring.profiles.active}")
 public interface SmsTemplateRepository extends JpaRepository<SmsTemplate, String> {}

src/test/java/uk/gov/ons/ssdc/caseprocessor/model/repository/SurveyRepository.java

@@ -7,5 +7,5 @@
 import uk.gov.ons.ssdc.common.model.entity.Survey;
 
 @Component
-@ActiveProfiles("test")
+@ActiveProfiles("${spring.profiles.active}")
 public interface SurveyRepository extends JpaRepository<Survey, UUID> {}

src/test/java/uk/gov/ons/ssdc/caseprocessor/schedule/ActionRuleIT.java

@@ -47,7 +47,7 @@
 
 @ContextConfiguration
 @SpringBootTest
-@ActiveProfiles("test")
+@ActiveProfiles("${spring.profiles.active}")
 @ExtendWith(SpringExtension.class)
 class ActionRuleIT {
   private static final String PACK_CODE = "test-pack-code";

src/test/java/uk/gov/ons/ssdc/caseprocessor/schedule/FulfilmentIT.java

@@ -37,7 +37,7 @@
 
 @ContextConfiguration
 @SpringBootTest
-@ActiveProfiles("test")
+@ActiveProfiles("${spring.profiles.active}")
 @ExtendWith(SpringExtension.class)
 class FulfilmentIT {
   private static final String FULFILMENT_TOPIC = "event_print-fulfilment";

src/test/java/uk/gov/ons/ssdc/caseprocessor/testutils/DeleteDataHelper.java

@@ -21,7 +21,7 @@
 import uk.gov.ons.ssdc.caseprocessor.model.repository.UacQidLinkRepository;
 
 @Component
-@ActiveProfiles("test")
+@ActiveProfiles("${spring.profiles.active}")
 public class DeleteDataHelper {
   @Autowired private CaseRepository caseRepository;
   @Autowired private CollectionExerciseRepository collectionExerciseRepository;

src/test/java/uk/gov/ons/ssdc/caseprocessor/testutils/EventPoller.java

@@ -9,7 +9,7 @@
 import uk.gov.ons.ssdc.common.model.entity.Event;
 
 @Component
-@ActiveProfiles("test")
+@ActiveProfiles("${spring.profiles.active}")
 public class EventPoller {
   private final EventRepository eventRepository;
 

src/test/java/uk/gov/ons/ssdc/caseprocessor/testutils/JunkDataHelper.java

@@ -25,7 +25,7 @@
 import uk.gov.ons.ssdc.common.validation.Rule;
 
 @Component
-@ActiveProfiles("test")
+@ActiveProfiles("${spring.profiles.active}")
 public class JunkDataHelper {
   private static final Random RANDOM = new Random();
 

src/test/java/uk/gov/ons/ssdc/caseprocessor/testutils/PubsubHelper.java

@@ -30,7 +30,7 @@
 import uk.gov.ons.ssdc.caseprocessor.utils.ObjectMapperFactory;
 
 @Component
-@ActiveProfiles("test")
+@ActiveProfiles("${spring.profiles.active}")
 @EnableRetry
 public class PubsubHelper {
   @Qualifier("pubSubTemplateForIntegrationTests")

src/test/java/uk/gov/ons/ssdc/caseprocessor/testutils/TestConfig.java

@@ -10,7 +10,7 @@
 import uk.gov.ons.ssdc.caseprocessor.utils.ObjectMapperFactory;
 
 @Configuration
-@ActiveProfiles("test")
+@ActiveProfiles("${spring.profiles.active}")
 public class TestConfig {
   @Bean("pubSubTemplateForIntegrationTests")
   public PubSubTemplate pubSubTemplate(

src/test/resources/application-test-ci.yml

@@ -0,0 +1,22 @@
+spring:
+  datasource:
+    url: jdbc:postgresql://postgres-case-it:5432/postgres
+
+  cloud:
+    gcp:
+      pubsub:
+        emulator-host: pubsub-emulator-case-it:8538
+        project-id: our-project
+
+uacservice:
+  connection:
+    port: 8164
+    host: uac-qid-case-it
+  uacqid-cache-min: 5
+  uacqid-fetch-count: 10
+  uacqid-get-timeout: 1   #seconds
+
+caserefgeneratorkey: rPr3qsjlU42hsDX5npfuCzlyF4UYfDTO
+
+queueconfig:
+  shared-pubsub-project: shared-project