Merge branch 'main' into fix-implement-post-job-logging

Author: tadasbar

snakemake_executor_plugin_googlebatch/executor.py

@@ -57,7 +57,7 @@ def get_labels(self, job):
         """
         Derive default labels for the job (and add custom)
         """
-        labels = {"snakemake-job": job.name}
+        labels = {"snakemake-job": self.fix_job_name(job.name)}
         for contender in self.get_param(job, "labels").split(","):
             if not contender:
                 continue
@@ -94,7 +94,7 @@ def generate_jobid(self, job):
         Generate a random jobid
         """
         uid = str(uuid.uuid4())
-        return job.name.replace("_", "-") + "-" + uid[0:6]
+        return self.fix_job_name(job.name) + "-" + uid[0:6]
 
     def get_container(self, job, entrypoint=None, commands=None):
         """
@@ -181,6 +181,13 @@ def get_command_writer(self, job):
             resources=job.resources,
         )
 
+    def fix_job_name(self, name):
+        """
+        Replace illegal symbols and fix the job name length to adhere to
+        the Google Batch API job ID and label naming restrictions
+        """
+        return name.replace("_", "-").replace(".", "")[:50]
+
     def run_job(self, job: JobExecutorInterface):
         """
         Run the Google Batch job.