From dcd1bd7ff027355976a42dbfba9a890a09d52976 Mon Sep 17 00:00:00 2001
From: Chris Wright <chris@dxw.com>
Date: Fri, 27 Sep 2024 16:52:38 +0100
Subject: [PATCH] Move aws-sso login message

* The aws-sso login is ran in the main dalmatian script. If it's the
  parent script, it runs without `QUIET_MODE`. To make the message make
  more sense, have it always display the attemping login message.
  Without this move, it can just output: "You're already logged in"
---
 bin/aws-sso/v2/login | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/aws-sso/v2/login b/bin/aws-sso/v2/login
index aaaae7c..d06a67a 100755
--- a/bin/aws-sso/v2/login
+++ b/bin/aws-sso/v2/login
@@ -33,6 +33,7 @@ done
 START_URL="$(aws configure get sso_start_url --profile dalmatian-login)"
 AWS_SSO_CACHE_JSON="$(grep -h -e "\"$START_URL\"" ~/.aws/sso/cache/*.json || true)"
 EXPIRES_AT="$(echo "$AWS_SSO_CACHE_JSON" | jq -r '.expiresAt')"
+log_info -l "Attempting AWS SSO login ..." -q "$QUIET_MODE"
 if [ -n "$EXPIRES_AT" ]
 then
   EXPIRES_AT_SEC="$(gdate -d "$EXPIRES_AT" +%s)"
@@ -44,7 +45,6 @@ if [[
   "$FORCE_RELOG" == "1"
   ]]
 then
-  log_info -l "Attempting AWS SSO login ..." -q "$QUIET_MODE"
   aws sso login --profile "$AWS_SSO_PROFILE"
   log_info -l "Checking AWS SSO login was successful..." -q "$QUIET_MODE"
   AWS_SSO_CACHE_JSON="$(grep -h -e "\"$START_URL\"" ~/.aws/sso/cache/*.json || true)"