Merge pull request #618 from redhat-cop/precommit-lineend

added pre-commit for end-of-file-fixer and trailing-whitespace

Author: ckavili

.github/actions/setup-kind-cluster-for-helm-chart-testing/action.yaml

@@ -6,7 +6,7 @@ inputs:
     description: helm version to install
     required: true
     default: 'v3.16.3'
-  
+
   # renovate: datasource=github-tags depName=python/cpython
   python-version:
     description: python version to install
@@ -36,7 +36,7 @@ inputs:
     required: false
     default: 'registryuser1'
 
-  local-registry-password: 
+  local-registry-password:
     description: local authenticated registry password
     required: false
     default: 'registrypassword1'
@@ -70,7 +70,7 @@ runs:
       version: ${{ inputs.kind-version }}
       config: _test/kind-config.yaml
 
-  # for helm charts we are testing that require installing operators 
+  # for helm charts we are testing that require installing operators
   - name: Setup kind cluster - Install OLM 🧰
     env:
       OLM_VERSION: ${{ inputs.olm-version }}
@@ -121,7 +121,7 @@ runs:
         --set registryPassword=${LOCAL_REGISTRY_PASSWORD} \
         --set registryIngressHost=${LOCAL_REGISTRY_URI}
     if: inputs.local-registry-enabled == 'true'
-  
+
   # copy images needed by CT tests that use private registry to the private registry
   - name: Setup kind cluster - Copy images into private registry 🔺
     env:

.github/renovate-bump.sh

@@ -16,4 +16,4 @@ for chart in ${changed}; do
   echo
 done
 
-echo "CHARTS=$(echo ${CHARTS_CHANGED[*]})" >> $GITHUB_OUTPUT
+echo "CHARTS=$(echo ${CHARTS_CHANGED[*]})" >> $GITHUB_OUTPUT

.github/workflows/conftest.yaml

@@ -1,6 +1,6 @@
 name: Validate
 
-on: 
+on:
   push:
     paths-ignore:
       - '.github/**'

.github/workflows/install-integration-tests-operators-installer.yaml

@@ -29,7 +29,7 @@ jobs:
       uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
       with:
         fetch-depth: 0
-    
+
     # set up kind cluster (using re-usable local composite action)
     - name: Setup Kind Cluster for Helm Chart Testing 🧰
       uses: ./.github/actions/setup-kind-cluster-for-helm-chart-testing
@@ -93,7 +93,7 @@ jobs:
       uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
       with:
         fetch-depth: 0
-    
+
     # set up kind cluster (using re-usable local composite action)
     - name: Setup Kind Cluster for Helm Chart Testing 🧰
       uses: ./.github/actions/setup-kind-cluster-for-helm-chart-testing

.github/workflows/install-unit-test.yaml

@@ -26,7 +26,7 @@ jobs:
 
     - name: Setup chart-testing 🧰
       uses: helm/chart-testing-action@0d28d3144d3a25ea2cc349d6e59901c4ff469b3b # v2.7.0
-    
+
     - name: Find changed Charts 🔎
       id: changed-charts
       run: |
@@ -35,7 +35,7 @@ jobs:
         if [[ -n "$changed" ]]; then
           echo "changed=true" >> $GITHUB_OUTPUT
         fi
-    
+
     # set up kind cluster (using re-usable local composite action)
     - name: Setup Kind Cluster for Helm Chart Testing 🧰
       uses: ./.github/actions/setup-kind-cluster-for-helm-chart-testing

.github/workflows/lint-test.yaml

@@ -1,6 +1,6 @@
 name: Lint Test
 
-on: 
+on:
   pull_request:
     paths-ignore:
       - '.github/**'

.github/workflows/precommit-validate.yml

@@ -0,0 +1,45 @@
+name: Run pre-commit
+
+on:
+  push:
+    paths-ignore:
+      - '.github/**'
+  pull_request:
+    paths-ignore:
+      - '.github/**'
+
+# Declare default permissions as read only.
+permissions: read-all
+
+jobs:
+  pre-commit:
+    runs-on: ubuntu-latest
+    name: pre-commit
+    steps:
+      - name: Checkout
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
+      - uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5
+        with:
+          python-version: 3.x
+
+      - name: Remove rh-pre-commit hook (requires VPN)
+        uses: mikefarah/yq@8bf425b4d1344db7cd469a8d10a390876e0c77fd # v4.45.1
+        with:
+          cmd: yq -i 'del( .repos[] | select(.rev == "rh-pre-commit-*"))' .pre-commit-config.yaml
+
+      - uses: pre-commit/action@2c7b3805fd2a0fd8c1884dcaebf91fc102a13ecd # v3.0.1
+
+      - name: Check if there are changes
+        id: changes
+        run: |
+          git checkout HEAD -- .pre-commit-config.yaml
+          echo "changed=$(git status --porcelain | wc -l)" >> $GITHUB_OUTPUT
+
+      - name: Fail if changes found
+        if: steps.changes.outputs.changed >= 1
+        run: |
+          echo "Uncommitted changes exist. Failing."
+          echo
+          git status --porcelain
+          exit 1

