Add code to enable defualt login option

This commit is contained in:
vibhansa 2024-10-02 05:12:27 -07:00
Родитель 42b3b19b42
Коммит 24f61a70eb
3 изменённых файлов: 122 добавлений и 1 удалений

Просмотреть файл

@ -130,6 +130,12 @@ func getAzBlobAuth(config azAuthConfig) azAuth {
azAuthBase: base,
},
}
} else if config.AuthMode == EAuthType.AZDEFAULT() {
return &azAuthBlobDefault{
azAuthDefault{
azAuthBase: base,
},
}
} else {
log.Crit("azAuth::getAzBlobAuth : Auth type %s not supported. Failed to create Auth object", config.AuthMode)
}
@ -168,6 +174,12 @@ func getAzDatalakeAuth(config azAuthConfig) azAuth {
azAuthBase: base,
},
}
} else if config.AuthMode == EAuthType.AZDEFAULT() {
return &azAuthDatalakeDefault{
azAuthDefault{
azAuthBase: base,
},
}
} else {
log.Crit("azAuth::getAzDatalakeAuth : Auth type %s not supported. Failed to create Auth object", config.AuthMode)
}

Просмотреть файл

@ -0,0 +1,104 @@
/*
_____ _____ _____ ____ ______ _____ ------
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| --- | | | | |-----| |---- | | |-----| |----- ------
| | | | | | | | | | | | |
| ____| |_____ | ____| | ____| | |_____| _____| |_____ |_____
Licensed under the MIT License <http://opensource.org/licenses/MIT>.
Copyright © 2020-2024 Microsoft Corporation. All rights reserved.
Author : <blobfusedev@microsoft.com>
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE
*/
package azstorage
import (
"github.com/Azure/azure-sdk-for-go/sdk/azidentity"
"github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/service"
serviceBfs "github.com/Azure/azure-sdk-for-go/sdk/storage/azdatalake/service"
"github.com/Azure/azure-storage-fuse/v2/common/log"
)
// Verify that the Auth implement the correct AzAuth interfaces
var _ azAuth = &azAuthBlobMSI{}
var _ azAuth = &azAuthDatalakeMSI{}
type azAuthDefault struct {
azAuthBase
azOAuthBase
}
type azAuthBlobDefault struct {
azAuthDefault
}
// getServiceClient : returns MSI based service client for blob
func (azblobdef *azAuthBlobDefault) getServiceClient(stConfig *AzStorageConfig) (interface{}, error) {
cred, err := azidentity.NewDefaultAzureCredential(nil)
if err != nil {
log.Err("azAuthBlobDefault::getServiceClient : Failed to get token credential using environment [%s]", err.Error())
return nil, err
}
opts, err := getAzBlobServiceClientOptions(stConfig)
if err != nil {
log.Err("azAuthBlobDefault::getServiceClient : Failed to create client options [%s]", err.Error())
return nil, err
}
svcClient, err := service.NewClient(azblobdef.config.Endpoint, cred, opts)
if err != nil {
log.Err("azAuthBlobDefault::getServiceClient : Failed to create service client [%s]", err.Error())
}
return svcClient, err
}
type azAuthDatalakeDefault struct {
azAuthDefault
}
// getServiceClient : returns MSI based service client for datalake
func (azdfsdef *azAuthDatalakeDefault) getServiceClient(stConfig *AzStorageConfig) (interface{}, error) {
cred, err := azidentity.NewDefaultAzureCredential(nil)
if err != nil {
log.Err("azAuthDatalakeDefault::getServiceClient : Failed to get token credential using environment [%s]", err.Error())
return nil, err
}
opts, err := getAzDatalakeServiceClientOptions(stConfig)
if err != nil {
log.Err("azAuthDatalakeDefault::getServiceClient : Failed to create client options [%s]", err.Error())
return nil, err
}
svcClient, err := serviceBfs.NewClient(azdfsdef.config.Endpoint, cred, opts)
if err != nil {
log.Err("azAuthDatalakeDefault::getServiceClient : Failed to create service client [%s]", err.Error())
}
return svcClient, err
}

Просмотреть файл

@ -75,6 +75,10 @@ func (AuthType) AZCLI() AuthType {
return AuthType(5)
}
func (AuthType) AZDEFAULT() AuthType {
return AuthType(6)
}
func (a AuthType) String() string {
return enum.StringInt(a, reflect.TypeOf(a))
}
@ -460,7 +464,8 @@ func ParseAndValidateConfig(az *AzStorage, opt AzStorageOptions) error {
az.stConfig.authConfig.OAuthTokenFilePath = opt.OAuthTokenFilePath
case EAuthType.AZCLI():
az.stConfig.authConfig.AuthMode = EAuthType.AZCLI()
case EAuthType.AZDEFAULT():
az.stConfig.authConfig.AuthMode = EAuthType.AZDEFAULT()
default:
log.Err("ParseAndValidateConfig : Invalid auth mode %s", opt.AuthMode)
return errors.New("invalid auth mode")