Skip to content

Commit 07ebda0

Browse files
marrobimarrobi
committed
fix linting
1 parent c73a127 commit 07ebda0

File tree

2 files changed

+99
-193
lines changed

2 files changed

+99
-193
lines changed

‎.github/workflows/deploy_tre_reusable.yml‎

Lines changed: 98 additions & 192 deletions
Original file line numberDiff line numberDiff line change
@@ -383,70 +383,38 @@ jobs:
383383
strategy:
384384
matrix:
385385
include:
386-
- {
387-
BUNDLE_TYPE: "workspace",
388-
BUNDLE_DIR: "./templates/workspaces/base",
389-
}
390-
- {
391-
BUNDLE_TYPE: "workspace",
392-
BUNDLE_DIR: "./templates/workspaces/unrestricted",
393-
}
394-
- {
395-
BUNDLE_TYPE: "workspace",
396-
BUNDLE_DIR: "./templates/workspaces/airlock-import-review",
397-
}
398-
- {
399-
BUNDLE_TYPE: "workspace_service",
400-
BUNDLE_DIR: "./templates/workspace_services/guacamole",
401-
}
402-
- {
403-
BUNDLE_TYPE: "workspace_service",
404-
BUNDLE_DIR: "./templates/workspace_services/azureml",
405-
}
406-
- {
407-
BUNDLE_TYPE: "workspace_service",
408-
BUNDLE_DIR: "./templates/workspace_services/gitea",
409-
}
410-
- {
411-
BUNDLE_TYPE: "workspace_service",
412-
BUNDLE_DIR: "./templates/workspace_services/mysql",
413-
}
414-
- {
415-
BUNDLE_TYPE: "workspace_service",
416-
BUNDLE_DIR: "./templates/workspace_services/health-services",
417-
}
418-
- {
419-
BUNDLE_TYPE: "workspace_service",
420-
BUNDLE_DIR: "./templates/workspace_services/databricks",
421-
}
422-
- {
423-
BUNDLE_TYPE: "workspace_service",
424-
BUNDLE_DIR: "./templates/workspace_services/ohdsi",
425-
}
426-
- {
427-
BUNDLE_TYPE: "workspace_service",
428-
BUNDLE_DIR: "./templates/workspace_services/azuresql",
429-
}
430-
- {
431-
BUNDLE_TYPE: "workspace_service",
432-
BUNDLE_DIR: "./templates/workspace_services/openai",
433-
}
434-
- {
435-
BUNDLE_TYPE: "user_resource",
436-
BUNDLE_DIR: "./templates/workspace_services/guacamole/user_resources/guacamole-azure-windowsvm",
437-
}
438-
- {
439-
BUNDLE_TYPE: "user_resource",
440-
BUNDLE_DIR: "./templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm",
441-
}
442-
- {
443-
BUNDLE_TYPE: "user_resource",
444-
BUNDLE_DIR: "./templates/workspace_services/guacamole/user_resources/guacamole-azure-export-reviewvm",
445-
}
446-
- {
447-
BUNDLE_TYPE: "user_resource",
448-
BUNDLE_DIR: "./templates/workspace_services/guacamole/user_resources/guacamole-azure-import-reviewvm",
449-
}
386+
- BUNDLE_TYPE: "workspace"
387+
BUNDLE_DIR: "./templates/workspaces/base"
388+
- BUNDLE_TYPE: "workspace",
389+
BUNDLE_DIR: "./templates/workspaces/unrestricted"
390+
- BUNDLE_TYPE: "workspace"
391+
BUNDLE_DIR: "./templates/workspaces/airlock-import-review"
392+
- BUNDLE_TYPE: "workspace_service"
393+
BUNDLE_DIR: "./templates/workspace_services/guacamole"
394+
- BUNDLE_TYPE: "workspace_service"
395+
BUNDLE_DIR: "./templates/workspace_services/azureml"
396+
- BUNDLE_TYPE: "workspace_service"
397+
BUNDLE_DIR: "./templates/workspace_services/gitea"
398+
- BUNDLE_TYPE: "workspace_service"
399+
BUNDLE_DIR: "./templates/workspace_services/mysql"
400+
- BUNDLE_TYPE: "workspace_service"
401+
BUNDLE_DIR: "./templates/workspace_services/health-services"
402+
- BUNDLE_TYPE: "workspace_service"
403+
BUNDLE_DIR: "./templates/workspace_services/databricks"
404+
- BUNDLE_TYPE: "workspace_service"
405+
BUNDLE_DIR: "./templates/workspace_services/ohdsi"
406+
- BUNDLE_TYPE: "workspace_service"
407+
BUNDLE_DIR: "./templates/workspace_services/azuresql"
408+
- BUNDLE_TYPE: "workspace_service"
409+
BUNDLE_DIR: "./templates/workspace_services/openai"
410+
- BUNDLE_TYPE: "user_resource"
411+
BUNDLE_DIR: "./templates/workspace_services/guacamole/user_resources/guacamole-azure-windowsvm"
412+
- BUNDLE_TYPE: "user_resource"
413+
BUNDLE_DIR: "./templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm"
414+
- BUNDLE_TYPE: "user_resource"
415+
BUNDLE_DIR: "./templates/workspace_services/guacamole/user_resources/guacamole-azure-export-reviewvm"
416+
- BUNDLE_TYPE: "user_resource"
417+
BUNDLE_DIR: "./templates/workspace_services/guacamole/user_resources/guacamole-azure-import-reviewvm"
450418
environment: ${{ inputs.environmentName }}
451419
steps:
452420
- name: Checkout
@@ -482,38 +450,22 @@ jobs:
482450
strategy:
483451
matrix:
484452
include:
485-
- {
486-
BUNDLE_TYPE: "shared_service",
487-
BUNDLE_DIR: "./templates/shared_services/firewall/",
488-
}
489-
- {
490-
BUNDLE_TYPE: "shared_service",
491-
BUNDLE_DIR: "./templates/shared_services/gitea/",
492-
}
493-
- {
494-
BUNDLE_TYPE: "shared_service",
495-
BUNDLE_DIR: "./templates/shared_services/admin-vm/",
496-
}
497-
- {
498-
BUNDLE_TYPE: "shared_service",
499-
BUNDLE_DIR: "./templates/shared_services/airlock_notifier/",
500-
}
501-
- {
502-
BUNDLE_TYPE: "shared_service",
503-
BUNDLE_DIR: "./templates/shared_services/certs/",
504-
}
505-
- {
506-
BUNDLE_TYPE: "shared_service",
507-
BUNDLE_DIR: "./templates/shared_services/cyclecloud/",
508-
}
509-
- {
510-
BUNDLE_TYPE: "shared_service",
511-
BUNDLE_DIR: "./templates/shared_services/sonatype-nexus-vm/",
512-
}
513-
- {
514-
BUNDLE_TYPE: "shared_service",
515-
BUNDLE_DIR: "./templates/shared_services/databricks-auth/",
516-
}
453+
- BUNDLE_TYPE: "shared_service"
454+
BUNDLE_DIR: "./templates/shared_services/firewall/"
455+
- BUNDLE_TYPE: "shared_service"
456+
BUNDLE_DIR: "./templates/shared_services/gitea/"
457+
- BUNDLE_TYPE: "shared_service"
458+
BUNDLE_DIR: "./templates/shared_services/admin-vm/"
459+
- BUNDLE_TYPE: "shared_service"
460+
BUNDLE_DIR: "./templates/shared_services/airlock_notifier/"
461+
- BUNDLE_TYPE: "shared_service"
462+
BUNDLE_DIR: "./templates/shared_services/certs/"
463+
- BUNDLE_TYPE: "shared_service"
464+
BUNDLE_DIR: "./templates/shared_services/cyclecloud/"
465+
- BUNDLE_TYPE: "shared_service"
466+
BUNDLE_DIR: "./templates/shared_services/sonatype-nexus-vm/"
467+
- BUNDLE_TYPE: "shared_service"
468+
BUNDLE_DIR: "./templates/shared_services/databricks-auth/"
517469
environment: ${{ inputs.environmentName }}
518470
steps:
519471
- name: Checkout
@@ -549,38 +501,22 @@ jobs:
549501
strategy:
550502
matrix:
551503
include:
552-
- {
553-
BUNDLE_TYPE: "shared_service",
554-
BUNDLE_DIR: "./templates/shared_services/firewall",
555-
}
556-
- {
557-
BUNDLE_TYPE: "shared_service",
558-
BUNDLE_DIR: "./templates/shared_services/gitea",
559-
}
560-
- {
561-
BUNDLE_TYPE: "shared_service",
562-
BUNDLE_DIR: "./templates/shared_services/admin-vm/",
563-
}
564-
- {
565-
BUNDLE_TYPE: "shared_service",
566-
BUNDLE_DIR: "./templates/shared_services/airlock_notifier/",
567-
}
568-
- {
569-
BUNDLE_TYPE: "shared_service",
570-
BUNDLE_DIR: "./templates/shared_services/certs/",
571-
}
572-
- {
573-
BUNDLE_TYPE: "shared_service",
574-
BUNDLE_DIR: "./templates/shared_services/cyclecloud/",
575-
}
576-
- {
577-
BUNDLE_TYPE: "shared_service",
578-
BUNDLE_DIR: "./templates/shared_services/sonatype-nexus-vm/",
579-
}
580-
- {
581-
BUNDLE_TYPE: "shared_service",
582-
BUNDLE_DIR: "./templates/shared_services/databricks-auth/",
583-
}
504+
- BUNDLE_TYPE: "shared_service"
505+
BUNDLE_DIR: "./templates/shared_services/firewall"
506+
- BUNDLE_TYPE: "shared_service"
507+
BUNDLE_DIR: "./templates/shared_services/gitea"
508+
- BUNDLE_TYPE: "shared_service"
509+
BUNDLE_DIR: "./templates/shared_services/admin-vm/"
510+
- BUNDLE_TYPE: "shared_service"
511+
BUNDLE_DIR: "./templates/shared_services/airlock_notifier/"
512+
- BUNDLE_TYPE: "shared_service"
513+
BUNDLE_DIR: "./templates/shared_services/certs/"
514+
- BUNDLE_TYPE: "shared_service"
515+
BUNDLE_DIR: "./templates/shared_services/cyclecloud/"
516+
- BUNDLE_TYPE: "shared_service"
517+
BUNDLE_DIR: "./templates/shared_services/sonatype-nexus-vm/"
518+
- BUNDLE_TYPE: "shared_service"
519+
BUNDLE_DIR: "./templates/shared_services/databricks-auth/"
584520
environment: ${{ inputs.environmentName }}
585521
steps:
586522
- name: Checkout
@@ -623,50 +559,28 @@ jobs:
623559
matrix:
624560
include:
625561
# bundles type can be inferred from the bundle dir (but this is more explicit)
626-
- {
627-
BUNDLE_TYPE: "workspace",
628-
BUNDLE_DIR: "./templates/workspaces/base",
629-
}
630-
- {
631-
BUNDLE_TYPE: "workspace",
632-
BUNDLE_DIR: "./templates/workspaces/unrestricted",
633-
}
634-
- {
635-
BUNDLE_TYPE: "workspace",
636-
BUNDLE_DIR: "./templates/workspaces/airlock-import-review",
637-
}
638-
- {
639-
BUNDLE_TYPE: "workspace_service",
640-
BUNDLE_DIR: "./templates/workspace_services/guacamole",
641-
}
642-
- {
643-
BUNDLE_TYPE: "workspace_service",
644-
BUNDLE_DIR: "./templates/workspace_services/azureml",
645-
}
646-
- {
647-
BUNDLE_TYPE: "workspace_service",
648-
BUNDLE_DIR: "./templates/workspace_services/gitea",
649-
}
650-
- {
651-
BUNDLE_TYPE: "workspace_service",
652-
BUNDLE_DIR: "./templates/workspace_services/mysql",
653-
}
654-
- {
655-
BUNDLE_TYPE: "workspace_service",
656-
BUNDLE_DIR: "./templates/workspace_services/health-services",
657-
}
658-
- {
659-
BUNDLE_TYPE: "workspace_service",
660-
BUNDLE_DIR: "./templates/workspace_services/databricks",
661-
}
662-
- {
663-
BUNDLE_TYPE: "workspace_service",
664-
BUNDLE_DIR: "./templates/workspace_services/ohdsi",
665-
}
666-
- {
667-
BUNDLE_TYPE: "workspace_service",
668-
BUNDLE_DIR: "./templates/workspace_services/azuresql",
669-
}
562+
- BUNDLE_TYPE: "workspace"
563+
BUNDLE_DIR: "./templates/workspaces/base"
564+
- BUNDLE_TYPE: "workspace"
565+
BUNDLE_DIR: "./templates/workspaces/unrestricted"
566+
- BUNDLE_TYPE: "workspace"
567+
BUNDLE_DIR: "./templates/workspaces/airlock-import-review"
568+
- BUNDLE_TYPE: "workspace_service"
569+
BUNDLE_DIR: "./templates/workspace_services/guacamole"
570+
- BUNDLE_TYPE: "workspace_service"
571+
BUNDLE_DIR: "./templates/workspace_services/azureml"
572+
- BUNDLE_TYPE: "workspace_service"
573+
BUNDLE_DIR: "./templates/workspace_services/gitea"
574+
- BUNDLE_TYPE: "workspace_service"
575+
BUNDLE_DIR: "./templates/workspace_services/mysql"
576+
- BUNDLE_TYPE: "workspace_service"
577+
BUNDLE_DIR: "./templates/workspace_services/health-services"
578+
- BUNDLE_TYPE: "workspace_service"
579+
BUNDLE_DIR: "./templates/workspace_services/databricks"
580+
- BUNDLE_TYPE: "workspace_service"
581+
BUNDLE_DIR: "./templates/workspace_services/ohdsi"
582+
- BUNDLE_TYPE: "workspace_service"
583+
BUNDLE_DIR: "./templates/workspace_services/azuresql"
670584

