scripts: Add shfmt

.github/ISSUE_TEMPLATE/config.yml

@@ -1,8 +1,8 @@
 blank_issues_enabled: false
 contact_links:
   - name: Create Release
-    about: Please create the release issue in the internal Issue Tracker repository. - _Only accessible by maintainers._
+    about: Please create the release issue in the internal Issue Tracker repository. - Only accessible by maintainers.
     url: https://github.com/elastisys/ck8s-issue-tracker/issues/new?template=release-apps.md
   - name: Create Patch
-    about: Please create the patch issue in the internal Issue Tracker repository. - _Only accessible by maintainers._
+    about: Please create the patch issue in the internal Issue Tracker repository. - Only accessible by maintainers.
     url: https://github.com/elastisys/ck8s-issue-tracker/issues/new?template=patch-apps.md

.pre-commit-config.yaml

@@ -4,6 +4,7 @@ repos:
     hooks:
       - id: check-executables-have-shebangs
       - id: check-merge-conflict
+        exclude: ^helmfile.d/upstream/opensearch-project/opensearch/CHANGELOG.md$
       - id: check-json
         exclude: ^helmfile\.d/upstream/
       - id: check-toml
@@ -22,16 +23,52 @@ repos:
       - id: trailing-whitespace
         exclude: ^helmfile\.d/upstream/|^tests/.*/.*\.out$
 
-  - repo: https://github.com/koalaman/shellcheck-precommit
-    rev: v0.10.0
+  - repo: local
     hooks:
+      - id: generate-cypress-tests
+        name: generate cypress tests
+        language: script
+        require_serial: true
+        files: '.*\.cy.js'
+        entry: tests/common/gen.bash
+        args:
+          - cypress
+
+      - id: generate-template-tests
+        name: generate template tests
+        language: script
+        require_serial: true
+        files: '.*\.bats.gotmpl'
+        entry: tests/common/gen.bash
+        args:
+          - template
+
       - id: shellcheck
         name: check scripts
-        exclude: ^helmfile\.d/charts/opensearch/configurer/files/|^helmfile\.d/upstream/
+        types: [shell]
+        exclude_types: [csh, tcsh, zsh]
+        exclude: ^helmfile\.d/charts/opensearch/configurer/files/|^helmfile\.d/upstream/|^images/elasticsearch-curator/
+        language: script
+        require_serial: true
+        entry: scripts/run-from-container.sh
+        args:
+          - --network=none
+          - docker.io/koalaman/shellcheck:v0.10.0@sha256:2097951f02e735b613f4a34de20c40f937a6c8f18ecb170612c88c34517221fb
+          - --color=always
+          - --external-sources
+
+      - id: shfmt
+        name: format scripts
+        types: [shell]
+        exclude_types: [csh, tcsh, zsh]
+        exclude: ^helmfile\.d/charts/opensearch/configurer/files/|^helmfile\.d/upstream/|^images/elasticsearch-curator/
+        language: script
         require_serial: true
+        entry: scripts/run-from-container.sh
         args:
-        - --color=always
-        - --external-sources
+          - --network=none
+          - docker.io/mvdan/shfmt:v3.10.0@sha256:d19cc37644449fe9a488f234d2c0cf0b770eaf6a5a40e30103e8099013ef8f9e
+          - -w
 
   - repo: https://github.com/codespell-project/codespell
     rev: v2.3.0
@@ -51,23 +88,3 @@ repos:
         exclude: ^changelog/|^docs/sbom.md$|^helmfile\.d/charts/opensearch/configurer/files/|^helmfile\.d/upstream/|^images/elasticsearch-curator/
         args:
           - --fix
-
-  - repo: local
-    hooks:
-      - id: generate-cypress-tests
-        name: generate cypress tests
-        language: script
-        require_serial: true
-        files: '.*\.cy.js'
-        entry: tests/common/gen.bash
-        args:
-          - cypress
-
-      - id: generate-template-tests
-        name: generate template tests
-        language: script
-        require_serial: true
-        files: '.*\.bats.gotmpl'
-        entry: tests/common/gen.bash
-        args:
-          - template

bin/apply.bash

@@ -61,11 +61,14 @@ declare environment
 
 case "${1:-}" in
 sc)
-  environment="service_cluster" ;;
+  environment="service_cluster"
+  ;;
 wc)
-  environment="workload_cluster" ;;
+  environment="workload_cluster"
+  ;;
 *)
-  usage "${1:-}" ;;
+  usage "${1:-}"
+  ;;
 esac
 
 update_ips_dryrun "$1" "${environment}"