fix: restrict ConfigMap file to base name only, support path in VolumeClaim

Author: moko-poi

api/v1alpha1/testrun_types.go

@@ -154,7 +154,6 @@ type K6Configmap struct {
 	// Name of the ConfigMap. It is expected to be in the sanme namespace as the `TestRun`.
 	Name string `json:"name"`
 	// Name of the file to execute (.js or .tar), stored as a key in the ConfigMap.
-	// Can include a path component (e.g., "subdir/script.js").
 	File string `json:"file,omitempty"`
 }
 
@@ -210,6 +209,7 @@ func (k6 TestRunSpec) ParseScript() (*types.Script, error) {
 	spec := k6.Script
 	s := &types.Script{}
 
+	// VolumeClaim: allow file to include a path component (e.g. "subdir/script.js").
 	if spec.VolumeClaim.Name != "" {
 		s.Name = spec.VolumeClaim.Name
 		if spec.VolumeClaim.File != "" {
@@ -227,17 +227,15 @@ func (k6 TestRunSpec) ParseScript() (*types.Script, error) {
 		return s, nil
 	}
 
+	// ConfigMap: supports file name only (no path components)
 	if spec.ConfigMap.Name != "" {
+		s.Path = "/test/"
+		s.Filename = "test.js"
+
 		s.Name = spec.ConfigMap.Name
 
 		if spec.ConfigMap.File != "" {
-			s.Path, s.Filename = filepath.Split(spec.ConfigMap.File)
-		}
-		if s.Path == "" {
-			s.Path = "/test/"
-		}
-		if s.Filename == "" {
-			s.Filename = "test.js"
+			s.Filename = spec.ConfigMap.File
 		}
 
 		s.Type = "ConfigMap"

docs/crd-generated.md

@@ -779,8 +779,7 @@ K6Configmap describes the location of the script in the ConfigMap.
         <td><b>file</b></td>
         <td>string</td>
         <td>
-          Name of the file to execute (.js or .tar), stored as a key in the ConfigMap.
-Can include a path component (e.g., "subdir/script.js").<br/>
+          Name of the file to execute (.js or .tar), stored as a key in the ConfigMap.<br/>
         </td>
         <td>false</td>
       </tr></tbody>

pkg/types/script.go

@@ -57,27 +57,24 @@ func (s *Script) Volume() []corev1.Volume {
 // VolumeMount creates a VolumeMount spec for the script
 func (s *Script) VolumeMount() []corev1.VolumeMount {
 
-	mountPath := s.Path
-	if mountPath == "" {
-		mountPath = "/test/"
-	}
-
 	switch s.Type {
 
+	// VolumeClaim: mounts the volume at s.Path (default "/test").
 	case "VolumeClaim":
 		return []corev1.VolumeMount{
 			corev1.VolumeMount{
 				Name:      "k6-test-volume",
-				MountPath: mountPath,
+				MountPath: s.Path,
 				ReadOnly:  s.ReadOnly,
 			},
 		}
 
+	// ConfigMap: always mounted at "/test" since keys cannot represent nested directories.
 	case "ConfigMap":
 		return []corev1.VolumeMount{
 			corev1.VolumeMount{
 				Name:      "k6-test-volume",
-				MountPath: mountPath,
+				MountPath: "/test",
 				ReadOnly:  true,
 			},
 		}