Skip to content
This repository was archived by the owner on Mar 18, 2025. It is now read-only.

Commit c25240c

Browse files
committed
fix consistent naming for sigV4
1 parent 4ac35b2 commit c25240c

File tree

1 file changed

+25
-25
lines changed

1 file changed

+25
-25
lines changed

pkg/remotewrite/config.go

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -70,14 +70,14 @@ type Config struct {
7070

7171
StaleMarkers null.Bool `json:"staleMarkers"`
7272

73-
// Sigv4Region is the AWS region where the workspace is.
74-
Sigv4Region null.String `json:"sigV4Region"`
73+
// SigV4Region is the AWS region where the workspace is.
74+
SigV4Region null.String `json:"sigV4Region"`
7575

76-
// Sigv4AccessKey is the AWS access key.
77-
Sigv4AccessKey null.String `json:"sigV4AccessKey"`
76+
// SigV4AccessKey is the AWS access key.
77+
SigV4AccessKey null.String `json:"sigV4AccessKey"`
7878

79-
// Sigv4SecretKey is the AWS secret key.
80-
Sigv4SecretKey null.String `json:"sigV4SecretKey"`
79+
// SigV4SecretKey is the AWS secret key.
80+
SigV4SecretKey null.String `json:"sigV4SecretKey"`
8181
}
8282

8383
// NewConfig creates an Output's configuration.
@@ -91,9 +91,9 @@ func NewConfig() Config {
9191
Headers: make(map[string]string),
9292
TrendStats: defaultTrendStats,
9393
StaleMarkers: null.BoolFrom(false),
94-
Sigv4Region: null.NewString("", false),
95-
Sigv4AccessKey: null.NewString("", false),
96-
Sigv4SecretKey: null.NewString("", false),
94+
SigV4Region: null.NewString("", false),
95+
SigV4AccessKey: null.NewString("", false),
96+
SigV4SecretKey: null.NewString("", false),
9797
}
9898
}
9999

@@ -123,11 +123,11 @@ func (conf Config) RemoteConfig() (*remote.HTTPConfig, error) {
123123
hc.TLSConfig.Certificates = []tls.Certificate{cert}
124124
}
125125

126-
if conf.Sigv4Region.Valid && conf.Sigv4AccessKey.Valid && conf.Sigv4SecretKey.Valid {
126+
if conf.SigV4Region.Valid && conf.SigV4AccessKey.Valid && conf.SigV4SecretKey.Valid {
127127
hc.SigV4 = &sigv4.Config{
128-
Region: conf.Sigv4Region.String,
129-
AwsAccessKeyID: conf.Sigv4AccessKey.String,
130-
AwsSecretAccessKey: conf.Sigv4SecretKey.String,
128+
Region: conf.SigV4Region.String,
129+
AwsAccessKeyID: conf.SigV4AccessKey.String,
130+
AwsSecretAccessKey: conf.SigV4SecretKey.String,
131131
}
132132
}
133133

@@ -170,16 +170,16 @@ func (conf Config) Apply(applied Config) Config {
170170
conf.BearerToken = applied.BearerToken
171171
}
172172

173-
if applied.Sigv4Region.Valid {
174-
conf.Sigv4Region = applied.Sigv4Region
173+
if applied.SigV4Region.Valid {
174+
conf.SigV4Region = applied.SigV4Region
175175
}
176176

177-
if applied.Sigv4AccessKey.Valid {
178-
conf.Sigv4AccessKey = applied.Sigv4AccessKey
177+
if applied.SigV4AccessKey.Valid {
178+
conf.SigV4AccessKey = applied.SigV4AccessKey
179179
}
180180

181-
if applied.Sigv4SecretKey.Valid {
182-
conf.Sigv4SecretKey = applied.Sigv4SecretKey
181+
if applied.SigV4SecretKey.Valid {
182+
conf.SigV4SecretKey = applied.SigV4SecretKey
183183
}
184184

185185
if applied.PushInterval.Valid {
@@ -332,16 +332,16 @@ func parseEnvs(env map[string]string) (Config, error) {
332332
}
333333
}
334334

335-
if sigv4Region, sigv4RegionDefined := env["K6_PROMETHEUS_RW_SIGV4_REGION"]; sigv4RegionDefined {
336-
c.Sigv4Region = null.StringFrom(sigv4Region)
335+
if sigV4Region, sigV4RegionDefined := env["K6_PROMETHEUS_RW_SIGV4_REGION"]; sigV4RegionDefined {
336+
c.SigV4Region = null.StringFrom(sigV4Region)
337337
}
338338

339-
if sigv4AccessKey, sigv4AccessKeyDefined := env["K6_PROMETHEUS_RW_SIGV4_ACCESS_KEY"]; sigv4AccessKeyDefined {
340-
c.Sigv4AccessKey = null.StringFrom(sigv4AccessKey)
339+
if sigV4AccessKey, sigV4AccessKeyDefined := env["K6_PROMETHEUS_RW_SIGV4_ACCESS_KEY"]; sigV4AccessKeyDefined {
340+
c.SigV4AccessKey = null.StringFrom(sigV4AccessKey)
341341
}
342342

343-
if sigv4SecretKey, sigv4SecretKeyDefined := env["K6_PROMETHEUS_RW_SIGV4_SECRET_KEY"]; sigv4SecretKeyDefined {
344-
c.Sigv4SecretKey = null.StringFrom(sigv4SecretKey)
343+
if sigV4SecretKey, sigV4SecretKeyDefined := env["K6_PROMETHEUS_RW_SIGV4_SECRET_KEY"]; sigV4SecretKeyDefined {
344+
c.SigV4SecretKey = null.StringFrom(sigV4SecretKey)
345345
}
346346

347347
if b, err := envBool(env, "K6_PROMETHEUS_RW_TREND_AS_NATIVE_HISTOGRAM"); err != nil {

0 commit comments

Comments
 (0)