fix it

Author: anthony-nhs

SAMtemplates/lambda_resources.yaml

@@ -110,8 +110,6 @@ Resources:
   LambdaManagedPolicy:
     Type: AWS::IAM::ManagedPolicy
     Properties:
-      Roles:
-        - !Ref LambdaRole
       PolicyDocument:
         Version: 2012-10-17
         Statement:
@@ -120,8 +118,8 @@ Resources:
               - logs:CreateLogStream
               - logs:PutLogEvents
             Resource:
-              - !Sub "arn:aws:logs:${AWS::Region}:${AWS::AccountId}:log-group:${LambdaLogGroup}"
-              - !Sub "arn:aws:logs:${AWS::Region}:${AWS::AccountId}:log-group:${LambdaLogGroup}:log-stream:*"
+              - !GetAtt LambdaLogGroup.Arn
+              - !Sub ${LambdaLogGroup.Arn}:log-stream:*
 
   LambdaLogGroup:
     Type: "AWS::Logs::LogGroup"

SAMtemplates/main_template.yaml

@@ -126,7 +126,6 @@ Resources:
         CloudWatchKMSKey: !ImportValue account-resources:CloudwatchLogsKmsKeyArn
         SplunkSubscriptionFilterRole: !ImportValue lambda-resources:SplunkSubscriptionFilterRole
         SplunkDeliveryStream: !ImportValue lambda-resources:SplunkDeliveryStream
-        EnableSplunk: "true"
         LambdaName: !Sub "${AWS::StackName}-FHIRValidatorNHSDigitalLegacy"
         LambdaArn: !Sub arn:aws:lambda:${AWS::Region}:${AWS::AccountId}:function:${AWS::StackName}-FHIRValidatorNHSDigitalLegacy
         LogRetentionDays: !Ref LogRetentionDays

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

@@ -110,8 +110,8 @@ public ValidatorConfiguration(String _PROFILE_MANIFEST_FILE) {
                 String packagePath = String.format("%s-%s.tgz", individualPackage.packageName,
                         individualPackage.version);
                 try (InputStream is = ClasspathUtil.loadResourceAsStream(packagePath)) {
-                    PrePopulatedValidationSupport foo = createPrePopulatedValidationSupport(is);
-                    supportChain.addValidationSupport(foo);
+                    PrePopulatedValidationSupport prePopulatedValidationSupport = createPrePopulatedValidationSupport(is);
+                    supportChain.addValidationSupport(prePopulatedValidationSupport);
                 }
                 try (InputStream is = ClasspathUtil.loadResourceAsStream(packagePath)) {
                     NpmPackage pkg = NpmPackage.fromPackage(is);