Added support for file share

azure-pipeline-templates/build.yml

@@ -117,14 +117,18 @@ steps:
       echo "{" > $cnfFile
       echo "\"block-acct\"": "\"$(AZTEST_BLOCK_ACC_NAME)\"", >> $cnfFile
       echo "\"adls-acct\"": "\"$(AZTEST_ADLS_ACC_NAME)\"", >> $cnfFile
+      echo "\"file-acct\"": "\"$(AZTEST_FILE_ACC_NAME)\"", >> $cnfFile
       echo "\"block-cont\"": "\"${{ parameters.container }}\"", >> $cnfFile
       echo "\"adls-cont\"": "\"${{ parameters.container }}\"", >> $cnfFile
+      echo "\"file-cont\"": "\"${{ parameters.container }}\"", >> $cnfFile
       echo "\"block-key\"": "\"$(AZTEST_BLOCK_KEY)\"", >> $cnfFile
       echo "\"adls-key\"": "\"$(AZTEST_ADLS_KEY)\"", >> $cnfFile
+      echo "\"file-key\"": "\"$(AZTEST_FILE_KEY)\"", >> $cnfFile
       echo "\"block-sas\"": "\"$(AZTEST_BLOCK_SAS)\"", >> $cnfFile
       echo "\"block-cont-sas-ubn-18\"": "\"$(AZTEST_BLOCK_CONT_SAS_UBN_18)\"", >> $cnfFile
       echo "\"block-cont-sas-ubn-20\"": "\"$(AZTEST_BLOCK_CONT_SAS_UBN_20)\"", >> $cnfFile
       echo "\"adls-sas\"": "\"$(AZTEST_ADLS_SAS)\"", >> $cnfFile
+      echo "\"file-sas\"": "\"$(AZTEST_FILE_SAS)\"", >> $cnfFile
       echo "\"msi-appid\"": "\"$(AZTEST_APP_ID)\"", >> $cnfFile
       echo "\"msi-resid\"": "\"$(AZTEST_RES_ID)\"", >> $cnfFile
       echo "\"msi-objid\"": "\"$(AZTEST_OBJ_ID)\"", >> $cnfFile

azure-pipeline-templates/e2e-tests.yml

@@ -13,6 +13,8 @@ parameters:
     type: step
   - name: adls
     type: boolean
+  - name: fileshare 
+    type: boolean
   - name: clone
     type: boolean
     default: false
@@ -51,7 +53,7 @@ steps:
   - task: Go@0
     inputs:
       command: 'test'
-      arguments: '-v -timeout=2h ./... -args -mnt-path=${{ parameters.mount_dir }} -adls=${{parameters.adls}} -clone=${{parameters.clone}} -tmp-path=${{parameters.temp_dir}} -quick-test=${{parameters.quick_test}} -stream-direct-test=${{parameters.stream_direct_test}} -distro-name="${{parameters.distro_name}}"'
+      arguments: '-v -timeout=2h ./... -args -mnt-path=${{ parameters.mount_dir }} -adls=${{parameters.adls}} -fileshare=false -clone=${{parameters.clone}} -tmp-path=${{parameters.temp_dir}} -quick-test=${{parameters.quick_test}} -stream-direct-test=${{parameters.stream_direct_test}} -distro-name="${{parameters.distro_name}}"'
       workingDirectory: ${{ parameters.working_dir }}/test/e2e_tests
     displayName: 'E2E Test: ${{ parameters.idstring }}'
     timeoutInMinutes: 120

azure-pipeline-templates/release-distro-tests.yml

@@ -132,6 +132,53 @@ steps:
       blobfuse2 unmount ${{ parameters.mount_dir }}
     displayName: 'Unmount ADLS'
 
