diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bf823ea9813fb270969e794d45ddf81fa61101a8..8fa173af038d819ea44475cc1ba24d06d6766a03 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,7 +9,7 @@ default: - 1cpu-4gb # build on smaller machine variables: - API_DOMAIN_PATH: "$CI_PROJECT_DIR/api_domain" + API_DOMAIN_PATH: '$CI_PROJECT_DIR/api_domain' # job templates @@ -17,15 +17,15 @@ variables: image: name: 'europe-north1-docker.pkg.dev/holi-shared/docker-hub-remote/hashicorp/terraform:1.6.6' # default entrypoint is terraform command, but we want to run shell scripts - entrypoint: ["/bin/sh", "-c"] + entrypoint: ['/bin/sh', '-c'] variables: ENVIRONMENT_ID: $CI_ENVIRONMENT_SLUG artifacts: paths: - - "terraform/environments/crash.log" # optional, only available in case of a crash/panic - - "terraform/environments/terraform-*.log" # separate log for every step/command + - 'terraform/environments/crash.log' # optional, only available in case of a crash/panic + - 'terraform/environments/terraform-*.log' # separate log for every step/command - $API_DOMAIN_PATH - name: "${CI_JOB_NAME}_${CI_JOB_ID}" + name: '${CI_JOB_NAME}_${CI_JOB_ID}' #when: on_failure expire_in: 1 week script: @@ -57,7 +57,6 @@ cache_lint_test: - deno lint - deno test - # You can override the included template(s) by including variable overrides # SAST customization: https://docs.gitlab.com/ee/user/application_security/sast/#customizing-the-sast-settings # Secret Detection customization: https://docs.gitlab.com/ee/user/application_security/secret_detection/#customizing-settings @@ -69,7 +68,7 @@ sast: needs: ['cache_lint_test'] stage: test include: -- template: Security/SAST.gitlab-ci.yml + - template: Security/SAST.gitlab-ci.yml build_docker: needs: ['cache_lint_test'] @@ -113,7 +112,7 @@ review_destroy: image: name: 'europe-north1-docker.pkg.dev/holi-shared/docker-hub-remote/hashicorp/terraform:1.6.6' # default entrypoint is terraform command, but we want to run shell scripts - entrypoint: ["/bin/sh", "-c"] + entrypoint: ['/bin/sh', '-c'] variables: # has to be set to none for auto stop GIT_STRATEGY: none @@ -124,9 +123,9 @@ review_destroy: dependencies: [] # explicitly disable artifact usage artifacts: paths: - - "terraform/environments/crash.log" # optional, only available in case of a crash/panic - - "terraform/environments/terraform-*.log" # separate log for every step/command - name: "${CI_JOB_NAME}_${CI_JOB_ID}" + - 'terraform/environments/crash.log' # optional, only available in case of a crash/panic + - 'terraform/environments/terraform-*.log' # separate log for every step/command + name: '${CI_JOB_NAME}_${CI_JOB_ID}' when: on_failure expire_in: 1 week script: diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 2f34ebc58adb3df395e52bedee0d670532274122..f4b830c8175179542b86e58cc479dbe443a5adbb 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,7 +1,7 @@ repos: -- repo: local + - repo: local hooks: - - id: gitleaks + - id: gitleaks name: gitleaks language: system entry: gitleaks protect --staged -v -c ../.gitleaks.toml diff --git a/smoketest/main.js b/smoketest/main.js index 439103a086daa0dc0baee8aab3e20d3082a4ff8a..dd2431354e85f93fbab09a47f60fd706a0fce71a 100644 --- a/smoketest/main.js +++ b/smoketest/main.js @@ -1,7 +1,6 @@ import http from 'k6/http' import { check, sleep } from 'k6' - // You don't need to change anything in this section, it's k6 glue code. // See the default function at the end of the file for defining your smoketest. // This configuration only executes 1 test, enough for a smoketest. The smoketest will fail on any check failing. @@ -35,7 +34,7 @@ export default () => { check(JSON.parse(response.body), { // there can be multiple tests here, e.g. //"contains topics object": (r) => typeof r.data.topics != null, - 'returns unauthorized error': (r) => r.errors[0].message === "Unauthorized", + 'returns unauthorized error': (r) => r.errors[0].message === 'Unauthorized', }) }) }