WPB-23896: fix trivial SonarQube errors

charts/cassandra-migrations/templates/cassandra-certs.yaml

@@ -15,7 +15,7 @@ metadata:
 type: Opaque
 data:
   ca.pem: {{ include "tlsCaBrig" . | b64enc | quote }}
-{{- end}}
+{{- end }}
 {{- if ne (trim (include "tlsCaGalley" .)) "" }}
 ---
 apiVersion: v1
@@ -34,7 +34,7 @@ metadata:
 type: Opaque
 data:
   ca.pem: {{ include "tlsCaGalley" . | b64enc | quote }}
-{{- end}}
+{{- end }}
 {{- if ne (trim (include "tlsCaGundeck" .)) "" }}
 ---
 apiVersion: v1
@@ -53,7 +53,7 @@ metadata:
 type: Opaque
 data:
   ca.pem: {{ include "tlsCaGundeck" . | b64enc | quote }}
-{{- end}}
+{{- end }}
 {{- if ne (trim (include "tlsCaSpar" .)) "" }}
 ---
 apiVersion: v1
@@ -72,4 +72,4 @@ metadata:
 type: Opaque
 data:
   ca.pem: {{ include "tlsCaSpar" . | b64enc | quote }}
-{{- end}}
+{{- end }}

charts/elasticsearch-index/templates/elasticsearch-ca-secret.yaml

@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: "{{ include "fullname" .}}-ca"
+  name: "{{ include "fullname" . }}-ca"
   labels:
     app: elasticsearch-index
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}

charts/nginx-ingress-services/templates/issuer.yaml

@@ -3,7 +3,7 @@ apiVersion: cert-manager.io/v1
 {{- if or (eq .Values.tls.issuer.kind "Issuer") (eq .Values.tls.issuer.kind "ClusterIssuer") }}
 kind: "{{ .Values.tls.issuer.kind }}"
 {{- else }}
-{{- fail (cat ".tls.issuer.kind can only be one of Issuer or ClusterIssuer, got: " .tls.issuer.kind )}}
+{{- fail (cat ".tls.issuer.kind can only be one of Issuer or ClusterIssuer, got: " .tls.issuer.kind ) }}
 {{- end }}
 metadata:
   name: {{ include "nginx-ingress-services.getIssuerName" . | quote }}

charts/wire-server/templates/background-worker/configmap.yaml

@@ -85,10 +85,10 @@ data:
     migrateTeamFeatures: {{ .migrateTeamFeatures }}
     migrateDomainRegistration: {{ .migrateDomainRegistration }}
     migrationOptions:
-{{toYaml .migrationOptions | indent 6 }}
+{{ toYaml .migrationOptions | indent 6 }}
 
     backendNotificationPusher:
-{{toYaml .backendNotificationPusher | indent 6 }}
+{{ toYaml .backendNotificationPusher | indent 6 }}
     {{- with .backgroundJobs }}
     backgroundJobs:
 {{ toYaml . | indent 6 }}

charts/wire-server/templates/brig/tests/brig-integration.yaml

@@ -48,12 +48,12 @@ spec:
     - name: elasticsearch-ca
       secret:
         secretName: {{ include "brig.elasticsearchTlsSecretName" .Values.brig.config }}
-    {{- end}}
+    {{- end }}
     {{- if eq (include "useCassandraTLS" .Values.brig.config.cassandra) "true" }}
     - name: "brig-cassandra"
       secret:
         secretName: {{ (include "brig.tlsSecretRef" .Values.brig.config | fromYaml).name }}
-    {{- end}}
+    {{- end }}
     {{- if .Values.brig.config.rabbitmq.tlsCaSecretRef }}
     - name: "rabbitmq-ca"
       secret:
@@ -119,7 +119,7 @@ spec:
     {{- if eq (include "brig.configureElasticSearchCa" .Values.brig.config) "true" }}
     - name: elasticsearch-ca
       mountPath: "/etc/wire/brig/elasticsearch-ca"
-    {{- end}}
+    {{- end }}
     {{- if eq (include "useCassandraTLS" .Values.brig.config.cassandra) "true" }}
     - name: "brig-cassandra"
       mountPath: "/etc/wire/brig/cassandra"

charts/wire-server/templates/galley/configmap.yaml

