From 6cec6ee9b2f580a36b7ed4d5771f7b3b36dd1f8c Mon Sep 17 00:00:00 2001 From: Stacky McStackface Date: Wed, 7 Oct 2026 09:32:38 +0000 Subject: [PATCH 1/2] chore: Generated commit to update templated files since the last template run up to stackabletech/operator-templating@0f53eecffba74cfb96c8d4635c656edb20a3ac85 Reference-to: stackabletech/operator-templating@0f53eec (feat: Rollout crate/typos for operators) --- .pre-commit-config.yaml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 74002636..842399b1 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -7,6 +7,19 @@ default_language_version: node: system repos: + # The word lists live in a per-repo `typos.toml`, which is not templated. + # typos has no layered configuration (https://github.com/crate-ci/typos/issues/193). + # A templated config can currently not be extended locally. + - repo: https://github.com/crate-ci/typos + rev: 00f422f3b19c57bc6338715ebfe3316d38768461 # v1.50.3 + hooks: + - id: typos + # Drop the upstream default `--write-changes` so the hook only + # reports failures instead of writing changes. + # Keep `--force-exclude` so the excludes in typos.toml still + # apply to the paths prek passes in. + args: ["--force-exclude"] + - repo: https://github.com/pre-commit/pre-commit-hooks rev: 3e8a8703264a2f4a69428a0aa4dcb512790b2c8c # 6.0.0 hooks: From 39af91ebbdef8a08e5491c85e6f7c4ad1790256c Mon Sep 17 00:00:00 2001 From: Maxi Wittich Date: Wed, 7 Oct 2026 11:55:29 +0200 Subject: [PATCH 2/2] chore: Add typos.toml and fix spelling findings --- .../src/controller/build/command.rs | 2 +- .../controller/build/resource/statefulset.rs | 2 +- .../02-create-kerberos-secretclass.yaml.j2 | 2 +- .../02-create-kerberos-secretclass.yaml.j2 | 2 +- typos.toml | 48 +++++++++++++++++++ 5 files changed, 52 insertions(+), 4 deletions(-) create mode 100644 typos.toml diff --git a/rust/operator-binary/src/controller/build/command.rs b/rust/operator-binary/src/controller/build/command.rs index 2bb22ad8..2617b557 100644 --- a/rust/operator-binary/src/controller/build/command.rs +++ b/rust/operator-binary/src/controller/build/command.rs @@ -22,7 +22,7 @@ pub fn build_container_command_args( let core_site = ConfigFileName::CoreSite; let hive_site = ConfigFileName::HiveSite; let mut args = vec![ - // copy config files to a writeable empty folder in order to set s3 access and secret keys + // copy config files to a writable empty folder in order to set s3 access and secret keys format!("echo copying {STACKABLE_CONFIG_MOUNT_DIR} to {STACKABLE_CONFIG_DIR}"), format!("cp -RL {STACKABLE_CONFIG_MOUNT_DIR}/* {STACKABLE_CONFIG_DIR}"), // Copy log4j2 properties diff --git a/rust/operator-binary/src/controller/build/resource/statefulset.rs b/rust/operator-binary/src/controller/build/resource/statefulset.rs index 5ef78b60..2896464f 100644 --- a/rust/operator-binary/src/controller/build/resource/statefulset.rs +++ b/rust/operator-binary/src/controller/build/resource/statefulset.rs @@ -147,7 +147,7 @@ constant!(CONTAINERDEBUG_LOG_DIRECTORY: EnvVarName = "CONTAINERDEBUG_LOG_DIRECTO /// The directory the HDFS discovery ConfigMap volume is mounted at. Also consumed by /// [`build_container_command_args`] when copying the -/// mounted HDFS config into the writeable config directory. +/// mounted HDFS config into the writable config directory. pub(crate) const HDFS_CONFIG_MOUNT_DIR: &str = "/stackable/mount/hdfs-config"; /// The rolegroup [`StatefulSet`] runs the rolegroup, as configured by the administrator. diff --git a/tests/templates/kuttl/kerberos-hdfs/02-create-kerberos-secretclass.yaml.j2 b/tests/templates/kuttl/kerberos-hdfs/02-create-kerberos-secretclass.yaml.j2 index c016e25a..e20b40d1 100644 --- a/tests/templates/kuttl/kerberos-hdfs/02-create-kerberos-secretclass.yaml.j2 +++ b/tests/templates/kuttl/kerberos-hdfs/02-create-kerberos-secretclass.yaml.j2 @@ -33,7 +33,7 @@ metadata: name: secret-operator-keytab data: {% if test_scenario['values']['kerberos-backend'] == 'mit' %} - # To create keytab. When promted enter password asdf + # To create keytab. When prompted enter password asdf # cat | ktutil << 'EOF' # list # add_entry -password -p stackable-secret-operator@CLUSTER.LOCAL -k 1 -e aes256-cts-hmac-sha384-192 diff --git a/tests/templates/kuttl/kerberos-s3/02-create-kerberos-secretclass.yaml.j2 b/tests/templates/kuttl/kerberos-s3/02-create-kerberos-secretclass.yaml.j2 index c016e25a..e20b40d1 100644 --- a/tests/templates/kuttl/kerberos-s3/02-create-kerberos-secretclass.yaml.j2 +++ b/tests/templates/kuttl/kerberos-s3/02-create-kerberos-secretclass.yaml.j2 @@ -33,7 +33,7 @@ metadata: name: secret-operator-keytab data: {% if test_scenario['values']['kerberos-backend'] == 'mit' %} - # To create keytab. When promted enter password asdf + # To create keytab. When prompted enter password asdf # cat | ktutil << 'EOF' # list # add_entry -password -p stackable-secret-operator@CLUSTER.LOCAL -k 1 -e aes256-cts-hmac-sha384-192 diff --git a/typos.toml b/typos.toml new file mode 100644 index 00000000..3d87db13 --- /dev/null +++ b/typos.toml @@ -0,0 +1,48 @@ +# Configuration for typos (https://github.com/crate-ci/typos), run via the prek +# hook in .pre-commit-config.yaml. + +[files] +# Bare `typos` skips hidden dirs by default, but prek passes explicit paths and +# so does check them. Turn it off so both agree. +ignore-hidden = false + +extend-exclude = [ + # Ignore `.git`, which the above `ignore-hidden = false` would otherwise pull in. + ".git/", + # Generated by crate2nix (`make regenerate-nix`). Already skipped by the prek + # top-level `exclude`; listed here so a bare `typos` run agrees. + "Cargo.nix", + # Generated by `make regenerate-charts` from the Rust doc comments, which are + # checked at their source. The rest is Kubernetes' own schema documentation. + "extra/crds.yaml", +] + +[default] +# typos has no native suppression directive +# (https://github.com/crate-ci/typos/issues/316), so these regexes provide one. +# A marker must sit in a comment: after `#`, `//` or `;` (free text may follow), +# or inside a closed ``, `/* */` or `{# #}` (free text may precede the +# closer). An unterminated `typos:ignore-block-start` suppresses nothing. +# +# Use one of the following when the word is correct at one place but would still be a typo elsewhere: +# +# # typos:ignore-line at the end of the line it applies to +# # typos:ignore-next-line on its own line, above the offending line +# # typos:ignore-block-start / typos:ignore-block-end around a block +extend-ignore-re = [ + '(?Rm)^.*?(?:(?:^|[^{])(?:#|//|;)[ \t]*typos:ignore-line\b.*|(?:|/\*[ \t]*typos:ignore-line\b.*?\*/|\{#[ \t]*typos:ignore-line\b.*?#\})[ \t]*)$', + '(?Rm)^[ \t]*(?:(?:#|//|;)[ \t]*typos:ignore-next-line\b.*|(?:|/\*[ \t]*typos:ignore-next-line\b.*?\*/|\{#[ \t]*typos:ignore-next-line\b.*?#\})[ \t]*)\r?\n.*$', + '(?ms)(?:(?:^|[^{])(?:#|//|;)[ \t]*typos:ignore-block-start\b||/\*[ \t]*typos:ignore-block-start\b[^\n]*?\*/|\{#[ \t]*typos:ignore-block-start\b[^\n]*?#\}).*?(?:(?:^|[^{])(?:#|//|;)[ \t]*typos:ignore-block-end\b||/\*[ \t]*typos:ignore-block-end\b[^\n]*?\*/|\{#[ \t]*typos:ignore-block-end\b[^\n]*?#\})', +] + +# Before adding an entry in here, consider an in-place marker instead. +# Every entry below gets a one-line comment saying what the word is. +[default.extend-words] +# Azure Kubernetes Service +aks = "aks" + +[default.extend-identifiers] +# Hive SerDe (serializer/deserializer) classes, as named by the Hive Metastore client library. +SerDeInfoBuilder = "SerDeInfoBuilder" +# Hive's Parquet SerDe class, `org.apache.hadoop.hive.ql.io.parquet.serde.ParquetHiveSerDe`. +ParquetHiveSerDe = "ParquetHiveSerDe"