Merge pull request #318 from Roming22/fix/sonarcloud

chore: fix some SonarQube issues

Author: openshift-merge-bot[bot]

Dockerfile

@@ -2,7 +2,7 @@
 # Build
 #
 
-FROM registry.redhat.io/openshift4/ose-tools-rhel9@sha256:683fe19d6624335d60fcfdd9b53aedac6d299205c4c573e4f334008d92591eb5 as ose-tools
+FROM registry.redhat.io/openshift4/ose-tools-rhel9@sha256:683fe19d6624335d60fcfdd9b53aedac6d299205c4c573e4f334008d92591eb5 AS ose-tools
 FROM registry.access.redhat.com/ubi9/go-toolset:1.22.5-1730550521 AS builder
 
 USER root

ci/Dockerfile

@@ -8,8 +8,26 @@ ENV OC_VERSION=4.14.8
 USER root
 
 # hadolint ignore=DL3041
-RUN dnf install -y -q --allowerasing --nobest nodejs-devel nodejs-libs python3-pip jq diffutils \
-    openssl openssl-devel ca-certificates make cmake cpp gcc gcc-c++ zlib zlib-devel brotli brotli-devel python3 nodejs-packaging && \
+RUN dnf install -y -q --allowerasing --nobest \
+    brotli \
+    brotli-devel \
+    ca-certificates \
+    cmake \
+    cpp \
+    diffutils \
+    gcc \
+    gcc-c++ \
+    jq \
+    make \
+    nodejs-devel \
+    nodejs-libs \
+    nodejs-packaging \
+    openssl \
+    openssl-devel \
+    python3 \
+    python3-pip \
+    zlib \
+    zlib-devel && \
     pip3 install --upgrade pip && \
     pip3 install --upgrade setuptools && \
     pip3 install yq yamllint && \
@@ -18,18 +36,23 @@ RUN dnf install -y -q --allowerasing --nobest nodejs-devel nodejs-libs python3-p
     echo -n "node version: "; node -v; \
     echo -n "npm  version: "; npm -v; \
     echo -n "yarn version: "; yarn -v && \
-    curl --fail -sSL  https://github.com/koalaman/shellcheck/releases/download/v$SHELLCHECK_VERSION/shellcheck-v$SHELLCHECK_VERSION.linux.x86_64.tar.xz | tar -xJvf - shellcheck-v$SHELLCHECK_VERSION/shellcheck && \
-    mv shellcheck-v$SHELLCHECK_VERSION/shellcheck /usr/local/bin/shellcheck && chmod 755 /usr/local/bin/shellcheck && rm -rf "shellcheck-v$SHELLCHECK_VERSION" && \
-    curl -fsSL -o get_helm.sh https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 && chmod 700 get_helm.sh && ./get_helm.sh && rm -rf get_helm.sh && \
-    curl -Lso /usr/local/bin/yq https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/yq_linux_amd64 && chmod +x /usr/local/bin/yq && \
-    curl -fsSL -o tkn.tgz "https://github.com/tektoncd/cli/releases/download/${TEKTONCD_CLI_VERSION}/tkn_${TEKTONCD_CLI_VERSION:1}_Linux_x86_64.tar.gz" && tar -C "/usr/local/bin" --no-same-owner -xzf "tkn.tgz" tkn && rm -rf "tkn.tgz" && \
-    curl -sSL -o argocd-linux-amd64 https://github.com/argoproj/argo-cd/releases/latest/download/argocd-linux-amd64 &&\
+    curl -fsSL --proto "=https" "https://github.com/koalaman/shellcheck/releases/download/v${SHELLCHECK_VERSION}/shellcheck-v${SHELLCHECK_VERSION}.linux.x86_64.tar.xz" | tar -xJvf - "shellcheck-v${SHELLCHECK_VERSION}/shellcheck" && \
+    mv "shellcheck-v${SHELLCHECK_VERSION}/shellcheck" /usr/local/bin/shellcheck && \
+    chmod 755 /usr/local/bin/shellcheck && \
+    rm -rf "shellcheck-v${SHELLCHECK_VERSION}" && \
+    curl -fsSL --proto "=https" -o get_helm.sh https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 && \
+    chmod 700 get_helm.sh && ./get_helm.sh && rm -rf get_helm.sh && \
+    curl -fsSL --proto "=https" -o /usr/local/bin/yq "https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/yq_linux_amd64" && chmod +x /usr/local/bin/yq && \
+    curl -fsSL --proto "=https" -o tkn.tgz "https://github.com/tektoncd/cli/releases/download/${TEKTONCD_CLI_VERSION}/tkn_${TEKTONCD_CLI_VERSION:1}_Linux_x86_64.tar.gz" && tar -C "/usr/local/bin" --no-same-owner -xzf "tkn.tgz" tkn && rm -rf "tkn.tgz" && \
+    curl -fsSL --proto "=https" -o argocd-linux-amd64 https://github.com/argoproj/argo-cd/releases/latest/download/argocd-linux-amd64 &&\
     install -m 555 argocd-linux-amd64 /usr/local/bin/argocd && \
     rm argocd-linux-amd64 && \
