GetClosestVolumeIDFromTargetPath server implementation

Author: mauriciopoppe

integrationtests/volume_test.go

@@ -172,4 +172,8 @@ func TestVolumeAPIs(t *testing.T) {
 		skipTestOnCondition(t, isRunningOnGhActions())
 		v1VolumeTests(t)
 	})
+	t.Run("v2alpha1Tests", func(t *testing.T) {
+		skipTestOnCondition(t, isRunningOnGhActions())
+		v2alpha1VolumeTests(t)
+	})
 }

pkg/os/volume/api.go

@@ -45,6 +45,11 @@ type VolumeAPI struct{}
 // verifies that the API is implemented
 var _ API = &VolumeAPI{}
 
+var (
+	// VolumeRegexp matches a Volume
+	VolumeRegexp = regexp.MustCompile(`^Volume\{[\w-]*\}`)
+)
+
 // New - Construct a new Volume API Implementation.
 func New() VolumeAPI {
 	return VolumeAPI{}
@@ -304,7 +309,7 @@ func findClosestVolume(path string) (string, error) {
 				return "", err
 			}
 			// if it has the form Volume{volumeid}\ then it's a volume
-			if strings.HasPrefix(target, "Volume") {
+			if VolumeRegexp.Match([]byte(target)) {
 				// symlinks that are pointing to Volumes don't have this prefix
 				target = "\\\\?\\" + target
 				return target, nil

pkg/server/volume/api_group_generated.go

@@ -85,6 +85,14 @@ type GetVolumeIDFromTargetPathResponse struct {
 	VolumeId string
 }
 
+type GetClosestVolumeIDFromTargetPathRequest struct {
+	TargetPath string
+}
+
+type GetClosestVolumeIDFromTargetPathResponse struct {
+	VolumeId string
+}
+
 // These structs are used in APIs less than v1beta3 and rerouted internally
 
 type DismountVolumeRequest struct {

pkg/server/volume/impl/types.go

@@ -290,3 +290,24 @@ func (s *Server) GetVolumeIDFromTargetPath(context context.Context, request *int
 
 	return response, nil
 }
+
+func (s *Server) GetClosestVolumeIDFromTargetPath(context context.Context, request *internal.GetClosestVolumeIDFromTargetPathRequest, version apiversion.Version) (*internal.GetClosestVolumeIDFromTargetPathResponse, error) {
+	klog.V(2).Infof("GetClosestVolumeIDFromTargetPath: Request: %+v", request)
+
+	targetPath := request.TargetPath
+	if targetPath == "" {
+		return nil, fmt.Errorf("target path is empty")
+	}
+
+	volume, err := s.hostAPI.GetClosestVolumeIDFromTargetPath(targetPath)
+	if err != nil {
+		klog.Errorf("failed GetClosestVolumeIDFromTargetPath: %v", err)
+		return nil, err
+	}
+
+	response := &internal.GetClosestVolumeIDFromTargetPathResponse{
+		VolumeId: volume,
+	}
+
+	return response, nil
+}

pkg/server/volume/impl/v1/server_generated.go

@@ -58,6 +58,10 @@ func (volumeAPI *fakeVolumeAPI) GetVolumeIDFromTargetPath(mount string) (string,
 	return "id", nil
 }
 
+func (volumeAPI *fakeVolumeAPI) GetClosestVolumeIDFromTargetPath(mount string) (string, error) {
+	return "id", nil
+}
+
 func (volumeAPI *fakeVolumeAPI) GetVolumeStats(volumeID string) (int64, int64, error) {
 	return -1, -1, nil
 }