From 8547465e0853108d5f1849f6de5737572d6960ce Mon Sep 17 00:00:00 2001
From: JoshuaWilkes <14214200+JoshuaWilkes@users.noreply.github.com>
Date: Tue, 12 Nov 2024 14:10:44 +0800
Subject: [PATCH] use sso role name from grant output for eks and rds access
 (#803)

---
 pkg/granted/eks/eks.go | 2 +-
 pkg/granted/rds/rds.go | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/granted/eks/eks.go b/pkg/granted/eks/eks.go
index e3c128aa..6586ca68 100644
--- a/pkg/granted/eks/eks.go
+++ b/pkg/granted/eks/eks.go
@@ -91,7 +91,7 @@ var proxyCommand = cli.Command{
 			err = proxy.WaitForSSMConnectionToProxyServer(ctx, proxy.WaitForSSMConnectionToProxyServerOpts{
 				AWSConfig: proxy.AWSConfig{
 					SSOAccountID:     ensuredAccess.GrantOutput.EksCluster.AccountId,
-					SSORoleName:      ensuredAccess.Grant.Id,
+					SSORoleName:      ensuredAccess.GrantOutput.SsoRoleName,
 					SSORegion:        ensuredAccess.GrantOutput.SsoRegion,
 					SSOStartURL:      ensuredAccess.GrantOutput.SsoStartUrl,
 					Region:           ensuredAccess.GrantOutput.EksCluster.Region,
diff --git a/pkg/granted/rds/rds.go b/pkg/granted/rds/rds.go
index d13d94b6..12648706 100644
--- a/pkg/granted/rds/rds.go
+++ b/pkg/granted/rds/rds.go
@@ -92,7 +92,7 @@ var proxyCommand = cli.Command{
 			err = proxy.WaitForSSMConnectionToProxyServer(ctx, proxy.WaitForSSMConnectionToProxyServerOpts{
 				AWSConfig: proxy.AWSConfig{
 					SSOAccountID:     ensuredAccess.GrantOutput.RdsDatabase.AccountId,
-					SSORoleName:      ensuredAccess.Grant.Id,
+					SSORoleName:      ensuredAccess.GrantOutput.SsoRoleName,
 					SSORegion:        ensuredAccess.GrantOutput.SsoRegion,
 					SSOStartURL:      ensuredAccess.GrantOutput.SsoStartUrl,
 					Region:           ensuredAccess.GrantOutput.RdsDatabase.Region,