.github/workflows/release.yaml

@@ -58,7 +58,7 @@ jobs:
           for chart in ${packaged_charts}; do
             cosign sign-blob --yes ${chart}
           done
-          
+
           echo "hashes=$(sha256sum ${packaged_charts} | base64 -w0)" >> "$GITHUB_OUTPUT"
 
     outputs:

.gitleaks.toml

@@ -5,4 +5,4 @@ description = "Global Allowlist"
 paths = [
     # Ignore all example certs
     'renovate.json'
-]
+]

.pre-commit-config.yaml

@@ -5,8 +5,8 @@ repos:
       - id: check-case-conflict
       - id: check-shebang-scripts-are-executable
       - id: check-json
-      #- id: end-of-file-fixer
-      #- id: trailing-whitespace
+      - id: end-of-file-fixer
+      - id: trailing-whitespace
   - repo: https://gitlab.cee.redhat.com/infosec-public/developer-workbench/tools.git
     rev: rh-pre-commit-2.3.2
     hooks:

README.md

@@ -42,7 +42,7 @@ helm install my-jenkins -f my-values.yaml redhat-cop/jenkins
 
 ## 🏃‍♂️💨 Chart linting
 
-Before adding a chart to this repo, make sure there is no linting issues, otherwise the PR actions will fail. 
+Before adding a chart to this repo, make sure there is no linting issues, otherwise the PR actions will fail.
 We use both the integrated [`helm lint`](https://helm.sh/docs/helm/helm_lint/) command and the [`chart testing`](https://github.com/helm/chart-testing/blob/master/doc/ct_lint.md) tool.
 
 ```bash

_test/bats-support-clone.bash

@@ -6,4 +6,4 @@ fi
 if [[ ! -d "_test/test_helper/redhatcop-bats-library" ]]; then
   # Download redhat-cop/bats-library dynamically so it doesnt need to be added into source
   git clone https://github.com/redhat-cop/bats-library _test/test_helper/redhatcop-bats-library --depth 1
-fi
+fi

_test/private-registry/templates/Ingress.yaml

@@ -15,4 +15,3 @@ spec:
             name: registry
             port:
               number: 5000
-

_test/private-registry/templates/Secret_htpasswd.yaml

@@ -5,4 +5,3 @@ kind: Secret
 metadata:
   name: htpasswd
   namespace: registry
-

_test/prow.sh

@@ -20,4 +20,4 @@ run() {
   echo "Done testing all charts."
 }
 
-run
+run

charts-we-like.md

@@ -2,7 +2,7 @@
 Below is a collection of charts we've used in the past that run on OpenShift with examples and the values to get up and going:
 
 #### 🕵️‍♀️ Sealed Secrets
-[Sealed Secrets](https://github.com/bitnami-labs/sealed-secrets/tree/main/helm/sealed-secrets) 
+[Sealed Secrets](https://github.com/bitnami-labs/sealed-secrets/tree/main/helm/sealed-secrets)
 allows you to encrypt your K8s Secret into a SealedSecret, which is safe to store - even to a public repository:
 
 ```yaml
@@ -31,7 +31,7 @@ mysql:
 ```
 
 #### 🧪 Zalenium
-[Zalenium](https://github.com/zalando/zalenium/tree/master/charts/zalenium) 
+[Zalenium](https://github.com/zalando/zalenium/tree/master/charts/zalenium)
 is a Selenium Grid deployment with on demand provisioning of the browsers for running your tests:
 
 ```yaml
@@ -71,7 +71,7 @@ route:
 ```
 
 #### 🦟 Hoverfly
-[Hoverfly](https://github.com/helm/charts/tree/master/incubator/hoverfly) 
+[Hoverfly](https://github.com/helm/charts/tree/master/incubator/hoverfly)
 is a lightweight, open source API simulation tool. Using Hoverfly, you can create realistic simulations of the APIs your application depends on:
 
 ```yaml
@@ -87,7 +87,7 @@ openshift:
 ```
 
 #### 🗝 Vault
-[Vault](https://github.com/hashicorp/vault-helm.git) 
+[Vault](https://github.com/hashicorp/vault-helm.git)
 helps you to store and control access to your tokens, passwords, certificates, API keys and other secrets.
 
 ```yaml
@@ -121,7 +121,7 @@ server:
 ```
 
 ### 🚉 EAP
-[EAP](https://github.com/jbossas/eap-charts.git) 
+[EAP](https://github.com/jbossas/eap-charts.git)
 is Red Hat's [Jakarta EE offering](https://www.redhat.com/en/technologies/jboss-middleware/application-platform)
 
 ```yaml
@@ -141,4 +141,4 @@ build:
     value: '-XX:MetaspaceSize=96m -XX:MaxMetaspaceSize=256m'
 deploy:
   replicas: 3
-```
+```

charts/ansible-automation-platform/.helmignore

@@ -19,4 +19,4 @@
 .project
 .idea/
 *.tmproj
-ci/
+ci/

charts/ansible-automation-platform/.test.sh

@@ -73,4 +73,4 @@ case $1 in
   *)
     echo "Not an option"
     exit 1
