Remove Caddy-specific version fallback

grafana · Oct 21, 2020 · 1f641a2 · 1f641a2
1 parent 3e0f794
commit 1f641a2
Showing 1 changed file with 1 addition and 6 deletions.
diff --git a/environment.go b/environment.go
@@ -29,12 +29,7 @@ import (
 )
 
 func (b Builder) newEnvironment(ctx context.Context) (*environment, error) {
-	// assume Caddy v2 if no semantic version is provided
-	caddyModulePath := defaultCaddyModulePath
-	if !strings.HasPrefix(b.CaddyVersion, "v") || !strings.Contains(b.CaddyVersion, ".") {
-		caddyModulePath += "/v2"
-	}
-	caddyModulePath, err := versionedModulePath(caddyModulePath, b.CaddyVersion)
+	k6ModulePath, err := versionedModulePath(defaultK6ModulePath, b.K6Version)
 	if err != nil {
 		return nil, err
 	}