@@ -216,32 +216,32 @@ func GetConsolidatedConfig(jsonRawConf json.RawMessage, env map[string]string, _
216216 return result , nil
217217}
218218
219- func parseEnvs (env map [string ]string ) (Config , error ) {
220- c := Config {
221- Headers : make (map [string ]string ),
222- }
219+ func envBool (env map [string ]string , name string ) (null.Bool , error ) {
220+ if v , vDefined := env [name ]; vDefined {
221+ b , err := strconv .ParseBool (v )
222+ if err != nil {
223+ return null .NewBool (false , false ), err
224+ }
223225
224- getEnvBool := func (env map [string ]string , name string ) (null.Bool , error ) {
225- if v , vDefined := env [name ]; vDefined {
226- b , err := strconv .ParseBool (v )
227- if err != nil {
228- return null .NewBool (false , false ), err
229- }
226+ return null .BoolFrom (b ), nil
227+ }
228+ return null .NewBool (false , false ), nil
229+ }
230230
231- return null .BoolFrom (b ), nil
231+ func envMap (env map [string ]string , prefix string ) map [string ]string {
232+ result := make (map [string ]string )
233+ for ek , ev := range env {
234+ if strings .HasPrefix (ek , prefix ) {
235+ k := strings .TrimPrefix (ek , prefix )
236+ result [k ] = ev
232237 }
233- return null .NewBool (false , false ), nil
234238 }
239+ return result
240+ }
235241
236- getEnvMap := func (env map [string ]string , prefix string ) map [string ]string {
237- result := make (map [string ]string )
238- for ek , ev := range env {
239- if strings .HasPrefix (ek , prefix ) {
240- k := strings .TrimPrefix (ek , prefix )
241- result [k ] = ev
242- }
243- }
244- return result
242+ func parseEnvs (env map [string ]string ) (Config , error ) {
243+ c := Config {
244+ Headers : make (map [string ]string ),
245245 }
246246
247247 if pushInterval , pushIntervalDefined := env ["K6_PROMETHEUS_RW_PUSH_INTERVAL" ]; pushIntervalDefined {
@@ -254,7 +254,7 @@ func parseEnvs(env map[string]string) (Config, error) {
254254 c .ServerURL = null .StringFrom (url )
255255 }
256256
257- if b , err := getEnvBool (env , "K6_PROMETHEUS_RW_INSECURE_SKIP_TLS_VERIFY" ); err != nil {
257+ if b , err := envBool (env , "K6_PROMETHEUS_RW_INSECURE_SKIP_TLS_VERIFY" ); err != nil {
258258 return c , err
259259 } else if b .Valid {
260260 c .InsecureSkipTLSVerify = b
@@ -276,7 +276,7 @@ func parseEnvs(env map[string]string) (Config, error) {
276276 c .ClientCertificateKey = null .StringFrom (clientCertificateKey )
277277 }
278278
279- envHeaders := getEnvMap (env , "K6_PROMETHEUS_RW_HEADERS_" )
279+ envHeaders := envMap (env , "K6_PROMETHEUS_RW_HEADERS_" )
280280 for k , v := range envHeaders {
281281 c .Headers [k ] = v
282282 }
@@ -291,13 +291,13 @@ func parseEnvs(env map[string]string) (Config, error) {
291291 }
292292 }
293293
294- if b , err := getEnvBool (env , "K6_PROMETHEUS_RW_TREND_AS_NATIVE_HISTOGRAM" ); err != nil {
294+ if b , err := envBool (env , "K6_PROMETHEUS_RW_TREND_AS_NATIVE_HISTOGRAM" ); err != nil {
295295 return c , err
296296 } else if b .Valid {
297297 c .TrendAsNativeHistogram = b
298298 }
299299
300- if b , err := getEnvBool (env , "K6_PROMETHEUS_RW_STALE_MARKERS" ); err != nil {
300+ if b , err := envBool (env , "K6_PROMETHEUS_RW_STALE_MARKERS" ); err != nil {
301301 return c , err
302302 } else if b .Valid {
303303 c .StaleMarkers = b
0 commit comments