From ea4f9212cd85228f76ed24d959dea14af28baf82 Mon Sep 17 00:00:00 2001 From: Wendi Onwuakpa Date: Tue, 27 Aug 2024 16:50:59 -0400 Subject: [PATCH] listing with OAuth support added + e2e test --- cmd/list.go | 2 -- e2etest/zt_newe2e_list_test.go | 18 +++++++++++------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/cmd/list.go b/cmd/list.go index 6a7ac0964..418d6013c 100755 --- a/cmd/list.go +++ b/cmd/list.go @@ -236,8 +236,6 @@ func (cooked cookedListCmdArgs) handleListContainerCommand() (err error) { // isSource is rather misnomer for canBePublic. We can list public containers, and hence isSource=true if credentialInfo, _, err = GetCredentialInfoForLocation(ctx, cooked.location, source, true, common.CpkOptions{}); err != nil { return fmt.Errorf("failed to obtain credential info: %s", err.Error()) - } else if cooked.location == cooked.location.File() && source.SAS == "" { - return errors.New("azure files requires a SAS token for authentication") } else if credentialInfo.CredentialType.IsAzureOAuth() { uotm := GetUserOAuthTokenManagerInstance() if tokenInfo, err := uotm.GetTokenInfo(ctx); err != nil { diff --git a/e2etest/zt_newe2e_list_test.go b/e2etest/zt_newe2e_list_test.go index c58e1302f..b7d9a9d3f 100644 --- a/e2etest/zt_newe2e_list_test.go +++ b/e2etest/zt_newe2e_list_test.go @@ -14,7 +14,8 @@ func init() { type ListSuite struct{} func (s *ListSuite) Scenario_ListBasic(svm *ScenarioVariationManager) { - srcService := GetRootResource(svm, ResolveVariation(svm, []common.Location{common.ELocation.Blob()})) + srcService := GetRootResource(svm, ResolveVariation(svm, []common.Location{common.ELocation.Blob(), + common.ELocation.File()})) svm.InsertVariationSeparator(":") body := NewRandomObjectContentContainer(svm, SizeFromString("1K")) @@ -38,12 +39,15 @@ func (s *ListSuite) Scenario_ListBasic(svm *ScenarioVariationManager) { AzCopyCommand{ Verb: AzCopyVerbList, Targets: []ResourceManager{ - srcObj.Parent().(RemoteResourceManager).WithSpecificAuthType(EExplicitCredentialType.SASToken(), svm, CreateAzCopyTargetOptions{ - SASTokenOptions: GenericServiceSignatureValues{ - ContainerName: srcObj.ContainerName(), - Permissions: (&blobsas.ContainerPermissions{Read: true, List: true}).String(), - }, - }), + srcObj.Parent().(RemoteResourceManager).WithSpecificAuthType(ResolveVariation(svm, + []ExplicitCredentialTypes{EExplicitCredentialType.OAuth(), + EExplicitCredentialType.SASToken()}), svm, + CreateAzCopyTargetOptions{ + SASTokenOptions: GenericServiceSignatureValues{ + ContainerName: srcObj.ContainerName(), + Permissions: (&blobsas.ContainerPermissions{Read: true, List: true}).String(), + }, + }), }, Flags: ListFlags{}, })