@@ -85,7 +85,7 @@ data:
       {{- else if .settings.multiIngress }}
       multiIngress: {{- toYaml .settings.multiIngress | nindent 8 }}
       {{- else }}
-      {{ fail "Either settings.conversationCodeURI or settings.multiIngress have to be set"}}
+      {{ fail "Either settings.conversationCodeURI or settings.multiIngress have to be set" }}
       {{- end }}
       {{- if (and .settings.conversationCodeURI .settings.multiIngress) }}
       {{ fail "settings.conversationCodeURI and settings.multiIngress are mutually exclusive" }}

charts/wire-server/templates/gundeck/configmap.yaml

@@ -48,7 +48,7 @@ data:
       enableTls: {{ .redis.enableTls }}
       insecureSkipVerifyTls: {{ .redis.insecureSkipVerifyTls }}
       {{- if eq (include "gundeck.configureRedisCa" .) "true" }}
-      tlsCa: /etc/wire/gundeck/redis-ca/{{ include "gundeck.redisTlsSecretKey" .}}
+      tlsCa: /etc/wire/gundeck/redis-ca/{{ include "gundeck.redisTlsSecretKey" . }}
       {{- end }}
 
     {{- if .redisAdditionalWrite }}
@@ -59,7 +59,7 @@ data:
       enableTls: {{ .redisAdditionalWrite.enableTls }}
       insecureSkipVerifyTls: {{ .redisAdditionalWrite.insecureSkipVerifyTls }}
       {{- if eq (include "gundeck.configureAdditionalRedisCa" .) "true" }}
-      tlsCa: /etc/wire/gundeck/additional-redis-ca/{{ include "gundeck.additionalRedisTlsSecretKey" .}}
+      tlsCa: /etc/wire/gundeck/additional-redis-ca/{{ include "gundeck.additionalRedisTlsSecretKey" . }}
       {{- end }}
     {{- end }}
 

charts/wire-server/templates/gundeck/deployment.yaml

@@ -49,7 +49,7 @@ spec:
         - name: "gundeck-cassandra"
           secret:
             secretName: {{ (include "gundeck.tlsSecretRef" .Values.gundeck.config | fromYaml).name }}
-        {{- end}}
+        {{- end }}
         {{- if eq (include "gundeck.configureRedisCa" .Values.gundeck.config) "true" }}
         - name: "redis-ca"
           secret:

charts/wire-server/templates/gundeck/tests/gundeck-integration.yaml

@@ -17,7 +17,7 @@ spec:
     - name: "gundeck-cassandra"
       secret:
         secretName: {{ (include "gundeck.tlsSecretRef" .Values.gundeck.config | fromYaml).name }}
-    {{- end}}
+    {{- end }}
     {{- if eq (include "gundeck.configureRedisCa" .Values.gundeck.config) "true" }}
     - name: "redis-ca"
       secret:

charts/wire-server/templates/spar/tests/spar-integration.yaml

@@ -20,7 +20,7 @@ spec:
     - name: "spar-cassandra"
       secret:
         secretName: {{ (include "spar.tlsSecretRef" .Values.spar.config | fromYaml).name }}
-    {{- end}}
+    {{- end }}
   containers:
   - name: integration
     image: "{{ .Values.spar.image.repository }}-integration:{{ .Values.spar.image.tag }}"

hack/bin/create_team.sh

@@ -49,7 +49,7 @@ while getopts ":o:e:p:v:t:c:h:" opt; do
     : ) echo "-$OPTARG" requires an argument 1>&2
         exit 1
       ;;
-    \? ) echo "$USAGE" 1>&2
+    * ) echo "$USAGE" 1>&2
          exit 1
       ;;
   esac

hack/bin/create_team_members.sh

@@ -52,7 +52,7 @@ while getopts ":a:t:h:c:" opt; do
     : ) echo "-$OPTARG" requires an argument 1>&2
         exit 1
       ;;
-    \? ) echo "$USAGE" 1>&2
+    * ) echo "$USAGE" 1>&2
          exit 1
       ;;
   esac

hack/bin/create_team_request_code.sh

@@ -28,7 +28,7 @@ while getopts ":e:h:" opt; do
     : ) echo "-$OPTARG" requires an argument 1>&2
         exit 1
       ;;
