Merge pull request #68925 from casusbelli/fix_65312

Adding Quobyte Tenant to QuobyteVolumeSource to enable deletion of persistent volumes

vendor/github.com/quobyte/api/quobyte.go

@@ -2,7 +2,6 @@
 package quobyte
 
 import (
-	"log"
 	"net/http"
 	"regexp"
 )
@@ -15,6 +14,8 @@ const (
 	RetryOncePerTarget string = "ONCE_PER_TARGET"
 )
 
+var UUIDValidator = regexp.MustCompile("^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-4[a-fA-F0-9]{3}-[8|9|aA|bB][a-fA-F0-9]{3}-[a-fA-F0-9]{12}$")
+
 type QuobyteClient struct {
 	client         *http.Client
 	url            string
@@ -45,24 +46,50 @@ func NewQuobyteClient(url string, username string, password string) *QuobyteClie
 // CreateVolume creates a new Quobyte volume. Its root directory will be owned by given user and group
 func (client QuobyteClient) CreateVolume(request *CreateVolumeRequest) (string, error) {
 	var response volumeUUID
-
-	if request.TenantID != "" && !IsValidUUID(request.TenantID) {
-		log.Printf("Tenant name resolution: Resolving  %s to UUID\n", request.TenantID)
-		tenantUUID, err := client.ResolveTenantNameToUUID(request.TenantID)
-		if err != nil {
-			return "", err
-		}
-
-		request.TenantID = tenantUUID
+	tenantUUID, err := client.GetTenantUUID(request.TenantID)
+	if err != nil {
+		return "", err
 	}
+	request.TenantID = tenantUUID
 
-	if err := client.sendRequest("createVolume", request, &response); err != nil {
+	if err = client.sendRequest("createVolume", request, &response); err != nil {
 		return "", err
 	}
 
 	return response.VolumeUUID, nil
 }
 
+// GetVolumeUUID resolves the volumeUUID for the given volume and tenant name.
+// This method should be used when it is not clear if the given string is volume UUID or Name.
+func (client QuobyteClient) GetVolumeUUID(volume, tenant string) (string, error) {
+	if len(volume) != 0 && !IsValidUUID(volume) {
+		tenantUUID, err := client.GetTenantUUID(tenant)
+		if err != nil {
+			return "", err
+		}
+		volUUID, err := client.ResolveVolumeNameToUUID(volume, tenantUUID)
+		if err != nil {
+			return "", err
+		}
+
+		return volUUID, nil
+	}
+	return volume, nil
+}
+
+// GetTenantUUID resolves the tenatnUUID for the given name
+// This method should be used when it is not clear if the given string is Tenant UUID or Name.
+func (client QuobyteClient) GetTenantUUID(tenant string) (string, error) {
+	if len(tenant) != 0 && !IsValidUUID(tenant) {
+		tenantUUID, err := client.ResolveTenantNameToUUID(tenant)
+		if err != nil {
+			return "", err
+		}
+		return tenantUUID, nil
+	}
+	return tenant, nil
+}
+
 // ResolveVolumeNameToUUID resolves a volume name to a UUID
 func (client *QuobyteClient) ResolveVolumeNameToUUID(volumeName, tenant string) (string, error) {
 	request := &resolveVolumeNameRequest{
@@ -77,6 +104,18 @@ func (client *QuobyteClient) ResolveVolumeNameToUUID(volumeName, tenant string)
 	return response.VolumeUUID, nil
 }
 
+// DeleteVolumeByResolvingNamesToUUID deletes the volume by resolving the volume name and tenant name to
+// respective UUID if required.
+// This method should be used if the given volume, tenant information is name or UUID.
+func (client *QuobyteClient) DeleteVolumeByResolvingNamesToUUID(volume, tenant string) error {
+	volumeUUID, err := client.GetVolumeUUID(volume, tenant)
+	if err != nil {
+		return err
+	}
+
+	return client.DeleteVolume(volumeUUID)
+}
+
 // DeleteVolume deletes a Quobyte volume
 func (client *QuobyteClient) DeleteVolume(UUID string) error {
 	return client.sendRequest(
@@ -182,10 +221,9 @@ func (client *QuobyteClient) SetTenant(tenantName string) (string, error) {
 	return response.TenantID, nil
 }
 
-// IsValidUUID Validates given uuid
+// IsValidUUID Validates the given uuid
 func IsValidUUID(uuid string) bool {
-	r := regexp.MustCompile("^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-4[a-fA-F0-9]{3}-[8|9|aA|bB][a-fA-F0-9]{3}-[a-fA-F0-9]{12}$")
-	return r.MatchString(uuid)
+	return UUIDValidator.MatchString(uuid)
 }
 
 // ResolveTenantNameToUUID Returns UUID for given name, error if not found.