From a3607fdd5ccb92f1181f7b5653e6f0f611653276 Mon Sep 17 00:00:00 2001 From: Andrew Burke Date: Wed, 22 Nov 2023 12:26:52 -0800 Subject: [PATCH 1/2] Only use azure-client-id in installer if requested --- api/types/installers/installer.sh.tmpl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/api/types/installers/installer.sh.tmpl b/api/types/installers/installer.sh.tmpl index ab4f7032f127f..447a46afb1fd4 100644 --- a/api/types/installers/installer.sh.tmpl +++ b/api/types/installers/installer.sh.tmpl @@ -110,7 +110,9 @@ on_gcp() { sudo /usr/local/bin/teleport node configure \ --proxy="{{ .PublicProxyAddr }}" \ --join-method=${JOIN_METHOD} \ + {{- if .AzureClientID }} --azure-client-id="{{ .AzureClientID }}" \ + {{ end -}} --token="$1" \ --output=file \ --labels="${LABELS}" From 9e8da136ec5d2df107a794e0d669bcb4a48a64fe Mon Sep 17 00:00:00 2001 From: Andrew Burke Date: Wed, 22 Nov 2023 13:35:06 -0800 Subject: [PATCH 2/2] Fix linting --- api/types/installers/installer.sh.tmpl | 1 + 1 file changed, 1 insertion(+) diff --git a/api/types/installers/installer.sh.tmpl b/api/types/installers/installer.sh.tmpl index 447a46afb1fd4..03b24c2f17bab 100644 --- a/api/types/installers/installer.sh.tmpl +++ b/api/types/installers/installer.sh.tmpl @@ -1,4 +1,5 @@ #!/usr/bin/env bash +# shellcheck disable=SC1083,SC2215,SC2288 # caused by Go templating, and shellcheck won't parse if the lines are excluded individually set -eu