refactor

Author: anthony-nhs

Makefile

@@ -34,7 +34,20 @@ lint-githubaction-scripts:
 # test targets
 
 test: download-dependencies
-	cd latest && mvn test
+	mvn clean test -Pcurrent
+	mvn clean test -Plegacy
+
+# build targets for SAM
+# the target must be build-<RESOURCE_NAME>
+build-FHIRValidatorUKCore: download-dependencies
+	mvn clean package -Pcurrent
+	mkdir -p $(ARTIFACTS_DIR)/lib
+	cp  ./target/FHIRValidator-current.jar $(ARTIFACTS_DIR)/lib/
+
+build-FHIRValidatorNHSDigital: download-dependencies
+	mvn clean package -Plegacy
+	mkdir -p $(ARTIFACTS_DIR)/lib
+	cp  ./target/FHIRValidator-legacy.jar $(ARTIFACTS_DIR)/lib/
 
 check-licenses: check-licenses-python check-licenses-java
 
@@ -79,7 +92,7 @@ sam-validate:
 	sam validate --template-file SAMtemplates/lambda_resources.yaml --region eu-west-2
 
 sam-build: sam-validate download-dependencies
-	sam build --debug --template-file SAMtemplates/main_template.yaml --region eu-west-2
+	sam build --template-file SAMtemplates/main_template.yaml --region eu-west-2
 
 sam-sync: guard-AWS_DEFAULT_PROFILE guard-stack_name download-dependencies
 	sam sync \

SAMtemplates/main_template.yaml

@@ -64,7 +64,7 @@ Resources:
     Type: AWS::Serverless::Function
     Properties:
       FunctionName: !Sub "${AWS::StackName}-FHIRValidatorUKCore"
-      CodeUri: ../latest/
+      CodeUri: ../
       Handler: software.nhs.fhirvalidator.handler.HandlerStream::handleRequest
       Role: !GetAtt FHIRValidatorUKCoreResources.Outputs.LambdaRoleArn
       SnapStart:
@@ -83,6 +83,7 @@ Resources:
           POWERTOOLS_LOG_LEVEL: !Ref LogLevel
           PROFILE_MANIFEST_FILE: uk_core.manifest.json
     Metadata:
+      BuildMethod: makefile
       guard:
         SuppressedRules:
           - LAMBDA_DLQ_CHECK
@@ -120,7 +121,7 @@ Resources:
     Type: AWS::Serverless::Function
     Properties:
       FunctionName: !Sub "${AWS::StackName}-FHIRValidatorNHSDigital"
-      CodeUri: ../legacy/
+      CodeUri: ../
       Handler: software.nhs.fhirvalidator.handler.HandlerStream::handleRequest
       Role: !GetAtt FHIRValidatorNHSDigitalResources.Outputs.LambdaRoleArn
       SnapStart:
@@ -146,6 +147,7 @@ Resources:
           POWERTOOLS_LOG_LEVEL: !Ref LogLevel
           PROFILE_MANIFEST_FILE: nhs_digital.manifest.json
     Metadata:
+      BuildMethod: makefile
       guard:
         SuppressedRules:
           - LAMBDA_DLQ_CHECK