+  # - script: |
+  #     blobfuse2 gen-test-config --config-file=${{ parameters.root_dir }}/azure-storage-fuse/testdata/config/azure_key.yaml --container-name=${{ parameters.container }} --temp-path=${{ parameters.temp_dir }} --output-file=${{ parameters.root_dir }}/file_share_config.yaml
+  #   displayName: 'Create File Share Config File'
+  #   env:
+  #     NIGHTLY_STO_ACC_NAME: $(AZTEST_FILE_ACC_NAME)
+  #     NIGHTLY_STO_ACC_KEY: $(AZTEST_FILE_KEY)
+  #     ACCOUNT_TYPE: 'file'
+  #     ACCOUNT_ENDPOINT: 'https://$(AZTEST_FILE_ACC_NAME).file.core.windows.net'
+  #     VERBOSE_LOG: false
+  #     USE_HTTP: false
+  #   continueOnError: false
+
+  # - script: |
+  #     cat ${{ parameters.root_dir }}/file_share_config.yaml
+  #   displayName: 'Print File Share Config File'
+
+  # - script: |
+  #     blobfuse2 unmount all 
+  #     sudo fusermount -u ${{ parameters.mount_dir }}
+  #     blobfuse2 mount ${{ parameters.mount_dir }} --config-file=${{ parameters.root_dir }}/file_share_config.yaml
+  #   displayName: 'Mount File Share'
+
+  #   # Wait for some time to let the container come up
+  # - script: |
+  #     sleep 10s
+  #   displayName: 'Waiting for Mount'
+
+  # - script: |
+  #     df
+  #     echo "-------------------------------------------------------------------"
+  #     df | grep blobfuse2
+  #     exit $?
+  #   displayName: 'Verify Mount'
+
+  # - task: Go@0
+  #   inputs:
+  #     command: 'test'
+  #     arguments: '-v -timeout=2h -run Test.i.* -args -mnt-path=${{ parameters.mount_dir }} -adls=false -fileshare=true -clone=false -tmp-path=${{ parameters.temp_dir }} -quick-test=true'
+  #     workingDirectory: ${{ parameters.work_dir }}/test/e2e_tests
+  #   displayName: 'E2E Test: File Share'
+  #   timeoutInMinutes: 120
+  #   continueOnError: false
+
+  - script: |
+      blobfuse2 unmount ${{ parameters.mount_dir }}
+    displayName: 'Unmount File Share'
+
   - script: |
       cat blobfuse2-logs.txt
     displayName: 'View Logs'

blobfuse2-ci.yaml

@@ -65,14 +65,18 @@ jobs:
         echo "{" > $cnfFile
         echo "\"block-acct\"": "\"$(AZTEST_BLOCK_ACC_NAME)\"", >> $cnfFile
         echo "\"adls-acct\"": "\"$(AZTEST_ADLS_ACC_NAME)\"", >> $cnfFile
+        echo "\"file-acct\"": "\"$(AZTEST_FILE_ACC_NAME)\"", >> $cnfFile
         echo "\"block-cont\"": "\"$(containerName)\"", >> $cnfFile
         echo "\"adls-cont\"": "\"$(containerName)\"", >> $cnfFile
+        cho "\"file-cont\"": "\"$(containerName)\"", >> $cnfFile
         echo "\"block-key\"": "\"$(AZTEST_BLOCK_KEY)\"", >> $cnfFile
         echo "\"adls-key\"": "\"$(AZTEST_ADLS_KEY)\"", >> $cnfFile
+        echo "\"file-key\"": "\"$(AZTEST_FILE_KEY)\"", >> $cnfFile
         echo "\"block-sas\"": "\"$(AZTEST_BLOCK_SAS)\"", >> $cnfFile
+        echo "\"adls-sas\"": "\"$(adlsSas)\"", >> $cnfFile
+        echo "\"file-sas\"": "\"$(AZTEST_FILE_SAS)\"", >> $cnfFile
         echo "\"block-cont-sas-ubn-18\"": "\"$(AZTEST_BLOCK_CONT_SAS_UBN_18)\"", >> $cnfFile
         echo "\"block-cont-sas-ubn-20\"": "\"$(AZTEST_BLOCK_CONT_SAS_UBN_20)\"", >> $cnfFile
-        echo "\"adls-sas\"": "\"$(adlsSas)\"", >> $cnfFile
         echo "\"msi-appid\"": "\"$(AZTEST_APP_ID)\"", >> $cnfFile
         echo "\"msi-resid\"": "\"$(AZTEST_RES_ID)\"", >> $cnfFile
         echo "\"msi-objid\"": "\"$(AZTEST_OBJ_ID)\"", >> $cnfFile

component/azstorage/azauth.go

@@ -91,6 +91,8 @@ func getAzAuth(config azAuthConfig) azAuth {
 		return getAzAuthBlob(config)
 	} else if EAccountType.ADLS() == config.AccountType {
 		return getAzAuthBfs(config)
+	} else if EAccountType.FILE() == config.AccountType {
+		return getAzAuthFile(config)
 	}
 	return nil
 }
@@ -159,6 +161,26 @@ func getAzAuthBfs(config azAuthConfig) azAuth {
 	return nil
 }
 
