treewide: Format with shellcheck, jsonlint and yamllint

2025-12-29 12:41:13 +01:00
parent d7e4fb43cb
commit f81a4b2732
53 changed files with 313 additions and 220 deletions
@@ -73,7 +73,7 @@
    "connString": "Username=postgres;Password=secret;Host=localhost;Port=5432;Database=app;Pooling=true;",
    "sorcerer" : "https://sorcerer.data.oceanbox.io",
    "allowedOrigins": [
-        "https://maps.oceanbox.io",
+        "https://maps.oceanbox.io"
    ],
    "appName": "atlantis",
    "appEnv": "prod",
@@ -4,14 +4,14 @@ identity:
    scheme: {{ .Values.linkerd.secretScheme }}
    {{- if .Values.linkerd.identityIssuerPEM }}
    tls:
-      crtPEM: {{- .Values.linkerd.identityIssuerPEM | toYaml | indent 14 }} 
+      crtPEM: {{- .Values.linkerd.identityIssuerPEM | toYaml | indent 14 }}
    {{- end }}
 policyValidator:
  externalSecret: true
-  caBundle: {{- .Values.linkerd.webhookPEM | toYaml | indent 9 }}  
+  caBundle: {{- .Values.linkerd.webhookPEM | toYaml | indent 9 }}
 proxyInjector:
  externalSecret: true
-  caBundle: {{- .Values.linkerd.webhookPEM | toYaml | indent 9 }}  
+  caBundle: {{- .Values.linkerd.webhookPEM | toYaml | indent 9 }}
 profileValidator:
  externalSecret: true
-  caBundle: {{- .Values.linkerd.webhookPEM | toYaml | indent 9 }}  
+  caBundle: {{- .Values.linkerd.webhookPEM | toYaml | indent 9 }}
@@ -1,5 +1,5 @@
 containerPort: 10250
-resources: 
+resources:
    requests:
        cpu: 100m
        memory: 200Mi
@@ -6,7 +6,7 @@ metadata:
  namespace: argocd
 spec:
  destination:
-    namespace: kube-system 
+    namespace: kube-system
    server: 'https://kubernetes.default.svc'
  sources:
  - repoURL: {{ .Values.clusterConfig.manifests }}
@@ -6,5 +6,5 @@
    "appVersion": "1.0.0",
    "cacheDir": "/data/archives/cache/prod",
    "otelCollector": "http://10.255.241.12:4317",
-    "sentryUrl": "https://2b68ecf0c4d02e6cc9433c371321ac9d@o4509530141622272.ingest.de.sentry.io/4509910315237456",
+    "sentryUrl": "https://2b68ecf0c4d02e6cc9433c371321ac9d@o4509530141622272.ingest.de.sentry.io/4509910315237456"
 }
@@ -24,7 +24,7 @@ spec:
            grafana_folder: Prometheus-stack
      targets:
      - apiVersion: v1
-        kind: ConfigMap        
+        kind: ConfigMap
        name: "{{`{{ request.object.metadata.name }}`}}"
    name: generate-dashboard-folder-annotation
    skipBackgroundRequests: true
@@ -1,5 +1,5 @@
 redis:
-  enabled: true 
+  enabled: true
  envs:
  - prod
  - staging
@@ -3,7 +3,7 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: {{ . }}-redis 
+  name: {{ . }}-redis
  namespace: argocd
  annotations:
    argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
@@ -60,7 +60,7 @@
        "https://maps.beta.oceanbox.io",
        "https://atlantis.beta.oceanbox.io",
        "https://jonas-atlantis.dev.oceanbox.io",
-        "https://stig-atlantis.dev.oceanbox.io",
+        "https://stig-atlantis.dev.oceanbox.io"
    ],
    "appName": "sorcerer",
    "appEnv": "prod",
@@ -13,7 +13,7 @@ metadata:
      is time consuming and error prone. This policy will copy a
      Secret called `regcred` which exists in the `default` Namespace to
      new Namespaces when they are created. It will also push updates to
-      the copied Secrets should the source Secret be changed.            
+      the copied Secrets should the source Secret be changed.
 spec:
  rules:
  - name: sync-image-pull-secret
@@ -37,7 +37,7 @@ rules:
    resources:
      - events
    verbs: ["*"]
-      
+
  - nonResourceURLs: ["*"]
    verbs: ["*"]
  - apiGroups:
@@ -13,7 +13,7 @@ metadata:
      is time consuming and error prone. This policy will copy a
      Secret called `regcred` which exists in the `default` Namespace to
      new Namespaces when they are created. It will also push updates to
-      the copied Secrets should the source Secret be changed.            
+      the copied Secrets should the source Secret be changed.
 spec:
  rules:
  - name: sync-image-pull-secret
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash

-if [ $# -ne 1 ]
+if [[ $# -ne 1 ]]
 then
 	echo "Usage: $0 <file>.sql"
 	exit 1
@@ -8,11 +8,11 @@ fi

 file=$1

-if [ ! -e $file ]
+if [[ ! -e "${file}" ]]
 then
-	echo "file $file does not exist"
+	echo "file ${file} does not exist"
 	exit 1
 fi

-cat $file | kubectl -n analytics exec -i svc/prod-umami-db-rw -c postgres -- psql app
+kubectl -n analytics exec -i svc/prod-umami-db-rw -c postgres -- psql app < "${file}"

@@ -32,7 +32,7 @@ GROUP BY

 SELECT
  *
-FROM 
+FROM
  crosstab_integer_5_cols(
    'SELECT * FROM simulations
     WHERE
@@ -1,4 +1,4 @@
-select 
+select
 	s.distinct_id,
 	count(distinct w.visit_id)
 from
@@ -9,7 +9,7 @@ join
 where
 	w.website_id = '16e7d807-4db5-45fd-92a9-27393445a153'
 	and w.event_type = 1
-	and w.created_at between '2025-10-13' and '2025-10-19' 
+	and w.created_at between '2025-10-13' and '2025-10-19'
 	and s.distinct_id is not null
 	and substring(s.distinct_id similar '%#"@%#"' escape '#') not in ('@oceanbox.io')
 group by
@@ -9,7 +9,7 @@ join
 where
 	w.website_id = '16e7d807-4db5-45fd-92a9-27393445a153'
 	and w.event_type = 1
-	and w.created_at between '2025-10-06' and '2025-10-10' 
+	and w.created_at between '2025-10-06' and '2025-10-10'
 	and s.distinct_id is not null
 	and s.distinct_id like '%@%'
 group by
@@ -21,7 +21,7 @@

 SELECT
  *
-FROM 
+FROM
  crosstab(
    'SELECT "group", sim_type, count::text FROM weekly_sim_submit_count_v2 ORDER BY 1, 2',
    'SELECT DISTINCT sim_type FROM weekly_sim_submit_count_v2 ORDER BY 1'