| 1 |
--- a/job.go |
| 2 |
+++ b/job.go |
| 3 |
@@ -4,7 +4,6 @@ |
| 4 |
"context" |
| 5 |
"fmt" |
| 6 |
"net/url" |
| 7 |
- "os" |
| 8 |
"regexp" |
| 9 |
"strings" |
| 10 |
"time" |
| 11 |
@@ -18,9 +17,6 @@ |
| 12 |
_ "github.com/lib/pq" // register the PostgreSQL driver |
| 13 |
"github.com/prometheus/client_golang/prometheus" |
| 14 |
sqladmin "google.golang.org/api/sqladmin/v1beta4" |
| 15 |
- |
| 16 |
- "github.com/aws/aws-sdk-go/aws/session" |
| 17 |
- "github.com/aws/aws-sdk-go/service/rds/rdsutils" |
| 18 |
) |
| 19 |
|
| 20 |
var ( |
| 21 |
@@ -31,27 +27,6 @@ |
| 22 |
CloudSQLPrefix = "cloudsql+" |
| 23 |
) |
| 24 |
|
| 25 |
-func handleRDSMySQLIAMAuth(conn string) (string, time.Time, error) { |
| 26 |
- dsn := strings.TrimPrefix(conn, "rds-mysql://") |
| 27 |
- config, err := mysql.ParseDSN(dsn) |
| 28 |
- if err != nil { |
| 29 |
- return "", time.Time{}, fmt.Errorf("failed to parse MySQL DSN: %v", err) |
| 30 |
- } |
| 31 |
- |
| 32 |
- sess := session.Must(session.NewSessionWithOptions(session.Options{ |
| 33 |
- SharedConfigState: session.SharedConfigEnable, |
| 34 |
- })) |
| 35 |
- |
| 36 |
- token, err := rdsutils.BuildAuthToken(config.Addr, os.Getenv("AWS_REGION"), config.User, sess.Config.Credentials) |
| 37 |
- if err != nil { |
| 38 |
- return "", time.Time{}, fmt.Errorf("failed to build RDS auth token: %v", err) |
| 39 |
- } |
| 40 |
- |
| 41 |
- expirationTime := time.Now().Add(14 * time.Minute) |
| 42 |
- |
| 43 |
- return token, expirationTime, nil |
| 44 |
-} |
| 45 |
- |
| 46 |
// Init will initialize the metric descriptors |
| 47 |
func (j *Job) Init(logger log.Logger, queries map[string]string) error { |
| 48 |
j.log = log.With(logger, "job", j.Name) |
| 49 |
@@ -229,17 +204,11 @@ |
| 50 |
} |
| 51 |
|
| 52 |
// Handle both RDS MySQL and regular MySQL connections |
| 53 |
- if strings.HasPrefix(conn, "rds-mysql://") || strings.HasPrefix(conn, "mysql://") { |
| 54 |
- isRDS := strings.HasPrefix(conn, "rds-mysql://") |
| 55 |
+ if strings.HasPrefix(conn, "mysql://") { |
| 56 |
var dsn string |
| 57 |
var expirationTime time.Time |
| 58 |
|
| 59 |
- trimmedConn := conn |
| 60 |
- if isRDS { |
| 61 |
- trimmedConn = strings.TrimPrefix(conn, "rds-mysql://") |
| 62 |
- } else { |
| 63 |
- trimmedConn = strings.TrimPrefix(conn, "mysql://") |
| 64 |
- } |
| 65 |
+ trimmedConn := strings.TrimPrefix(conn, "mysql://") |
| 66 |
|
| 67 |
config, err := mysql.ParseDSN(trimmedConn) |
| 68 |
if err != nil { |
| 69 |
@@ -247,21 +216,7 @@ |
| 70 |
continue |
| 71 |
} |
| 72 |
|
| 73 |
- if isRDS { |
| 74 |
- authToken, tokenExpiration, err := handleRDSMySQLIAMAuth(conn) |
| 75 |
- if err != nil { |
| 76 |
- level.Error(j.log).Log("msg", "Failed to build RDS auth token", "url", conn, "err", err) |
| 77 |
- continue |
| 78 |
- } |
| 79 |
- config.Passwd = authToken |
| 80 |
- config.AllowCleartextPasswords = true |
| 81 |
- expirationTime = tokenExpiration |
| 82 |
- } |
| 83 |
- |
| 84 |
dsn = config.FormatDSN() |
| 85 |
- if isRDS { |
| 86 |
- dsn = "rds-mysql://" + dsn |
| 87 |
- } |
| 88 |
|
| 89 |
j.conns = append(j.conns, &connection{ |
| 90 |
conn: nil, |
| 91 |
@@ -275,25 +230,6 @@ |
| 92 |
continue |
| 93 |
} |
| 94 |
|
| 95 |
- if strings.HasPrefix(conn, "rds-postgres://") { |
| 96 |
- // Reuse Postgres driver by stripping "rds-" from connection URL after building the RDS authentication token |
| 97 |
- conn = strings.TrimPrefix(conn, "rds-") |
| 98 |
- u, err := url.Parse(conn) |
| 99 |
- if err != nil { |
| 100 |
- level.Error(j.log).Log("msg", "failed to parse connection url", "url", conn, "err", err) |
| 101 |
- continue |
| 102 |
- } |
| 103 |
- sess := session.Must(session.NewSessionWithOptions(session.Options{ |
| 104 |
- SharedConfigState: session.SharedConfigEnable, |
| 105 |
- })) |
| 106 |
- token, err := rdsutils.BuildAuthToken(u.Host, os.Getenv("AWS_REGION"), u.User.Username(), sess.Config.Credentials) |
| 107 |
- if err != nil { |
| 108 |
- level.Error(j.log).Log("msg", "failed to parse connection url", "url", conn, "err", err) |
| 109 |
- continue |
| 110 |
- } |
| 111 |
- conn = strings.Replace(conn, "AUTHTOKEN", url.QueryEscape(token), 1) |
| 112 |
- } |
| 113 |
- |
| 114 |
if strings.HasPrefix(conn, "postgres://") || strings.HasPrefix(conn, "pg://") { |
| 115 |
u, err := url.Parse(conn) |
| 116 |
var filteredDBs []string |
| 117 |
@@ -601,38 +537,6 @@ |
| 118 |
func (c *connection) connect(job *Job) error { |
| 119 |
// already connected |
| 120 |
if c.conn != nil { |
| 121 |
- if strings.HasPrefix(c.url, "rds-mysql://") && time.Now().After(c.tokenExpirationTime) { |
| 122 |
- level.Warn(job.log).Log("msg", "Connection token expired, reconnecting") |
| 123 |
- |
| 124 |
- authToken, expirationTime, err := handleRDSMySQLIAMAuth(c.url) |
| 125 |
- if err != nil { |
| 126 |
- return fmt.Errorf("failed to refresh RDS MySQL IAM Auth token: %w", err) |
| 127 |
- } |
| 128 |
- |
| 129 |
- config, err := mysql.ParseDSN(strings.TrimPrefix(c.url, "rds-mysql://")) |
| 130 |
- if err != nil { |
| 131 |
- return fmt.Errorf("failed to parse MySQL DSN: %w", err) |
| 132 |
- } |
| 133 |
- |
| 134 |
- config.Passwd = authToken |
| 135 |
- dsn := "rds-mysql://" + config.FormatDSN() |
| 136 |
- |
| 137 |
- // Close the existing connection |
| 138 |
- c.conn.Close() |
| 139 |
- c.conn = nil |
| 140 |
- |
| 141 |
- // Update the connection details |
| 142 |
- c.tokenExpirationTime = expirationTime |
| 143 |
- c.url = dsn |
| 144 |
- |
| 145 |
- // Connect to the database with the new token |
| 146 |
- conn, err := sqlx.Connect(c.driver, strings.TrimPrefix(dsn, "rds-mysql://")) |
| 147 |
- if err != nil { |
| 148 |
- return fmt.Errorf("failed to connect to the database: %w", err) |
| 149 |
- } |
| 150 |
- c.conn = conn |
| 151 |
- return nil |
| 152 |
- } |
| 153 |
return nil |
| 154 |
} |
| 155 |
if c.driver == "snowflake" { |
| 156 |
@@ -667,7 +571,6 @@ |
| 157 |
switch c.driver { |
| 158 |
case "mysql": |
| 159 |
dsn = strings.TrimPrefix(dsn, "mysql://") |
| 160 |
- dsn = strings.TrimPrefix(dsn, "rds-mysql://") |
| 161 |
} |
| 162 |
conn, err := sqlx.Connect(c.driver, dsn) |
| 163 |
if err != nil { |