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