From 230e59532dd99c0544a0ec48eef1d78cdb69fa00 Mon Sep 17 00:00:00 2001
From: Bryan Davis <bd808@wikimedia.org>
Date: Tue, 1 Mar 2022 16:39:04 -0700
Subject: [PATCH] dev: fix yaml linter warnings

Fix various linter warnings in preparation for updating
eslint-config-wikimedia to a version with YAML coverage.

Change-Id: I805afa1dd3fdf7b859eb1218bb4110067450f6d5
---
 contrib/demo-server/docker-compose.yaml       | 12 +++++------
 .../prometheus/docker-compose.prometheus.yaml |  8 +++----
 contrib/prometheus/prometheus.yml             | 10 ++++-----
 docker-compose.yaml                           | 21 +++++++++----------
 jsonschema/toolinfo/current.yaml              | 10 ++++-----
 5 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/contrib/demo-server/docker-compose.yaml b/contrib/demo-server/docker-compose.yaml
index 62ccd0a5..d8707c32 100644
--- a/contrib/demo-server/docker-compose.yaml
+++ b/contrib/demo-server/docker-compose.yaml
@@ -13,10 +13,10 @@ services:
       - /bin/bash
       - -c
       - >-
-        poetry run python3 manage.py migrate
-        && poetry run python3 manage.py createinitialrevisions
-        && poetry run python3 manage.py search_index --rebuild -f
-        && poetry run python3 manage.py runserver --noreload --nostatic 0.0.0.0:8000
+          poetry run python3 manage.py migrate
+          && poetry run python3 manage.py createinitialrevisions
+          && poetry run python3 manage.py search_index --rebuild -f
+          && poetry run python3 manage.py runserver --noreload --nostatic 0.0.0.0:8000
     environment:
       - DJANGO_SECRET_KEY
       - DJANGO_DEBUG
@@ -50,8 +50,8 @@ services:
     image: mariadb:10.4
     restart: always
     command:
-      - "--character-set-server=utf8mb4"
-      - "--collation-server=utf8mb4_unicode_ci"
+      - --character-set-server=utf8mb4
+      - --collation-server=utf8mb4_unicode_ci
     environment:
       MYSQL_DATABASE: ${DB_NAME}
       MYSQL_USER: ${DB_USER}
diff --git a/contrib/prometheus/docker-compose.prometheus.yaml b/contrib/prometheus/docker-compose.prometheus.yaml
index f2a1c21e..cde3e581 100644
--- a/contrib/prometheus/docker-compose.prometheus.yaml
+++ b/contrib/prometheus/docker-compose.prometheus.yaml
@@ -13,10 +13,10 @@ services:
         target: /prometheus
         consistency: cached
     command:
-      - '--config.file=/etc/prometheus/prometheus.yml'
-      - '--storage.tsdb.path=/prometheus'
-      - '--web.console.libraries=/usr/share/prometheus/console_libraries'
-      - '--web.console.templates=/etc/prometheus/consoles'
+      - --config.file=/etc/prometheus/prometheus.yml
+      - --storage.tsdb.path=/prometheus
+      - --web.console.libraries=/usr/share/prometheus/console_libraries
+      - --web.console.templates=/etc/prometheus/consoles
     ports:
       - "${TOOLHUB_PROMETHEUS_PORT:-9090}:9090"
     depends_on:
diff --git a/contrib/prometheus/prometheus.yml b/contrib/prometheus/prometheus.yml
index 917f8461..3b2a4a84 100644
--- a/contrib/prometheus/prometheus.yml
+++ b/contrib/prometheus/prometheus.yml
@@ -6,12 +6,12 @@ global:
     monitor: django-monitor
 
 rule_files:
-  - 'toolhub.rules'
+  - toolhub.rules
 
 scrape_configs:
-  - job_name: 'prometheus'
+  - job_name: prometheus
     static_configs:
-      - targets: ['localhost:9090']
-  - job_name: 'toolhub'
+      - targets: [ "localhost:9090" ]
+  - job_name: toolhub
     static_configs:
-      - targets: ['web:8000']
+      - targets: [ "web:8000" ]
diff --git a/docker-compose.yaml b/docker-compose.yaml
index f916ca3a..9aaf238b 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -15,11 +15,10 @@ services:
       - bash
       - -c
       - >-
-        mkdir -p /tmp/runtime-home &&
-        export HOME=/tmp/runtime-home &&
-        /srv/dockerize/bin/dockerize -wait tcp://db:3306
-        poetry run
-        python3 manage.py runserver --nostatic 0.0.0.0:8000
+          mkdir -p /tmp/runtime-home
+          && export HOME=/tmp/runtime-home
+          && /srv/dockerize/bin/dockerize -wait tcp://db:3306
+          poetry run python3 manage.py runserver --nostatic 0.0.0.0:8000
     environment:
       - DJANGO_SECRET_KEY
       - DJANGO_DEBUG
@@ -60,8 +59,8 @@ services:
     image: mariadb:10.4
     restart: always
     command:
-      - "--character-set-server=utf8mb4"
-      - "--collation-server=utf8mb4_unicode_ci"
+      - --character-set-server=utf8mb4
+      - --collation-server=utf8mb4_unicode_ci
     environment:
       MYSQL_DATABASE: ${DB_NAME}
       MYSQL_USER: ${DB_USER}
@@ -87,10 +86,10 @@ services:
       - bash
       - -c
       - >-
-        mkdir -p /tmp/runtime-home &&
-        export HOME=/tmp/runtime-home &&
-        npm install &&
-        npm run serve:vue
+          mkdir -p /tmp/runtime-home
+          && export HOME=/tmp/runtime-home
+          && npm install
+          && npm run serve:vue
     volumes:
       - type: bind
         source: .
diff --git a/jsonschema/toolinfo/current.yaml b/jsonschema/toolinfo/current.yaml
index 99b99d1f..ab85b65c 100644
--- a/jsonschema/toolinfo/current.yaml
+++ b/jsonschema/toolinfo/current.yaml
@@ -235,11 +235,11 @@ definitions:
         $ref: "#/definitions/url"
     additionalProperties: false
   url_multilingual_or_array:
-      oneOf:
-        - type: array
-          items:
-            $ref: "#/definitions/url_multilingual"
-        - $ref: "#/definitions/url"
+    oneOf:
+      - type: array
+        items:
+          $ref: "#/definitions/url_multilingual"
+      - $ref: "#/definitions/url"
   string_or_string_array:
     oneOf:
       - type: string