refactor: align with latest grouped updates (#30)

.trunk/.gitignore

@@ -2,7 +2,8 @@
 *logs
 *actions
 *notifications
+*tools
 plugins
 user_trunk.yaml
 user.yaml
-tools
+tmp

.trunk/configs/.markdownlint.yaml

@@ -1,10 +1,55 @@
-# Autoformatter friendly markdownlint config (all formatting rules disabled)
+---
+#https://github.com/DavidAnson/markdownlint/blob/main/doc/Rules.md#md002
+# comment: my-markdown-linting-rules
+
+# enable all default tagged rules
 default: true
-blank_lines: false
-bullet: false
-html: false
-indentation: false
-line_length: false
-spaces: false
-url: false
-whitespace: false
+
+# enable indentation rules by default
+indentation: true
+
+#MD004 - Unordered list style
+# Parameters: style ("consistent", "asterisk", "plus", "dash", "sublist"; default "consistent")
+# Defaults to dash
+MD004:
+  style: dash
+
+# MD041 - First line in a file should be a top-level heading: https://github.com/DavidAnson/markdownlint/blob/main/doc/Rules.md#md041---first-line-in-a-file-should-be-a-top-level-heading
+MD041: true
+# MD007 - Unordered list indentation: https://github.com/DavidAnson/markdownlint/blob/main/doc/Rules.md#md007---unordered-list-indentation
+# This rule is triggered when list items are not indented by the configured number of spaces (default: 2).
+MD007: true
+no-hard-tabs: true
+
+# enable all whitespace rules, such as:
+# - eliminate trailing whitespace
+# - no tabs, use only spaces
+# - remove double spaces
+# - clean spacing up
+whitespace: true
+
+# require urls to have []() format, rather than just pasting raw links. This improves readability.
+no-bare-urls: true
+
+# Don't allow anonymous code blocks, make sure a language is specificed, so that formatting can be applied.
+fenced-code-language: true
+# Don't allow nested html to be directly used without exception being allowed.
+no-inline-html: true
+# MD025 - Multiple top-level headings in the same document -> https://github.com/DavidAnson/markdownlint/blob/main/doc/Rules.md#md025---multiple-top-level-headings-in-the-same-document
+# if using front matter, we don't want a title property + a # Title to conflict
+MD025: true
+
+# MD013 - Line length
+# This is for maintainability and code diffs.
+# Try applying semantic line break concept for breaking up longer phrases
+# https://sembr.org/
+MD013:
+  line_length: 200
+
+# MD024/no-duplicate-heading/no-duplicate-header - Multiple headings with the same content
+# This tweaks to allow nested items to have duplicate headers.
+MD024:
+  # Only check sibling headings
+  allow_different_nesting: true
+  # Only check sibling headings
+  siblings_only: true

.trunk/configs/.shellcheckrc

@@ -0,0 +1,7 @@
+enable=all
+source-path=SCRIPTDIR
+disable=SC2154
+
+# If you're having issues with shellcheck following source, disable the errors via:
+# disable=SC1090
+# disable=SC1091

.trunk/trunk.yaml

@@ -1,42 +1,56 @@
 version: 0.1
 cli:
-  version: 1.13.0
+  version: 1.22.6
 plugins:
   sources:
     - id: trunk
-      ref: v1.0.0
+      ref: v1.2.1
       uri: https://github.com/trunk-io/plugins
 lint:
   enabled:
-    - [email protected]
-    - [email protected]
-    - [email protected]
-    - [email protected]
+    - [email protected]
+    - [email protected]
+    - [email protected]
+    - [email protected]
+    - [email protected]
+    - [email protected]
+    - [email protected]
+    - [email protected]
+    - [email protected]
     - git-diff-check
-    - [email protected]
-    - [email protected]
-    - [email protected]
-  ignore:
-    - linters:
-        - renovate
-      paths:
+    - [email protected]
+    - [email protected]
+    - [email protected]
+  files:
+    - name: renovate
+      filenames:
         - common.json
+        - default-disabled-managers.json
+        - default-enabled-nonstandard-managers.json
+        - default-manager-config.json
+        - default-schedule.json
         - default.json
-        - group-by-manager.json
+        - packagerules-disable.json
+        - packagerules-default.json
+        - packagerules-force-disable-all-managers.json
+        - packagerules-npm.json
+        - packagerules-pinned.json
+        - renovate.json
         - security.json
 runtimes:
   enabled:
     - [email protected]
-    - go@1.19.5
+    - go@1.23.0
     - [email protected]
 actions:
   disabled:
     - trunk-announce
+    - renovate-config-validator
+
   enabled:
     - trunk-fmt-pre-commit
     - trunk-check-pre-push
     - trunk-upgrade-available
-    - renovate-config-validator
   definitions:
     - id: renovate-config-validator
       description: Validate the config.

common.json

@@ -1,27 +1,59 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": [
-    ":dependencyDashboard",
-    ":semanticPrefixFixDepsChoreOthers",
+    ":semanticCommits",
+    ":semanticCommitTypeAll(build)",
     ":ignoreModulesAndTests",
     "replacements:all",
     "workarounds:all",
-    ":semanticCommitTypeAll(chore)",
-    "github>whitesource/merge-confidence:beta",
-    "github>aquaproj/aqua-renovate-config#1.2.6",
     "helpers:pinGitHubActionDigests",
     "regexManagers:githubActionsVersions",
     "regexManagers:dockerfileVersions",
-    ":enableVulnerabilityAlerts",
-    "group:linters"
+    "group:linters",
+    ":disablePrControls",
+    ":pinVersions",
+    ":pinSkipCi",
+    ":disableDependencyDashboard",
+    "group:dotNetCore",
+    "github>aquaproj/aqua-renovate-config:installer-script#2.3.1(scripts/.*\\.sh)",
+    "github>aquaproj/aqua-renovate-config#2.3.1",
+    "github>aquaproj/aqua-renovate-config:aqua-renovate-config#2.3.1(common\\.json)",
+    "security:openssf-scorecard",
+    ":renovatePrefix",
+    "mergeConfidence:all-badges"
   ],
