fix crash due to go variable context change

Go v1.22 changes how variables are shadowed which was causing ListAccounts() to return an empty list
synfinatic · Sep 21, 2024 · 8687d9e · 8687d9e
1 parent 60c56c4
commit 8687d9e
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -4,6 +4,23 @@
     // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
     "version": "0.2.0",
     "configurations": [
+        {
+            "name": "Run Wizard",
+            "type": "go",
+            "request": "launch",
+            "mode": "auto",
+            "program": "${workspaceFolder}/cmd/aws-sso/",
+            "args": ["setup", "wizard", "--config=foo.yaml", "--hostname=synfinatic", "--region=us-east-2", "--profile-format=Friendly"]
+        },
+        {
+            "name": "List Profiles",
+            "type": "go",
+            "request": "launch",
+            "mode": "auto",
+            "program": "${workspaceFolder}/cmd/aws-sso/",
+            "args": ["list", "--config=${workspaceFolder}/config.yaml"]
+        },
+
         {
             "name": "Run ECS Server",
             "type": "go",

diff --git a/internal/sso/awssso.go b/internal/sso/awssso.go
@@ -239,9 +239,9 @@ func (as *AWSSSO) ListAccounts(input *sso.ListAccountsInput) (*sso.ListAccountsO
 				as.rolesLock.Lock()
 				log.Error("AccessToken Unauthorized Error; refreshing", "error", err.Error())
 
-				if err = as.reauthenticate(); err != nil {
+				if err2 := as.reauthenticate(); err2 != nil {
 					// fail hard now
-					return output, err
+					return output, err2
 				}
 				input.AccessToken = aws.String(as.Token.AccessToken)
 				as.rolesLock.Unlock()