make the build work

Author: anthony-nhs

SAMtemplates/main_template.yaml

@@ -63,7 +63,7 @@ Resources:
     Type: AWS::Serverless::Function
     Properties:
       FunctionName: !Sub "${AWS::StackName}-FHIRValidatorUKCore"
-      CodeUri: ../
+      CodeUri: ../latest/
       Handler: software.nhs.fhirvalidator.handler.HandlerStream::handleRequest
       Role: !GetAtt FHIRValidatorUKCoreResources.Outputs.LambdaRoleArn
       SnapStart:

latest/pom.xml

@@ -168,6 +168,7 @@
                 <includes>
                     <include>log4j2.xml</include>
                     <include>package/*</include>
+                    <include>*.tgz</include>
                     <include>primerPayload.json</include>
                     <include>nhs_digital.manifest.json</include>
                     <include>uk_core.manifest.json</include>

latest/src/main/java/software/nhs/fhirvalidator/configuration/ValidatorConfiguration.java

@@ -64,7 +64,7 @@ public ValidatorConfiguration(String _PROFILE_MANIFEST_FILE) {
 
         try {
             for (SimplifierPackage individualPackage : packages) {
-                String packagePath = String.format("classpath:package/%s-%s.tgz", individualPackage.packageName,
+                String packagePath = String.format("classpath:%s-%s.tgz", individualPackage.packageName,
                         individualPackage.version);
                 npmPackageSupport.loadPackageFromClasspath(packagePath);
                 try (InputStream is = ClasspathUtil.loadResourceAsStream(packagePath)) {

latest/src/main/resources/package/.gitkeep

@@ -4,17 +4,18 @@
 import requests
 
 
-def download_dependencies(manifest_file):
-    with open(f"src/main/resources/{manifest_file}", "r") as manifestFile:
+def download_dependencies(manifest_file, path):
+    with open(f"{path}/src/main/resources/{manifest_file}", "r") as manifestFile:
         manifestStr = manifestFile.read()
         manifest = json.loads(manifestStr)
         for entry in manifest:
             packageName = entry["packageName"]
             version = entry["version"]
             packageData = requests.get(f"https://packages.simplifier.net/{packageName}/{version}").content
-            with open(f"src/main/resources/{packageName}-{version}.tgz", "wb") as packageFile:
+            with open(f"{path}/src/main/resources/{packageName}-{version}.tgz", "wb") as packageFile:
                 packageFile.write(packageData)
 
 
-download_dependencies("nhs_digital.manifest.json")
-download_dependencies("uk_core.manifest.json")
+download_dependencies("nhs_digital.manifest.json", "latest")
+download_dependencies("uk_core.manifest.json", "latest")
+download_dependencies("nhs_digital.manifest.json", "legacy")