+func getAzAuthFile(config azAuthConfig) azAuth {
+	base := azAuthBase{config: config}
+	if config.AuthMode == EAuthType.KEY() {
+		return &azAuthFileKey{
+			azAuthKey{
+				azAuthBase: base,
+			},
+		}
+	} else if config.AuthMode == EAuthType.SAS() {
+		return &azAuthFileSAS{
+			azAuthSAS{
+				azAuthBase: base,
+			},
+		}
+	} else {
+		log.Crit("azAuth::getAzAuthBfs : Auth type %s not supported. Failed to create Auth object", config.AuthMode)
+	}
+	return nil
+}
+
 type azAuthBase struct {
 	config azAuthConfig
 }

component/azstorage/azauth_test.go

@@ -53,17 +53,22 @@ type storageTestConfiguration struct {
 	// Get the mount path from command line argument
 	BlockAccount   string `json:"block-acct"`
 	AdlsAccount    string `json:"adls-acct"`
+	FileAccount    string `json:"file-acct"`
 	BlockContainer string `json:"block-cont"`
 	AdlsContainer  string `json:"adls-cont"`
+	FileContainer  string `json:"file-cont"`
 	// AdlsDirectory      string `json:"adls-dir"`
 	BlockContainerHuge string `json:"block-cont-huge"`
 	AdlsContainerHuge  string `json:"adls-cont-huge"`
+	FileContainerHuge  string `json:"file-cont-huge"`
 	BlockKey           string `json:"block-key"`
 	AdlsKey            string `json:"adls-key"`
+	FileKey            string `json:"file-key"`
 	BlockSas           string `json:"block-sas"`
 	BlockContSasUbn18  string `json:"block-cont-sas-ubn-18"`
 	BlockContSasUbn20  string `json:"block-cont-sas-ubn-20"`
 	AdlsSas            string `json:"adls-sas"`
+	FileSas            string `json:"file-sas"`
 	// AdlsDirSasUbn18    string `json:"adls-dir-sas-ubn-18"`
 	// AdlsDirSasUbn20    string `json:"adls-dir-sas-ubn-20"`
 	MsiAppId        string `json:"msi-appid"`
@@ -143,6 +148,8 @@ func generateEndpoint(useHttp bool, accountName string, accountType AccountType)
 		endpoint += ".dfs."
 	} else if accountType == EAccountType.BLOCK() {
 		endpoint += ".blob."
+	} else if accountType == EAccountType.FILE() {
+		endpoint += ".file."
 	}
 	endpoint += "core.windows.net/"
 	return endpoint
@@ -338,6 +345,37 @@ func (suite *authTestSuite) TestHttpAdlsSharedKey() {
 	suite.validateStorageTest("TestHttpAdlsSharedKey", stgConfig)
 }
 