-    \? ) echo "$USAGE" 1>&2
+    * ) echo "$USAGE" 1>&2
          exit 1
       ;;
   esac

hack/bin/create_test_team_admins.sh

@@ -37,7 +37,7 @@ while getopts ":n:h:c" opt; do
     : ) echo "-$OPTARG" requires an argument 1>&2
         exit 1
       ;;
-    \? ) echo "$USAGE" 1>&2
+    * ) echo "$USAGE" 1>&2
          exit 1
       ;;
   esac

hack/bin/create_test_team_members.sh

@@ -59,7 +59,7 @@ while getopts ":a:t:s:n:h:d:c" opt; do
     : ) echo "-$OPTARG" requires an argument 1>&2
         exit 1
       ;;
-    \? ) echo "$USAGE" 1>&2
+    * ) echo "$USAGE" 1>&2
          exit 1
       ;;
   esac

hack/bin/create_test_team_scim.sh

@@ -32,7 +32,7 @@ while getopts ":h:s:" opt; do
     : ) echo "-$OPTARG" requires an argument 1>&2
         exit 1
       ;;
-    \? ) echo "$USAGE" 1>&2
+    * ) echo "$USAGE" 1>&2
          exit 1
       ;;
   esac

hack/bin/create_test_user.sh

@@ -33,7 +33,7 @@ while getopts ":n:h:c" opt; do
     : ) echo "-$OPTARG" requires an argument 1>&2
         exit 1
       ;;
-    \? ) echo "$USAGE" 1>&2
+    * ) echo "$USAGE" 1>&2
          exit 1
       ;;
   esac

hack/bin/generate-clients.sh

@@ -20,8 +20,8 @@ curl -s "$SWAGGER_URL" > "$OUTPUT_DIR/swagger.json"
 
 # Check if docker is available
 if ! command -v docker &> /dev/null; then
-    echo "Error: docker is not installed. Please install docker to use openapi-generator."
-    echo "Alternative: install openapi-generator-cli via npm: npm install -g @openapitools/openapi-generator-cli"
+    echo "Error: docker is not installed. Please install docker to use openapi-generator." >&2
+    echo "Alternative: install openapi-generator-cli via npm: npm install -g @openapitools/openapi-generator-cli" >&2
     exit 1
 fi
 

hack/bin/integration-setup-federation.sh

@@ -18,10 +18,10 @@ HELM_PARALLELISM=${HELM_PARALLELISM:-1}
 changed_files=$(git --no-pager diff-tree --no-commit-id -r --name-only HEAD)
 
 if [[ "$WIRE_INGRESS_MODE" != "nginx" ]] && echo "$changed_files" | grep -q "^charts/nginx-ingress-services"; then
-  echo "ERROR: Changes detected in charts/nginx-ingress-services but WIRE_INGRESS_MODE is '${WIRE_INGRESS_MODE}'."
-  echo "This failure is intentional: changes to nginx-ingress-services are not exercised by the"
-  echo "integration test suite when running in envoy mode, and would be merged without any test coverage."
-  echo "To test these changes, change to WIRE_INGRESS_MODE=nginx. and merge the changes"
+  echo "ERROR: Changes detected in charts/nginx-ingress-services but WIRE_INGRESS_MODE is '${WIRE_INGRESS_MODE}'." >&2
+echo "This failure is intentional: changes to nginx-ingress-services are not exercised by the" >&2
+echo "integration test suite when running in envoy mode, and would be merged without any test coverage."  >&2
+echo "To test these changes, change to WIRE_INGRESS_MODE=nginx. and merge the changes"  >&2
   echo "Then in a follow-up PR change WIRE_INGRESS_MODE=envoy and re-implement the changes also in charts/wire-ingress"
   echo "FUTUREWORK: Remove WIRE_INGRESS_MODE once ingress-nginx is no longer supported by wire-server"
   exit 1

hack/bin/oauth_test.sh

@@ -18,14 +18,14 @@ while getopts ":u:" opt; do
   u)
     USER="$OPTARG"
     ;;
-  \?)
-    echo "$USAGE" 1>&2
-    exit 1
-    ;;
   :)
     echo "-$OPTARG" requires an argument 1>&2
     exit 1
     ;;
