Fix: UI ADLS import validity regex (#6509)

* Fix: UI ADLS import validity regex * Fix: UI ADLS import validity regex * Fixes 2 * Fixes 2 * Update pkg/block/azure/adapter.go Co-authored-by: Barak Amar <[email protected]> --------- Co-authored-by: Barak Amar <[email protected]>
treeverse · Aug 29, 2023 · 18562f6 · 18562f6
1 parent 1149f79
commit 18562f6
Show file tree

Hide file tree

Showing 13 changed files with 73 additions and 12 deletions.
diff --git a/api/swagger.yml b/api/swagger.yml
@@ -1027,6 +1027,7 @@ components:
         - pre_sign_support
         - pre_sign_support_ui
         - import_support
+        - import_validity_regex
       properties:
         blockstore_type:
           type: string
@@ -1042,6 +1043,8 @@ components:
           type: boolean
         import_support:
           type: boolean
+        import_validity_regex:
+          type: string
 
     VersionConfig:
       type: object

diff --git a/clients/java/api/openapi.yaml b/clients/java/api/openapi.yaml
diff --git a/clients/java/docs/StorageConfig.md b/clients/java/docs/StorageConfig.md
diff --git a/clients/java/src/main/java/io/lakefs/clients/api/model/StorageConfig.java b/clients/java/src/main/java/io/lakefs/clients/api/model/StorageConfig.java
diff --git a/clients/java/src/test/java/io/lakefs/clients/api/model/StorageConfigTest.java b/clients/java/src/test/java/io/lakefs/clients/api/model/StorageConfigTest.java
diff --git a/clients/python/docs/StorageConfig.md b/clients/python/docs/StorageConfig.md
diff --git a/clients/python/lakefs_client/model/storage_config.py b/clients/python/lakefs_client/model/storage_config.py
diff --git a/docs/assets/js/swagger.yml b/docs/assets/js/swagger.yml
@@ -1027,6 +1027,7 @@ components:
         - pre_sign_support
         - pre_sign_support_ui
         - import_support
+        - import_validity_regex
       properties:
         blockstore_type:
           type: string
@@ -1042,6 +1043,8 @@ components:
           type: boolean
         import_support:
           type: boolean
+        import_validity_regex:
+          type: string
 
     VersionConfig:
       type: object

diff --git a/pkg/api/controller.go b/pkg/api/controller.go
@@ -1452,6 +1452,7 @@ func (c *Controller) GetStorageConfig(w http.ResponseWriter, r *http.Request) {
 		PreSignSupport:                   info.PreSignSupport,
 		PreSignSupportUi:                 info.PreSignSupportUI,
 		ImportSupport:                    info.ImportSupport,
+		ImportValidityRegex:              info.ImportValidityRegex,
 	}
 	writeResponse(w, r, http.StatusOK, response)
 }

diff --git a/pkg/block/azure/adapter.go b/pkg/block/azure/adapter.go
@@ -570,7 +570,8 @@ func (a *Adapter) CompleteMultiPartUpload(ctx context.Context, obj block.ObjectP
 
 func (a *Adapter) GetStorageNamespaceInfo() block.StorageNamespaceInfo {
 	info := block.DefaultStorageNamespaceInfo(block.BlockstoreTypeAzure)
-	info.ValidityRegex = `^https?://[a-z,0-9]+\.blob\.core\.windows\.net`
+	info.ImportValidityRegex = `^https?://[a-z0-9_-]+\.(blob|adls)\.core\.windows\.net` // added adls for import hint validation in UI
+	info.ValidityRegex = `^https?://[a-z0-9_-]+\.blob\.core\.windows\.net`
 	info.Example = "https://mystorageaccount.blob.core.windows.net/mycontainer/"
 	if a.disablePreSigned {
 		info.PreSignSupport = false

diff --git a/pkg/block/namespace.go b/pkg/block/namespace.go
@@ -51,6 +51,7 @@ type StorageNamespaceInfo struct {
 	PreSignSupport         bool
 	PreSignSupportUI       bool
 	ImportSupport          bool
+	ImportValidityRegex    string
 }
 
 type QualifiedKey interface {
@@ -189,9 +190,10 @@ func DefaultValidationRegex(scheme string) string {
 
 func DefaultStorageNamespaceInfo(scheme string) StorageNamespaceInfo {
 	return StorageNamespaceInfo{
-		ValidityRegex:  DefaultValidationRegex(scheme),
-		Example:        DefaultExample(scheme),
-		PreSignSupport: true,
-		ImportSupport:  true,
+		ValidityRegex:       DefaultValidationRegex(scheme),
+		Example:             DefaultExample(scheme),
+		PreSignSupport:      true,
+		ImportSupport:       true,
+		ImportValidityRegex: DefaultValidationRegex(scheme),
 	}
 }
diff --git a/webui/src/lib/hooks/storageConfig.tsx b/webui/src/lib/hooks/storageConfig.tsx
@@ -16,6 +16,7 @@ type StorageConfigContextType = {
   blockstore_type: string | null;
   default_namespace_prefix: string | null;
   import_support: boolean;
+  import_validity_regex: string | null;
   pre_sign_support: boolean;
   pre_sign_support_ui: boolean;
 };
@@ -28,6 +29,7 @@ const storageConfigInitialState: StorageConfigContextType = {
   blockstore_type: null,
   default_namespace_prefix: null,
   import_support: false,
+  import_validity_regex: null,
   pre_sign_support: false,
   pre_sign_support_ui: false,
 };

diff --git a/webui/src/pages/repositories/services/import_data.jsx b/webui/src/pages/repositories/services/import_data.jsx
@@ -97,8 +97,8 @@ const ImportForm = ({
 
                     }) => {
     const [isSourceValid, setIsSourceValid] = useState(true);
-    const storageNamespaceValidityRegexStr = config.blockstore_namespace_ValidityRegex;
-    const storageNamespaceValidityRegex = RegExp(storageNamespaceValidityRegexStr);
+    const importValidityRegexStr = config.import_validity_regex;
+    const storageNamespaceValidityRegex = RegExp(importValidityRegexStr);
     const updateSourceURLValidity = () => {
         if (!sourceRef.current.value) {
             updateSrcValidity(true);
@@ -124,7 +124,7 @@ const ImportForm = ({
                               onChange={updateSourceURLValidity}/>
                 {isSourceValid === false &&
                     <Form.Text className="text-danger">
-                        {`Import source should match the following pattern: "${storageNamespaceValidityRegexStr}"`}
+                        {`Import source should match the following pattern: "${importValidityRegexStr}"`}
                     </Form.Text>
                 }
                 {isSourceValid &&