+func (suite *authTestSuite) TestFileSharedKey() {
+	defer suite.cleanupTest()
+	stgConfig := AzStorageConfig{
+		container: storageTestConfigurationParameters.FileContainer,
+		authConfig: azAuthConfig{
+			AuthMode:    EAuthType.KEY(),
+			AccountType: EAccountType.FILE(),
+			AccountName: storageTestConfigurationParameters.FileAccount,
+			AccountKey:  storageTestConfigurationParameters.FileKey,
+			Endpoint:    generateEndpoint(false, storageTestConfigurationParameters.FileAccount, EAccountType.FILE()),
+		},
+	}
+	suite.validateStorageTest("TestFileSharedKey", stgConfig)
+}
+
+func (suite *authTestSuite) TestHttpFileSharedKey() {
+	defer suite.cleanupTest()
+	stgConfig := AzStorageConfig{
+		container: storageTestConfigurationParameters.FileContainer,
+		authConfig: azAuthConfig{
+			AuthMode:    EAuthType.KEY(),
+			AccountType: EAccountType.FILE(),
+			AccountName: storageTestConfigurationParameters.FileAccount,
+			AccountKey:  storageTestConfigurationParameters.FileKey,
+			UseHTTP:     true,
+			Endpoint:    generateEndpoint(true, storageTestConfigurationParameters.FileAccount, EAccountType.FILE()),
+		},
+	}
+	suite.validateStorageTest("TestHttpFileSharedKey", stgConfig)
+}
+
 func (suite *authTestSuite) TestBlockInvalidSasKey() {
 	defer suite.cleanupTest()
 	stgConfig := AzStorageConfig{
@@ -521,6 +559,37 @@ func (suite *authTestSuite) TestHttpAdlsSasKey() {
 	suite.validateStorageTest("TestHttpAdlsSasKey", stgConfig)
 }
 
+func (suite *authTestSuite) TestFileSasKey() {
+	defer suite.cleanupTest()
+	stgConfig := AzStorageConfig{
+		container: storageTestConfigurationParameters.FileContainer,
+		authConfig: azAuthConfig{
+			AuthMode:    EAuthType.SAS(),
+			AccountType: EAccountType.FILE(),
+			AccountName: storageTestConfigurationParameters.FileAccount,
+			SASKey:      storageTestConfigurationParameters.FileSas,
+			Endpoint:    generateEndpoint(false, storageTestConfigurationParameters.FileAccount, EAccountType.FILE()),
+		},
+	}
+	suite.validateStorageTest("TestFileSasKey", stgConfig)
+}
+
+func (suite *authTestSuite) TestHttpFileSasKey() {
+	defer suite.cleanupTest()
+	stgConfig := AzStorageConfig{
+		container: storageTestConfigurationParameters.FileContainer,
+		authConfig: azAuthConfig{
+			AuthMode:    EAuthType.SAS(),
+			AccountType: EAccountType.FILE(),
+			AccountName: storageTestConfigurationParameters.FileAccount,
+			SASKey:      storageTestConfigurationParameters.FileSas,
+			UseHTTP:     true,
+			Endpoint:    generateEndpoint(true, storageTestConfigurationParameters.FileAccount, EAccountType.FILE()),
+		},
+	}
+	suite.validateStorageTest("TestHttpFileSasKey", stgConfig)
+}
+
 // func (suite *authTestSuite) TestAdlsDirSasKey() {
 // 	defer suite.cleanupTest()
 // 	assert := assert.New(suite.T())

component/azstorage/azauthkey.go

@@ -38,6 +38,7 @@ import (
 
 	"github.com/Azure/azure-storage-azcopy/v10/azbfs"
 	"github.com/Azure/azure-storage-blob-go/azblob"
+	"github.com/Azure/azure-storage-file-go/azfile"
 )
 
 // Verify that the Auth implement the correct AzAuth interfaces
@@ -87,3 +88,25 @@ func (azkey *azAuthBfsKey) getCredential() interface{} {
 
 	return credential
 }
+
+type azAuthFileKey struct {
+	azAuthKey
+}
+
+// GetCredential : Gets shared key based storage credentials for datalake
+func (azkey *azAuthFileKey) getCredential() interface{} {
+	if azkey.config.AccountKey == "" {
+		log.Err("azAuthFileKey::getCredential : Shared key for account is empty, cannot authenticate user")
+		return nil
+	}
+
+	credential, err := azfile.NewSharedKeyCredential(
+		azkey.config.AccountName,
+		azkey.config.AccountKey)
+	if err != nil {
+		log.Err("azAuthFileKey::getCredential : Failed to create shared key credentials")
+		return nil
+	}
+
+	return credential
+}

component/azstorage/azauthsas.go

@@ -40,6 +40,7 @@ import (
 
 	"github.com/Azure/azure-storage-azcopy/v10/azbfs"
 	"github.com/Azure/azure-storage-blob-go/azblob"
+	"github.com/Azure/azure-storage-file-go/azfile"
 )
 
 // Verify that the Auth implement the correct AzAuth interfaces
@@ -91,3 +92,17 @@ func (azsas *azAuthBfsSAS) getCredential() interface{} {
 
 	return azbfs.NewAnonymousCredential()
 }
+
+type azAuthFileSAS struct {
+	azAuthSAS
+}
+
+// GetCredential : Gets SAS based credentials for blob
+func (azsas *azAuthFileSAS) getCredential() interface{} {
+	if azsas.config.SASKey == "" {
+		log.Err("azAuthFileSAS::getCredential : SAS key for account is empty, cannot authenticate user")
+		return nil
+	}
+
+	return azfile.NewAnonymousCredential()
+}

component/azstorage/config.go

@@ -100,6 +100,10 @@ func (AccountType) ADLS() AccountType {
 	return AccountType(2)
 }
 
+func (AccountType) FILE() AccountType {
+	return AccountType(3)
+}
+
 func (f AccountType) String() string {
 	return enum.StringInt(f, reflect.TypeOf(f))
 }

component/azstorage/connection.go

@@ -140,6 +140,13 @@ func NewAzStorageConnection(cfg AzStorageConfig) AzConnection {
 		stg := &Datalake{}
 		_ = stg.Configure(cfg)
 		return stg
+	} else if cfg.authConfig.AccountType == EAccountType.FILE() {
+		stg := &FileShare{}
+		if err := stg.Configure(cfg); err != nil {
+			log.Err("NewAzStorageConnection : Failed to configure FileShare object (%s)", err.Error())
+			return nil
+		}
+		return stg
 	}
 
 	return nil