From 1fbc6766b97b30e330b27c6c2a335f2c579db10d Mon Sep 17 00:00:00 2001 From: Vladimir Garvardt Date: Thu, 5 Sep 2024 20:29:37 +0200 Subject: [PATCH] chore: disable json prettier linter ad fix yaml prettier issues --- .github/FUNDING.yml | 2 +- .github/linters/.markdown-lint.yml | 20 +++++++++---------- .github/workflows/lint.yml | 2 ++ Taskfile.yaml | 4 ++-- _example/outbox-worker-kafka/Taskfile.yaml | 8 ++++---- .../outbox-worker-kafka/docker-compose.yml | 14 ++++++------- docker-compose.yml | 4 ++-- 7 files changed, 28 insertions(+), 26 deletions(-) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index 516df33..8257346 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -11,4 +11,4 @@ #issuehunt: # Replace with a single IssueHunt username #otechie: # Replace with a single Otechie username #lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry -custom: ['paypal.me/vgarvardt'] +custom: ["paypal.me/vgarvardt"] diff --git a/.github/linters/.markdown-lint.yml b/.github/linters/.markdown-lint.yml index ad2ef77..1c5b832 100644 --- a/.github/linters/.markdown-lint.yml +++ b/.github/linters/.markdown-lint.yml @@ -18,22 +18,22 @@ ############### # Rules by id # ############### -MD004: false # Unordered list style +MD004: false # Unordered list style MD007: - indent: 2 # Unordered list indentation + indent: 2 # Unordered list indentation MD010: - code_blocks: false # Ignore no-hard-tabs in cde blocks because that's how formatting for golang works + code_blocks: false # Ignore no-hard-tabs in cde blocks because that's how formatting for golang works MD013: - line_length: 120 # Line length 80 is far too short + line_length: 120 # Line length 80 is far too short MD024: - siblings_only: true # Allow the same headers for different sections + siblings_only: true # Allow the same headers for different sections MD026: - punctuation: ".,;:!。，；:" # List of not allowed -MD029: false # Ordered list item prefix -MD033: false # Allow inline HTML -MD036: false # Emphasis used instead of a heading + punctuation: ".,;:!。，；:" # List of not allowed +MD029: false # Ordered list item prefix +MD033: false # Allow inline HTML +MD036: false # Emphasis used instead of a heading ################# # Rules by tags # ################# -blank_lines: false # Error on blank lines +blank_lines: false # Error on blank lines diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 0b8e64e..b75ea89 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -36,6 +36,8 @@ jobs: VALIDATE_SQL: false VALIDATE_SQLFLUFF: false VALIDATE_CHECKOV: false + # it forces all list items to be on a single line in .github/linters/.jscpd.json that is not pretty at all + VALIDATE_JSON_PRETTIER: false - name: Setup dependencies uses: ./.github/actions/setup-deps diff --git a/Taskfile.yaml b/Taskfile.yaml index 9ce92fa..354e520 100644 --- a/Taskfile.yaml +++ b/Taskfile.yaml @@ -1,5 +1,5 @@ --- -version: '3' +version: "3" env: CGO_ENABLED: 0 @@ -30,7 +30,7 @@ tasks: PG_HOST: sh: docker compose port postgres 5432 env: - TEST_POSTGRES: 'postgres://test:test@{{.PG_HOST}}/test?sslmode=disable' + TEST_POSTGRES: "postgres://test:test@{{.PG_HOST}}/test?sslmode=disable" spell-lint: summary: Check spelling diff --git a/_example/outbox-worker-kafka/Taskfile.yaml b/_example/outbox-worker-kafka/Taskfile.yaml index 6226922..daad020 100644 --- a/_example/outbox-worker-kafka/Taskfile.yaml +++ b/_example/outbox-worker-kafka/Taskfile.yaml @@ -1,5 +1,5 @@ --- -version: '3' +version: "3" env: CGO_ENABLED: 0 @@ -22,7 +22,7 @@ tasks: cmds: - go run ./... client env: - DB_DSN: 'postgres://outbox:outbox@localhost:{{.PG_PORT}}/outbox?sslmode=disable' + DB_DSN: "postgres://outbox:outbox@localhost:{{.PG_PORT}}/outbox?sslmode=disable" vars: PG_PORT: # `docker compose port postgres 5432` -> "0.0.0.0:52041" @@ -33,8 +33,8 @@ tasks: cmds: - go run ./... worker env: - DB_DSN: 'postgres://outbox:outbox@localhost:{{.PG_PORT}}/outbox?sslmode=disable' - KAFKA_BROKERS: 'localhost:{{.KAFKA_PORT}}' + DB_DSN: "postgres://outbox:outbox@localhost:{{.PG_PORT}}/outbox?sslmode=disable" + KAFKA_BROKERS: "localhost:{{.KAFKA_PORT}}" vars: PG_PORT: # `docker compose port postgres 5432` -> "0.0.0.0:52041" diff --git a/_example/outbox-worker-kafka/docker-compose.yml b/_example/outbox-worker-kafka/docker-compose.yml index 4cc8549..deec999 100644 --- a/_example/outbox-worker-kafka/docker-compose.yml +++ b/_example/outbox-worker-kafka/docker-compose.yml @@ -1,5 +1,5 @@ --- -version: '3.9' +version: "3.9" services: postgres: image: postgres:14 @@ -8,9 +8,9 @@ services: - POSTGRES_PASSWORD=outbox - POSTGRES_DATABASE=outbox ports: - - '5432' + - "5432" healthcheck: - test: [ 'CMD-SHELL', 'pg_isready -U test' ] + test: ["CMD-SHELL", "pg_isready -U test"] interval: 1s timeout: 2s retries: 20 @@ -21,12 +21,12 @@ services: - redpanda - start - --smp - - '1' + - "1" - --reserve-memory - 0M - --overprovisioned - --node-id - - '0' + - "0" - --kafka-addr - PLAINTEXT://0.0.0.0:29092,OUTSIDE://0.0.0.0:9092 - --advertise-kafka-addr @@ -36,9 +36,9 @@ services: - --advertise-pandaproxy-addr - PLAINTEXT://redpanda:28082,OUTSIDE://localhost:8082 ports: - - '9092:9092' + - "9092:9092" healthcheck: - test: [ 'CMD', 'curl', '--fail', 'localhost:9644/v1/status/ready' ] + test: ["CMD", "curl", "--fail", "localhost:9644/v1/status/ready"] start_period: 15s interval: 2s timeout: 1s diff --git a/docker-compose.yml b/docker-compose.yml index bf6effc..99abd8c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ services: postgres: image: postgres:11 ports: - - '5432' + - "5432" environment: LC_ALL: C.UTF-8 POSTGRES_USER: test @@ -12,7 +12,7 @@ services: tmpfs: - /var/lib/postgresql/data healthcheck: - test: [ "CMD", "pg_isready" ] + test: ["CMD", "pg_isready"] interval: 3s timeout: 3s retries: 5