Skip to content

Commit 5340a84

Browse files
walterwanderleywalterwanderley
committed
from headers to header
1 parent 811bd0b commit 5340a84

5 files changed

Lines changed: 31 additions & 31 deletions

File tree

‎db/discovery.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,6 @@ func isResponseTable(db *sql.DB, table string) (bool, error) {
5454
}
5555

5656
return slices.Contains(columns, "url") && slices.Contains(columns, "status") &&
57-
slices.Contains(columns, "body") && slices.Contains(columns, "headers") && slices.Contains(columns, "timestamp"), nil
57+
slices.Contains(columns, "body") && slices.Contains(columns, "header") && slices.Contains(columns, "timestamp"), nil
5858

5959
}

‎db/reository.go‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ func CreateResponseTables(db *sql.DB, tableNames ...string) error {
5858
url TEXT PRIMARY KEY,
5959
status INTEGER,
6060
body BLOB,
61-
headers JSONB,
61+
header JSONB,
6262
timestamp DATETIME
6363
)`, tableName)
6464
_, err := db.Exec(query)
@@ -85,7 +85,7 @@ func HttpToResponse(resp *http.Response) (*Response, error) {
8585
}
8686

8787
func getReaderQuery(tableName string) string {
88-
return fmt.Sprintf("SELECT status, body, headers, timestamp FROM %s WHERE url = ?", tableName)
88+
return fmt.Sprintf("SELECT status, body, header, timestamp FROM %s WHERE url = ?", tableName)
8989
}
9090

9191
func rowToResponse(row *sql.Row) (*Response, error) {
@@ -95,31 +95,31 @@ func rowToResponse(row *sql.Row) (*Response, error) {
9595
var (
9696
status int
9797
body string
98-
headers string
98+
header string
9999
timestamp time.Time
100100
)
101-
err := row.Scan(&status, &body, &headers, &timestamp)
101+
err := row.Scan(&status, &body, &header, &timestamp)
102102
if err != nil {
103103
return nil, fmt.Errorf("scan response row: %w", err)
104104
}
105-
var headersMap map[string][]string
106-
json.Unmarshal([]byte(headers), &headersMap)
105+
var headerMap map[string][]string
106+
json.Unmarshal([]byte(header), &headerMap)
107107

108108
return &Response{
109109
Status: status,
110110
Body: io.NopCloser(strings.NewReader(body)),
111-
Header: headersMap,
111+
Header: headerMap,
112112
Timestamp: timestamp,
113113
}, nil
114114
}
115115

116116
func getWriterQuery(tableName string) string {
117-
return fmt.Sprintf(`INSERT INTO %s(url, status, body, headers, timestamp)
117+
return fmt.Sprintf(`INSERT INTO %s(url, status, body, header, timestamp)
118118
VALUES(?, ?, ?, ?, DATETIME('now'))
119119
ON CONFLICT(url) DO UPDATE SET
120120
status = ?,
121121
body = ?,
122-
headers = ?,
122+
header = ?,
123123
timestamp = DATETIME('now')`, tableName)
124124
}
125125

@@ -130,14 +130,14 @@ func execWriter(ctx context.Context, stmt *sql.Stmt, url string, resp *Response)
130130
}
131131
bodyStr := string(body)
132132

133-
var headersBuf bytes.Buffer
134-
json.NewEncoder(&headersBuf).Encode(resp.Header)
135-
headers := headersBuf.String()
133+
var headerBuf bytes.Buffer
134+
json.NewEncoder(&headerBuf).Encode(resp.Header)
135+
header := headerBuf.String()
136136

137137
_, err = stmt.ExecContext(ctx,
138-
url, resp.Status, bodyStr, headers,
138+
url, resp.Status, bodyStr, header,
139139
// On Conflict
140-
resp.Status, bodyStr, headers)
140+
resp.Status, bodyStr, header)
141141