671585
environment: ${{ inputs.environmentName }}
672586
steps:
@@ -710,26 +624,18 @@ jobs:
710624
strategy:
711625
matrix:
712626
include:
713-
- {
714-
BUNDLE_TYPE: "user_resource",
715-
BUNDLE_DIR: "./templates/workspace_services/guacamole/user_resources/guacamole-azure-windowsvm",
716-
WORKSPACE_SERVICE_NAME: "tre-service-guacamole",
717-
}
718-
- {
719-
BUNDLE_TYPE: "user_resource",
720-
BUNDLE_DIR: "./templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm",
721-
WORKSPACE_SERVICE_NAME: "tre-service-guacamole",
722-
}
723-
- {
724-
BUNDLE_TYPE: "user_resource",
725-
BUNDLE_DIR: "./templates/workspace_services/guacamole/user_resources/guacamole-azure-export-reviewvm",
726-
WORKSPACE_SERVICE_NAME: "tre-service-guacamole",
727-
}
728-
- {
729-
BUNDLE_TYPE: "user_resource",
730-
BUNDLE_DIR: "./templates/workspace_services/guacamole/user_resources/guacamole-azure-import-reviewvm",
731-
WORKSPACE_SERVICE_NAME: "tre-service-guacamole",
732-
}
627+
- BUNDLE_TYPE: "user_resource"
628+
BUNDLE_DIR: "./templates/workspace_services/guacamole/user_resources/guacamole-azure-windowsvm"
629+
WORKSPACE_SERVICE_NAME: "tre-service-guacamole"
630+
- BUNDLE_TYPE: "user_resource"
631+
BUNDLE_DIR: "./templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm"
632+
WORKSPACE_SERVICE_NAME: "tre-service-guacamole"
633+
- BUNDLE_TYPE: "user_resource"
634+
BUNDLE_DIR: "./templates/workspace_services/guacamole/user_resources/guacamole-azure-export-reviewvm"
635+
WORKSPACE_SERVICE_NAME: "tre-service-guacamole"
636+
- BUNDLE_TYPE: "user_resource"
637+
BUNDLE_DIR: "./templates/workspace_services/guacamole/user_resources/guacamole-azure-import-reviewvm"
638+
WORKSPACE_SERVICE_NAME: "tre-service-guacamole"
733639
environment: ${{ inputs.environmentName }}
734640
steps:
735641
- name: Checkout

‎resource_processor/_version.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = "0.12.2"
1+
__version__ = "0.12.3"

0 commit comments

Comments
 (0)