44 "bufio"
55 "bytes"
66 "context"
7+ "encoding/json"
78 "errors"
89 "fmt"
910 "io"
@@ -16,6 +17,12 @@ import (
1617 "github.com/spf13/afero"
1718)
1819
20+ // secretSourceConfig represents the configuration for the secrets store
21+ type secretSourceConfig struct {
22+ URL string `json:"url"`
23+ Token string `json:"token"`
24+ }
25+
1926type Local struct {
2027 k6path string
2128 logger * zerolog.Logger
@@ -68,7 +75,18 @@ func (r Local) Run(ctx context.Context, script Script) (*RunResponse, error) {
6875 return nil , fmt .Errorf ("cannot write temporary script file: %w" , err )
6976 }
7077
71- k6Path , err := exec .LookPath (r .k6path )
78+ executable := r .k6path
79+ // TODO(d0ugal): This is a short-term hack to use a different k6 binary when
80+ // secrets are configured. This should be removed when the default binary has been updated
81+ if script .SecretStore .IsConfigured () {
82+ executable = r .k6path + "-gsm"
83+ logger .Info ().
84+ Str ("k6_path" , r .k6path ).
85+ Str ("k6_gsm_path" , executable ).
86+ Msg ("Using k6-gsm binary for secrets" )
87+ }
88+
89+ k6Path , err := exec .LookPath (executable )
7290 if err != nil {
7391 return nil , fmt .Errorf ("cannot find k6 executable: %w" , err )
7492 }
@@ -77,37 +95,21 @@ func (r Local) Run(ctx context.Context, script Script) (*RunResponse, error) {
7795 ctx , cancel = context .WithTimeout (ctx , checkTimeout )
7896 defer cancel ()
7997
80- args := []string {
81- "run" ,
82- "--out" , "sm=" + metricsFn ,
83- "--log-format" , "logfmt" ,
84- "--log-output" , "file=" + logsFn ,
85- "--max-redirects" , "10" ,
86- "--batch" , "10" ,
87- "--batch-per-host" , "4" ,
88- "--no-connection-reuse" ,
89- "--blacklist-ip" , r .blacklistedIP ,
90- "--block-hostnames" , "*.cluster.local" , // TODO(mem): make this configurable
91- "--summary-time-unit" , "s" ,
92- // "--discard-response-bodies", // TODO(mem): make this configurable
93- "--dns" , "ttl=30s,select=random,policy=preferIPv4" , // TODO(mem): this needs fixing, preferIPv4 is probably not what we want
94- "--address" , "" , // Disable REST API server
95- "--no-thresholds" ,
96- "--no-usage-report" ,
97- "--no-color" ,
98- "--no-summary" ,
99- "--verbose" ,
98+ var configFile string
99+ if script .SecretStore .IsConfigured () {
100+ var cleanup func ()
101+ configFile , cleanup , err = createSecretConfigFile (script .SecretStore .Url , script .SecretStore .Token )
102+ if err != nil {
103+ return nil , fmt .Errorf ("cannot create secret config file: %w" , err )
104+ }
105+ defer cleanup ()
100106 }
101107
102- if script .CheckInfo .Type != synthetic_monitoring .CheckTypeBrowser .String () {
103- args = append (args ,
104- "--vus" , "1" ,
105- "--iterations" , "1" ,
106- )
108+ args , err := r .buildK6Args (script , metricsFn , logsFn , scriptFn , configFile )
109+ if err != nil {
110+ return nil , fmt .Errorf ("building k6 arguments: %w" , err )
107111 }
108112
109- args = append (args , scriptFn )
110-
111113 cmd := exec .CommandContext (
112114 ctx ,
113115 k6Path ,
@@ -187,6 +189,46 @@ func (r Local) Run(ctx context.Context, script Script) (*RunResponse, error) {
187189 return & RunResponse {Metrics : metrics .Bytes (), Logs : logs .Bytes ()}, errors .Join (err , errorFromLogs (logs .Bytes ()))
188190}
189191
192+ func (r Local ) buildK6Args (script Script , metricsFn , logsFn , scriptFn , configFile string ) ([]string , error ) {
193+ args := []string {
194+ "run" ,
195+ "--out" , "sm=" + metricsFn ,
196+ "--log-format" , "logfmt" ,
197+ "--log-output" , "file=" + logsFn ,
198+ "--max-redirects" , "10" ,
199+ "--batch" , "10" ,
200+ "--batch-per-host" , "4" ,
201+ "--no-connection-reuse" ,
202+ "--blacklist-ip" , r .blacklistedIP ,
203+ "--block-hostnames" , "*.cluster.local" , // TODO(mem): make this configurable
204+ "--summary-time-unit" , "s" ,
205+ // "--discard-response-bodies", // TODO(mem): make this configurable
206+ "--dns" , "ttl=30s,select=random,policy=preferIPv4" , // TODO(mem): this needs fixing, preferIPv4 is probably not what we want
207+ "--address" , "" , // Disable REST API server
208+ "--no-thresholds" ,
209+ "--no-usage-report" ,
210+ "--no-color" ,
211+ "--no-summary" ,
212+ "--verbose" ,
213+ }
214+
215+ // Add secretStore configuration if available
216+ if script .SecretStore .IsConfigured () {
217+ args = append (args , "--secret-source" , "grafanasecrets=config=" + configFile )
218+ }
219+
220+ if script .CheckInfo .Type != synthetic_monitoring .CheckTypeBrowser .String () {
221+ args = append (args ,
222+ "--vus" , "1" ,
223+ "--iterations" , "1" ,
224+ )
225+ }
226+
227+ args = append (args , scriptFn )
228+
229+ return args , nil
230+ }
231+
190232func mktemp (fs afero.Fs , dir , pattern string ) (string , error ) {
191233 f , err := afero .TempFile (fs , dir , pattern )
192234 if err != nil {
@@ -262,3 +304,39 @@ func readFileLimit(f afero.Fs, name string, limit int64) (*bytes.Buffer, bool, e
262304
263305 return buf , true , nil
264306}
307+
308+ // createSecretConfigFile creates a JSON config file with the given secret store URL and token
309+ func createSecretConfigFile (url , token string ) (filename string , cleanup func (), err error ) {
310+ tmpFile , err := os .CreateTemp ("" , "k6-secrets-*.json" )
311+ if err != nil {
312+ return "" , nil , fmt .Errorf ("creating temp file: %w" , err )
313+ }
314+
315+ if err := os .Chmod (tmpFile .Name (), 0600 ); err != nil {
316+ os .Remove (tmpFile .Name ())
317+ return "" , nil , fmt .Errorf ("setting file permissions: %w" , err )
318+ }
319+
320+ config := secretSourceConfig {
321+ URL : url ,
322+ Token : token ,
323+ }
324+
325+ configData , err := json .Marshal (config )
326+ if err != nil {
327+ os .Remove (tmpFile .Name ())
328+ return "" , nil , fmt .Errorf ("marshaling config to JSON: %w" , err )
329+ }
330+
331+ if _ , err := tmpFile .Write (configData ); err != nil {
332+ os .Remove (tmpFile .Name ())
333+ return "" , nil , fmt .Errorf ("writing config file: %w" , err )
334+ }
335+
336+ if err := tmpFile .Close (); err != nil {
337+ os .Remove (tmpFile .Name ())
338+ return "" , nil , fmt .Errorf ("closing config file: %w" , err )
339+ }
340+
341+ return tmpFile .Name (), func () { os .Remove (tmpFile .Name ()) }, nil
342+ }
0 commit comments