142142
if err != nil {
143143
return fmt.Errorf("store response: %w", err)

‎extension/cache.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ func (m *CacheModule) Connect(conn *sqlite.Conn, args []string, declare func(str
3434
timeout time.Duration
3535
insecure bool
3636
ignoreStatusError bool
37-
headers = make(map[string]string)
37+
header = make(map[string]string)
3838
credentials clientcredentials.Config
3939
certFilePath string
4040
certKeyFilePath string
@@ -87,7 +87,7 @@ func (m *CacheModule) Connect(conn *sqlite.Conn, args []string, declare func(str
8787
case config.CertCAFile:
8888
caFilePath = v
8989
default:
90-
headers[k] = v
90+
header[k] = v
9191
}
9292
}
9393
}
@@ -103,7 +103,7 @@ func (m *CacheModule) Connect(conn *sqlite.Conn, args []string, declare func(str
103103
url TEXT PRIMARY KEY,
104104
status INTEGER,
105105
body BLOB,
106-
headers JSONB,
106+
header JSONB,
107107
timestamp DATETIME
108108
)`, responseTableName), nil)
109109
if err != nil {
@@ -136,7 +136,7 @@ func (m *CacheModule) Connect(conn *sqlite.Conn, args []string, declare func(str
136136

137137
client := &http.Client{
138138
Timeout: timeout,
139-
Transport: newTransport(&tlsConfig, headers),
139+
Transport: newTransport(&tlsConfig, header),
140140
}
141141

142142
if credentials.TokenURL != "" && credentials.ClientID != "" {

‎extension/transport.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,23 @@ import (
77

88
type transport struct {
99
http.RoundTripper
10-
Headers map[string]string
10+
Header map[string]string
1111
}
1212

13-
func newTransport(tlsConfig *tls.Config, headers map[string]string) http.RoundTripper {
13+
func newTransport(tlsConfig *tls.Config, header map[string]string) http.RoundTripper {
1414
baseTransport := http.DefaultTransport.(*http.Transport).Clone()
1515
baseTransport.TLSClientConfig = tlsConfig
16-
if len(headers) == 0 {
16+
if len(header) == 0 {
1717
return baseTransport
1818
}
1919
return &transport{
20-
baseTransport, headers,
20+
baseTransport, header,
2121
}
2222
}
2323

2424
func (t *transport) RoundTrip(req *http.Request) (*http.Response, error) {
2525
req2 := req.Clone(req.Context())
26-
for k, v := range t.Headers {
26+
for k, v := range t.Header {
2727
req2.Header.Set(k, v)
2828
}
2929
return t.RoundTripper.RoundTrip(req2)

‎extension/vtab.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ type RequestVirtualTable struct {
2222
}
2323

2424
func NewRequestVirtualTable(virtualTableName string, client *http.Client, ignoreStatusError bool, responseTableName string, conn *sqlite.Conn) (*RequestVirtualTable, error) {
25-
stmt, _, err := conn.Prepare(fmt.Sprintf(`INSERT INTO %s(url, status, body, headers, timestamp)
25+
stmt, _, err := conn.Prepare(fmt.Sprintf(`INSERT INTO %s(url, status, body, header, timestamp)
2626
VALUES(?, ?, ?, ?, DATETIME('now'))
2727
ON CONFLICT(url) DO UPDATE SET
2828
status = ?,
2929
body = ?,
30-
headers = ?,
30+
header = ?,
3131
timestamp = DATETIME('now')`, responseTableName))
3232
if err != nil {
3333
return nil, err
@@ -79,9 +79,9 @@ func (vt *RequestVirtualTable) Insert(values ...sqlite.Value) (int64, error) {
7979
body := string(bodyBytes)
8080
status := int64(resp.StatusCode)
8181

82-
var headersBuf bytes.Buffer
83-
json.NewEncoder(&headersBuf).Encode(resp.Header)
84-
headers := headersBuf.String()
82+
var headerBuf bytes.Buffer
83+
json.NewEncoder(&headerBuf).Encode(resp.Header)
84+
header := headerBuf.String()
8585

8686
vt.mu.Lock()
8787
err = vt.stmt.Reset()
@@ -91,11 +91,11 @@ func (vt *RequestVirtualTable) Insert(values ...sqlite.Value) (int64, error) {
9191
vt.stmt.BindText(1, url)
9292
vt.stmt.BindInt64(2, status)
9393
vt.stmt.BindText(3, body)
94-
vt.stmt.BindText(4, headers)
94+
vt.stmt.BindText(4, header)
9595
//ON CONFLICT
9696
vt.stmt.BindInt64(5, status)
9797
vt.stmt.BindText(6, body)
98-
vt.stmt.BindText(7, headers)
98+
vt.stmt.BindText(7, header)
9999
_, err = vt.stmt.Step()
100100
vt.mu.Unlock()
101101
if err != nil {

0 commit comments

Comments
 (0)