[GitHub] azcopy list with versionids does not show version id

cmd/zc_traverser_blob.go

@@ -478,6 +478,8 @@ func (t *blobTraverser) createStoredObjectForBlob(preprocessor objectMorpher, bl
 		object.blobSnapshotID = common.IffNotNil(blobInfo.Snapshot, "")
 	} else if t.includeDeleted && t.includeVersion && blobInfo.VersionID != nil {
 		object.blobVersionID = common.IffNotNil(blobInfo.VersionID, "")
+	} else if blobInfo.VersionID != nil {
+		object.blobVersionID = common.IffNotNil(blobInfo.VersionID, "")
 	}
 	return object
 }

cmd/zt_list_test.go

@@ -0,0 +1,65 @@
+package cmd
+
+import (
+	"github.com/Azure/azure-storage-azcopy/v10/common"
+	"github.com/stretchr/testify/assert"
+	"strings"
+	"testing"
+)
+
+func TestListVersions(t *testing.T) {
+	a := assert.New(t)
+	bsc := getSecondaryBlobServiceClient()
+	// set up the container with single blob with 2 versions
+	containerClient, containerName := createNewContainer(a, bsc)
+	defer deleteContainer(a, containerClient)
+
+	blobsToInclude := []string{"AzURE2021.jpeg", "sub1/dir2/HELLO-4.txt", "sub1/test/testing.txt"}
+	scenarioHelper{}.generateBlobsFromList(a, containerClient, blobsToInclude, blockBlobDefaultData)
+	a.NotNil(containerClient)
+
+	// get dictionary/map of blob: version id
+	versions := make(map[string]string)
+	for _, blob := range blobsToInclude {
+		props, err := containerClient.NewBlockBlobClient(blob).GetProperties(ctx, nil)
+		a.NoError(err)
+
+		versions[blob] = *props.VersionID
+	}
+
+	// confirm that container has 3 blobs
+	pager := containerClient.NewListBlobsFlatPager(nil)
+	list, err := pager.NextPage(ctx)
+	a.NoError(err)
+	a.NotNil(list.Segment.BlobItems)
+	a.Equal(3, len(list.Segment.BlobItems))
+
+	// set up interceptor
+	mockedRPC := interceptor{}
+	Rpc = mockedRPC.intercept
+	mockedRPC.init()
+
+	mockedLcm := mockedLifecycleManager{infoLog: make(chan string, 50)}
+	mockedLcm.SetOutputFormat(common.EOutputFormat.Text()) // text format
+	glcm = &mockedLcm
+
+	// construct the raw input to simulate user input
+	rawContainerURLWithSAS := scenarioHelper{}.getSecondaryRawContainerURLWithSAS(a, containerName)
+	raw := getDefaultListRawInput(rawContainerURLWithSAS.String())
+	raw.Properties = "VersionId"
+
+	runListAndVerify(a, raw, func(err error) {
+		a.Nil(err)
+
+		// validate that the no transfers were scheduled
+		a.Nil(mockedRPC.transfers)
+
+		// check if info logs contain the correct version id for each blob
+		msg := mockedLcm.GatherAllLogs(mockedLcm.infoLog)
+		for i, m := range msg {
+			a.True(strings.Contains(m, blobsToInclude[i]))
+			a.True(strings.Contains(m, "VersionId: "+versions[blobsToInclude[i]]))
+		}
+	})
+
+}

cmd/zt_scenario_helpers_for_test.go

@@ -599,6 +599,17 @@ func (scenarioHelper) getRawContainerURLWithSAS(a *assert.Assertions, containerN
 	return parsedURL
 }
 
+func (scenarioHelper) getSecondaryRawContainerURLWithSAS(a *assert.Assertions, containerName string) *url.URL {
+	accountName, accountKey := getSecondaryAccountAndKey()
+	credential, err := blob.NewSharedKeyCredential(accountName, accountKey)
+	a.Nil(err)
+	cc := getContainerClientWithSAS(a, credential, containerName)
+
+	u := cc.URL()
+	parsedURL, err := url.Parse(u)
+	return parsedURL
+}
+
 func (scenarioHelper) getContainerClientWithSAS(a *assert.Assertions, containerName string) *container.Client {
 	accountName, accountKey := getAccountAndKey()
 	credential, err := blob.NewSharedKeyCredential(accountName, accountKey)
@@ -858,6 +869,17 @@ func runCopyAndVerify(a *assert.Assertions, raw rawCopyCmdArgs, verifier func(er
 	verifier(err)
 }
 
+func runListAndVerify(a *assert.Assertions, raw rawListCmdArgs, verifier func(err error)) {
+	// the simulated user input should parse properly
+	cooked, err := raw.cook()
+	a.NoError(err)
+
+	err = cooked.HandleListContainerCommand()
+
+	// the err is passed to verified, which knows whether it is expected or not
+	verifier(err)
+}
+
 func validateUploadTransfersAreScheduled(a *assert.Assertions, sourcePrefix string, destinationPrefix string, expectedTransfers []string, mockedRPC interceptor) {
 	validateCopyTransfersAreScheduled(a, false, true, sourcePrefix, destinationPrefix, expectedTransfers, mockedRPC)
 }
@@ -989,6 +1011,17 @@ func getDefaultRemoveRawInput(src string) rawCopyCmdArgs {
 	}
 }
 
+func getDefaultListRawInput(src string) rawListCmdArgs {
+	return rawListCmdArgs{
+		sourcePath:      src,
+		Properties:      "",
+		MachineReadable: false,
+		RunningTally:    false,
+		MegaUnits:       false,
+		trailingDot:     "",
+	}
+}
+
 func getDefaultSetPropertiesRawInput(src string, params transferParams) rawCopyCmdArgs {
 	fromTo := common.EFromTo.BlobNone()
 	srcURL, _ := url.Parse(src)