+  "autoApprove": true,
+  "automerge": true,
+  "automergeStrategy": "squash",
+  "automergeType": "pr",
   "binarySource": "docker",
+  "branchPrefix": "renovate/",
+  "branchTopic": "{{{manager}}}-{{{newMajor}}}{{#if separateMinorPatch}}{{#if isPatch}}.{{{newMinor}}}{{/if}}{{/if}}.x{{#if isLockfileUpdate}}-lockfile{{/if}}",
+  "dependencyDashboardAutoclose": false,
+  "dependencyDashboardLabels": ["dependencies"],
+  "labels": ["dependencies"],
+  "major": {
+    "automerge": false,
+    "dependencyDashboardApproval": true
+  },
+  "minor": {
+    "automerge": true
+  },
+  "onboardingPrTitle": "chore(deps): onboard with renovate",
+  "patch": {
+    "automerge": true
+  },
   "platformAutomerge": true,
-  "pruneStaleBranches": true,
   "postUpdateOptions": ["gomodTidy", "gomodUpdateImportPaths"],
-  "unicodeEmoji": true,
+  "prConcurrentLimit": 0,
+  "prCreation": "immediate",
+  "prHourlyLimit": 0,
+  "pruneStaleBranches": true,
   "rangeStrategy": "pin",
-  "onboardingPrTitle": "chore(deps): onboard with renovate",
-  "labels": ["dependencies"],
-  "dependencyDashboardLabels": ["dependencies"]
+  "rebaseWhen": "behind-base-branch",
+  "semanticCommits": "enabled",
+  "separateMajorMinor": true,
+  "stopUpdatingLabel": "take-a-break-renovate",
+  "timezone": "America/Chicago",
+  "unicodeEmoji": true
 }

default-disabled-managers.json

@@ -0,0 +1,5 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "description": "## Default Disabled Managers\n\nThis configuration defines the disabled managers.",
+  "packageRules": []
+}

default-enabled-nonstandard-managers.json

@@ -0,0 +1,16 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "description": "### Default Enabled Nonstandard Managers\n\nThis is the default setup of enabled managers that aren't by default included. These are experimental or not in the standard list of [supported managers](https://docs.renovatebot.com/modules/manager/#supported-managers).",
+  "azure-pipelines": {
+    "description": "#### Azure Pipelines Manager\n\nAzure Pipelines functionality is currently in beta testing, so you must opt-in to test it. [Azure Pipelines Documentation](https://docs.renovatebot.com/modules/manager/azure-pipelines/)\n\n- **enabled**: `true` to enable the manager.\n\n- **fileMatch**: An array of file patterns to match Azure Pipelines YAML files.",
+    "enabled": true,
+    "fileMatch": [
+      "azure.*pipelines?.*\\.ya?ml$",
+      "build/.*\\.ya?ml$",
+      "pipelines/.*\\.ya?ml$",
+      "ci/.*\\.ya?ml$",
+      ".ci/.*\\.ya?ml$",
+      ".azure-devops/.*\\.ya?ml$"
+    ]
+  }
+}

default-schedule.json

@@ -0,0 +1,5 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "description": "### Default Schedule\n\nSets up a default schedule for Renovate to run during specific times. Security or override updates are generated outside of the evening hours. Note: This is relative to the CST timezone.\n\n- **Schedule**: \n  - After 10pm\n  - Before 3am\n\nFor more details, refer to the [Renovate Schema](https://docs.renovatebot.com/renovate-schema.json).",
+  "schedule": ["after 10pm", "before 3am"]
+}