NRL-1346 Syntax fixes

Author: jackleary

terraform/account-wide-infrastructure/dev/glue.tf

@@ -2,6 +2,6 @@ module "dev-glue" {
   is_enabled     = var.enable_reporting
   source         = "../modules/glue"
   name_prefix    = "nhsd-nrlf--dev"
-  schedule       = true
+  schedule       = false
   python_version = 3
 }

terraform/account-wide-infrastructure/modules/glue/glue.tf

@@ -75,10 +75,10 @@ resource "aws_glue_trigger" "glue_trigger" {
 
   name     = "${var.name_prefix}-glue-trigger"
   type     = "SCHEDULED"
-  schedule = "cron(0 0 1 * * *)"
+  schedule = "cron(0 1 * * ? *)"
 
   actions {
-    crawler_name = aws_glue_crawler.glue_job[0].name
+    job_name = aws_glue_job.glue_job[0].name
   }
 }
 

terraform/account-wide-infrastructure/modules/glue/src/transformations.py

@@ -25,10 +25,7 @@ def format_ssp(df, logger, name):
         return df
 
     logger.info("Processing SSP logs")
-    no_ods_code = df.filter(col("logReference") != "SSP0001")
-    ods_code = df.filter(col("logReference") == "SSP0001")
-
-    no_ods_code = no_ods_code.select(
+    no_ods_code = df.filter(col("logReference") != "SSP0001").select(
         "time",
         "host",
         "internalID",
@@ -38,7 +35,7 @@ def format_ssp(df, logger, name):
         "responseErrorMessage",
         "totalDuration",
     )
-    ods_code = ods_code.select(
+    ods_code = df.filter(col("logReference") == "SSP0001").select(
         "sspFrom",
         "fromOrgName",
         "fromOdsCode",