update prettier config && format renovate

.prettierrc

@@ -0,0 +1,4 @@
+{
+  "quoteProps": "preserve",
+  "trailingComma": "none"
+}

.renovate/customManagers.json5

@@ -13,14 +13,26 @@
     {
       "customType": "regex",
       "description": "Process Grafana dashboards",
-        "fileMatch": [
+      "fileMatch": ["(^|/)kubernetes/.+\\.ya?ml(\\.j2)?$"],
-          "(^|/)kubernetes/.+\\.ya?ml(\\.j2)?$"
-        ],
       "matchStrings": [
         "depName=\"(?<depName>\\S+)\"\\n.*?gnetId: (?<packageName>\\d+)\\n.*?revision: (?<currentValue>\\d+)"
       ],
       "datasourceTemplate": "custom.grafana-dashboards",
       "versioningTemplate": "regex:^(?<major>\\d+)$"
+    },
+    {
+      "customType": "regex",
+      "description": ["Process custom dependencies"],
+      "fileMatch": ["(^|/)kubernetes/.+\\.ya?ml(?:\\.j2)?$"],
+      "matchStrings": [
+        // # renovate: datasource=helm depName=cilium repository=https://helm.cilium.io
+        // version: 1.15.1
+        "datasource=(?<datasource>\\S+) depName=(?<depName>\\S+)( repository=(?<registryUrl>\\S+))?\\n.+: (&\\S+\\s)?(?<currentValue>\\S+)",
+        // # renovate: datasource=github-releases depName=rancher/system-upgrade-controller
+        // https://github.com/rancher/system-upgrade-controller/releases/download/v0.13.2/crd.yaml
+        "datasource=(?<datasource>\\S+) depName=(?<depName>\\S+)\\n.+/(?<currentValue>(v|\\d)[^/]+)"
+      ],
+      "datasourceTemplate": "{{#if datasource}}{{{datasource}}}{{else}}github-releases{{/if}}"
     }
   ],
   "packageRules": [

.vscode/settings.json

@@ -42,5 +42,9 @@
   "files.trimTrailingWhitespace": true,
   "ansible.python.interpreterPath": "/usr/bin/python3",
   "sops.defaults.ageKeyFile": "age.key",
-  "ansible.validation.lint.path": "~/projects/valinor/.venv/bin/ansible-lint"
+  "ansible.validation.lint.path": "~/projects/valinor/.venv/bin/ansible-lint",
+  "prettier.quoteProps": "preserve",
+  "[jsonc]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
 }

renovate.json5