-esac
+esac

charts/ansible-automation-platform/Chart.yaml

@@ -2,14 +2,14 @@ apiVersion: v2
 appVersion: v2.0.2
 description: A Helm chart for customizing the deployment of the Ansible Automation Platform Operator
 name: ansible-automation-platform
-version: 0.0.7
+version: 0.0.8
 home: https://github.com/redhat-cop/helm-charts
 maintainers:
 - name: paulbarfuss
 - name: ecda909
 - name: jfilipcz
 dependencies:
   - name: operatorhub
-    version: "0.0.10"
+    version: "0.0.11"
     repository: https://redhat-cop.github.io/helm-charts
     condition: operatorhub.enabled

charts/ansible-automation-platform/templates/privileged-scc.yaml

@@ -13,4 +13,4 @@ subjects:
   - kind: ServiceAccount
     name: ansible-automation-platform
     namespace: {{ .Values.namespace }}
-{{- end }}
+{{- end }}

charts/ansible-automation-platform/templates/wait-for-crd.yaml

@@ -3,15 +3,15 @@
 apiVersion: v1
 kind: Pod
 metadata:
-  name: cluster-check 
+  name: cluster-check
   annotations:
     "helm.sh/hook": post-install,post-upgrade
     "helm.sh/hook-weight": "-1"
     "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
   namespace: {{ .Values.namespace }}
 spec:
   containers:
-    - name: crd-check 
+    - name: crd-check
       image: quay.io/openshift/origin-cli:4.7
       imagePullPolicy: IfNotPresent
       command: ['sh', '-c', 'while [ true ]; do oc get crd automationcontrollers.automationcontroller.ansible.com; if [ $? -eq 0 ]; then break; fi ; sleep 5s; done']

charts/argocd-operator/.helmignore

@@ -19,4 +19,4 @@
 .project
 .idea/
 *.tmproj
-ci/
+ci/

charts/argocd-operator/.test.sh

@@ -73,4 +73,4 @@ case $1 in
   *)
     echo "Not an option"
     exit 1
-esac
+esac

charts/argocd-operator/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: v2.1.5
 description: A Helm chart for customising the deployment of the ArgoCD Operator ⚓️
 name: argocd-operator
-version: 1.2.1
+version: 1.2.2
 home: https://github.com/redhat-cop/helm-charts
 icon: https://cncf-branding.netlify.app/img/projects/argo/stacked/color/argo-stacked-color.png
 maintainers:

charts/argocd-operator/templates/PrometheusSubscription.yaml

@@ -12,4 +12,4 @@ spec:
   source: community-operators
   sourceNamespace: openshift-marketplace
   startingCSV: {{ .Values.metrics.prometheus.version | quote }}
-{{- end }}
+{{- end }}

charts/argocd-operator/templates/Secret.yaml

@@ -15,4 +15,4 @@ stringData:
   username:  {{ .username | quote }}
   sshPrivateKey: {{ .sshPrivateKey | quote }}
 {{- end }}
-{{- end }}
+{{- end }}

charts/argocd-operator/templates/crd-reader.yaml

@@ -33,4 +33,4 @@ subjects:
 - kind: ServiceAccount
   name: default
   namespace: {{ include "argocd-operator.ns" . }}
-{{- end }}
+{{- end }}

charts/argocd-operator/templates/helpers.tpl

@@ -7,4 +7,4 @@ Namespace from Values or Release Name
 {{- else -}}
 {{- .Release.Namespace | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
-{{- end -}}
+{{- end -}}

charts/argocd-operator/templates/wait-for-crd.yaml

@@ -19,4 +19,4 @@ spec:
   terminationGracePeriodSeconds: 0
   serviceAccount: default
   serviceAccountName: default
-{{- end }}
+{{- end }}

charts/bootstrap-project/.test.sh

@@ -64,4 +64,4 @@ case $1 in
   *)
     echo "Not an option"
     exit 1
-esac
+esac

charts/bootstrap-project/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: "v0.0.1"
 description: A Helm chart for deploying and managing Openshift projects 🦆
 name: bootstrap-project
-version: 1.0.1
+version: 1.0.2
 home: https://github.com/redhat-cop/helm-charts
 icon: https://www.iconpacks.net/icons/1/free-rocket-icon-1206-thumb.png
 maintainers:

charts/bootstrap-project/README.md

@@ -37,4 +37,4 @@ These values currently create `labs-ci-cd` , `labs-dev` and `labs-test` namespac
 
 ```bash
 $ helm template -f bootstrap-project/my-values.yaml bootstrap-project | oc apply -f-
-```
+```

charts/bootstrap-project/templates/bindings.yaml

@@ -34,4 +34,4 @@ items:
 {{- end }}
 {{- end }}
 {{- end }}
-{{- end }}
+{{- end }}