+  *)
+    echo "$USAGE" 1>&2
+    exit 1
+    ;;
   esac
 done
 shift $((OPTIND - 1))

hack/bin/performance.py

@@ -58,6 +58,8 @@
 
 RES_REGISTER_JSON = "res_register.json"
 
+RES_LOGIN_JSON = "res_login.json"
+
 def save_json_file(ob, path):
     with open(path, "w") as f:
         return json.dump(ob, f, indent=2)
@@ -349,7 +351,7 @@ def create_admin(ctx, basedir):
 
     res_login = save(
         api.login(ctx, res_creation["request"]["body"]["email"]),
-        j(ud, "res_login.json"),
+        j(ud, RES_LOGIN_JSON),
     )
     simple_expect_status(200, res_login)
 
@@ -414,7 +416,7 @@ def create_user(ctx, basedir):
     admin_user = admin["response"]["content"]["id"]
     team = admin["response"]["content"]["team"]
 
-    admin_res_login = load_json_file(j(admin_dir, "res_login.json"))
+    admin_res_login = load_json_file(j(admin_dir, RES_LOGIN_JSON))
     ctx.load_cookies_from_response(admin_res_login)
 
     ud_temp = random_path(basedir)
@@ -447,7 +449,7 @@ def create_user(ctx, basedir):
     shutil.move(j(ud_temp, RES_REGISTER_JSON), dest)
     print("Moving to", dest)
 
-    res_login = save(api.login(ctx, email_invitee), j(ud, "res_login.json"))
+    res_login = save(api.login(ctx, email_invitee), j(ud, RES_LOGIN_JSON))
     simple_expect_status(200, res_login)
 
     return user_id
@@ -692,7 +694,7 @@ def main_setup_add_participants(basedir, batchsize=500):
     admin = res_creation['response']['content']
     res_login = save(
         api.login(ctx_admin, res_creation["request"]["body"]["email"]),
-        j(admin_dir, "res_login.json"),
+        j(admin_dir, RES_LOGIN_JSON),
     )
     simple_expect_status(200, res_login)
 
@@ -801,7 +803,7 @@ def main_send(basedir):
         ctx.switch_user(admin_id)
         ud = user_dir(basedir, admin_id)
 
-        res_login = load_json_file(j(ud, "res_login.json"))
+        res_login = load_json_file(j(ud, RES_LOGIN_JSON))
         res = simplify_response(api.login(ctx, res_login["request"]["body"]["email"]))
         simple_expect_status(200, res)
 
@@ -990,7 +992,7 @@ async def receive_for_user(user_id):
             ctx = Context()
 
             ud = user_dir(basedir, user_id)
-            res_login = load_json_file(j(ud, "res_login.json"))
+            res_login = load_json_file(j(ud, RES_LOGIN_JSON))
 
             res = simplify_response(
                 api.login(ctx, res_login["request"]["body"]["email"])

hack/bin/register_idp.sh

@@ -53,9 +53,9 @@ else
 fi
 
 payload="{\"email\":\"$login\",\"password\":\"$password\"}"
-test -n "$trace" && echo "$curl_exe -is --show-error -XPOST \"https://$backend/login\" -H'Content-type: application/json' -d\"$payload\""
+test -n "$trace" && echo "$curl_exe -is --show-error -XPOST \"https://$backend/login\" -H'Content-type: application/json' -d\"$payload\"" >&2
 access_token=$($curl_exe -s --show-error -XPOST "https://$backend/login" -H'Content-type: application/json' -d"$payload" | $jq_exe -r .access_token)
 
 # register idp
-test -n "$trace" && echo "$curl_exe -is --show-error -XPOST \"https://$backend/identity-providers\" -H\"Authorization: Bearer $access_token\" -H'Content-type: application/xml' -d@\"$metadata_file\""
+test -n "$trace" && echo "$curl_exe -is --show-error -XPOST \"https://$backend/identity-providers\" -H\"Authorization: Bearer $access_token\" -H'Content-type: application/xml' -d@\"$metadata_file\"" >&2
 $curl_exe -is --show-error -XPOST "https://$backend/identity-providers" -H"Authorization: Bearer $access_token" -H'Content-type: application/xml' -d@"$metadata_file"