-    curl -Lso /usr/local/bin/kubectl "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl" && chmod +x /usr/local/bin/kubectl && \
-    curl -Lso /usr/local/bin/cosign https://github.com/sigstore/cosign/releases/latest/download/cosign-linux-amd64 && chmod +x /usr/local/bin/cosign && \
-    curl -sSfL https://raw.githubusercontent.com/anchore/syft/main/install.sh | sh -s -- -b /usr/local/bin && \
-    curl -L "https://mirror.openshift.com/pub/openshift-v4/clients/ocp/${OC_VERSION}/openshift-client-linux.tar.gz" -o /tmp/openshift-client-linux.tar.gz && \
+    curl -fsSL -o /usr/local/bin/kubectl "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl" && \
+    chmod +x /usr/local/bin/kubectl && \
+    curl -fsSL --proto "=https" -o /usr/local/bin/cosign https://github.com/sigstore/cosign/releases/latest/download/cosign-linux-amd64 && \
+    chmod +x /usr/local/bin/cosign && \
+    curl -fsSL --proto "=https" https://raw.githubusercontent.com/anchore/syft/main/install.sh | sh -s -- -b /usr/local/bin && \
+    curl -fsSL --proto "=https" "https://mirror.openshift.com/pub/openshift-v4/clients/ocp/${OC_VERSION}/openshift-client-linux.tar.gz" -o /tmp/openshift-client-linux.tar.gz && \
     tar --no-same-owner -xzf /tmp/openshift-client-linux.tar.gz && \
     mv oc kubectl /usr/local/bin && \
     oc version --client && \

installer/charts/rhtap-integrations/templates/developer-hub/serviceaccount.yaml

@@ -17,7 +17,7 @@ kind: ServiceAccount
 metadata:
   name: {{ $saName }}
   namespace: {{ .Release.Namespace }}
-{{- $secrets := (get $sa "secrets" | default list)}}
+{{- $secrets := (get $sa "secrets" | default list) }}
 secrets:
   {{/* Patch ServiceAccount secrets */}}
   {{- $secretExists := false }}

installer/charts/rhtap-integrations/templates/integrations/gitlab-integration.secret.yaml

@@ -9,7 +9,7 @@ metadata:
 stringData:
   host: {{ get $data "host" | default "gitlab.com" }}
   token: {{ $data.token }}
-  {{- if and ( $data.clientId $data.clientSecret)}}
+  {{- if and ( $data.clientId $data.clientSecret) }}
   clientId: {{ $data.clientId }}
   clientSecret: {{ $data.clientSecret }}
   {{- end }}

test/charts/testing/templates/configmap.yaml

@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ .Chart.Name}}
+  name: {{ .Chart.Name }}
 data:
 {{- range $key, $value := .Values }}
   {{ $key }}: {{ $value | quote }}