@@ -8,57 +8,39 @@
   ],
   "ignorePaths": [".archive/**"],
   "flux": {
-    "fileMatch": [
+    "fileMatch": ["kubernetes/.+\\.ya?ml$"]
-      "kubernetes/.+\\.ya?ml$"
-    ]
   },
   "helm-values": {
-    "fileMatch": [
+    "fileMatch": ["kubernetes/.+\\.ya?ml$"]
-      "kubernetes/.+\\.ya?ml$"
-    ]
   },
   "kubernetes": {
-    "fileMatch": [
+    "fileMatch": ["kubernetes/.+\\.ya?ml$"]
-      "kubernetes/.+\\.ya?ml$"
-    ]
   },
   "regexManagers": [
     {
       "description": [
         "Process CRD dependencies - Chart and Github Release are the same version"
       ],
-      "fileMatch": [
+      "fileMatch": ["kubernetes/.+\\.ya?ml$"],
-        "kubernetes/.+\\.ya?ml$"
-      ],
       "matchStrings": [
-        "# renovate: registryUrl=(?<registryUrl>\\S+) chart=(?<depName>\\S+)\n.*?(?<currentValue>[^-\\s]*)\n",
+        "# renovate: registryUrl=(?<registryUrl>\\S+) chart=(?<depName>\\S+)\n.*?(?<currentValue>[^-\\s]*)\n"
       ],
       "datasourceTemplate": "helm"
     },
     {
-      "description": [
+      "description": ["Generic Docker image Regex manager"],
-        "Generic Docker image Regex manager"
+      "fileMatch": ["infrastructure/.+\\.ya?ml$", "infrastructure/.+\\.tf$"],
-      ],
-      "fileMatch": [
-        "infrastructure/.+\\.ya?ml$",
-        "infrastructure/.+\\.tf$"
-      ],
       "matchStrings": [
-        "# renovate: docker-image( versioning=(?<versioning>.*=?))?\n .*[:|=] \"?(?<depName>.*?):(?<currentValue>[^\"\n]*=?)\"?",
+        "# renovate: docker-image( versioning=(?<versioning>.*=?))?\n .*[:|=] \"?(?<depName>.*?):(?<currentValue>[^\"\n]*=?)\"?"
       ],
       "datasourceTemplate": "docker",
       "versioningTemplate": "{{#if versioning}}{{{versioning}}}{{else}}semver{{/if}}"
     },
     {
-      "description": [
+      "description": ["Raw GitHub URL Regex manager"],
-        "Raw GitHub URL Regex manager"
+      "fileMatch": ["infrastructure/.+\\.ya?ml$", "kubernetes/.+\\.ya?ml$"],
-      ],
-      "fileMatch": [
-        "infrastructure/.+\\.ya?ml$",
-        "kubernetes/.+\\.ya?ml$"
-      ],
       "matchStrings": [
-        "https:\\/\\/raw.githubusercontent.com\\/(?<depName>[\\w\\d\\-_]+\\/[\\w\\d\\-_]+)\\/(?<currentValue>[\\w\\d\\.\\-_]+)\\/.*",
+        "https:\\/\\/raw.githubusercontent.com\\/(?<depName>[\\w\\d\\-_]+\\/[\\w\\d\\-_]+)\\/(?<currentValue>[\\w\\d\\.\\-_]+)\\/.*"
       ],
       "datasourceTemplate": "github-releases",
       "versioningTemplate": "semver"
@@ -67,87 +49,60 @@
   "packageRules": [
     {
       "description": "Use custom versioning for Vector",
-      "matchDatasources": [
+      "matchDatasources": ["docker"],
-        "docker"
+      "matchPackageNames": ["docker.io/timberio/vector"],
-      ],
-      "matchPackageNames": [
-        "docker.io/timberio/vector"
-      ],
       "versioning": "regex:^(?<major>\\d+)\\.(?<minor>\\d+)\\.(?<patch>\\d+)-(?<compatibility>.*)$"
     },
     {
       "description": "Use custom versioning for Minio",
-      "matchDatasources": [
+      "matchDatasources": ["docker"],
-        "docker"
-      ],
       "versioning": "regex:^RELEASE\\.(?<major>\\d+)-(?<minor>\\d+)-(?<patch>\\d+)T.*Z(-(?<compatibility>.*))?$",
-      "matchPackageNames": [
+      "matchPackageNames": ["quay.io/minio/minio"]
-        "quay.io/minio/minio"
-      ]
     },
     {
       "description": "Flux Group",
       "groupName": "Flux",
-      "matchPackagePatterns": [
+      "matchPackagePatterns": ["^flux", "^ghcr.io/fluxcd/"],
-        "^flux",
+      "matchDatasources": ["docker", "github-tags"],
-        "^ghcr.io/fluxcd/"
-      ],
-      "matchDatasources": [
-        "docker",
-        "github-tags"
-      ],
       "versioning": "semver",
       "group": {
-        "commitMessageTopic": "{{{groupName}}} group",
+        "commitMessageTopic": "{{{groupName}}} group"
       },
-      "separateMinorPatch": true,
+      "separateMinorPatch": true
     },
     {
       "description": "Mastodon images",
       "groupName": "Mastodon",
-      "matchPackagePatterns": [
+      "matchPackagePatterns": ["mastodon", "^ghcr.io/mastodon/"],
-        "mastodon",
+      "matchDatasources": ["docker", "github-tags"],
-        "^ghcr.io/mastodon/"
-      ],
-      "matchDatasources": [
-        "docker",
-        "github-tags"
-      ],
       "versioning": "semver",
       "group": {
-        "commitMessageTopic": "{{{groupName}}} group",
+        "commitMessageTopic": "{{{groupName}}} group"
       },
-      "separateMinorPatch": true,
+      "separateMinorPatch": true
     },
     {
       "description": "1Password Connect images",
       "groupName": "1password-connect",
       "matchPackageNames": [
         "docker.io/1password/connect-sync",
-        "docker.io/1password/connect-api",
+        "docker.io/1password/connect-api"
-      ],
-      "matchDatasources": [
-        "docker"
       ],
+      "matchDatasources": ["docker"],
       "group": {
         "commitMessageTopic": "{{{groupName}}} group"
       },
-      "separateMinorPatch": true,
+      "separateMinorPatch": true
     },
     {
       "description": "Rook-Ceph image and chart",
       "groupName": "Rook Ceph",
-      "matchPackagePatterns": [
+      "matchPackagePatterns": ["rook.ceph"],
-        "rook.ceph"
+      "matchDatasources": ["docker", "helm"],
-      ],
-      "matchDatasources": [
-        "docker",
-        "helm"
-      ],
       "group": {
         "commitMessageTopic": "{{{groupName}}} group"
       },
-      "separateMinorPatch": true,
+      "separateMinorPatch": true
     },
     {
       "description": "Cilium image and chart",
@@ -155,16 +110,13 @@
       "matchPackageNames": [
         "quay.io/cilium/cilium",
         "quay.io/cilium/operator-generic",
-        "cilium",
+        "cilium"
-      ],
-      "matchDatasources": [
-        "helm",
-        "docker"
       ],
+      "matchDatasources": ["helm", "docker"],
       "group": {
         "commitMessageTopic": "{{{groupName}}} group"
       },
-      "separateMinorPatch": true,
+      "separateMinorPatch": true
     },
     {
       "description": "External Snapshotter charts",
@@ -173,9 +125,7 @@
         "snapshot-controller",
         "snapshot-validation-webhook"
       ],
-      "matchDatasources": [
+      "matchDatasources": ["helm"],
-        "helm"
-      ],
       "group": {
         "commitMessageTopic": "{{{groupName}}} group"
       },
@@ -184,42 +134,23 @@
     {
       "description": "Thanos image and chart - versions do not match",
       "groupName": "Thanos",
-      "matchPackagePatterns": [
+      "matchPackagePatterns": ["quay.io/thanos/thanos", "thanos"],
-        "quay.io/thanos/thanos",
+      "matchDatasources": ["docker", "github-releases", "helm"],
-        "thanos"
+      "matchUpdateTypes": ["minor", "patch"],
-      ],
-      "matchDatasources": [
-        "docker",
-        "github-releases",
-        "helm"
-      ],
-      "matchUpdateTypes": [
-        "minor",
-        "patch"
-      ],
       "group": {
         "commitMessageTopic": "{{{groupName}}} group"
-      },
+      }
     },
     {
       "description": "Vector image and chart - versions do not match",
       "groupName": "Vector",
-      "matchPackagePatterns": [
+      "matchPackagePatterns": ["vector"],
-        "vector"
+      "matchDatasources": ["docker", "github-releases", "helm"],
-      ],
+      "matchUpdateTypes": ["minor", "patch"],
-      "matchDatasources": [
-        "docker",
-        "github-releases",
-        "helm"
-      ],
-      "matchUpdateTypes": [
-        "minor",
-        "patch"
-      ],
       "group": {
         "commitMessageTopic": "{{{groupName}}} group"
-      },
+      }
-    },
+    }
     // Version strategies
   ]
 }