diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml index 0f68e97c09..5a0e0e3d7c 100644 --- a/.github/workflows/backend.yml +++ b/.github/workflows/backend.yml @@ -2,9 +2,9 @@ on: push: - branches: [ master ] + branches: [master] pull_request: - branches: [ master ] + branches: [master] jobs: test_build: diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml index dd5767f3b1..dc75a98b6a 100644 --- a/.github/workflows/frontend.yml +++ b/.github/workflows/frontend.yml @@ -2,9 +2,9 @@ on: push: - branches: [ master ] + branches: [master] pull_request: - branches: [ master ] + branches: [master] jobs: lint_test_build: diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index 5715d94a3b..dcbb42ee8c 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -2,9 +2,9 @@ name: python on: push: - branches: [ master ] + branches: [master] pull_request: - branches: [ master ] + branches: [master] jobs: lint: diff --git a/.vscode/settings.json b/.vscode/settings.json index ea225fb56f..17110d8148 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -24,5 +24,8 @@ }, "[typescriptreact]": { "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[yaml]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" } } diff --git a/docker_deploy/group_vars/build_agent/main.yml b/docker_deploy/group_vars/build_agent/main.yml index ce0077914d..5a0dff37e6 100644 --- a/docker_deploy/group_vars/build_agent/main.yml +++ b/docker_deploy/group_vars/build_agent/main.yml @@ -1,5 +1,4 @@ --- - aws_user: teamcity aws_group: teamcity diff --git a/docker_deploy/group_vars/qa/main.yml b/docker_deploy/group_vars/qa/main.yml index 9789eeb309..52b3368da8 100644 --- a/docker_deploy/group_vars/qa/main.yml +++ b/docker_deploy/group_vars/qa/main.yml @@ -26,5 +26,5 @@ aws_backup_profile: s3_read_write aws_ecr_profile: ecr_read_only my_aws_profiles: - - "{{ aws_backup_profile }}" - - "{{ aws_ecr_profile }}" + - "{{ aws_backup_profile }}" + - "{{ aws_ecr_profile }}" diff --git a/docker_deploy/group_vars/server/main.yml b/docker_deploy/group_vars/server/main.yml index 155895fb90..7bd8784608 100644 --- a/docker_deploy/group_vars/server/main.yml +++ b/docker_deploy/group_vars/server/main.yml @@ -5,7 +5,6 @@ # Group: server ################################################# - # TheCombine is installed on the Live Server by TeamCity. It will set the # IMAGE_TAG environment variable to major.minor.build_no and launch # Docker compose @@ -18,7 +17,6 @@ combine_image_certmgr: "{{ aws_ecr }}/combine/certmgr:{{ image_tag }}" # SSL cert variables specific to Server targets cert_mode: "letsencrypt" - aws_user: "{{ combine_user }}" aws_group: "{{ combine_group }}" @@ -32,10 +30,10 @@ aws_backup_profile: s3_read_write aws_ecr_profile: ecr_read_only my_aws_profiles: - - "{{ aws_backup_profile }}" - - "{{ aws_ecr_profile }}" + - "{{ aws_backup_profile }}" + - "{{ aws_ecr_profile }}" # Define backup times (UTC) -backup_hour: "3" -backup_minute: "15" -num_backups: "3" +backup_hour: "3" +backup_minute: "15" +num_backups: "3" diff --git a/docker_deploy/hosts.yml b/docker_deploy/hosts.yml index 579ca9a50e..07282b002e 100644 --- a/docker_deploy/hosts.yml +++ b/docker_deploy/hosts.yml @@ -1,5 +1,4 @@ --- - all: hosts: children: diff --git a/docker_deploy/roles/aws_access/tasks/main.yml b/docker_deploy/roles/aws_access/tasks/main.yml index 8c5ad7efb5..e5c7016de7 100644 --- a/docker_deploy/roles/aws_access/tasks/main.yml +++ b/docker_deploy/roles/aws_access/tasks/main.yml @@ -1,5 +1,4 @@ --- - - name: check for aws version command: aws --version register: aws_version diff --git a/docker_deploy/roles/combine_user/tasks/main.yml b/docker_deploy/roles/combine_user/tasks/main.yml index 479e44db96..07ba9e0db8 100644 --- a/docker_deploy/roles/combine_user/tasks/main.yml +++ b/docker_deploy/roles/combine_user/tasks/main.yml @@ -1,5 +1,4 @@ --- - # create the group for the combine user - name: create group for combine app group: diff --git a/docker_deploy/roles/docker_install/tasks/main.yml b/docker_deploy/roles/docker_install/tasks/main.yml index c416475528..e2607ca418 100644 --- a/docker_deploy/roles/docker_install/tasks/main.yml +++ b/docker_deploy/roles/docker_install/tasks/main.yml @@ -52,7 +52,7 @@ dest: /etc/docker/daemon.json owner: root group: root - mode: 0600 + mode: 0600 notify: restart docker - name: Install Docker Compose diff --git a/docker_deploy/roles/package_install/defaults/main.yml b/docker_deploy/roles/package_install/defaults/main.yml index e29ab843b0..11a2fee572 100644 --- a/docker_deploy/roles/package_install/defaults/main.yml +++ b/docker_deploy/roles/package_install/defaults/main.yml @@ -1,5 +1,4 @@ --- - required_packages: - apt-transport-https - aptitude diff --git a/package.json b/package.json index 1a436da6c7..3ccca21f23 100644 --- a/package.json +++ b/package.json @@ -11,8 +11,8 @@ "eject": "react-scripts eject", "fmt-backend": "dotnet-format", "fmt-backend-check": "dotnet-format --check", - "fmt-frontend": "prettier --write \"./{.vscode,docs,public,scripts,src}/**/*.{js,jsx,ts,tsx,json,md}\"", - "fmt-frontend-check": "prettier --check \"./{.vscode,docs,public,scripts,src}/**/*.{js,jsx,ts,tsx,json,md}\"", + "fmt-frontend": "prettier --write \"./{.github,.vscode,docker_deploy,docs,public,scripts,src}/**/*.{js,jsx,ts,tsx,json,md,yml}\"", + "fmt-frontend-check": "prettier --check \"./{.github,.vscode,docker_deploy,docs,public,scripts,src}/**/*.{js,jsx,ts,tsx,json,md,yml}\"", "frontend": "react-scripts start", "gen-backend-coverage-report": "tsc scripts/genBackendCoverageReport.ts && node scripts/genBackendCoverageReport.js", "import-sem-doms": "tsc scripts/importSemanticDomains.ts && node scripts/importSemanticDomains.js",