Skip to content

Commit 6d25add

Browse files
committed
chore: cmd: remove validation of -k6-uri
This is now done by k6 repository directly, and k6-uri defaults to empty string.
1 parent effb00e commit 6d25add

File tree

1 file changed

+0
-37
lines changed
  • cmd/synthetic-monitoring-agent

1 file changed

+0
-37
lines changed

cmd/synthetic-monitoring-agent/main.go

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@ import (
77
"io"
88
"math"
99
"net"
10-
"net/url"
1110
"os"
12-
"os/exec"
1311
"os/signal"
1412
"path/filepath"
1513
"strconv"
@@ -224,15 +222,6 @@ func run(args []string, stdout io.Writer) error {
224222

225223
notifyAboutDeprecatedFeatureFlags(features, zl)
226224

227-
if features.IsSet(feature.K6) {
228-
newUri, err := validateK6URI(config.K6URI)
229-
if err != nil {
230-
return err
231-
} else if newUri != config.K6URI {
232-
config.K6URI = newUri
233-
}
234-
}
235-
236225
var usageReporter usage.Reporter
237226
switch {
238227
case config.DisableUsageReports:
@@ -487,32 +476,6 @@ func boolFromEnv(name string, defaultValue bool) bool {
487476
return parsed
488477
}
489478

490-
func validateK6URI(uri string) (string, error) {
491-
u, err := url.Parse(uri)
492-
if err != nil {
493-
return "", err
494-
}
495-
496-
switch u.Scheme {
497-
case "http", "https":
498-
499-
case "":
500-
if u.Path == "" {
501-
return "", fmt.Errorf("missing path in %q", uri)
502-
}
503-
504-
uri, err = exec.LookPath(u.Path)
505-
if err != nil {
506-
return "", err
507-
}
508-
509-
default:
510-
return "", fmt.Errorf("invalid scheme %q", u.Scheme)
511-
}
512-
513-
return uri, nil
514-
}
515-
516479
func notifyAboutDeprecatedFeatureFlags(features feature.Collection, zl zerolog.Logger) {
517480
for _, ff := range []string{feature.K6, feature.Traceroute} {
518481
if features.IsSet(ff) {

0 commit comments

Comments
 (0)