Skip to content

Commit b38eac6

Browse files
committed
minor refactor
1 parent fbac1e3 commit b38eac6

2 files changed

Lines changed: 5 additions & 20 deletions

File tree

flow/connectors/postgres/postgres_source.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ func (c *PostgresConnector) SetupReplConn(ctx context.Context, env map[string]st
122122
if c.Config.TlsHost != "" {
123123
host = c.Config.TlsHost
124124
}
125-
if _, err := c.rdsAuth.ForceRefreshToken(ctx, utils.RDSConnectionConfig{
125+
if _, err := c.rdsAuth.GetFreshRdsToken(ctx, utils.RDSConnectionConfig{
126126
Host: host,
127127
Port: c.Config.Port,
128128
User: c.Config.User,

flow/connectors/utils/rds.go

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -86,28 +86,13 @@ func GetRDSToken(ctx context.Context, connConfig RDSConnectionConfig, rdsAuth *R
8686
logger.Info("Using cached RDS token for connector", slog.String("connector", connectorName))
8787
return rdsAuth.token, nil
8888
}
89-
return func() (string, error) {
90-
logger.Info("Generating new RDS token for connector", slog.String("connector", connectorName))
91-
rdsAuth.lock.Lock()
92-
defer rdsAuth.lock.Unlock()
93-
newUpdateTime := time.Now()
94-
if rdsAuth.updateTime.Add(RDSAuthTokenTTL).After(now) && rdsAuth.token != "" {
95-
return rdsAuth.token, nil
96-
}
97-
peerAWSCredentials := BuildPeerAWSCredentials(rdsAuth.AwsAuthConfig)
98-
token, err := buildRdsToken(ctx, connConfig, peerAWSCredentials, connectorName)
99-
if err != nil {
100-
return "", err
101-
}
102-
rdsAuth.token = token
103-
rdsAuth.updateTime = newUpdateTime
104-
return token, nil
105-
}()
89+
logger.Info("Generating new RDS token for connector", slog.String("connector", connectorName))
90+
return rdsAuth.GetFreshRdsToken(ctx, connConfig, connectorName)
10691
}
10792

108-
// ForceRefreshToken bypasses the cache TTL and immediately fetches a new RDS IAM token.
93+
// GetFreshRdsToken bypasses the cache TTL and immediately fetches a new RDS IAM token.
10994
// Use this when a connection break requires a guaranteed-fresh token for reconnect.
110-
func (r *RDSAuth) ForceRefreshToken(
95+
func (r *RDSAuth) GetFreshRdsToken(
11196
ctx context.Context,
11297
connConfig RDSConnectionConfig,
11398
connectorName string,

0 commit comments

Comments
 (0)