fix: fixed sts client caching (#195)

fix: fixed Sts Client Caching Co-authored-by: Ayushi Sharma <[email protected]>
goto · Dec 23, 2024 · dd17ff7 · dd17ff7
1 parent df093f6
commit dd17ff7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/pkg/stsClient/stsClient.go b/pkg/stsClient/stsClient.go
@@ -54,7 +54,7 @@ func NewSTSClient(userAccessKeyID, userSecretAccessKey, regionID string) (*clien
 }
 
 func (s *Sts) GetSTSClient(clientIdentifier, userAccessKeyID, userSecret, regionID string) (*client.Client, error) {
-	if c, ok := s.clients[clientIdentifier]; ok {
+	if c, ok := s.clients[clientIdentifier]; ok && s.IsSTSTokenValid(clientIdentifier) {
 		return c.client, nil
 	}
 

diff --git a/plugins/providers/maxcompute/provider.go b/plugins/providers/maxcompute/provider.go
@@ -458,10 +458,8 @@ func (p *provider) getRamRoleAndStsClientID(clientType string, creds *credential
 }
 
 func (p *provider) getCachedOdpsClient(ramRole, stsClientID, urn string) (*odps.Odps, bool) {
-	if c, ok := p.odpsClients[ramRole]; ok {
-		if c.stsClientExist && p.sts.IsSTSTokenValid(stsClientID) {
-			return c.client, true
-		}
+	c, ok := p.odpsClients[ramRole]
+	if ramRole != "" && ok && c.stsClientExist && p.sts.IsSTSTokenValid(stsClientID) {
 		return c.client, true
 	}
 
@@ -474,7 +472,7 @@ func (p *provider) getCachedOdpsClient(ramRole, stsClientID, urn string) (*odps.
 
 func (p *provider) getCachedRestClient(ramRole, stsClientID, urn string) (*maxcompute.Client, bool) {
 	c, ok := p.restClients[ramRole]
-	if ok && c.stsClientExist && p.sts.IsSTSTokenValid(stsClientID) {
+	if ramRole != "" && ok && c.stsClientExist && p.sts.IsSTSTokenValid(stsClientID) {
 		return c.client, true
 	}
 

diff --git a/plugins/providers/oss/provider.go b/plugins/providers/oss/provider.go
@@ -432,10 +432,8 @@ func (p *provider) getOSSClient(pc *domain.ProviderConfig, ramRole string) (*oss
 }
 
 func (p *provider) getCachedOSSClient(ramRole, stsClientID, urn string) (*oss.Client, bool) {
-	if c, ok := p.ossClients[ramRole]; ok {
-		if c.stsClientExist && p.sts.IsSTSTokenValid(stsClientID) {
-			return c.client, true
-		}
+	c, ok := p.ossClients[ramRole]
+	if ramRole != "" && ok && c.stsClientExist && p.sts.IsSTSTokenValid(stsClientID) {
 		return c.client, true
 	}